This commit is contained in:
koopthekoopa
2026-07-08 16:37:32 +01:00
parent 7761d9ffb0
commit ff68d54ab3
103 changed files with 10684 additions and 8413 deletions

View File

@@ -68,4 +68,4 @@ SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
TabWidth: 4
UseTab: Never
UseTab: Never

View File

@@ -44,11 +44,13 @@
# Code Guidelines
### Note: In some scenarios, some of these rules can be ignored if they either affect matching or relate to symbols or DWARF from ELF files.
### General
- Style formatting is all done by `clang-format`.
- It should automatically apply when using Visual Studio Code on saving a source file.
- For checking on pointers, please use the `NULL` macro, unless if it affects code matching.
- For checking on pointers, please use the `NULL` macro.
```cpp
// Do this!
if (myPointer == NULL) {
@@ -149,7 +151,7 @@ Make sure the guard names are uppercase SNAKE_CASE.
### Literals
- For floating-point values, please be explicit with them. (it can change code and data matching)
- For floating-point values, please be explicit with them. (they also affect matching)
```cpp
// Do this!
float value0 = 1.0f;

View File

@@ -1756,10 +1756,10 @@ list_sd_save_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348DEC; // type:functio
list_sd_app_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E00; // type:function size:0x14
get_sd_save_banner_async__Q23ipl12NandSDWorkerFUlP17WIISaveBannerFile = .text:0x81348E14; // type:function size:0x28
get_sd_app_thumbnail_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81348E3C; // type:function size:0x34
iplNandSD_81348DFC__Q23ipl12NandSDWorkerFUlPvPv = .text:0x81348E70; // type:function size:0x34
update_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348EA4; // type:function size:0x14
read_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348EB8; // type:function size:0x14
iplNandSD_81348E58__Q23ipl12NandSDWorkerFUxPvPv = .text:0x81348ECC; // type:function size:0x30
get_sd_app_meta_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl12NandSDWorker14SDAppMetaEntry = .text:0x81348E70; // type:function size:0x34
update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348EA4; // type:function size:0x14
read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348EB8; // type:function size:0x14
check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x81348ECC; // type:function size:0x30
check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348EFC; // type:function size:0x20
iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348F1C; // type:function size:0x2C
get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348F48; // type:function size:0x18
@@ -1776,7 +1776,7 @@ copy_sd_save_to_nand_async__Q23ipl12NandSDWorkerFUl = .text:0x81349028; // type:
format_sd_async__Q23ipl12NandSDWorkerFv = .text:0x81349044; // type:function size:0x8
get_sd_free_area_async__Q23ipl12NandSDWorkerFPUx = .text:0x8134904C; // type:function size:0x14
list_nand_app_async__Q23ipl12NandSDWorkerFPUx = .text:0x81349060; // type:function size:0x14
iplNandSD_81349000__Q23ipl12NandSDWorkerFPvPv = .text:0x81349074; // type:function size:0x20
list_nand_apps_usage_async__Q23ipl12NandSDWorkerFPvPv = .text:0x81349074; // type:function size:0x20
get_nand_app_thumbnail_async__Q23ipl12NandSDWorkerFUxPvPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81349094; // type:function size:0x30
delete_nand_app_async__Q23ipl12NandSDWorkerFUxb = .text:0x813490C4; // type:function size:0x28
copy_nand_app_to_sd_async__Q23ipl12NandSDWorkerFUx = .text:0x813490EC; // type:function size:0x20
@@ -1817,12 +1817,12 @@ check_nand_save_banner_exist__Q23ipl12NandSDWorkerFUx = .text:0x8134AFDC; // typ
get_nand_save_banner__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134B0C0; // type:function size:0x3B0
do_get_sd_save_banner__Q23ipl12NandSDWorkerFv = .text:0x8134B470; // type:function size:0x160
do_get_sd_app_thumbnail__Q23ipl12NandSDWorkerFv = .text:0x8134B5D0; // type:function size:0x1CC
do_unk_8134B728__Q23ipl12NandSDWorkerFv = .text:0x8134B79C; // type:function size:0x1F4
do_update_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134B990; // type:function size:0x344
do_read_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134BCD4; // type:function size:0x270
do_unk_8134BED0__Q23ipl12NandSDWorkerFv = .text:0x8134BF44; // type:function size:0x3C8
do_get_sd_app_meta__Q23ipl12NandSDWorkerFv = .text:0x8134B79C; // type:function size:0x1F4
do_update_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134B990; // type:function size:0x344
do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134BCD4; // type:function size:0x270
do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134BF44; // type:function size:0x3C8
check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134C30C; // type:function size:0x3D8
do_list_nand_apps_usages__Q23ipl12NandSDWorkerFv = .text:0x8134C6E4; // type:function size:0x1C8
do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134C6E4; // type:function size:0x1C8
do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134C8AC; // type:function size:0x2D0
do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134CB7C; // type:function size:0x260
do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134CDDC; // type:function size:0x1F4
@@ -1852,7 +1852,7 @@ delete_download_task__Q23ipl12NandSDWorkerFUl = .text:0x8134FD08; // type:functi
delete_nand_app_content__Q23ipl12NandSDWorkerFUx = .text:0x8134FF1C; // type:function size:0x134
do_copy_nand_app_to_sd__Q23ipl12NandSDWorkerFv = .text:0x81350050; // type:function size:0x530
get_save_banner_for_data_only_title__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x81350580; // type:function size:0x160
get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker11SDAppBanner = .text:0x813506E0; // type:function size:0x480
get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker15SDAppBackupData = .text:0x813506E0; // type:function size:0x480
open_nand_app_content__Q23ipl12NandSDWorkerFUxUsPUlPP12ESTicketView = .text:0x81350B60; // type:function size:0x21C
read_file__Q23ipl12NandSDWorkerFPvQ33ipl12NandSDWorker8FileKindlUlPv = .text:0x81350D7C; // type:function size:0x158
search_meta_header__Q23ipl12NandSDWorkerFPCUc = .text:0x81350ED4; // type:function size:0x54
@@ -1920,13 +1920,13 @@ check_nand_save_exist_lo__Q23ipl12NandSDWorkerFUl = .text:0x8135476C; // type:fu
get_nand_title_version__Q23ipl12NandSDWorkerFUxPUs = .text:0x81354834; // type:function size:0x80
get_sd_title_version__Q23ipl12NandSDWorkerFUlPUs = .text:0x813548B4; // type:function size:0xF4
check_sd_title_restorable__Q23ipl12NandSDWorkerFUl = .text:0x813549A8; // type:function size:0x184
__ct__Q33ipl2ut8FreeListFv = .text:0x81354B2C; // type:function size:0x14
init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81354B40; // type:function size:0x5C
get__Q33ipl2ut8FreeListFv = .text:0x81354B9C; // type:function size:0x24
__ct__Q33ipl2ut5StackFv = .text:0x81354BC0; // type:function size:0x40
init__Q33ipl2ut5StackFPvUlUl = .text:0x81354C00; // type:function size:0x4C
push__Q33ipl2ut5StackFPCv = .text:0x81354C4C; // type:function size:0x78
pop__Q33ipl2ut5StackFPv = .text:0x81354CC4; // type:function size:0x80
__ct__Q33ipl2ut8FreeListFv = .text:0x81354B2C; // type:function size:0x14 scope:weak
init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81354B40; // type:function size:0x5C scope:weak
get__Q33ipl2ut8FreeListFv = .text:0x81354B9C; // type:function size:0x24 scope:weak
__ct__Q33ipl2ut5StackFv = .text:0x81354BC0; // type:function size:0x40 scope:weak
init__Q33ipl2ut5StackFPvUlUl = .text:0x81354C00; // type:function size:0x4C scope:weak
push__Q33ipl2ut5StackFPCv = .text:0x81354C4C; // type:function size:0x78 scope:weak
pop__Q33ipl2ut5StackFPv = .text:0x81354CC4; // type:function size:0x80 scope:weak
getFirstController__Q23ipl8keyboardFv = .text:0x81354D44; // type:function size:0x50
onCommand__Q33ipl8keyboard13EventObserverFQ39textinput15CommandReceiver13INPUT_COMMANDPv = .text:0x81354D94; // type:function size:0x34
onSE__Q33ipl8keyboard13EventObserverFQ39textinput5sound2SE = .text:0x81354DC8; // type:function size:0x218
@@ -2607,8 +2607,8 @@ LeftScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginV
RightScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136FA28; // type:function size:0x3C
GetScrollState__Q23www9trasitionFv = .text:0x8136FA64; // type:function size:0x8
ResetScrollState__Q23www9trasitionFv = .text:0x8136FA6C; // type:function size:0xC
www_wiisetting_8136F9D0 = .text:0x8136FA78; // type:function size:0x24 scope:local
www_wiisetting_8136F9F4 = .text:0x8136FA9C; // type:function size:0x44 scope:local
DPDCallback2__Q23www10wiisettingFll = .text:0x8136FA78; // type:function size:0x24 scope:local
DPDCallback__Q23www10wiisettingFll = .text:0x8136FA9C; // type:function size:0x44 scope:local
allow_access__Q23www10wiisettingFPCcPCci = .text:0x8136FAE0; // type:function size:0x8
AddJsPlugin__Q23www10wiisettingFv = .text:0x8136FAE8; // type:function size:0x88
globalGetter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136FB70; // type:function size:0xC8
@@ -2617,9 +2617,9 @@ Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x81
Setter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8137065C; // type:function size:0x50C
wiiOSReport__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x81370B68; // type:function size:0x5C
wiiWriteBack__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x81370BC4; // type:function size:0x344
www_wiisetting_81370E60 = .text:0x81370F08; // type:function size:0x54 scope:local
getKeyboardLanguage__Q23www10wiisettingFUc = .text:0x81370F08; // type:function size:0x54 scope:local
initWiiSetting__Q23www10wiisettingFv = .text:0x81370F5C; // type:function size:0x60
www_wiisetting_81370F14 = .text:0x81370FBC; // type:function size:0x98 scope:local
getBytePropIndex__Q23www10wiisettingFPCc = .text:0x81370FBC; // type:function size:0x98 scope:local
startFunc__Q23www10wiisettingFUc = .text:0x81371054; // type:function size:0x1A4
getWiiSettingData__Q23www10wiisettingFv = .text:0x813711F8; // type:function size:0xC
getWiiSettingFlag__Q23www10wiisettingFv = .text:0x81371204; // type:function size:0x8
@@ -13814,7 +13814,7 @@ lbl_8160D840 = .rodata:0x8160D840; // type:object size:0x20
scNumber__3ipl = .rodata:0x8160D860; // type:object size:0x16 data:wstring
c_es_encrypt_iv__Q23ipl12NandSDWorker = .rodata:0x8160D878; // type:object size:0x10
c_md5_secret_key__Q23ipl12NandSDWorker = .rodata:0x8160D888; // type:object size:0x10
lbl_8160D898 = .rodata:0x8160D898; // type:object size:0x10 data:4byte
@14986 = .rodata:0x8160D898; // type:object size:0x10 scope:local data:4byte
cDefaultChanList__3ipl = .rodata:0x8160D8A8; // type:object size:0x300 scope:local
odh_zigzag_order = .rodata:0x8160DBA8; // type:object size:0x40 scope:local data:byte
odh_natural_order = .rodata:0x8160DBE8; // type:object size:0x40 scope:local data:byte
@@ -13856,8 +13856,8 @@ scMonthToMessageID__Q23ipl5scene = .rodata:0x8160FD98; // type:object size:0x30
scNumber__Q23ipl5scene = .rodata:0x8160FDC8; // type:object size:0x18 scope:local data:2byte
scAnmFrame__Q23ipl5scene = .rodata:0x8160FDE0; // type:object size:0x90 scope:local
scNumber__Q23ipl5scene = .rodata:0x8160FE70; // type:object size:0x18 scope:local
scNumber__Q23ipl5scene = .rodata:0x8160FE88; // type:object size:0x14 scope:local data:2byte
scNumber2__Q23ipl5scene = .rodata:0x8160FE9C; // type:object size:0x14 scope:local data:2byte
@13129 = .rodata:0x8160FE88; // type:object size:0x14 scope:local data:2byte
@13171 = .rodata:0x8160FE9C; // type:object size:0x14 scope:local data:2byte
lbl_8160FEB0 = .rodata:0x8160FEB0; // type:object size:0x10
lbl_8160FEC0 = .rodata:0x8160FEC0; // type:object size:0x10
scNumber__Q23ipl5scene = .rodata:0x8160FED0; // type:object size:0x18 scope:local data:2byte
@@ -13869,9 +13869,9 @@ cfChanThumbOfss__Q23ipl5scene = .rodata:0x81610510; // type:object size:0x10 sco
lbl_81610520 = .rodata:0x81610520; // type:object size:0x10 data:4byte
lbl_81610530 = .rodata:0x81610530; // type:object size:0x20 data:4byte
@10845 = .rodata:0x81610550; // type:object size:0x14 scope:local data:2byte
scNumber__Q23ipl5scene = .rodata:0x81610568; // type:object size:0x14 scope:local data:2byte
scNumber2__Q23ipl5scene = .rodata:0x8161057C; // type:object size:0x14 scope:local data:2byte
scNumber__Q23ipl5scene = .rodata:0x81610590; // type:object size:0x14 scope:local data:2byte
@13108 = .rodata:0x81610568; // type:object size:0x14 scope:local data:2byte
@13150 = .rodata:0x8161057C; // type:object size:0x14 scope:local data:2byte
@12843 = .rodata:0x81610590; // type:object size:0x14 scope:local data:2byte
scAnmName__Q23ipl5scene = .rodata:0x816105A8; // type:object size:0xD8 scope:local
scTextboxToMessageID__Q23ipl5scene = .rodata:0x81610680; // type:object size:0x28 scope:local
scNumber__Q23ipl5scene = .rodata:0x816106A8; // type:object size:0x18 scope:local data:2byte
@@ -14055,7 +14055,7 @@ g_SpecialsChars = .rodata:0x81618FB0; // type:object size:0x10 scope:local data:
TtableInv = .rodata:0x81618FC0; // type:object size:0x10 scope:local
VFipf_valid_fn_char = .rodata:0x81618FD0; // type:object size:0x60
fat_special_values = .rodata:0x81619030; // type:object size:0x3C scope:local
cp932_to_unicode = .rodata:0x81619070; // type:object size:0x4272 scope:local data:2byte
cp932_to_unicode = .rodata:0x81619070; // type:object size:0x4272 scope:local data:2byte noreloc
ErrInfoTbl$4383 = .rodata:0x8161D2E8; // type:object size:0xD0 scope:local
l_nand_func = .rodata:0x8161D3B8; // type:object size:0x20 scope:local
pfd_sddrv_func = .rodata:0x8161D3D8; // type:object size:0x20 scope:local
@@ -14189,7 +14189,7 @@ ms_ppki = .rodata:0x8162E438; // type:object size:0x240 noreloc
@1272 = .rodata:0x8162E678; // type:object size:0x278 scope:local data:4byte
pf_valid_fn_char = .rodata:0x8162E8F0; // type:object size:0x60
fat_special_values = .rodata:0x8162E950; // type:object size:0x3C
cp932_to_unicode = .rodata:0x8162E990; // type:object size:0x4272 data:2byte
cp932_to_unicode = .rodata:0x8162E990; // type:object size:0x4272 scope:local data:2byte noreloc
fa_nand_func = .rodata:0x81632C08; // type:object size:0x20
pfd_sddrv_func = .rodata:0x81632C28; // type:object size:0x20
sddrv_size_depend_tbl = .rodata:0x81632C48; // type:object size:0x150 data:4byte
@@ -14397,65 +14397,290 @@ __vt__Q23ipl12DialogWindow = .data:0x81635CD0; // type:object size:0x18
__vt__Q23gui12EventHandler = .data:0x81635CE8; // type:object size:0x18 scope:weak
__vt__Q23gui9Interface = .data:0x81635D00; // type:object size:0x20 scope:weak
@10439 = .data:0x81635D20; // type:object size:0x12 scope:local data:string
lbl_81635D38 = .data:0x81635D38; // type:object size:0xB data:string
lbl_81635D43 = .data:0x81635D43; // type:object size:0xB data:string
lbl_81635D4E = .data:0x81635D4E; // type:object size:0x14 data:string
lbl_81635D62 = .data:0x81635D62; // type:object size:0x9 data:string
lbl_81635D6B = .data:0x81635D6B; // type:object size:0xC data:string
lbl_81635D77 = .data:0x81635D77; // type:object size:0x14 data:string
lbl_81635D8B = .data:0x81635D8B; // type:object size:0x20 data:string
lbl_81635DAB = .data:0x81635DAB; // type:object size:0x10 data:string
lbl_81635DBB = .data:0x81635DBB; // type:object size:0xC data:string
@12343 = .data:0x81635D38; // type:object size:0xB scope:local data:string
...data.0 = .data:0x81635D38; // type:label scope:local
@12345 = .data:0x81635D43; // type:object size:0xB scope:local data:string
@12346 = .data:0x81635D4E; // type:object size:0x14 scope:local data:string
@12347 = .data:0x81635D62; // type:object size:0x9 scope:local data:string
@12348 = .data:0x81635D6B; // type:object size:0xC scope:local data:string
@12349 = .data:0x81635D77; // type:object size:0x14 scope:local data:string
@12350 = .data:0x81635D8B; // type:object size:0x20 scope:local data:string
@12351 = .data:0x81635DAB; // type:object size:0x10 scope:local data:string
@12354 = .data:0x81635DBB; // type:object size:0xC scope:local data:string
c_ignore_list_for_shared2__Q23ipl12NandSDWorker = .data:0x81635DC8; // type:object size:0x14
lbl_81635DDC = .data:0x81635DDC; // type:object size:0xC data:string
lbl_81635DE8 = .data:0x81635DE8; // type:object size:0xA data:string
lbl_81635DF2 = .data:0x81635DF2; // type:object size:0x1E data:string
lbl_81635E10 = .data:0x81635E10; // type:object size:0x22 data:string
lbl_81635E32 = .data:0x81635E32; // type:object size:0x22 data:string
lbl_81635E54 = .data:0x81635E54; // type:object size:0x6A
lbl_81635EBE = .data:0x81635EBE; // type:object size:0x21 data:string
lbl_81635EDF = .data:0x81635EDF; // type:object size:0x25 data:string
lbl_81635F04 = .data:0x81635F04; // type:object size:0xC7
lbl_81635FCB = .data:0x81635FCB; // type:object size:0x95
jumptable_81636060 = .data:0x81636060; // type:object size:0xD0 scope:local
lbl_81636130 = .data:0x81636130; // type:object size:0x54B scope:local
lbl_8163667B = .data:0x8163667B; // type:object size:0x163
lbl_816367DE = .data:0x816367DE; // type:object size:0x15 data:string
lbl_816367F3 = .data:0x816367F3; // type:object size:0x42
lbl_81636835 = .data:0x81636835; // type:object size:0x170
lbl_816369A5 = .data:0x816369A5; // type:object size:0x25 data:string
lbl_816369CA = .data:0x816369CA; // type:object size:0xAE
lbl_81636A78 = .data:0x81636A78; // type:object size:0xE0
lbl_81636B58 = .data:0x81636B58; // type:object size:0x21 data:string
lbl_81636B79 = .data:0x81636B79; // type:object size:0x1F data:string
lbl_81636B98 = .data:0x81636B98; // type:object size:0x1E data:string
lbl_81636BB6 = .data:0x81636BB6; // type:object size:0x450
lbl_81637006 = .data:0x81637006; // type:object size:0x64E
lbl_81637654 = .data:0x81637654; // type:object size:0x26 data:string
lbl_8163767A = .data:0x8163767A; // type:object size:0x13 data:string
lbl_8163768D = .data:0x8163768D; // type:object size:0xD data:string
lbl_8163769A = .data:0x8163769A; // type:object size:0x61
lbl_816376FB = .data:0x816376FB; // type:object size:0x2A data:string
lbl_81637725 = .data:0x81637725; // type:object size:0x425
lbl_81637B4A = .data:0x81637B4A; // type:object size:0x28 data:string
lbl_81637B72 = .data:0x81637B72; // type:object size:0x6D9
lbl_8163824B = .data:0x8163824B; // type:object size:0x35 data:string
lbl_81638280 = .data:0x81638280; // type:object size:0x34 data:string
lbl_816382B4 = .data:0x816382B4; // type:object size:0x448
lbl_816386FC = .data:0x816386FC; // type:object size:0x69
lbl_81638765 = .data:0x81638765; // type:object size:0x24 data:string
lbl_81638789 = .data:0x81638789; // type:object size:0x2E data:string
lbl_816387B7 = .data:0x816387B7; // type:object size:0x79
lbl_81638830 = .data:0x81638830; // type:object size:0xCE
lbl_816388FE = .data:0x816388FE; // type:object size:0x20 data:string
lbl_8163891E = .data:0x8163891E; // type:object size:0x1E1
lbl_81638AFF = .data:0x81638AFF; // type:object size:0x21 data:string
lbl_81638B20 = .data:0x81638B20; // type:object size:0x24 data:string
lbl_81638B44 = .data:0x81638B44; // type:object size:0x43
lbl_81638B87 = .data:0x81638B87; // type:object size:0x2A data:string
lbl_81638BB1 = .data:0x81638BB1; // type:object size:0x1 data:string
@12357 = .data:0x81635DDC; // type:object size:0xC scope:local data:string
@12358 = .data:0x81635DE8; // type:object size:0xA scope:local data:string
@12359 = .data:0x81635DF2; // type:object size:0x1E scope:local data:string
@21503 = .data:0x81635E10; // type:object size:0x22 scope:local data:string
@21504 = .data:0x81635E32; // type:object size:0x22 scope:local data:string
@21767 = .data:0x81635E54; // type:object size:0x16 scope:local data:string
@21770 = .data:0x81635E6A; // type:object size:0x11 scope:local data:string
@21777 = .data:0x81635E7B; // type:object size:0x19 scope:local data:string
@21780 = .data:0x81635E94; // type:object size:0x1A scope:local data:string
@21783 = .data:0x81635EAE; // type:object size:0x10 scope:local data:string
@21788 = .data:0x81635EBE; // type:object size:0x21 scope:local data:string
@21789 = .data:0x81635EDF; // type:object size:0x25 scope:local data:string
@21792 = .data:0x81635F04; // type:object size:0x28 scope:local data:string
@21804 = .data:0x81635F2C; // type:object size:0x1B scope:local data:string
@21805 = .data:0x81635F47; // type:object size:0x1E scope:local data:string
@21806 = .data:0x81635F65; // type:object size:0x29 scope:local data:string
@21917 = .data:0x81635F8E; // type:object size:0x1F scope:local data:string
@21918 = .data:0x81635FAD; // type:object size:0x1E scope:local data:string
@21919 = .data:0x81635FCB; // type:object size:0x2F scope:local data:string
@21920 = .data:0x81635FFA; // type:object size:0x34 scope:local data:string
@21921 = .data:0x8163602E; // type:object size:0x14 scope:local data:string
@21922 = .data:0x81636042; // type:object size:0x1B scope:local data:string
@21924 = .data:0x81636060; // type:object size:0xD0 scope:local
@21965 = .data:0x81636130; // type:object size:0x21 scope:local data:string
@21966 = .data:0x81636151; // type:object size:0x22 scope:local data:string
@21967 = .data:0x81636173; // type:object size:0x30 scope:local data:string
@21968 = .data:0x816361A3; // type:object size:0x3F scope:local data:string
@21969 = .data:0x816361E2; // type:object size:0x33 scope:local data:string
@21970 = .data:0x81636215; // type:object size:0x30 scope:local data:string
@21971 = .data:0x81636245; // type:object size:0x2E scope:local data:string
@21972 = .data:0x81636273; // type:object size:0x28 scope:local data:string
@21973 = .data:0x8163629B; // type:object size:0x28 scope:local data:string
@21974 = .data:0x816362C3; // type:object size:0x35 scope:local data:string
@21975 = .data:0x816362F8; // type:object size:0x21 scope:local data:string
@21999 = .data:0x81636319; // type:object size:0x2F scope:local data:string
@22000 = .data:0x81636348; // type:object size:0x33 scope:local data:string
@22001 = .data:0x8163637B; // type:object size:0x3A scope:local data:string
@22002 = .data:0x816363B5; // type:object size:0x3F scope:local data:string
@22028 = .data:0x816363F4; // type:object size:0x2C scope:local data:string
@22029 = .data:0x81636420; // type:object size:0x32 scope:local data:string
@22030 = .data:0x81636452; // type:object size:0x29 scope:local data:string
@22055 = .data:0x8163647B; // type:object size:0x2D scope:local data:string
@22056 = .data:0x816364A8; // type:object size:0x9 scope:local data:string
@22057 = .data:0x816364B1; // type:object size:0x3C scope:local data:string
@22058 = .data:0x816364ED; // type:object size:0x28 scope:local data:string
@22106 = .data:0x81636515; // type:object size:0x29 scope:local data:string
@22107 = .data:0x8163653E; // type:object size:0x1D scope:local data:string
@22108 = .data:0x8163655B; // type:object size:0x1E scope:local data:string
@22109 = .data:0x81636579; // type:object size:0x1D scope:local data:string
@22110 = .data:0x81636596; // type:object size:0x24 scope:local data:string
@22134 = .data:0x816365BA; // type:object size:0x34 scope:local data:string
@22135 = .data:0x816365EE; // type:object size:0x1E scope:local data:string
@22136 = .data:0x8163660C; // type:object size:0x28 scope:local data:string
@22137 = .data:0x81636634; // type:object size:0x2B scope:local data:string
@22138 = .data:0x8163665F; // type:object size:0x1C scope:local data:string
@22158 = .data:0x8163667B; // type:object size:0x2D scope:local data:string
@22193 = .data:0x816366A8; // type:object size:0x26 scope:local data:string
@22194 = .data:0x816366CE; // type:object size:0x2C scope:local data:string
@22195 = .data:0x816366FA; // type:object size:0x30 scope:local data:string
@22196 = .data:0x8163672A; // type:object size:0x30 scope:local data:string
@22197 = .data:0x8163675A; // type:object size:0x26 scope:local data:string
@22198 = .data:0x81636780; // type:object size:0x27 scope:local data:string
@22199 = .data:0x816367A7; // type:object size:0x37 scope:local data:string
@13884 = .data:0x816367DE; // type:object size:0x15 scope:local data:string
@13885 = .data:0x816367F3; // type:object size:0x15 scope:local data:string
@22354 = .data:0x81636808; // type:object size:0x2D scope:local data:string
@22355 = .data:0x81636835; // type:object size:0x30 scope:local data:string
@22356 = .data:0x81636865; // type:object size:0x4E scope:local data:string
@22357 = .data:0x816368B3; // type:object size:0x40 scope:local data:string
@22358 = .data:0x816368F3; // type:object size:0x2E scope:local data:string
@22359 = .data:0x81636921; // type:object size:0x37 scope:local data:string
@22360 = .data:0x81636958; // type:object size:0x4D scope:local data:string
@22400 = .data:0x816369A5; // type:object size:0x25 scope:local data:string
@22401 = .data:0x816369CA; // type:object size:0x41 scope:local data:string
@22422 = .data:0x81636A0B; // type:object size:0x30 scope:local data:string
@22423 = .data:0x81636A3B; // type:object size:0x3D scope:local data:string
@22455 = .data:0x81636A78; // type:object size:0x48 scope:local data:string
@22476 = .data:0x81636AC0; // type:object size:0x31 scope:local data:string
@22477 = .data:0x81636AF1; // type:object size:0x38 scope:local data:string
@22497 = .data:0x81636B29; // type:object size:0x2F scope:local data:string
@22513 = .data:0x81636B58; // type:object size:0x21 scope:local data:string
@22514 = .data:0x81636B79; // type:object size:0x1F scope:local data:string
@22536 = .data:0x81636B98; // type:object size:0x1E scope:local data:string
@22537 = .data:0x81636BB6; // type:object size:0x20 scope:local data:string
@22570 = .data:0x81636BD6; // type:object size:0x9 scope:local data:string
@22571 = .data:0x81636BDF; // type:object size:0x37 scope:local data:string
@22572 = .data:0x81636C16; // type:object size:0x34 scope:local data:string
@22573 = .data:0x81636C4A; // type:object size:0xD scope:local data:string
@22574 = .data:0x81636C57; // type:object size:0x3A scope:local data:string
@22575 = .data:0x81636C91; // type:object size:0x31 scope:local data:string
@22576 = .data:0x81636CC2; // type:object size:0x2E scope:local data:string
@22577 = .data:0x81636CF0; // type:object size:0x2E scope:local data:string
@22578 = .data:0x81636D1E; // type:object size:0x2B scope:local data:string
@22579 = .data:0x81636D49; // type:object size:0x2C scope:local data:string
@22580 = .data:0x81636D75; // type:object size:0x2B scope:local data:string
@22581 = .data:0x81636DA0; // type:object size:0x23 scope:local data:string
@22582 = .data:0x81636DC3; // type:object size:0x38 scope:local data:string
@22583 = .data:0x81636DFB; // type:object size:0x2E scope:local data:string
@22584 = .data:0x81636E29; // type:object size:0x2A scope:local data:string
@22593 = .data:0x81636E53; // type:object size:0xF scope:local data:string
@22594 = .data:0x81636E62; // type:object size:0x3C scope:local data:string
@22595 = .data:0x81636E9E; // type:object size:0xF scope:local data:string
@22596 = .data:0x81636EAD; // type:object size:0x3C scope:local data:string
@22619 = .data:0x81636EE9; // type:object size:0x2E scope:local data:string
@22620 = .data:0x81636F17; // type:object size:0x33 scope:local data:string
@22621 = .data:0x81636F4A; // type:object size:0x39 scope:local data:string
@22622 = .data:0x81636F83; // type:object size:0x28 scope:local data:string
@22634 = .data:0x81636FAB; // type:object size:0x2B scope:local data:string
@22635 = .data:0x81636FD6; // type:object size:0x30 scope:local data:string
@22647 = .data:0x81637006; // type:object size:0x38 scope:local data:string
@22681 = .data:0x8163703E; // type:object size:0x2F scope:local data:string
@22682 = .data:0x8163706D; // type:object size:0x2F scope:local data:string
@22683 = .data:0x8163709C; // type:object size:0x36 scope:local data:string
@22684 = .data:0x816370D2; // type:object size:0x34 scope:local data:string
@22685 = .data:0x81637106; // type:object size:0x35 scope:local data:string
@22686 = .data:0x8163713B; // type:object size:0x2B scope:local data:string
@22690 = .data:0x81637166; // type:object size:0x32 scope:local data:string
@22691 = .data:0x81637198; // type:object size:0x21 scope:local data:string
@22692 = .data:0x816371B9; // type:object size:0x21 scope:local data:string
@22693 = .data:0x816371DA; // type:object size:0x26 scope:local data:string
@22701 = .data:0x81637200; // type:object size:0x36 scope:local data:string
@22702 = .data:0x81637236; // type:object size:0x38 scope:local data:string
@22703 = .data:0x8163726E; // type:object size:0x2A scope:local data:string
@22730 = .data:0x81637298; // type:object size:0x31 scope:local data:string
@22731 = .data:0x816372C9; // type:object size:0x33 scope:local data:string
@22732 = .data:0x816372FC; // type:object size:0x2F scope:local data:string
@22733 = .data:0x8163732B; // type:object size:0x31 scope:local data:string
@22789 = .data:0x8163735C; // type:object size:0x26 scope:local data:string
@22790 = .data:0x81637382; // type:object size:0x2F scope:local data:string
@22791 = .data:0x816373B1; // type:object size:0x2B scope:local data:string
@22792 = .data:0x816373DC; // type:object size:0x2C scope:local data:string
@22793 = .data:0x81637408; // type:object size:0x4F scope:local data:string
@22794 = .data:0x81637457; // type:object size:0x28 scope:local data:string
@22795 = .data:0x8163747F; // type:object size:0x3A scope:local data:string
@22796 = .data:0x816374B9; // type:object size:0x2D scope:local data:string
@22797 = .data:0x816374E6; // type:object size:0x22 scope:local data:string
@22798 = .data:0x81637508; // type:object size:0x20 scope:local data:string
@22799 = .data:0x81637528; // type:object size:0x22 scope:local data:string
@22800 = .data:0x8163754A; // type:object size:0x27 scope:local data:string
@22801 = .data:0x81637571; // type:object size:0x23 scope:local data:string
@22802 = .data:0x81637594; // type:object size:0x3D scope:local data:string
@22803 = .data:0x816375D1; // type:object size:0x27 scope:local data:string
@22815 = .data:0x816375F8; // type:object size:0x2C scope:local data:string
@22816 = .data:0x81637624; // type:object size:0x30 scope:local data:string
@22817 = .data:0x81637654; // type:object size:0x26 scope:local data:string
@14983 = .data:0x8163767A; // type:object size:0x13 scope:local data:string
@14984 = .data:0x8163768D; // type:object size:0xD scope:local data:string
@14985 = .data:0x8163769A; // type:object size:0x9 scope:local data:string
@22831 = .data:0x816376A3; // type:object size:0x18 scope:local data:string
@22832 = .data:0x816376BB; // type:object size:0x1C scope:local data:string
@22833 = .data:0x816376D7; // type:object size:0x24 scope:local data:string
@22841 = .data:0x816376FB; // type:object size:0x2A scope:local data:string
@22842 = .data:0x81637725; // type:object size:0x28 scope:local data:string
@22914 = .data:0x8163774D; // type:object size:0x35 scope:local data:string
@22915 = .data:0x81637782; // type:object size:0x2C scope:local data:string
@22916 = .data:0x816377AE; // type:object size:0x34 scope:local data:string
@22917 = .data:0x816377E2; // type:object size:0x35 scope:local data:string
@22918 = .data:0x81637817; // type:object size:0x2A scope:local data:string
@22919 = .data:0x81637841; // type:object size:0x38 scope:local data:string
@22920 = .data:0x81637879; // type:object size:0x53 scope:local data:string
@22921 = .data:0x816378CC; // type:object size:0x2A scope:local data:string
@22922 = .data:0x816378F6; // type:object size:0x29 scope:local data:string
@22923 = .data:0x8163791F; // type:object size:0x27 scope:local data:string
@22924 = .data:0x81637946; // type:object size:0x28 scope:local data:string
@22925 = .data:0x8163796E; // type:object size:0x28 scope:local data:string
@22926 = .data:0x81637996; // type:object size:0x33 scope:local data:string
@22927 = .data:0x816379C9; // type:object size:0x35 scope:local data:string
@22947 = .data:0x816379FE; // type:object size:0x2A scope:local data:string
@22948 = .data:0x81637A28; // type:object size:0x20 scope:local data:string
@22949 = .data:0x81637A48; // type:object size:0x39 scope:local data:string
@22977 = .data:0x81637A81; // type:object size:0x41 scope:local data:string
@22978 = .data:0x81637AC2; // type:object size:0x3D scope:local data:string
@22979 = .data:0x81637AFF; // type:object size:0x27 scope:local data:string
@22980 = .data:0x81637B26; // type:object size:0x24 scope:local data:string
@22984 = .data:0x81637B4A; // type:object size:0x28 scope:local data:string
@22985 = .data:0x81637B72; // type:object size:0x24 scope:local data:string
@23013 = .data:0x81637B96; // type:object size:0x22 scope:local data:string
@23014 = .data:0x81637BB8; // type:object size:0x21 scope:local data:string
@23015 = .data:0x81637BD9; // type:object size:0x39 scope:local data:string
@23016 = .data:0x81637C12; // type:object size:0x3A scope:local data:string
@23017 = .data:0x81637C4C; // type:object size:0x35 scope:local data:string
@23018 = .data:0x81637C81; // type:object size:0x33 scope:local data:string
@23019 = .data:0x81637CB4; // type:object size:0x29 scope:local data:string
@23020 = .data:0x81637CDD; // type:object size:0x38 scope:local data:string
@23021 = .data:0x81637D15; // type:object size:0x2D scope:local data:string
@23035 = .data:0x81637D42; // type:object size:0x39 scope:local data:string
@23036 = .data:0x81637D7B; // type:object size:0x31 scope:local data:string
@23037 = .data:0x81637DAC; // type:object size:0x2F scope:local data:string
@23038 = .data:0x81637DDB; // type:object size:0x30 scope:local data:string
@23094 = .data:0x81637E0B; // type:object size:0x46 scope:local data:string
@23095 = .data:0x81637E51; // type:object size:0x2D scope:local data:string
@23096 = .data:0x81637E7E; // type:object size:0x2D scope:local data:string
@23097 = .data:0x81637EAB; // type:object size:0x2C scope:local data:string
@23098 = .data:0x81637ED7; // type:object size:0x34 scope:local data:string
@23123 = .data:0x81637F0B; // type:object size:0x27 scope:local data:string
@23124 = .data:0x81637F32; // type:object size:0x2B scope:local data:string
@23125 = .data:0x81637F5D; // type:object size:0x1F scope:local data:string
@23126 = .data:0x81637F7C; // type:object size:0x21 scope:local data:string
@23127 = .data:0x81637F9D; // type:object size:0x26 scope:local data:string
@23128 = .data:0x81637FC3; // type:object size:0x29 scope:local data:string
@23129 = .data:0x81637FEC; // type:object size:0xF scope:local data:string
@23130 = .data:0x81637FFB; // type:object size:0x23 scope:local data:string
@23131 = .data:0x8163801E; // type:object size:0x2B scope:local data:string
@23132 = .data:0x81638049; // type:object size:0x23 scope:local data:string
@23159 = .data:0x8163806C; // type:object size:0x34 scope:local data:string
@23160 = .data:0x816380A0; // type:object size:0x3B scope:local data:string
@23161 = .data:0x816380DB; // type:object size:0x30 scope:local data:string
@23162 = .data:0x8163810B; // type:object size:0x4D scope:local data:string
@23163 = .data:0x81638158; // type:object size:0x50 scope:local data:string
@23176 = .data:0x816381A8; // type:object size:0x23 scope:local data:string
@23177 = .data:0x816381CB; // type:object size:0x24 scope:local data:string
@23178 = .data:0x816381EF; // type:object size:0x2E scope:local data:string
@23179 = .data:0x8163821D; // type:object size:0x2E scope:local data:string
@23199 = .data:0x8163824B; // type:object size:0x35 scope:local data:string
@23200 = .data:0x81638280; // type:object size:0x34 scope:local data:string
@23214 = .data:0x816382B4; // type:object size:0x2C scope:local data:string
@23269 = .data:0x816382E0; // type:object size:0x29 scope:local data:string
@23270 = .data:0x81638309; // type:object size:0x3E scope:local data:string
@23271 = .data:0x81638347; // type:object size:0x30 scope:local data:string
@23272 = .data:0x81638377; // type:object size:0x3C scope:local data:string
@23273 = .data:0x816383B3; // type:object size:0x34 scope:local data:string
@23278 = .data:0x816383E7; // type:object size:0x35 scope:local data:string
@23279 = .data:0x8163841C; // type:object size:0x32 scope:local data:string
@23280 = .data:0x8163844E; // type:object size:0x32 scope:local data:string
@23281 = .data:0x81638480; // type:object size:0x2D scope:local data:string
@23325 = .data:0x816384AD; // type:object size:0x32 scope:local data:string
@23326 = .data:0x816384DF; // type:object size:0x1F scope:local data:string
@23327 = .data:0x816384FE; // type:object size:0x3C scope:local data:string
@23328 = .data:0x8163853A; // type:object size:0x2F scope:local data:string
@23363 = .data:0x81638569; // type:object size:0x2E scope:local data:string
@23364 = .data:0x81638597; // type:object size:0x29 scope:local data:string
@23365 = .data:0x816385C0; // type:object size:0x45 scope:local data:string
@23366 = .data:0x81638605; // type:object size:0x36 scope:local data:string
@23367 = .data:0x8163863B; // type:object size:0x2D scope:local data:string
@23368 = .data:0x81638668; // type:object size:0x49 scope:local data:string
@23369 = .data:0x816386B1; // type:object size:0x4B scope:local data:string
@23376 = .data:0x816386FC; // type:object size:0x33 scope:local data:string
@23414 = .data:0x8163872F; // type:object size:0x36 scope:local data:string
@23486 = .data:0x81638765; // type:object size:0x24 scope:local data:string
@23496 = .data:0x81638789; // type:object size:0x2E scope:local data:string
@23499 = .data:0x816387B7; // type:object size:0x2E scope:local data:string
@23572 = .data:0x816387E5; // type:object size:0x15 scope:local data:string
@23573 = .data:0x816387FA; // type:object size:0x36 scope:local data:string
@23575 = .data:0x81638830; // type:object size:0x2B scope:local data:string
@23576 = .data:0x8163885B; // type:object size:0xA scope:local data:string
@23577 = .data:0x81638865; // type:object size:0xA scope:local data:string
@23578 = .data:0x8163886F; // type:object size:0x38 scope:local data:string
@23579 = .data:0x816388A7; // type:object size:0x22 scope:local data:string
@23580 = .data:0x816388C9; // type:object size:0x35 scope:local data:string
@23593 = .data:0x816388FE; // type:object size:0x20 scope:local data:string
@23598 = .data:0x8163891E; // type:object size:0x1F scope:local data:string
@23689 = .data:0x8163893D; // type:object size:0x30 scope:local data:string
@23690 = .data:0x8163896D; // type:object size:0x30 scope:local data:string
@23691 = .data:0x8163899D; // type:object size:0x1B scope:local data:string
@23692 = .data:0x816389B8; // type:object size:0x24 scope:local data:string
@23693 = .data:0x816389DC; // type:object size:0x2F scope:local data:string
@23694 = .data:0x81638A0B; // type:object size:0x2E scope:local data:string
@23695 = .data:0x81638A39; // type:object size:0x25 scope:local data:string
@23710 = .data:0x81638A5E; // type:object size:0x2D scope:local data:string
@23711 = .data:0x81638A8B; // type:object size:0x2B scope:local data:string
@23712 = .data:0x81638AB6; // type:object size:0x22 scope:local data:string
@23713 = .data:0x81638AD8; // type:object size:0x27 scope:local data:string
@23719 = .data:0x81638AFF; // type:object size:0x21 scope:local data:string
@23724 = .data:0x81638B20; // type:object size:0x24 scope:local data:string
@23750 = .data:0x81638B44; // type:object size:0x25 scope:local data:string
@23766 = .data:0x81638B69; // type:object size:0x1E scope:local data:string
@23767 = .data:0x81638B87; // type:object size:0x2A scope:local data:string
@23772 = .data:0x81638BB1; // type:object size:0x26 scope:local data:string
lbl_81638BB2 = .data:0x81638BB2; // type:object size:0x26 data:string
lbl_81638BD7 = .data:0x81638BD7; // type:object size:0xBA
@23777 = .data:0x81638BD7; // type:object size:0x26 scope:local data:string
@23879 = .data:0x81638BFD; // type:object size:0x3B scope:local data:string
@23880 = .data:0x81638C38; // type:object size:0x29 scope:local data:string
@23881 = .data:0x81638C61; // type:object size:0x30 scope:local data:string
sZiSysLangTable__Q23ipl8keyboard = .data:0x81638C98; // type:object size:0x58 scope:local
sZiOemLangTable__Q23ipl8keyboard = .data:0x81638CF0; // type:object size:0x58 scope:local
lbl_81638D48 = .data:0x81638D48; // type:object size:0x1A8
@@ -16583,9 +16808,24 @@ __vt__Q33ipl5scene7Setting = .data:0x81657A5C; // type:object size:0xFC
@1909 = .data:0x81657BDC; // type:object size:0x12 scope:local data:string
@1910 = .data:0x81657BEE; // type:object size:0xC scope:local data:string
@1911 = .data:0x81657BFA; // type:object size:0x16 scope:local data:string
lbl_81657C10 = .data:0x81657C10; // type:object size:0x21 data:string
lbl_81657C31 = .data:0x81657C31; // type:object size:0x1E data:string
lbl_81657C4F = .data:0x81657C4F; // type:object size:0x111
@12223 = .data:0x81657C10; // type:object size:0x21 scope:local data:string
...data.0 = .data:0x81657C10; // type:label scope:local
@12284 = .data:0x81657C31; // type:object size:0x1E scope:local data:string
@12285 = .data:0x81657C4F; // type:object size:0x22 scope:local data:string
@12300 = .data:0x81657C71; // type:object size:0x10 scope:local data:string
@12301 = .data:0x81657C81; // type:object size:0x9 scope:local data:string
@12303 = .data:0x81657C8A; // type:object size:0xD scope:local data:string
@12306 = .data:0x81657C97; // type:object size:0xA scope:local data:string
@12308 = .data:0x81657CA1; // type:object size:0xB scope:local data:string
@12310 = .data:0x81657CAC; // type:object size:0xD scope:local data:string
@12312 = .data:0x81657CB9; // type:object size:0x13 scope:local data:string
@12314 = .data:0x81657CCC; // type:object size:0x11 scope:local data:string
@12316 = .data:0x81657CDD; // type:object size:0x17 scope:local data:string
@12318 = .data:0x81657CF4; // type:object size:0x20 scope:local data:string
@12320 = .data:0x81657D14; // type:object size:0x1E scope:local data:string
@12322 = .data:0x81657D32; // type:object size:0xF scope:local data:string
@12324 = .data:0x81657D41; // type:object size:0xE scope:local data:string
@12326 = .data:0x81657D4F; // type:object size:0xD scope:local data:string
lbl_81657D60 = .data:0x81657D60; // type:object size:0x1B data:string
lbl_81657D7B = .data:0x81657D7B; // type:object size:0x1D data:string
__vt__Q33ipl5scene12APScanThread = .data:0x81657D98; // type:object size:0x30
@@ -19700,12 +19940,12 @@ lbl_8169638B = .sdata2:0x8169638B; // type:object size:0x5 data:byte
@10441 = .sdata2:0x81696400; // type:object size:0x4 scope:local align:4 data:float
@10442 = .sdata2:0x81696404; // type:object size:0x4 scope:local align:4 data:float
@10445 = .sdata2:0x81696408; // type:object size:0x8 scope:local align:8 data:double
lbl_81696410 = .sdata2:0x81696410; // type:object size:0x4 data:4byte
@13886 = .sdata2:0x81696410; // type:object size:0x8 scope:local data:4byte
lbl_81696414 = .sdata2:0x81696414; // type:object size:0x4 data:4byte
lbl_81696418 = .sdata2:0x81696418; // type:object size:0x4 data:4byte
@13978 = .sdata2:0x81696418; // type:object size:0x8 scope:local data:4byte
lbl_8169641C = .sdata2:0x8169641C; // type:object size:0x4 data:4byte
lbl_81696420 = .sdata2:0x81696420; // type:object size:0x4 align:4 data:float
lbl_81696428 = .sdata2:0x81696428; // type:object size:0x8 align:8 data:double
@23219 = .sdata2:0x81696420; // type:object size:0x4 scope:local align:4 data:float
@23221 = .sdata2:0x81696428; // type:object size:0x8 scope:local align:8 data:double
lbl_81696430 = .sdata2:0x81696430; // type:object size:0x4 align:4 data:float
lbl_81696434 = .sdata2:0x81696434; // type:object size:0x4 align:4 data:float
lbl_81696438 = .sdata2:0x81696438; // type:object size:0x8 align:4 data:float
@@ -21038,7 +21278,7 @@ lbl_81697F96 = .sdata:0x81697F96; // type:object size:0x6 data:string
@14129 = .sdata:0x8169802A; // type:object size:0x6 scope:local data:string
@14332 = .sdata:0x81698030; // type:object size:0x6 scope:local data:string
c_banner_file_name__Q23ipl12NandSDWorker = .sdata:0x81698038; // type:object size:0x4 data:4byte
lbl_8169803C = .sdata:0x8169803C; // type:object size:0x7 data:string
@12344 = .sdata:0x8169803C; // type:object size:0x7 scope:local data:string
c_nocopy_folder_name__Q23ipl12NandSDWorker = .sdata:0x81698044; // type:object size:0x4 data:4byte
c_notransfer_folder_name__Q23ipl12NandSDWorker = .sdata:0x81698048; // type:object size:0x4 data:4byte
c_wii_sd_title_root__Q23ipl12NandSDWorker = .sdata:0x8169804C; // type:object size:0x4 data:4byte
@@ -21047,17 +21287,17 @@ c_sd_app_file_name__Q23ipl12NandSDWorker = .sdata:0x81698054; // type:object siz
c_succession_path__Q23ipl12NandSDWorker = .sdata:0x81698058; // type:object size:0x4 data:4byte
c_transferid_path__Q23ipl12NandSDWorker = .sdata:0x8169805C; // type:object size:0x4 data:4byte
c_tmp_work_path__Q23ipl12NandSDWorker = .sdata:0x81698060; // type:object size:0x4 data:4byte
lbl_81698064 = .sdata:0x81698064; // type:object size:0x6 data:string
lbl_8169806A = .sdata:0x8169806A; // type:object size:0x7 data:string
lbl_81698071 = .sdata:0x81698071; // type:object size:0x6 data:string
lbl_81698077 = .sdata:0x81698077; // type:object size:0x5 data:string
@12352 = .sdata:0x81698064; // type:object size:0x6 scope:local data:string
@12353 = .sdata:0x8169806A; // type:object size:0x7 scope:local data:string
@12355 = .sdata:0x81698071; // type:object size:0x6 scope:local data:string
@12356 = .sdata:0x81698077; // type:object size:0x5 scope:local data:string
c_ignore_list_for_wiimenu__Q23ipl12NandSDWorker = .sdata:0x8169807C; // type:object size:0x8
c_wii_menu_save_path__Q23ipl12NandSDWorker = .sdata:0x81698084; // type:object size:0x4 data:4byte
lbl_81698088 = .sdata:0x81698088; // type:object size:0x2 data:string
lbl_8169808A = .sdata:0x8169808A; // type:object size:0x3 data:string
lbl_8169808D = .sdata:0x8169808D; // type:object size:0x2 data:string
lbl_8169808F = .sdata:0x8169808F; // type:object size:0x5 data:string
lbl_81698094 = .sdata:0x81698094; // type:object size:0x4 data:string
@22157 = .sdata:0x81698088; // type:object size:0x2 scope:local data:string
@22300 = .sdata:0x8169808A; // type:object size:0x3 scope:local data:string
@22314 = .sdata:0x8169808D; // type:object size:0x2 scope:local data:string
@23190 = .sdata:0x8169808F; // type:object size:0x5 scope:local data:string
@23574 = .sdata:0x81698094; // type:object size:0x4 scope:local data:string
lbl_81698098 = .sdata:0x81698098; // type:object size:0x4 data:string
lbl_8169809C = .sdata:0x8169809C; // type:object size:0x4
@10074 = .sdata:0x816980A0; // type:object size:0x4 scope:local data:string
@@ -21729,8 +21969,8 @@ lbl_81699063 = .sdata:0x81699063; // type:object size:0x6 data:string
lbl_81699069 = .sdata:0x81699069; // type:object size:0x7 data:string
lbl_81699070 = .sdata:0x81699070; // type:object size:0x3 data:string
lbl_81699074 = .sdata:0x81699074; // type:object size:0x8 data:wstring
lbl_81699080 = .sdata:0x81699080; // type:object size:0x5 data:string
lbl_81699085 = .sdata:0x81699085; // type:object size:0x5 data:string
@12299 = .sdata:0x81699080; // type:object size:0x5 scope:local data:string
@12302 = .sdata:0x81699085; // type:object size:0x5 scope:local data:string
lbl_81699090 = .sdata:0x81699090; // type:object size:0x4 data:string
lbl_81699098 = .sdata:0x81699098; // type:object size:0x8 data:4byte
lbl_816990A0 = .sdata:0x816990A0; // type:object size:0x4 data:4byte
@@ -22845,7 +23085,7 @@ ScrollState___Q23www9trasition = .sbss:0x8169A824; // type:object size:0x4 scope
gDpdWaitFrm = .sbss:0x8169A828; // type:object size:0x4 data:4byte
wiiFlag__Q23www10wiisetting = .sbss:0x8169A82C; // type:object size:0x8 data:4byte
writeBackID__Q23www10wiisetting = .sbss:0x8169A834; // type:object size:0x1 data:byte
savedata_smth__Q23www10wiisetting = .sbss:0x8169A835; // type:object size:0x1 data:byte
saveData__Q23www10wiisetting = .sbss:0x8169A835; // type:object size:0x1 data:byte
funcResult__Q23www10wiisetting = .sbss:0x8169A836; // type:object size:0x1 data:byte
setupFlag__Q23www10wiisetting = .sbss:0x8169A837; // type:object size:0x1 data:byte
mQueue__Q23www10wiisetting = .sbss:0x8169A838; // type:object size:0x4 data:4byte

View File

@@ -1523,10 +1523,10 @@ list_sd_save_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348258; // type:functio
list_sd_app_async__Q23ipl12NandSDWorkerFPUl = .text:0x8134826C; // type:function size:0x14
get_sd_save_banner_async__Q23ipl12NandSDWorkerFUlP17WIISaveBannerFile = .text:0x81348280; // type:function size:0x28
get_sd_app_thumbnail_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl7channel18SChanMgrMetaHeader = .text:0x813482A8; // type:function size:0x34
iplNandSD_81348DFC__Q23ipl12NandSDWorkerFUlPvPv = .text:0x813482DC; // type:function size:0x34
update_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348310; // type:function size:0x14
read_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348324; // type:function size:0x14
iplNandSD_81348E58__Q23ipl12NandSDWorkerFUxPvPv = .text:0x81348338; // type:function size:0x30
get_sd_app_meta_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl12NandSDWorker14SDAppMetaEntry = .text:0x813482DC; // type:function size:0x34
update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348310; // type:function size:0x14
read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348324; // type:function size:0x14
check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x81348338; // type:function size:0x30
check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348368; // type:function size:0x20
iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348388; // type:function size:0x2C
get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x813483B4; // type:function size:0x18
@@ -1543,7 +1543,7 @@ copy_sd_save_to_nand_async__Q23ipl12NandSDWorkerFUl = .text:0x81348494; // type:
format_sd_async__Q23ipl12NandSDWorkerFv = .text:0x813484B0; // type:function size:0x8
get_sd_free_area_async__Q23ipl12NandSDWorkerFPUx = .text:0x813484B8; // type:function size:0x14
list_nand_app_async__Q23ipl12NandSDWorkerFPUx = .text:0x813484CC; // type:function size:0x14
iplNandSD_81349000__Q23ipl12NandSDWorkerFPvPv = .text:0x813484E0; // type:function size:0x20
list_nand_apps_usage_async__Q23ipl12NandSDWorkerFPvPv = .text:0x813484E0; // type:function size:0x20
get_nand_app_thumbnail_async__Q23ipl12NandSDWorkerFUxPvPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81348500; // type:function size:0x30
delete_nand_app_async__Q23ipl12NandSDWorkerFUxb = .text:0x81348530; // type:function size:0x28
copy_nand_app_to_sd_async__Q23ipl12NandSDWorkerFUx = .text:0x81348558; // type:function size:0x20
@@ -1584,12 +1584,12 @@ check_nand_save_banner_exist__Q23ipl12NandSDWorkerFUx = .text:0x8134A448; // typ
get_nand_save_banner__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134A52C; // type:function size:0x3B0
do_get_sd_save_banner__Q23ipl12NandSDWorkerFv = .text:0x8134A8DC; // type:function size:0x160
do_get_sd_app_thumbnail__Q23ipl12NandSDWorkerFv = .text:0x8134AA3C; // type:function size:0x1CC
do_unk_8134B728__Q23ipl12NandSDWorkerFv = .text:0x8134AC08; // type:function size:0x1F4
do_update_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134ADFC; // type:function size:0x344
do_read_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134B140; // type:function size:0x270
do_unk_8134BED0__Q23ipl12NandSDWorkerFv = .text:0x8134B3B0; // type:function size:0x3C8
do_get_sd_app_meta__Q23ipl12NandSDWorkerFv = .text:0x8134AC08; // type:function size:0x1F4
do_update_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134ADFC; // type:function size:0x344
do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134B140; // type:function size:0x270
do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134B3B0; // type:function size:0x3C8
check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134B778; // type:function size:0x3D8
do_list_nand_apps_usages__Q23ipl12NandSDWorkerFv = .text:0x8134BB50; // type:function size:0x1C8
do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134BB50; // type:function size:0x1C8
do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134BD18; // type:function size:0x2D0
do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134BFE8; // type:function size:0x260
do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134C248; // type:function size:0x1F4
@@ -1619,7 +1619,7 @@ delete_download_task__Q23ipl12NandSDWorkerFUl = .text:0x8134F174; // type:functi
delete_nand_app_content__Q23ipl12NandSDWorkerFUx = .text:0x8134F388; // type:function size:0x134
do_copy_nand_app_to_sd__Q23ipl12NandSDWorkerFv = .text:0x8134F4BC; // type:function size:0x530
get_save_banner_for_data_only_title__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134F9EC; // type:function size:0x160
get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker11SDAppBanner = .text:0x8134FB4C; // type:function size:0x480
get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker15SDAppBackupData = .text:0x8134FB4C; // type:function size:0x480
open_nand_app_content__Q23ipl12NandSDWorkerFUxUsPUlPP12ESTicketView = .text:0x8134FFCC; // type:function size:0x21C
read_file__Q23ipl12NandSDWorkerFPvQ33ipl12NandSDWorker8FileKindlUlPv = .text:0x813501E8; // type:function size:0x158
search_meta_header__Q23ipl12NandSDWorkerFPCUc = .text:0x81350340; // type:function size:0x54
@@ -1687,13 +1687,13 @@ check_nand_save_exist_lo__Q23ipl12NandSDWorkerFUl = .text:0x81353BD8; // type:fu
get_nand_title_version__Q23ipl12NandSDWorkerFUxPUs = .text:0x81353CA0; // type:function size:0x80
get_sd_title_version__Q23ipl12NandSDWorkerFUlPUs = .text:0x81353D20; // type:function size:0xF4
check_sd_title_restorable__Q23ipl12NandSDWorkerFUl = .text:0x81353E14; // type:function size:0x184
__ct__Q33ipl2ut8FreeListFv = .text:0x81353F98; // type:function size:0x14
init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81353FAC; // type:function size:0x5C
get__Q33ipl2ut8FreeListFv = .text:0x81354008; // type:function size:0x24
__ct__Q33ipl2ut5StackFv = .text:0x8135402C; // type:function size:0x40
init__Q33ipl2ut5StackFPvUlUl = .text:0x8135406C; // type:function size:0x4C
push__Q33ipl2ut5StackFPCv = .text:0x813540B8; // type:function size:0x78
pop__Q33ipl2ut5StackFPv = .text:0x81354130; // type:function size:0x80
__ct__Q33ipl2ut8FreeListFv = .text:0x81353F98; // type:function size:0x14 scope:weak
init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81353FAC; // type:function size:0x5C scope:weak
get__Q33ipl2ut8FreeListFv = .text:0x81354008; // type:function size:0x24 scope:weak
__ct__Q33ipl2ut5StackFv = .text:0x8135402C; // type:function size:0x40 scope:weak
init__Q33ipl2ut5StackFPvUlUl = .text:0x8135406C; // type:function size:0x4C scope:weak
push__Q33ipl2ut5StackFPCv = .text:0x813540B8; // type:function size:0x78 scope:weak
pop__Q33ipl2ut5StackFPv = .text:0x81354130; // type:function size:0x80 scope:weak
getFirstController__Q23ipl8keyboardFv = .text:0x813541B0; // type:function size:0x50
onCommand__Q33ipl8keyboard13EventObserverFQ39textinput15CommandReceiver13INPUT_COMMANDPv = .text:0x81354200; // type:function size:0x34
onSE__Q33ipl8keyboard13EventObserverFQ39textinput5sound2SE = .text:0x81354234; // type:function size:0x218
@@ -2376,8 +2376,8 @@ LeftScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginV
RightScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136EE34; // type:function size:0x3C
GetScrollState__Q23www9trasitionFv = .text:0x8136EE70; // type:function size:0x8
ResetScrollState__Q23www9trasitionFv = .text:0x8136EE78; // type:function size:0xC
www_wiisetting_8136F9D0 = .text:0x8136EE84; // type:function size:0x24 scope:local
www_wiisetting_8136F9F4 = .text:0x8136EEA8; // type:function size:0x44 scope:local
DPDCallback2__Q23www10wiisettingFll = .text:0x8136EE84; // type:function size:0x24 scope:local
DPDCallback__Q23www10wiisettingFll = .text:0x8136EEA8; // type:function size:0x44 scope:local
allow_access__Q23www10wiisettingFPCcPCci = .text:0x8136EEEC; // type:function size:0x8
AddJsPlugin__Q23www10wiisettingFv = .text:0x8136EEF4; // type:function size:0x88
globalGetter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136EF7C; // type:function size:0xC8
@@ -2386,9 +2386,9 @@ Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x81
Setter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136FA68; // type:function size:0x50C
wiiOSReport__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136FF74; // type:function size:0x5C
wiiWriteBack__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136FFD0; // type:function size:0x344
www_wiisetting_81370E60 = .text:0x81370314; // type:function size:0x54 scope:local
getKeyboardLanguage__Q23www10wiisettingFUc = .text:0x81370314; // type:function size:0x54 scope:local
initWiiSetting__Q23www10wiisettingFv = .text:0x81370368; // type:function size:0x60
www_wiisetting_81370F14 = .text:0x813703C8; // type:function size:0x98 scope:local
getBytePropIndex__Q23www10wiisettingFPCc = .text:0x813703C8; // type:function size:0x98 scope:local
startFunc__Q23www10wiisettingFUc = .text:0x81370460; // type:function size:0x1A4
getWiiSettingData__Q23www10wiisettingFv = .text:0x81370604; // type:function size:0xC
getWiiSettingFlag__Q23www10wiisettingFv = .text:0x81370610; // type:function size:0x8
@@ -13836,7 +13836,7 @@ lbl_81636800 = .rodata:0x81636800; // type:object size:0x20
scNumber__3ipl = .rodata:0x81636820; // type:object size:0x16 data:wstring
c_es_encrypt_iv__Q23ipl12NandSDWorker = .rodata:0x81636838; // type:object size:0x10
c_md5_secret_key__Q23ipl12NandSDWorker = .rodata:0x81636848; // type:object size:0x10
lbl_81636858 = .rodata:0x81636858; // type:object size:0x10 data:4byte
@14986 = .rodata:0x81636858; // type:object size:0x10 scope:local data:4byte
cDefaultChanList__3ipl = .rodata:0x81636868; // type:object size:0x300 scope:local
odh_zigzag_order = .rodata:0x81636B68; // type:object size:0x40 scope:local data:byte
odh_natural_order = .rodata:0x81636BA8; // type:object size:0x40 scope:local data:byte
@@ -13878,8 +13878,8 @@ scMonthToMessageID__Q23ipl5scene = .rodata:0x81638D58; // type:object size:0x30
scNumber__Q23ipl5scene = .rodata:0x81638D88; // type:object size:0x18 scope:local data:2byte
scAnmFrame__Q23ipl5scene = .rodata:0x81638DA0; // type:object size:0x90 scope:local
scNumber__Q23ipl5scene = .rodata:0x81638E30; // type:object size:0x18 scope:local
scNumber__Q23ipl5scene = .rodata:0x81638E48; // type:object size:0x14 scope:local data:2byte
scNumber2__Q23ipl5scene = .rodata:0x81638E5C; // type:object size:0x14 scope:local data:2byte
@13129 = .rodata:0x81638E48; // type:object size:0x14 scope:local data:2byte
@13171 = .rodata:0x81638E5C; // type:object size:0x14 scope:local data:2byte
lbl_81638E70 = .rodata:0x81638E70; // type:object size:0x10
lbl_81638E80 = .rodata:0x81638E80; // type:object size:0x10
scNumber__Q23ipl5scene = .rodata:0x81638E90; // type:object size:0x18 scope:local data:2byte
@@ -13891,9 +13891,9 @@ cfChanThumbOfss__Q23ipl5scene = .rodata:0x816394D0; // type:object size:0x10 sco
lbl_816394E0 = .rodata:0x816394E0; // type:object size:0x10 data:4byte
lbl_816394F0 = .rodata:0x816394F0; // type:object size:0x20 data:4byte
@10845 = .rodata:0x81639510; // type:object size:0x14 scope:local data:2byte
scNumber__Q23ipl5scene = .rodata:0x81639528; // type:object size:0x14 scope:local data:2byte
scNumber2__Q23ipl5scene = .rodata:0x8163953C; // type:object size:0x14 scope:local data:2byte
scNumber__Q23ipl5scene = .rodata:0x81639550; // type:object size:0x14 scope:local data:2byte
@13108 = .rodata:0x81639528; // type:object size:0x14 scope:local data:2byte
@13150 = .rodata:0x8163953C; // type:object size:0x14 scope:local data:2byte
@12843 = .rodata:0x81639550; // type:object size:0x14 scope:local data:2byte
scAnmName__Q23ipl5scene = .rodata:0x81639568; // type:object size:0xD8 scope:local
scTextboxToMessageID__Q23ipl5scene = .rodata:0x81639640; // type:object size:0x28 scope:local
scNumber__Q23ipl5scene = .rodata:0x81639668; // type:object size:0x18 scope:local data:2byte
@@ -14139,8 +14139,8 @@ DAYS_OF_YEAR = .rodata:0x81648F90; // type:object size:0x18 scope:local
g_SpecialsChars = .rodata:0x81648FA8; // type:object size:0x10 data:byte
TtableInv = .rodata:0x81648FB8; // type:object size:0x10 scope:local
VFipf_valid_fn_char = .rodata:0x81648FC8; // type:object size:0x60
fat_special_values = .rodata:0x81649028; // type:object size:0x3C scope:local
cp932_to_unicode = .rodata:0x81649068; // type:object size:0x4272 scope:local data:2byte
fat_special_values = .rodata:0x81649028; // type:object size:0x3C scope:local noreloc
cp932_to_unicode = .rodata:0x81649068; // type:object size:0x4272 scope:local data:2byte noreloc
ErrInfoTbl$4383 = .rodata:0x8164D2E0; // type:object size:0xD0 scope:local
l_nand_func = .rodata:0x8164D3B0; // type:object size:0x20 scope:local
pfd_sddrv_func = .rodata:0x8164D3D0; // type:object size:0x20 scope:local
@@ -14274,7 +14274,7 @@ ms_ppki = .rodata:0x8165E430; // type:object size:0x240 noreloc
@1272 = .rodata:0x8165E670; // type:object size:0x278 scope:local data:4byte
pf_valid_fn_char = .rodata:0x8165E8E8; // type:object size:0x60
fat_special_values = .rodata:0x8165E948; // type:object size:0x3C
cp932_to_unicode = .rodata:0x8165E988; // type:object size:0x4272 data:2byte
cp932_to_unicode = .rodata:0x8165E988; // type:object size:0x4272 scope:local data:2byte noreloc
fa_nand_func = .rodata:0x81662C00; // type:object size:0x20
pfd_sddrv_func = .rodata:0x81662C20; // type:object size:0x20
sddrv_size_depend_tbl = .rodata:0x81662C40; // type:object size:0x150 data:4byte
@@ -14483,64 +14483,289 @@ __vt__Q23ipl12DialogWindow = .data:0x81666370; // type:object size:0x18
__vt__Q23gui12EventHandler = .data:0x81666388; // type:object size:0x18 scope:weak
__vt__Q23gui9Interface = .data:0x816663A0; // type:object size:0x20 scope:weak
@10439 = .data:0x816663C0; // type:object size:0x12 scope:local data:string
lbl_816663D8 = .data:0x816663D8; // type:object size:0xB data:string
lbl_816663E3 = .data:0x816663E3; // type:object size:0xB data:string
lbl_816663EE = .data:0x816663EE; // type:object size:0x14 data:string
lbl_81666402 = .data:0x81666402; // type:object size:0x9 data:string
lbl_8166640B = .data:0x8166640B; // type:object size:0xC data:string
lbl_81666417 = .data:0x81666417; // type:object size:0x14 data:string
lbl_8166642B = .data:0x8166642B; // type:object size:0x20 data:string
lbl_8166644B = .data:0x8166644B; // type:object size:0x10 data:string
lbl_8166645B = .data:0x8166645B; // type:object size:0xC data:string
@12343 = .data:0x816663D8; // type:object size:0xB scope:local data:string
...data.0 = .data:0x816663D8; // type:label scope:local
@12345 = .data:0x816663E3; // type:object size:0xB scope:local data:string
@12346 = .data:0x816663EE; // type:object size:0x14 scope:local data:string
@12347 = .data:0x81666402; // type:object size:0x9 scope:local data:string
@12348 = .data:0x8166640B; // type:object size:0xC scope:local data:string
@12349 = .data:0x81666417; // type:object size:0x14 scope:local data:string
@12350 = .data:0x8166642B; // type:object size:0x20 scope:local data:string
@12351 = .data:0x8166644B; // type:object size:0x10 scope:local data:string
@12354 = .data:0x8166645B; // type:object size:0xC scope:local data:string
c_ignore_list_for_shared2__Q23ipl12NandSDWorker = .data:0x81666468; // type:object size:0x14
lbl_8166647C = .data:0x8166647C; // type:object size:0xC data:string
lbl_81666488 = .data:0x81666488; // type:object size:0xA data:string
lbl_81666492 = .data:0x81666492; // type:object size:0x1E data:string
lbl_816664B0 = .data:0x816664B0; // type:object size:0x22 data:string
lbl_816664D2 = .data:0x816664D2; // type:object size:0x22 data:string
lbl_816664F4 = .data:0x816664F4; // type:object size:0x6A
lbl_8166655E = .data:0x8166655E; // type:object size:0x21 data:string
lbl_8166657F = .data:0x8166657F; // type:object size:0x25 data:string
lbl_816665A4 = .data:0x816665A4; // type:object size:0xC7
lbl_8166666B = .data:0x8166666B; // type:object size:0x95
jumptable_81666700 = .data:0x81666700; // type:object size:0xD0 scope:local
lbl_81636130 = .data:0x816667D0; // type:object size:0x54B scope:local
lbl_81666D1B = .data:0x81666D1B; // type:object size:0x163
lbl_81666E7E = .data:0x81666E7E; // type:object size:0x15 data:string
lbl_81666E93 = .data:0x81666E93; // type:object size:0x42
lbl_81666ED5 = .data:0x81666ED5; // type:object size:0x170
lbl_81667045 = .data:0x81667045; // type:object size:0x25 data:string
lbl_8166706A = .data:0x8166706A; // type:object size:0xAE
lbl_81667118 = .data:0x81667118; // type:object size:0xE0
lbl_816671F8 = .data:0x816671F8; // type:object size:0x21 data:string
lbl_81667219 = .data:0x81667219; // type:object size:0x1F data:string
lbl_81667238 = .data:0x81667238; // type:object size:0x1E data:string
lbl_81667256 = .data:0x81667256; // type:object size:0x450
lbl_816676A6 = .data:0x816676A6; // type:object size:0x64E
lbl_81667CF4 = .data:0x81667CF4; // type:object size:0x26 data:string
lbl_81667D1A = .data:0x81667D1A; // type:object size:0x13 data:string
lbl_81667D2D = .data:0x81667D2D; // type:object size:0xD data:string
lbl_81667D3A = .data:0x81667D3A; // type:object size:0x61
lbl_81667D9B = .data:0x81667D9B; // type:object size:0x2A data:string
lbl_81667DC5 = .data:0x81667DC5; // type:object size:0x425
lbl_816681EA = .data:0x816681EA; // type:object size:0x28 data:string
lbl_81668212 = .data:0x81668212; // type:object size:0x6D9
lbl_816688EB = .data:0x816688EB; // type:object size:0x35 data:string
lbl_81668920 = .data:0x81668920; // type:object size:0x34 data:string
lbl_81668954 = .data:0x81668954; // type:object size:0x448
lbl_81668D9C = .data:0x81668D9C; // type:object size:0x69
lbl_81668E05 = .data:0x81668E05; // type:object size:0x24 data:string
lbl_81668E29 = .data:0x81668E29; // type:object size:0x2E data:string
lbl_81668E57 = .data:0x81668E57; // type:object size:0x79
lbl_81668ED0 = .data:0x81668ED0; // type:object size:0xCE
lbl_81668F9E = .data:0x81668F9E; // type:object size:0x20 data:string
lbl_81668FBE = .data:0x81668FBE; // type:object size:0x1E1
lbl_8166919F = .data:0x8166919F; // type:object size:0x21 data:string
lbl_816691C0 = .data:0x816691C0; // type:object size:0x24 data:string
lbl_816691E4 = .data:0x816691E4; // type:object size:0x43
lbl_81669227 = .data:0x81669227; // type:object size:0x2A data:string
lbl_81669251 = .data:0x81669251; // type:object size:0x26 data:string
lbl_81669277 = .data:0x81669277; // type:object size:0xBA
@12357 = .data:0x8166647C; // type:object size:0xC scope:local data:string
@12358 = .data:0x81666488; // type:object size:0xA scope:local data:string
@12359 = .data:0x81666492; // type:object size:0x1E scope:local data:string
@21503 = .data:0x816664B0; // type:object size:0x22 scope:local data:string
@21504 = .data:0x816664D2; // type:object size:0x22 scope:local data:string
@21767 = .data:0x816664F4; // type:object size:0x16 scope:local data:string
@21770 = .data:0x8166650A; // type:object size:0x11 scope:local data:string
@21777 = .data:0x8166651B; // type:object size:0x19 scope:local data:string
@21780 = .data:0x81666534; // type:object size:0x1A scope:local data:string
@21783 = .data:0x8166654E; // type:object size:0x10 scope:local data:string
@21788 = .data:0x8166655E; // type:object size:0x21 scope:local data:string
@21789 = .data:0x8166657F; // type:object size:0x25 scope:local data:string
@21792 = .data:0x816665A4; // type:object size:0x28 scope:local data:string
@21804 = .data:0x816665CC; // type:object size:0x1B scope:local data:string
@21805 = .data:0x816665E7; // type:object size:0x1E scope:local data:string
@21806 = .data:0x81666605; // type:object size:0x29 scope:local data:string
@21917 = .data:0x8166662E; // type:object size:0x1F scope:local data:string
@21918 = .data:0x8166664D; // type:object size:0x1E scope:local data:string
@21919 = .data:0x8166666B; // type:object size:0x2F scope:local data:string
@21920 = .data:0x8166669A; // type:object size:0x34 scope:local data:string
@21921 = .data:0x816666CE; // type:object size:0x14 scope:local data:string
@21922 = .data:0x816666E2; // type:object size:0x1B scope:local data:string
@21924 = .data:0x81666700; // type:object size:0xD0 scope:local
@21965 = .data:0x816667D0; // type:object size:0x21 scope:local data:string
@21966 = .data:0x816667F1; // type:object size:0x22 scope:local data:string
@21967 = .data:0x81666813; // type:object size:0x30 scope:local data:string
@21968 = .data:0x81666843; // type:object size:0x3F scope:local data:string
@21969 = .data:0x81666882; // type:object size:0x33 scope:local data:string
@21970 = .data:0x816668B5; // type:object size:0x30 scope:local data:string
@21971 = .data:0x816668E5; // type:object size:0x2E scope:local data:string
@21972 = .data:0x81666913; // type:object size:0x28 scope:local data:string
@21973 = .data:0x8166693B; // type:object size:0x28 scope:local data:string
@21974 = .data:0x81666963; // type:object size:0x35 scope:local data:string
@21975 = .data:0x81666998; // type:object size:0x21 scope:local data:string
@21999 = .data:0x816669B9; // type:object size:0x2F scope:local data:string
@22000 = .data:0x816669E8; // type:object size:0x33 scope:local data:string
@22001 = .data:0x81666A1B; // type:object size:0x3A scope:local data:string
@22002 = .data:0x81666A55; // type:object size:0x3F scope:local data:string
@22028 = .data:0x81666A94; // type:object size:0x2C scope:local data:string
@22029 = .data:0x81666AC0; // type:object size:0x32 scope:local data:string
@22030 = .data:0x81666AF2; // type:object size:0x29 scope:local data:string
@22055 = .data:0x81666B1B; // type:object size:0x2D scope:local data:string
@22056 = .data:0x81666B48; // type:object size:0x9 scope:local data:string
@22057 = .data:0x81666B51; // type:object size:0x3C scope:local data:string
@22058 = .data:0x81666B8D; // type:object size:0x28 scope:local data:string
@22106 = .data:0x81666BB5; // type:object size:0x29 scope:local data:string
@22107 = .data:0x81666BDE; // type:object size:0x1D scope:local data:string
@22108 = .data:0x81666BFB; // type:object size:0x1E scope:local data:string
@22109 = .data:0x81666C19; // type:object size:0x1D scope:local data:string
@22110 = .data:0x81666C36; // type:object size:0x24 scope:local data:string
@22134 = .data:0x81666C5A; // type:object size:0x34 scope:local data:string
@22135 = .data:0x81666C8E; // type:object size:0x1E scope:local data:string
@22136 = .data:0x81666CAC; // type:object size:0x28 scope:local data:string
@22137 = .data:0x81666CD4; // type:object size:0x2B scope:local data:string
@22138 = .data:0x81666CFF; // type:object size:0x1C scope:local data:string
@22158 = .data:0x81666D1B; // type:object size:0x2D scope:local data:string
@22193 = .data:0x81666D48; // type:object size:0x26 scope:local data:string
@22194 = .data:0x81666D6E; // type:object size:0x2C scope:local data:string
@22195 = .data:0x81666D9A; // type:object size:0x30 scope:local data:string
@22196 = .data:0x81666DCA; // type:object size:0x30 scope:local data:string
@22197 = .data:0x81666DFA; // type:object size:0x26 scope:local data:string
@22198 = .data:0x81666E20; // type:object size:0x27 scope:local data:string
@22199 = .data:0x81666E47; // type:object size:0x37 scope:local data:string
@13884 = .data:0x81666E7E; // type:object size:0x15 scope:local data:string
@13885 = .data:0x81666E93; // type:object size:0x15 scope:local data:string
@22354 = .data:0x81666EA8; // type:object size:0x2D scope:local data:string
@22355 = .data:0x81666ED5; // type:object size:0x30 scope:local data:string
@22356 = .data:0x81666F05; // type:object size:0x4E scope:local data:string
@22357 = .data:0x81666F53; // type:object size:0x40 scope:local data:string
@22358 = .data:0x81666F93; // type:object size:0x2E scope:local data:string
@22359 = .data:0x81666FC1; // type:object size:0x37 scope:local data:string
@22360 = .data:0x81666FF8; // type:object size:0x4D scope:local data:string
@22400 = .data:0x81667045; // type:object size:0x25 scope:local data:string
@22401 = .data:0x8166706A; // type:object size:0x41 scope:local data:string
@22422 = .data:0x816670AB; // type:object size:0x30 scope:local data:string
@22423 = .data:0x816670DB; // type:object size:0x3D scope:local data:string
@22455 = .data:0x81667118; // type:object size:0x48 scope:local data:string
@22476 = .data:0x81667160; // type:object size:0x31 scope:local data:string
@22477 = .data:0x81667191; // type:object size:0x38 scope:local data:string
@22497 = .data:0x816671C9; // type:object size:0x2F scope:local data:string
@22513 = .data:0x816671F8; // type:object size:0x21 scope:local data:string
@22514 = .data:0x81667219; // type:object size:0x1F scope:local data:string
@22536 = .data:0x81667238; // type:object size:0x1E scope:local data:string
@22537 = .data:0x81667256; // type:object size:0x20 scope:local data:string
@22570 = .data:0x81667276; // type:object size:0x9 scope:local data:string
@22571 = .data:0x8166727F; // type:object size:0x37 scope:local data:string
@22572 = .data:0x816672B6; // type:object size:0x34 scope:local data:string
@22573 = .data:0x816672EA; // type:object size:0xD scope:local data:string
@22574 = .data:0x816672F7; // type:object size:0x3A scope:local data:string
@22575 = .data:0x81667331; // type:object size:0x31 scope:local data:string
@22576 = .data:0x81667362; // type:object size:0x2E scope:local data:string
@22577 = .data:0x81667390; // type:object size:0x2E scope:local data:string
@22578 = .data:0x816673BE; // type:object size:0x2B scope:local data:string
@22579 = .data:0x816673E9; // type:object size:0x2C scope:local data:string
@22580 = .data:0x81667415; // type:object size:0x2B scope:local data:string
@22581 = .data:0x81667440; // type:object size:0x23 scope:local data:string
@22582 = .data:0x81667463; // type:object size:0x38 scope:local data:string
@22583 = .data:0x8166749B; // type:object size:0x2E scope:local data:string
@22584 = .data:0x816674C9; // type:object size:0x2A scope:local data:string
@22593 = .data:0x816674F3; // type:object size:0xF scope:local data:string
@22594 = .data:0x81667502; // type:object size:0x3C scope:local data:string
@22595 = .data:0x8166753E; // type:object size:0xF scope:local data:string
@22596 = .data:0x8166754D; // type:object size:0x3C scope:local data:string
@22619 = .data:0x81667589; // type:object size:0x2E scope:local data:string
@22620 = .data:0x816675B7; // type:object size:0x33 scope:local data:string
@22621 = .data:0x816675EA; // type:object size:0x39 scope:local data:string
@22622 = .data:0x81667623; // type:object size:0x28 scope:local data:string
@22634 = .data:0x8166764B; // type:object size:0x2B scope:local data:string
@22635 = .data:0x81667676; // type:object size:0x30 scope:local data:string
@22647 = .data:0x816676A6; // type:object size:0x38 scope:local data:string
@22681 = .data:0x816676DE; // type:object size:0x2F scope:local data:string
@22682 = .data:0x8166770D; // type:object size:0x2F scope:local data:string
@22683 = .data:0x8166773C; // type:object size:0x36 scope:local data:string
@22684 = .data:0x81667772; // type:object size:0x34 scope:local data:string
@22685 = .data:0x816677A6; // type:object size:0x35 scope:local data:string
@22686 = .data:0x816677DB; // type:object size:0x2B scope:local data:string
@22690 = .data:0x81667806; // type:object size:0x32 scope:local data:string
@22691 = .data:0x81667838; // type:object size:0x21 scope:local data:string
@22692 = .data:0x81667859; // type:object size:0x21 scope:local data:string
@22693 = .data:0x8166787A; // type:object size:0x26 scope:local data:string
@22701 = .data:0x816678A0; // type:object size:0x36 scope:local data:string
@22702 = .data:0x816678D6; // type:object size:0x38 scope:local data:string
@22703 = .data:0x8166790E; // type:object size:0x2A scope:local data:string
@22730 = .data:0x81667938; // type:object size:0x31 scope:local data:string
@22731 = .data:0x81667969; // type:object size:0x33 scope:local data:string
@22732 = .data:0x8166799C; // type:object size:0x2F scope:local data:string
@22733 = .data:0x816679CB; // type:object size:0x31 scope:local data:string
@22789 = .data:0x816679FC; // type:object size:0x26 scope:local data:string
@22790 = .data:0x81667A22; // type:object size:0x2F scope:local data:string
@22791 = .data:0x81667A51; // type:object size:0x2B scope:local data:string
@22792 = .data:0x81667A7C; // type:object size:0x2C scope:local data:string
@22793 = .data:0x81667AA8; // type:object size:0x4F scope:local data:string
@22794 = .data:0x81667AF7; // type:object size:0x28 scope:local data:string
@22795 = .data:0x81667B1F; // type:object size:0x3A scope:local data:string
@22796 = .data:0x81667B59; // type:object size:0x2D scope:local data:string
@22797 = .data:0x81667B86; // type:object size:0x22 scope:local data:string
@22798 = .data:0x81667BA8; // type:object size:0x20 scope:local data:string
@22799 = .data:0x81667BC8; // type:object size:0x22 scope:local data:string
@22800 = .data:0x81667BEA; // type:object size:0x27 scope:local data:string
@22801 = .data:0x81667C11; // type:object size:0x23 scope:local data:string
@22802 = .data:0x81667C34; // type:object size:0x3D scope:local data:string
@22803 = .data:0x81667C71; // type:object size:0x27 scope:local data:string
@22815 = .data:0x81667C98; // type:object size:0x2C scope:local data:string
@22816 = .data:0x81667CC4; // type:object size:0x30 scope:local data:string
@22817 = .data:0x81667CF4; // type:object size:0x26 scope:local data:string
@14983 = .data:0x81667D1A; // type:object size:0x13 scope:local data:string
@14984 = .data:0x81667D2D; // type:object size:0xD scope:local data:string
@14985 = .data:0x81667D3A; // type:object size:0x9 scope:local data:string
@22831 = .data:0x81667D43; // type:object size:0x18 scope:local data:string
@22832 = .data:0x81667D5B; // type:object size:0x1C scope:local data:string
@22833 = .data:0x81667D77; // type:object size:0x24 scope:local data:string
@22841 = .data:0x81667D9B; // type:object size:0x2A scope:local data:string
@22842 = .data:0x81667DC5; // type:object size:0x28 scope:local data:string noreloc
@22914 = .data:0x81667DED; // type:object size:0x35 scope:local data:string
@22915 = .data:0x81667E22; // type:object size:0x2C scope:local data:string
@22916 = .data:0x81667E4E; // type:object size:0x34 scope:local data:string
@22917 = .data:0x81667E82; // type:object size:0x35 scope:local data:string
@22918 = .data:0x81667EB7; // type:object size:0x2A scope:local data:string
@22919 = .data:0x81667EE1; // type:object size:0x38 scope:local data:string
@22920 = .data:0x81667F19; // type:object size:0x53 scope:local data:string
@22921 = .data:0x81667F6C; // type:object size:0x2A scope:local data:string
@22922 = .data:0x81667F96; // type:object size:0x29 scope:local data:string
@22923 = .data:0x81667FBF; // type:object size:0x27 scope:local data:string
@22924 = .data:0x81667FE6; // type:object size:0x28 scope:local data:string
@22925 = .data:0x8166800E; // type:object size:0x28 scope:local data:string
@22926 = .data:0x81668036; // type:object size:0x33 scope:local data:string
@22927 = .data:0x81668069; // type:object size:0x35 scope:local data:string
@22947 = .data:0x8166809E; // type:object size:0x2A scope:local data:string
@22948 = .data:0x816680C8; // type:object size:0x20 scope:local data:string
@22949 = .data:0x816680E8; // type:object size:0x39 scope:local data:string
@22977 = .data:0x81668121; // type:object size:0x41 scope:local data:string
@22978 = .data:0x81668162; // type:object size:0x3D scope:local data:string
@22979 = .data:0x8166819F; // type:object size:0x27 scope:local data:string
@22980 = .data:0x816681C6; // type:object size:0x24 scope:local data:string
@22984 = .data:0x816681EA; // type:object size:0x28 scope:local data:string
@22985 = .data:0x81668212; // type:object size:0x24 scope:local data:string
@23013 = .data:0x81668236; // type:object size:0x22 scope:local data:string
@23014 = .data:0x81668258; // type:object size:0x21 scope:local data:string
@23015 = .data:0x81668279; // type:object size:0x39 scope:local data:string
@23016 = .data:0x816682B2; // type:object size:0x3A scope:local data:string
@23017 = .data:0x816682EC; // type:object size:0x35 scope:local data:string
@23018 = .data:0x81668321; // type:object size:0x33 scope:local data:string
@23019 = .data:0x81668354; // type:object size:0x29 scope:local data:string
@23020 = .data:0x8166837D; // type:object size:0x38 scope:local data:string
@23021 = .data:0x816683B5; // type:object size:0x2D scope:local data:string
@23035 = .data:0x816683E2; // type:object size:0x39 scope:local data:string
@23036 = .data:0x8166841B; // type:object size:0x31 scope:local data:string
@23037 = .data:0x8166844C; // type:object size:0x2F scope:local data:string
@23038 = .data:0x8166847B; // type:object size:0x30 scope:local data:string
@23094 = .data:0x816684AB; // type:object size:0x46 scope:local data:string
@23095 = .data:0x816684F1; // type:object size:0x2D scope:local data:string
@23096 = .data:0x8166851E; // type:object size:0x2D scope:local data:string
@23097 = .data:0x8166854B; // type:object size:0x2C scope:local data:string
@23098 = .data:0x81668577; // type:object size:0x34 scope:local data:string
@23123 = .data:0x816685AB; // type:object size:0x27 scope:local data:string
@23124 = .data:0x816685D2; // type:object size:0x2B scope:local data:string
@23125 = .data:0x816685FD; // type:object size:0x1F scope:local data:string
@23126 = .data:0x8166861C; // type:object size:0x21 scope:local data:string
@23127 = .data:0x8166863D; // type:object size:0x26 scope:local data:string
@23128 = .data:0x81668663; // type:object size:0x29 scope:local data:string
@23129 = .data:0x8166868C; // type:object size:0xF scope:local data:string
@23130 = .data:0x8166869B; // type:object size:0x23 scope:local data:string
@23131 = .data:0x816686BE; // type:object size:0x2B scope:local data:string
@23132 = .data:0x816686E9; // type:object size:0x23 scope:local data:string
@23159 = .data:0x8166870C; // type:object size:0x34 scope:local data:string
@23160 = .data:0x81668740; // type:object size:0x3B scope:local data:string
@23161 = .data:0x8166877B; // type:object size:0x30 scope:local data:string
@23162 = .data:0x816687AB; // type:object size:0x4D scope:local data:string
@23163 = .data:0x816687F8; // type:object size:0x50 scope:local data:string
@23176 = .data:0x81668848; // type:object size:0x23 scope:local data:string
@23177 = .data:0x8166886B; // type:object size:0x24 scope:local data:string
@23178 = .data:0x8166888F; // type:object size:0x2E scope:local data:string
@23179 = .data:0x816688BD; // type:object size:0x2E scope:local data:string
@23199 = .data:0x816688EB; // type:object size:0x35 scope:local data:string
@23200 = .data:0x81668920; // type:object size:0x34 scope:local data:string
@23214 = .data:0x81668954; // type:object size:0x2C scope:local data:string
@23269 = .data:0x81668980; // type:object size:0x29 scope:local data:string
@23270 = .data:0x816689A9; // type:object size:0x3E scope:local data:string
@23271 = .data:0x816689E7; // type:object size:0x30 scope:local data:string
@23272 = .data:0x81668A17; // type:object size:0x3C scope:local data:string
@23273 = .data:0x81668A53; // type:object size:0x34 scope:local data:string
@23278 = .data:0x81668A87; // type:object size:0x35 scope:local data:string
@23279 = .data:0x81668ABC; // type:object size:0x32 scope:local data:string
@23280 = .data:0x81668AEE; // type:object size:0x32 scope:local data:string
@23281 = .data:0x81668B20; // type:object size:0x2D scope:local data:string
@23325 = .data:0x81668B4D; // type:object size:0x32 scope:local data:string
@23326 = .data:0x81668B7F; // type:object size:0x1F scope:local data:string
@23327 = .data:0x81668B9E; // type:object size:0x3C scope:local data:string
@23328 = .data:0x81668BDA; // type:object size:0x2F scope:local data:string
@23363 = .data:0x81668C09; // type:object size:0x2E scope:local data:string
@23364 = .data:0x81668C37; // type:object size:0x29 scope:local data:string
@23365 = .data:0x81668C60; // type:object size:0x45 scope:local data:string
@23366 = .data:0x81668CA5; // type:object size:0x36 scope:local data:string
@23367 = .data:0x81668CDB; // type:object size:0x2D scope:local data:string
@23368 = .data:0x81668D08; // type:object size:0x49 scope:local data:string
@23369 = .data:0x81668D51; // type:object size:0x4B scope:local data:string
@23376 = .data:0x81668D9C; // type:object size:0x33 scope:local data:string
@23414 = .data:0x81668DCF; // type:object size:0x36 scope:local data:string
@23486 = .data:0x81668E05; // type:object size:0x24 scope:local data:string
@23496 = .data:0x81668E29; // type:object size:0x2E scope:local data:string
@23499 = .data:0x81668E57; // type:object size:0x2E scope:local data:string
@23572 = .data:0x81668E85; // type:object size:0x15 scope:local data:string
@23573 = .data:0x81668E9A; // type:object size:0x36 scope:local data:string
@23575 = .data:0x81668ED0; // type:object size:0x2B scope:local data:string
@23576 = .data:0x81668EFB; // type:object size:0xA scope:local data:string
@23577 = .data:0x81668F05; // type:object size:0xA scope:local data:string
@23578 = .data:0x81668F0F; // type:object size:0x38 scope:local data:string
@23579 = .data:0x81668F47; // type:object size:0x22 scope:local data:string
@23580 = .data:0x81668F69; // type:object size:0x35 scope:local data:string
@23593 = .data:0x81668F9E; // type:object size:0x20 scope:local data:string
@23598 = .data:0x81668FBE; // type:object size:0x1F scope:local data:string
@23689 = .data:0x81668FDD; // type:object size:0x30 scope:local data:string
@23690 = .data:0x8166900D; // type:object size:0x30 scope:local data:string
@23691 = .data:0x8166903D; // type:object size:0x1B scope:local data:string
@23692 = .data:0x81669058; // type:object size:0x24 scope:local data:string
@23693 = .data:0x8166907C; // type:object size:0x2F scope:local data:string
@23694 = .data:0x816690AB; // type:object size:0x2E scope:local data:string
@23695 = .data:0x816690D9; // type:object size:0x25 scope:local data:string
@23710 = .data:0x816690FE; // type:object size:0x2D scope:local data:string
@23711 = .data:0x8166912B; // type:object size:0x2B scope:local data:string
@23712 = .data:0x81669156; // type:object size:0x22 scope:local data:string
@23713 = .data:0x81669178; // type:object size:0x27 scope:local data:string
@23719 = .data:0x8166919F; // type:object size:0x21 scope:local data:string
@23724 = .data:0x816691C0; // type:object size:0x24 scope:local data:string
@23750 = .data:0x816691E4; // type:object size:0x25 scope:local data:string
@23766 = .data:0x81669209; // type:object size:0x1E scope:local data:string
@23767 = .data:0x81669227; // type:object size:0x2A scope:local data:string
@23772 = .data:0x81669251; // type:object size:0x26 scope:local data:string
@23777 = .data:0x81669277; // type:object size:0x26 scope:local data:string
@23879 = .data:0x8166929D; // type:object size:0x3B scope:local data:string
@23880 = .data:0x816692D8; // type:object size:0x29 scope:local data:string
@23881 = .data:0x81669301; // type:object size:0x30 scope:local data:string
lbl_81669338 = .data:0x81669338; // type:object size:0x1A8
jumptable_816694E0 = .data:0x816694E0; // type:object size:0x60 scope:local
lbl_81669540 = .data:0x81669540; // type:object size:0x80 scope:local
@@ -16666,9 +16891,24 @@ __vt__Q33ipl5scene7Setting = .data:0x8168807C; // type:object size:0xFC
@1909 = .data:0x816881FC; // type:object size:0x12 scope:local data:string
@1910 = .data:0x8168820E; // type:object size:0xC scope:local data:string
@1911 = .data:0x8168821A; // type:object size:0x16 scope:local data:string
lbl_81688230 = .data:0x81688230; // type:object size:0x21 data:string
lbl_81688251 = .data:0x81688251; // type:object size:0x1E data:string
lbl_8168826F = .data:0x8168826F; // type:object size:0x111
@12223 = .data:0x81688230; // type:object size:0x21 scope:local data:string
...data.0 = .data:0x81688230; // type:label scope:local
@12284 = .data:0x81688251; // type:object size:0x1E scope:local data:string
@12285 = .data:0x8168826F; // type:object size:0x22 scope:local data:string
@12300 = .data:0x81688291; // type:object size:0x10 scope:local data:string
@12301 = .data:0x816882A1; // type:object size:0x9 scope:local data:string
@12303 = .data:0x816882AA; // type:object size:0xD scope:local data:string
@12306 = .data:0x816882B7; // type:object size:0xA scope:local data:string
@12308 = .data:0x816882C1; // type:object size:0xB scope:local data:string
@12310 = .data:0x816882CC; // type:object size:0xD scope:local data:string
@12312 = .data:0x816882D9; // type:object size:0x13 scope:local data:string
@12314 = .data:0x816882EC; // type:object size:0x11 scope:local data:string
@12316 = .data:0x816882FD; // type:object size:0x17 scope:local data:string
@12318 = .data:0x81688314; // type:object size:0x20 scope:local data:string
@12320 = .data:0x81688334; // type:object size:0x1E scope:local data:string
@12322 = .data:0x81688352; // type:object size:0xF scope:local data:string
@12324 = .data:0x81688361; // type:object size:0xE scope:local data:string
@12326 = .data:0x8168836F; // type:object size:0xD scope:local data:string
lbl_81688380 = .data:0x81688380; // type:object size:0x1B data:string
lbl_8168839B = .data:0x8168839B; // type:object size:0x1D data:string
__vt__Q33ipl5scene12APScanThread = .data:0x816883B8; // type:object size:0x30
@@ -19745,12 +19985,12 @@ lbl_816C3BEB = .sdata2:0x816C3BEB; // type:object size:0x5 data:byte
@10441 = .sdata2:0x816C3C60; // type:object size:0x4 scope:local align:4 data:float
@10442 = .sdata2:0x816C3C64; // type:object size:0x4 scope:local align:4 data:float
@10445 = .sdata2:0x816C3C68; // type:object size:0x8 scope:local align:8 data:double
lbl_816C3C70 = .sdata2:0x816C3C70; // type:object size:0x4 data:4byte
@13886 = .sdata2:0x816C3C70; // type:object size:0x8 scope:local data:4byte
lbl_816C3C74 = .sdata2:0x816C3C74; // type:object size:0x4 data:4byte
lbl_816C3C78 = .sdata2:0x816C3C78; // type:object size:0x4 data:4byte
@13978 = .sdata2:0x816C3C78; // type:object size:0x8 scope:local data:4byte
lbl_816C3C7C = .sdata2:0x816C3C7C; // type:object size:0x4 data:4byte
lbl_816C3C80 = .sdata2:0x816C3C80; // type:object size:0x4 align:4 data:float
lbl_816C3C88 = .sdata2:0x816C3C88; // type:object size:0x8 align:8 data:double
@23219 = .sdata2:0x816C3C80; // type:object size:0x4 scope:local align:4 data:float
@23221 = .sdata2:0x816C3C88; // type:object size:0x8 scope:local align:8 data:double
lbl_816C3C90 = .sdata2:0x816C3C90; // type:object size:0x4 align:4 data:float
lbl_816C3C94 = .sdata2:0x816C3C94; // type:object size:0x4 align:4 data:float
lbl_816C3C98 = .sdata2:0x816C3C98; // type:object size:0x4 align:4 data:float
@@ -21087,7 +21327,7 @@ lbl_816C57B6 = .sdata:0x816C57B6; // type:object size:0x6 data:string
@14129 = .sdata:0x816C584A; // type:object size:0x6 scope:local data:string
@14332 = .sdata:0x816C5850; // type:object size:0x6 scope:local data:string
c_banner_file_name__Q23ipl12NandSDWorker = .sdata:0x816C5858; // type:object size:0x4 data:4byte
lbl_816C585C = .sdata:0x816C585C; // type:object size:0x7 data:string
@12344 = .sdata:0x816C585C; // type:object size:0x7 scope:local data:string
c_nocopy_folder_name__Q23ipl12NandSDWorker = .sdata:0x816C5864; // type:object size:0x4 data:4byte
c_notransfer_folder_name__Q23ipl12NandSDWorker = .sdata:0x816C5868; // type:object size:0x4 data:4byte
c_wii_sd_title_root__Q23ipl12NandSDWorker = .sdata:0x816C586C; // type:object size:0x4 data:4byte
@@ -21096,17 +21336,17 @@ c_sd_app_file_name__Q23ipl12NandSDWorker = .sdata:0x816C5874; // type:object siz
c_succession_path__Q23ipl12NandSDWorker = .sdata:0x816C5878; // type:object size:0x4 data:4byte
c_transferid_path__Q23ipl12NandSDWorker = .sdata:0x816C587C; // type:object size:0x4 data:4byte
c_tmp_work_path__Q23ipl12NandSDWorker = .sdata:0x816C5880; // type:object size:0x4 data:4byte
lbl_816C5884 = .sdata:0x816C5884; // type:object size:0x6 data:string
lbl_816C588A = .sdata:0x816C588A; // type:object size:0x7 data:string
lbl_816C5891 = .sdata:0x816C5891; // type:object size:0x6 data:string
lbl_816C5897 = .sdata:0x816C5897; // type:object size:0x5 data:string
@12352 = .sdata:0x816C5884; // type:object size:0x6 scope:local data:string
@12353 = .sdata:0x816C588A; // type:object size:0x7 scope:local data:string
@12355 = .sdata:0x816C5891; // type:object size:0x6 scope:local data:string
@12356 = .sdata:0x816C5897; // type:object size:0x5 scope:local data:string
c_ignore_list_for_wiimenu__Q23ipl12NandSDWorker = .sdata:0x816C589C; // type:object size:0x8
c_wii_menu_save_path__Q23ipl12NandSDWorker = .sdata:0x816C58A4; // type:object size:0x4 data:4byte
lbl_816C58A8 = .sdata:0x816C58A8; // type:object size:0x2 data:string
lbl_816C58AA = .sdata:0x816C58AA; // type:object size:0x3 data:string
lbl_816C58AD = .sdata:0x816C58AD; // type:object size:0x2 data:string
lbl_816C58AF = .sdata:0x816C58AF; // type:object size:0x5 data:string
lbl_816C58B4 = .sdata:0x816C58B4; // type:object size:0x4 data:string
@22157 = .sdata:0x816C58A8; // type:object size:0x2 scope:local data:string
@22300 = .sdata:0x816C58AA; // type:object size:0x3 scope:local data:string
@22314 = .sdata:0x816C58AD; // type:object size:0x2 scope:local data:string
@23190 = .sdata:0x816C58AF; // type:object size:0x5 scope:local data:string
@23574 = .sdata:0x816C58B4; // type:object size:0x4 scope:local data:string
lbl_816C58B8 = .sdata:0x816C58B8; // type:object size:0x4 data:string
lbl_816C58BC = .sdata:0x816C58BC; // type:object size:0x2
lbl_816C58BE = .sdata:0x816C58BE; // type:object size:0x8 data:string
@@ -21790,8 +22030,8 @@ lbl_816C68C3 = .sdata:0x816C68C3; // type:object size:0x6 data:string
lbl_816C68C9 = .sdata:0x816C68C9; // type:object size:0x7 data:string
lbl_816C68D0 = .sdata:0x816C68D0; // type:object size:0x3 data:string
lbl_816C68D4 = .sdata:0x816C68D4; // type:object size:0x8 data:wstring
lbl_816C68E0 = .sdata:0x816C68E0; // type:object size:0x5 data:string
lbl_816C68E5 = .sdata:0x816C68E5; // type:object size:0x5 data:string
@12299 = .sdata:0x816C68E0; // type:object size:0x5 scope:local data:string
@12302 = .sdata:0x816C68E5; // type:object size:0x5 scope:local data:string
lbl_816C68F0 = .sdata:0x816C68F0; // type:object size:0x4 data:string
lbl_816C68F8 = .sdata:0x816C68F8; // type:object size:0x8 data:4byte
lbl_816C6900 = .sdata:0x816C6900; // type:object size:0x4 data:4byte
@@ -22906,7 +23146,7 @@ ScrollState___Q23www9trasition = .sbss:0x816C8084; // type:object size:0x4 scope
gDpdWaitFrm = .sbss:0x816C8088; // type:object size:0x4 data:4byte
wiiFlag__Q23www10wiisetting = .sbss:0x816C808C; // type:object size:0x8 data:4byte
writeBackID__Q23www10wiisetting = .sbss:0x816C8094; // type:object size:0x1 data:byte
savedata_smth__Q23www10wiisetting = .sbss:0x816C8095; // type:object size:0x1 data:byte
saveData__Q23www10wiisetting = .sbss:0x816C8095; // type:object size:0x1 data:byte
funcResult__Q23www10wiisetting = .sbss:0x816C8096; // type:object size:0x1 data:byte
setupFlag__Q23www10wiisetting = .sbss:0x816C8097; // type:object size:0x1 data:byte
mQueue__Q23www10wiisetting = .sbss:0x816C8098; // type:object size:0x4 data:4byte

View File

@@ -1510,10 +1510,10 @@ list_sd_save_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348210; // type:functio
list_sd_app_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348224; // type:function size:0x14
get_sd_save_banner_async__Q23ipl12NandSDWorkerFUlP17WIISaveBannerFile = .text:0x81348238; // type:function size:0x28
get_sd_app_thumbnail_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81348260; // type:function size:0x34
iplNandSD_81348DFC__Q23ipl12NandSDWorkerFUlPvPv = .text:0x81348294; // type:function size:0x34
update_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x813482C8; // type:function size:0x14
read_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x813482DC; // type:function size:0x14
iplNandSD_81348E58__Q23ipl12NandSDWorkerFUxPvPv = .text:0x813482F0; // type:function size:0x30
get_sd_app_meta_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl12NandSDWorker14SDAppMetaEntry = .text:0x81348294; // type:function size:0x34
update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x813482C8; // type:function size:0x14
read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x813482DC; // type:function size:0x14
check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x813482F0; // type:function size:0x30
check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348320; // type:function size:0x20
iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348340; // type:function size:0x2C
get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x8134836C; // type:function size:0x18
@@ -1530,7 +1530,7 @@ copy_sd_save_to_nand_async__Q23ipl12NandSDWorkerFUl = .text:0x8134844C; // type:
format_sd_async__Q23ipl12NandSDWorkerFv = .text:0x81348468; // type:function size:0x8
get_sd_free_area_async__Q23ipl12NandSDWorkerFPUx = .text:0x81348470; // type:function size:0x14
list_nand_app_async__Q23ipl12NandSDWorkerFPUx = .text:0x81348484; // type:function size:0x14
iplNandSD_81349000__Q23ipl12NandSDWorkerFPvPv = .text:0x81348498; // type:function size:0x20
list_nand_apps_usage_async__Q23ipl12NandSDWorkerFPvPv = .text:0x81348498; // type:function size:0x20
get_nand_app_thumbnail_async__Q23ipl12NandSDWorkerFUxPvPQ33ipl7channel18SChanMgrMetaHeader = .text:0x813484B8; // type:function size:0x30
delete_nand_app_async__Q23ipl12NandSDWorkerFUxb = .text:0x813484E8; // type:function size:0x28
copy_nand_app_to_sd_async__Q23ipl12NandSDWorkerFUx = .text:0x81348510; // type:function size:0x20
@@ -1571,12 +1571,12 @@ check_nand_save_banner_exist__Q23ipl12NandSDWorkerFUx = .text:0x8134A400; // typ
get_nand_save_banner__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134A4E4; // type:function size:0x3B0
do_get_sd_save_banner__Q23ipl12NandSDWorkerFv = .text:0x8134A894; // type:function size:0x160
do_get_sd_app_thumbnail__Q23ipl12NandSDWorkerFv = .text:0x8134A9F4; // type:function size:0x1CC
do_unk_8134B728__Q23ipl12NandSDWorkerFv = .text:0x8134ABC0; // type:function size:0x1F4
do_update_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134ADB4; // type:function size:0x344
do_read_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134B0F8; // type:function size:0x270
do_unk_8134BED0__Q23ipl12NandSDWorkerFv = .text:0x8134B368; // type:function size:0x3C8
do_get_sd_app_meta__Q23ipl12NandSDWorkerFv = .text:0x8134ABC0; // type:function size:0x1F4
do_update_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134ADB4; // type:function size:0x344
do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134B0F8; // type:function size:0x270
do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134B368; // type:function size:0x3C8
check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134B730; // type:function size:0x3D8
do_list_nand_apps_usages__Q23ipl12NandSDWorkerFv = .text:0x8134BB08; // type:function size:0x1C8
do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134BB08; // type:function size:0x1C8
do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134BCD0; // type:function size:0x2D0
do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134BFA0; // type:function size:0x260
do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134C200; // type:function size:0x1F4
@@ -1606,7 +1606,7 @@ delete_download_task__Q23ipl12NandSDWorkerFUl = .text:0x8134F12C; // type:functi
delete_nand_app_content__Q23ipl12NandSDWorkerFUx = .text:0x8134F340; // type:function size:0x134
do_copy_nand_app_to_sd__Q23ipl12NandSDWorkerFv = .text:0x8134F474; // type:function size:0x530
get_save_banner_for_data_only_title__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134F9A4; // type:function size:0x160
get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker11SDAppBanner = .text:0x8134FB04; // type:function size:0x480
get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker15SDAppBackupData = .text:0x8134FB04; // type:function size:0x480
open_nand_app_content__Q23ipl12NandSDWorkerFUxUsPUlPP12ESTicketView = .text:0x8134FF84; // type:function size:0x21C
read_file__Q23ipl12NandSDWorkerFPvQ33ipl12NandSDWorker8FileKindlUlPv = .text:0x813501A0; // type:function size:0x158
search_meta_header__Q23ipl12NandSDWorkerFPCUc = .text:0x813502F8; // type:function size:0x54
@@ -1674,13 +1674,13 @@ check_nand_save_exist_lo__Q23ipl12NandSDWorkerFUl = .text:0x81353B90; // type:fu
get_nand_title_version__Q23ipl12NandSDWorkerFUxPUs = .text:0x81353C58; // type:function size:0x80
get_sd_title_version__Q23ipl12NandSDWorkerFUlPUs = .text:0x81353CD8; // type:function size:0xF4
check_sd_title_restorable__Q23ipl12NandSDWorkerFUl = .text:0x81353DCC; // type:function size:0x184
__ct__Q33ipl2ut8FreeListFv = .text:0x81353F50; // type:function size:0x14
init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81353F64; // type:function size:0x5C
get__Q33ipl2ut8FreeListFv = .text:0x81353FC0; // type:function size:0x24
__ct__Q33ipl2ut5StackFv = .text:0x81353FE4; // type:function size:0x40
init__Q33ipl2ut5StackFPvUlUl = .text:0x81354024; // type:function size:0x4C
push__Q33ipl2ut5StackFPCv = .text:0x81354070; // type:function size:0x78
pop__Q33ipl2ut5StackFPv = .text:0x813540E8; // type:function size:0x80
__ct__Q33ipl2ut8FreeListFv = .text:0x81353F50; // type:function size:0x14 scope:weak
init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81353F64; // type:function size:0x5C scope:weak
get__Q33ipl2ut8FreeListFv = .text:0x81353FC0; // type:function size:0x24 scope:weak
__ct__Q33ipl2ut5StackFv = .text:0x81353FE4; // type:function size:0x40 scope:weak
init__Q33ipl2ut5StackFPvUlUl = .text:0x81354024; // type:function size:0x4C scope:weak
push__Q33ipl2ut5StackFPCv = .text:0x81354070; // type:function size:0x78 scope:weak
pop__Q33ipl2ut5StackFPv = .text:0x813540E8; // type:function size:0x80 scope:weak
getFirstController__Q23ipl8keyboardFv = .text:0x81354168; // type:function size:0x50
onCommand__Q33ipl8keyboard13EventObserverFQ39textinput15CommandReceiver13INPUT_COMMANDPv = .text:0x813541B8; // type:function size:0x34
onSE__Q33ipl8keyboard13EventObserverFQ39textinput5sound2SE = .text:0x813541EC; // type:function size:0x218
@@ -2359,8 +2359,8 @@ LeftScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginV
RightScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136ED14; // type:function size:0x3C
GetScrollState__Q23www9trasitionFv = .text:0x8136ED50; // type:function size:0x8
ResetScrollState__Q23www9trasitionFv = .text:0x8136ED58; // type:function size:0xC
www_wiisetting_8136F9D0 = .text:0x8136ED64; // type:function size:0x24 scope:local
www_wiisetting_8136F9F4 = .text:0x8136ED88; // type:function size:0x44 scope:local
DPDCallback2__Q23www10wiisettingFll = .text:0x8136ED64; // type:function size:0x24 scope:local
DPDCallback__Q23www10wiisettingFll = .text:0x8136ED88; // type:function size:0x44 scope:local
allow_access__Q23www10wiisettingFPCcPCci = .text:0x8136EDCC; // type:function size:0x8
AddJsPlugin__Q23www10wiisettingFv = .text:0x8136EDD4; // type:function size:0x88
globalGetter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136EE5C; // type:function size:0xC8
@@ -2369,9 +2369,9 @@ Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x81
Setter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136F948; // type:function size:0x50C
wiiOSReport__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136FE54; // type:function size:0x5C
wiiWriteBack__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136FEB0; // type:function size:0x344
www_wiisetting_81370E60 = .text:0x813701F4; // type:function size:0x54 scope:local
getKeyboardLanguage__Q23www10wiisettingFUc = .text:0x813701F4; // type:function size:0x54 scope:local
initWiiSetting__Q23www10wiisettingFv = .text:0x81370248; // type:function size:0x60
www_wiisetting_81370F14 = .text:0x813702A8; // type:function size:0x98 scope:local
getBytePropIndex__Q23www10wiisettingFPCc = .text:0x813702A8; // type:function size:0x98 scope:local
startFunc__Q23www10wiisettingFUc = .text:0x81370340; // type:function size:0x1A4
getWiiSettingData__Q23www10wiisettingFv = .text:0x813704E4; // type:function size:0xC
getWiiSettingFlag__Q23www10wiisettingFv = .text:0x813704F0; // type:function size:0x8
@@ -13405,7 +13405,7 @@ lbl_815E61C0 = .rodata:0x815E61C0; // type:object size:0x20
scNumber__3ipl = .rodata:0x815E61E0; // type:object size:0x16 data:wstring
c_es_encrypt_iv__Q23ipl12NandSDWorker = .rodata:0x815E61F8; // type:object size:0x10
c_md5_secret_key__Q23ipl12NandSDWorker = .rodata:0x815E6208; // type:object size:0x10
lbl_815E6218 = .rodata:0x815E6218; // type:object size:0x10 data:4byte
@14986 = .rodata:0x815E6218; // type:object size:0x10 scope:local data:4byte
cDefaultChanList__3ipl = .rodata:0x815E6228; // type:object size:0x300 scope:local
odh_zigzag_order = .rodata:0x815E6528; // type:object size:0x40 scope:local data:byte
odh_natural_order = .rodata:0x815E6568; // type:object size:0x40 scope:local data:byte
@@ -13447,8 +13447,8 @@ scMonthToMessageID__Q23ipl5scene = .rodata:0x815E8718; // type:object size:0x30
scNumber__Q23ipl5scene = .rodata:0x815E8748; // type:object size:0x18 scope:local data:2byte
scAnmFrame__Q23ipl5scene = .rodata:0x815E8760; // type:object size:0x90 scope:local
scNumber__Q23ipl5scene = .rodata:0x815E87F0; // type:object size:0x18 scope:local
scNumber__Q23ipl5scene = .rodata:0x815E8808; // type:object size:0x14 scope:local data:2byte
scNumber2__Q23ipl5scene = .rodata:0x815E881C; // type:object size:0x14 scope:local data:2byte
@13129 = .rodata:0x815E8808; // type:object size:0x14 scope:local data:2byte
@13171 = .rodata:0x815E881C; // type:object size:0x14 scope:local data:2byte
lbl_815E8830 = .rodata:0x815E8830; // type:object size:0x10
lbl_815E8840 = .rodata:0x815E8840; // type:object size:0x10
scNumber__Q23ipl5scene = .rodata:0x815E8850; // type:object size:0x18 scope:local data:2byte
@@ -13460,9 +13460,9 @@ cfChanThumbOfss__Q23ipl5scene = .rodata:0x815E8E90; // type:object size:0x10 sco
lbl_815E8EA0 = .rodata:0x815E8EA0; // type:object size:0x10 data:4byte
lbl_815E8EB0 = .rodata:0x815E8EB0; // type:object size:0x20 data:4byte
@10845 = .rodata:0x815E8ED0; // type:object size:0x14 scope:local data:2byte
scNumber__Q23ipl5scene = .rodata:0x815E8EE8; // type:object size:0x14 scope:local data:2byte
scNumber2__Q23ipl5scene = .rodata:0x815E8EFC; // type:object size:0x14 scope:local data:2byte
scNumber__Q23ipl5scene = .rodata:0x815E8F10; // type:object size:0x14 scope:local data:2byte
@13108 = .rodata:0x815E8EE8; // type:object size:0x14 scope:local data:2byte
@13150 = .rodata:0x815E8EFC; // type:object size:0x14 scope:local data:2byte
@12843 = .rodata:0x815E8F10; // type:object size:0x14 scope:local data:2byte
scAnmName__Q23ipl5scene = .rodata:0x815E8F28; // type:object size:0xD8 scope:local
scTextboxToMessageID__Q23ipl5scene = .rodata:0x815E9000; // type:object size:0x28 scope:local
scNumber__Q23ipl5scene = .rodata:0x815E9028; // type:object size:0x18 scope:local data:2byte
@@ -13634,7 +13634,7 @@ g_SpecialsChars = .rodata:0x815F2560; // type:object size:0x10 data:byte
TtableInv = .rodata:0x815F2570; // type:object size:0x10 scope:local
VFipf_valid_fn_char = .rodata:0x815F2580; // type:object size:0x60
fat_special_values = .rodata:0x815F25E0; // type:object size:0x3C scope:local
cp932_to_unicode = .rodata:0x815F2620; // type:object size:0x4272 scope:local data:2byte
cp932_to_unicode = .rodata:0x815F2620; // type:object size:0x4272 scope:local data:2byte noreloc
ErrInfoTbl$4383 = .rodata:0x815F6898; // type:object size:0xD0 scope:local
l_nand_func = .rodata:0x815F6968; // type:object size:0x20 scope:local
pfd_sddrv_func = .rodata:0x815F6988; // type:object size:0x20 scope:local
@@ -13770,7 +13770,7 @@ ms_ppki = .rodata:0x81606700; // type:object size:0x240 noreloc
@1272 = .rodata:0x81606940; // type:object size:0x278 scope:local data:4byte
pf_valid_fn_char = .rodata:0x81606BB8; // type:object size:0x60
fat_special_values = .rodata:0x81606C18; // type:object size:0x3C
cp932_to_unicode = .rodata:0x81606C58; // type:object size:0x4272 data:2byte
cp932_to_unicode = .rodata:0x81606C58; // type:object size:0x4272 scope:local data:2byte noreloc
fa_nand_func = .rodata:0x8160AED0; // type:object size:0x20
pfd_sddrv_func = .rodata:0x8160AEF0; // type:object size:0x20
sddrv_size_depend_tbl = .rodata:0x8160AF10; // type:object size:0x150 data:4byte
@@ -13977,64 +13977,289 @@ __vt__Q23ipl12DialogWindow = .data:0x8160DC10; // type:object size:0x18
__vt__Q23gui12EventHandler = .data:0x8160DC28; // type:object size:0x18 scope:weak
__vt__Q23gui9Interface = .data:0x8160DC40; // type:object size:0x20 scope:weak
@10439 = .data:0x8160DC60; // type:object size:0x12 scope:local data:string
lbl_8160DC78 = .data:0x8160DC78; // type:object size:0xB data:string
lbl_8160DC83 = .data:0x8160DC83; // type:object size:0xB data:string
lbl_8160DC8E = .data:0x8160DC8E; // type:object size:0x14 data:string
lbl_8160DCA2 = .data:0x8160DCA2; // type:object size:0x9 data:string
lbl_8160DCAB = .data:0x8160DCAB; // type:object size:0xC data:string
lbl_8160DCB7 = .data:0x8160DCB7; // type:object size:0x14 data:string
lbl_8160DCCB = .data:0x8160DCCB; // type:object size:0x20 data:string
lbl_8160DCEB = .data:0x8160DCEB; // type:object size:0x10 data:string
lbl_8160DCFB = .data:0x8160DCFB; // type:object size:0xC data:string
@12343 = .data:0x8160DC78; // type:object size:0xB scope:local data:string
...data.0 = .data:0x8160DC78; // type:label scope:local
@12345 = .data:0x8160DC83; // type:object size:0xB scope:local data:string
@12346 = .data:0x8160DC8E; // type:object size:0x14 scope:local data:string
@12347 = .data:0x8160DCA2; // type:object size:0x9 scope:local data:string
@12348 = .data:0x8160DCAB; // type:object size:0xC scope:local data:string
@12349 = .data:0x8160DCB7; // type:object size:0x14 scope:local data:string
@12350 = .data:0x8160DCCB; // type:object size:0x20 scope:local data:string
@12351 = .data:0x8160DCEB; // type:object size:0x10 scope:local data:string
@12354 = .data:0x8160DCFB; // type:object size:0xC scope:local data:string
c_ignore_list_for_shared2__Q23ipl12NandSDWorker = .data:0x8160DD08; // type:object size:0x14
lbl_8160DD1C = .data:0x8160DD1C; // type:object size:0xC data:string
lbl_8160DD28 = .data:0x8160DD28; // type:object size:0xA data:string
lbl_8160DD32 = .data:0x8160DD32; // type:object size:0x1E data:string
lbl_8160DD50 = .data:0x8160DD50; // type:object size:0x22 data:string
lbl_8160DD72 = .data:0x8160DD72; // type:object size:0x22 data:string
lbl_8160DD94 = .data:0x8160DD94; // type:object size:0x6A
lbl_8160DDFE = .data:0x8160DDFE; // type:object size:0x21 data:string
lbl_8160DE1F = .data:0x8160DE1F; // type:object size:0x25 data:string
lbl_8160DE44 = .data:0x8160DE44; // type:object size:0xC7
lbl_8160DF0B = .data:0x8160DF0B; // type:object size:0x95
jumptable_8160DFA0 = .data:0x8160DFA0; // type:object size:0xD0 scope:local
lbl_8160E070 = .data:0x8160E070; // type:object size:0x54B scope:local
lbl_8160E5BB = .data:0x8160E5BB; // type:object size:0x163
lbl_8160E71E = .data:0x8160E71E; // type:object size:0x15 data:string
lbl_8160E733 = .data:0x8160E733; // type:object size:0x42
lbl_8160E775 = .data:0x8160E775; // type:object size:0x170
lbl_8160E8E5 = .data:0x8160E8E5; // type:object size:0x25 data:string
lbl_8160E90A = .data:0x8160E90A; // type:object size:0xAE
lbl_8160E9B8 = .data:0x8160E9B8; // type:object size:0xE0
lbl_8160EA98 = .data:0x8160EA98; // type:object size:0x21 data:string
lbl_8160EAB9 = .data:0x8160EAB9; // type:object size:0x1F data:string
lbl_8160EAD8 = .data:0x8160EAD8; // type:object size:0x1E data:string
lbl_8160EAF6 = .data:0x8160EAF6; // type:object size:0x450
lbl_8160EF46 = .data:0x8160EF46; // type:object size:0x64E
lbl_8160F594 = .data:0x8160F594; // type:object size:0x26 data:string
lbl_8160F5BA = .data:0x8160F5BA; // type:object size:0x13 data:string
lbl_8160F5CD = .data:0x8160F5CD; // type:object size:0xD data:string
lbl_8160F5DA = .data:0x8160F5DA; // type:object size:0x61
lbl_8160F63B = .data:0x8160F63B; // type:object size:0x2A data:string
lbl_8160F665 = .data:0x8160F665; // type:object size:0x425
lbl_8160FA8A = .data:0x8160FA8A; // type:object size:0x28 data:string
lbl_8160FAB2 = .data:0x8160FAB2; // type:object size:0x6D9
lbl_8161018B = .data:0x8161018B; // type:object size:0x35 data:string
lbl_816101C0 = .data:0x816101C0; // type:object size:0x34 data:string
lbl_816101F4 = .data:0x816101F4; // type:object size:0x448
lbl_8161063C = .data:0x8161063C; // type:object size:0x69
lbl_816106A5 = .data:0x816106A5; // type:object size:0x24 data:string
lbl_816106C9 = .data:0x816106C9; // type:object size:0x2E data:string
lbl_816106F7 = .data:0x816106F7; // type:object size:0x79
lbl_81610770 = .data:0x81610770; // type:object size:0xCE
lbl_8161083E = .data:0x8161083E; // type:object size:0x20 data:string
lbl_8161085E = .data:0x8161085E; // type:object size:0x1E1
lbl_81610A3F = .data:0x81610A3F; // type:object size:0x21 data:string
lbl_81610A60 = .data:0x81610A60; // type:object size:0x24 data:string
lbl_81610A84 = .data:0x81610A84; // type:object size:0x43
lbl_81610AC7 = .data:0x81610AC7; // type:object size:0x2A data:string
lbl_81610AF1 = .data:0x81610AF1; // type:object size:0x26 data:string
lbl_81610B17 = .data:0x81610B17; // type:object size:0xBA
@12357 = .data:0x8160DD1C; // type:object size:0xC scope:local data:string
@12358 = .data:0x8160DD28; // type:object size:0xA scope:local data:string
@12359 = .data:0x8160DD32; // type:object size:0x1E scope:local data:string
@21503 = .data:0x8160DD50; // type:object size:0x22 scope:local data:string
@21504 = .data:0x8160DD72; // type:object size:0x22 scope:local data:string
@21767 = .data:0x8160DD94; // type:object size:0x16 scope:local data:string
@21770 = .data:0x8160DDAA; // type:object size:0x11 scope:local data:string
@21777 = .data:0x8160DDBB; // type:object size:0x19 scope:local data:string
@21780 = .data:0x8160DDD4; // type:object size:0x1A scope:local data:string
@21783 = .data:0x8160DDEE; // type:object size:0x10 scope:local data:string
@21788 = .data:0x8160DDFE; // type:object size:0x21 scope:local data:string
@21789 = .data:0x8160DE1F; // type:object size:0x25 scope:local data:string
@21792 = .data:0x8160DE44; // type:object size:0x28 scope:local data:string
@21804 = .data:0x8160DE6C; // type:object size:0x1B scope:local data:string
@21805 = .data:0x8160DE87; // type:object size:0x1E scope:local data:string
@21806 = .data:0x8160DEA5; // type:object size:0x29 scope:local data:string
@21917 = .data:0x8160DECE; // type:object size:0x1F scope:local data:string
@21918 = .data:0x8160DEED; // type:object size:0x1E scope:local data:string
@21919 = .data:0x8160DF0B; // type:object size:0x2F scope:local data:string
@21920 = .data:0x8160DF3A; // type:object size:0x34 scope:local data:string
@21921 = .data:0x8160DF6E; // type:object size:0x14 scope:local data:string
@21922 = .data:0x8160DF82; // type:object size:0x1B scope:local data:string
@21924 = .data:0x8160DFA0; // type:object size:0xD0 scope:local
@21965 = .data:0x8160E070; // type:object size:0x21 scope:local data:string
@21966 = .data:0x8160E091; // type:object size:0x22 scope:local data:string
@21967 = .data:0x8160E0B3; // type:object size:0x30 scope:local data:string
@21968 = .data:0x8160E0E3; // type:object size:0x3F scope:local data:string
@21969 = .data:0x8160E122; // type:object size:0x33 scope:local data:string
@21970 = .data:0x8160E155; // type:object size:0x30 scope:local data:string
@21971 = .data:0x8160E185; // type:object size:0x2E scope:local data:string
@21972 = .data:0x8160E1B3; // type:object size:0x28 scope:local data:string
@21973 = .data:0x8160E1DB; // type:object size:0x28 scope:local data:string
@21974 = .data:0x8160E203; // type:object size:0x35 scope:local data:string
@21975 = .data:0x8160E238; // type:object size:0x21 scope:local data:string
@21999 = .data:0x8160E259; // type:object size:0x2F scope:local data:string
@22000 = .data:0x8160E288; // type:object size:0x33 scope:local data:string
@22001 = .data:0x8160E2BB; // type:object size:0x3A scope:local data:string
@22002 = .data:0x8160E2F5; // type:object size:0x3F scope:local data:string
@22028 = .data:0x8160E334; // type:object size:0x2C scope:local data:string
@22029 = .data:0x8160E360; // type:object size:0x32 scope:local data:string
@22030 = .data:0x8160E392; // type:object size:0x29 scope:local data:string
@22055 = .data:0x8160E3BB; // type:object size:0x2D scope:local data:string
@22056 = .data:0x8160E3E8; // type:object size:0x9 scope:local data:string
@22057 = .data:0x8160E3F1; // type:object size:0x3C scope:local data:string
@22058 = .data:0x8160E42D; // type:object size:0x28 scope:local data:string
@22106 = .data:0x8160E455; // type:object size:0x29 scope:local data:string
@22107 = .data:0x8160E47E; // type:object size:0x1D scope:local data:string
@22108 = .data:0x8160E49B; // type:object size:0x1E scope:local data:string
@22109 = .data:0x8160E4B9; // type:object size:0x1D scope:local data:string
@22110 = .data:0x8160E4D6; // type:object size:0x24 scope:local data:string
@22134 = .data:0x8160E4FA; // type:object size:0x34 scope:local data:string
@22135 = .data:0x8160E52E; // type:object size:0x1E scope:local data:string
@22136 = .data:0x8160E54C; // type:object size:0x28 scope:local data:string
@22137 = .data:0x8160E574; // type:object size:0x2B scope:local data:string
@22138 = .data:0x8160E59F; // type:object size:0x1C scope:local data:string
@22158 = .data:0x8160E5BB; // type:object size:0x2D scope:local data:string
@22193 = .data:0x8160E5E8; // type:object size:0x26 scope:local data:string
@22194 = .data:0x8160E60E; // type:object size:0x2C scope:local data:string
@22195 = .data:0x8160E63A; // type:object size:0x30 scope:local data:string
@22196 = .data:0x8160E66A; // type:object size:0x30 scope:local data:string
@22197 = .data:0x8160E69A; // type:object size:0x26 scope:local data:string
@22198 = .data:0x8160E6C0; // type:object size:0x27 scope:local data:string
@22199 = .data:0x8160E6E7; // type:object size:0x37 scope:local data:string
@13884 = .data:0x8160E71E; // type:object size:0x15 scope:local data:string
@13885 = .data:0x8160E733; // type:object size:0x15 scope:local data:string
@22354 = .data:0x8160E748; // type:object size:0x2D scope:local data:string
@22355 = .data:0x8160E775; // type:object size:0x30 scope:local data:string
@22356 = .data:0x8160E7A5; // type:object size:0x4E scope:local data:string
@22357 = .data:0x8160E7F3; // type:object size:0x40 scope:local data:string
@22358 = .data:0x8160E833; // type:object size:0x2E scope:local data:string
@22359 = .data:0x8160E861; // type:object size:0x37 scope:local data:string
@22360 = .data:0x8160E898; // type:object size:0x4D scope:local data:string
@22400 = .data:0x8160E8E5; // type:object size:0x25 scope:local data:string
@22401 = .data:0x8160E90A; // type:object size:0x41 scope:local data:string
@22422 = .data:0x8160E94B; // type:object size:0x30 scope:local data:string
@22423 = .data:0x8160E97B; // type:object size:0x3D scope:local data:string
@22455 = .data:0x8160E9B8; // type:object size:0x48 scope:local data:string
@22476 = .data:0x8160EA00; // type:object size:0x31 scope:local data:string
@22477 = .data:0x8160EA31; // type:object size:0x38 scope:local data:string
@22497 = .data:0x8160EA69; // type:object size:0x2F scope:local data:string
@22513 = .data:0x8160EA98; // type:object size:0x21 scope:local data:string
@22514 = .data:0x8160EAB9; // type:object size:0x1F scope:local data:string
@22536 = .data:0x8160EAD8; // type:object size:0x1E scope:local data:string
@22537 = .data:0x8160EAF6; // type:object size:0x20 scope:local data:string
@22570 = .data:0x8160EB16; // type:object size:0x9 scope:local data:string
@22571 = .data:0x8160EB1F; // type:object size:0x37 scope:local data:string
@22572 = .data:0x8160EB56; // type:object size:0x34 scope:local data:string
@22573 = .data:0x8160EB8A; // type:object size:0xD scope:local data:string
@22574 = .data:0x8160EB97; // type:object size:0x3A scope:local data:string
@22575 = .data:0x8160EBD1; // type:object size:0x31 scope:local data:string
@22576 = .data:0x8160EC02; // type:object size:0x2E scope:local data:string
@22577 = .data:0x8160EC30; // type:object size:0x2E scope:local data:string
@22578 = .data:0x8160EC5E; // type:object size:0x2B scope:local data:string
@22579 = .data:0x8160EC89; // type:object size:0x2C scope:local data:string
@22580 = .data:0x8160ECB5; // type:object size:0x2B scope:local data:string
@22581 = .data:0x8160ECE0; // type:object size:0x23 scope:local data:string
@22582 = .data:0x8160ED03; // type:object size:0x38 scope:local data:string
@22583 = .data:0x8160ED3B; // type:object size:0x2E scope:local data:string
@22584 = .data:0x8160ED69; // type:object size:0x2A scope:local data:string
@22593 = .data:0x8160ED93; // type:object size:0xF scope:local data:string
@22594 = .data:0x8160EDA2; // type:object size:0x3C scope:local data:string
@22595 = .data:0x8160EDDE; // type:object size:0xF scope:local data:string
@22596 = .data:0x8160EDED; // type:object size:0x3C scope:local data:string
@22619 = .data:0x8160EE29; // type:object size:0x2E scope:local data:string
@22620 = .data:0x8160EE57; // type:object size:0x33 scope:local data:string
@22621 = .data:0x8160EE8A; // type:object size:0x39 scope:local data:string
@22622 = .data:0x8160EEC3; // type:object size:0x28 scope:local data:string
@22634 = .data:0x8160EEEB; // type:object size:0x2B scope:local data:string
@22635 = .data:0x8160EF16; // type:object size:0x30 scope:local data:string
@22647 = .data:0x8160EF46; // type:object size:0x38 scope:local data:string
@22681 = .data:0x8160EF7E; // type:object size:0x2F scope:local data:string
@22682 = .data:0x8160EFAD; // type:object size:0x2F scope:local data:string
@22683 = .data:0x8160EFDC; // type:object size:0x36 scope:local data:string
@22684 = .data:0x8160F012; // type:object size:0x34 scope:local data:string
@22685 = .data:0x8160F046; // type:object size:0x35 scope:local data:string
@22686 = .data:0x8160F07B; // type:object size:0x2B scope:local data:string
@22690 = .data:0x8160F0A6; // type:object size:0x32 scope:local data:string
@22691 = .data:0x8160F0D8; // type:object size:0x21 scope:local data:string
@22692 = .data:0x8160F0F9; // type:object size:0x21 scope:local data:string
@22693 = .data:0x8160F11A; // type:object size:0x26 scope:local data:string
@22701 = .data:0x8160F140; // type:object size:0x36 scope:local data:string
@22702 = .data:0x8160F176; // type:object size:0x38 scope:local data:string
@22703 = .data:0x8160F1AE; // type:object size:0x2A scope:local data:string
@22730 = .data:0x8160F1D8; // type:object size:0x31 scope:local data:string
@22731 = .data:0x8160F209; // type:object size:0x33 scope:local data:string
@22732 = .data:0x8160F23C; // type:object size:0x2F scope:local data:string
@22733 = .data:0x8160F26B; // type:object size:0x31 scope:local data:string
@22789 = .data:0x8160F29C; // type:object size:0x26 scope:local data:string
@22790 = .data:0x8160F2C2; // type:object size:0x2F scope:local data:string
@22791 = .data:0x8160F2F1; // type:object size:0x2B scope:local data:string
@22792 = .data:0x8160F31C; // type:object size:0x2C scope:local data:string
@22793 = .data:0x8160F348; // type:object size:0x4F scope:local data:string
@22794 = .data:0x8160F397; // type:object size:0x28 scope:local data:string
@22795 = .data:0x8160F3BF; // type:object size:0x3A scope:local data:string
@22796 = .data:0x8160F3F9; // type:object size:0x2D scope:local data:string
@22797 = .data:0x8160F426; // type:object size:0x22 scope:local data:string
@22798 = .data:0x8160F448; // type:object size:0x20 scope:local data:string
@22799 = .data:0x8160F468; // type:object size:0x22 scope:local data:string
@22800 = .data:0x8160F48A; // type:object size:0x27 scope:local data:string
@22801 = .data:0x8160F4B1; // type:object size:0x23 scope:local data:string
@22802 = .data:0x8160F4D4; // type:object size:0x3D scope:local data:string
@22803 = .data:0x8160F511; // type:object size:0x27 scope:local data:string
@22815 = .data:0x8160F538; // type:object size:0x2C scope:local data:string
@22816 = .data:0x8160F564; // type:object size:0x30 scope:local data:string
@22817 = .data:0x8160F594; // type:object size:0x26 scope:local data:string
@14983 = .data:0x8160F5BA; // type:object size:0x13 scope:local data:string
@14984 = .data:0x8160F5CD; // type:object size:0xD scope:local data:string
@14985 = .data:0x8160F5DA; // type:object size:0x9 scope:local data:string
@22831 = .data:0x8160F5E3; // type:object size:0x18 scope:local data:string
@22832 = .data:0x8160F5FB; // type:object size:0x1C scope:local data:string
@22833 = .data:0x8160F617; // type:object size:0x24 scope:local data:string
@22841 = .data:0x8160F63B; // type:object size:0x2A scope:local data:string
@22842 = .data:0x8160F665; // type:object size:0x28 scope:local data:string
@22914 = .data:0x8160F68D; // type:object size:0x35 scope:local data:string
@22915 = .data:0x8160F6C2; // type:object size:0x2C scope:local data:string
@22916 = .data:0x8160F6EE; // type:object size:0x34 scope:local data:string
@22917 = .data:0x8160F722; // type:object size:0x35 scope:local data:string
@22918 = .data:0x8160F757; // type:object size:0x2A scope:local data:string
@22919 = .data:0x8160F781; // type:object size:0x38 scope:local data:string
@22920 = .data:0x8160F7B9; // type:object size:0x53 scope:local data:string
@22921 = .data:0x8160F80C; // type:object size:0x2A scope:local data:string
@22922 = .data:0x8160F836; // type:object size:0x29 scope:local data:string
@22923 = .data:0x8160F85F; // type:object size:0x27 scope:local data:string
@22924 = .data:0x8160F886; // type:object size:0x28 scope:local data:string
@22925 = .data:0x8160F8AE; // type:object size:0x28 scope:local data:string
@22926 = .data:0x8160F8D6; // type:object size:0x33 scope:local data:string
@22927 = .data:0x8160F909; // type:object size:0x35 scope:local data:string
@22947 = .data:0x8160F93E; // type:object size:0x2A scope:local data:string
@22948 = .data:0x8160F968; // type:object size:0x20 scope:local data:string
@22949 = .data:0x8160F988; // type:object size:0x39 scope:local data:string
@22977 = .data:0x8160F9C1; // type:object size:0x41 scope:local data:string
@22978 = .data:0x8160FA02; // type:object size:0x3D scope:local data:string
@22979 = .data:0x8160FA3F; // type:object size:0x27 scope:local data:string
@22980 = .data:0x8160FA66; // type:object size:0x24 scope:local data:string
@22984 = .data:0x8160FA8A; // type:object size:0x28 scope:local data:string
@22985 = .data:0x8160FAB2; // type:object size:0x24 scope:local data:string
@23013 = .data:0x8160FAD6; // type:object size:0x22 scope:local data:string
@23014 = .data:0x8160FAF8; // type:object size:0x21 scope:local data:string
@23015 = .data:0x8160FB19; // type:object size:0x39 scope:local data:string
@23016 = .data:0x8160FB52; // type:object size:0x3A scope:local data:string
@23017 = .data:0x8160FB8C; // type:object size:0x35 scope:local data:string
@23018 = .data:0x8160FBC1; // type:object size:0x33 scope:local data:string
@23019 = .data:0x8160FBF4; // type:object size:0x29 scope:local data:string
@23020 = .data:0x8160FC1D; // type:object size:0x38 scope:local data:string
@23021 = .data:0x8160FC55; // type:object size:0x2D scope:local data:string
@23035 = .data:0x8160FC82; // type:object size:0x39 scope:local data:string
@23036 = .data:0x8160FCBB; // type:object size:0x31 scope:local data:string
@23037 = .data:0x8160FCEC; // type:object size:0x2F scope:local data:string
@23038 = .data:0x8160FD1B; // type:object size:0x30 scope:local data:string
@23094 = .data:0x8160FD4B; // type:object size:0x46 scope:local data:string
@23095 = .data:0x8160FD91; // type:object size:0x2D scope:local data:string
@23096 = .data:0x8160FDBE; // type:object size:0x2D scope:local data:string
@23097 = .data:0x8160FDEB; // type:object size:0x2C scope:local data:string
@23098 = .data:0x8160FE17; // type:object size:0x34 scope:local data:string
@23123 = .data:0x8160FE4B; // type:object size:0x27 scope:local data:string
@23124 = .data:0x8160FE72; // type:object size:0x2B scope:local data:string
@23125 = .data:0x8160FE9D; // type:object size:0x1F scope:local data:string
@23126 = .data:0x8160FEBC; // type:object size:0x21 scope:local data:string
@23127 = .data:0x8160FEDD; // type:object size:0x26 scope:local data:string
@23128 = .data:0x8160FF03; // type:object size:0x29 scope:local data:string
@23129 = .data:0x8160FF2C; // type:object size:0xF scope:local data:string
@23130 = .data:0x8160FF3B; // type:object size:0x23 scope:local data:string
@23131 = .data:0x8160FF5E; // type:object size:0x2B scope:local data:string
@23132 = .data:0x8160FF89; // type:object size:0x23 scope:local data:string
@23159 = .data:0x8160FFAC; // type:object size:0x34 scope:local data:string
@23160 = .data:0x8160FFE0; // type:object size:0x3B scope:local data:string
@23161 = .data:0x8161001B; // type:object size:0x30 scope:local data:string
@23162 = .data:0x8161004B; // type:object size:0x4D scope:local data:string
@23163 = .data:0x81610098; // type:object size:0x50 scope:local data:string
@23176 = .data:0x816100E8; // type:object size:0x23 scope:local data:string
@23177 = .data:0x8161010B; // type:object size:0x24 scope:local data:string
@23178 = .data:0x8161012F; // type:object size:0x2E scope:local data:string
@23179 = .data:0x8161015D; // type:object size:0x2E scope:local data:string
@23199 = .data:0x8161018B; // type:object size:0x35 scope:local data:string
@23200 = .data:0x816101C0; // type:object size:0x34 scope:local data:string
@23214 = .data:0x816101F4; // type:object size:0x2C scope:local data:string
@23269 = .data:0x81610220; // type:object size:0x29 scope:local data:string
@23270 = .data:0x81610249; // type:object size:0x3E scope:local data:string
@23271 = .data:0x81610287; // type:object size:0x30 scope:local data:string
@23272 = .data:0x816102B7; // type:object size:0x3C scope:local data:string
@23273 = .data:0x816102F3; // type:object size:0x34 scope:local data:string
@23278 = .data:0x81610327; // type:object size:0x35 scope:local data:string
@23279 = .data:0x8161035C; // type:object size:0x32 scope:local data:string
@23280 = .data:0x8161038E; // type:object size:0x32 scope:local data:string
@23281 = .data:0x816103C0; // type:object size:0x2D scope:local data:string
@23325 = .data:0x816103ED; // type:object size:0x32 scope:local data:string
@23326 = .data:0x8161041F; // type:object size:0x1F scope:local data:string
@23327 = .data:0x8161043E; // type:object size:0x3C scope:local data:string
@23328 = .data:0x8161047A; // type:object size:0x2F scope:local data:string
@23363 = .data:0x816104A9; // type:object size:0x2E scope:local data:string
@23364 = .data:0x816104D7; // type:object size:0x29 scope:local data:string
@23365 = .data:0x81610500; // type:object size:0x45 scope:local data:string
@23366 = .data:0x81610545; // type:object size:0x36 scope:local data:string
@23367 = .data:0x8161057B; // type:object size:0x2D scope:local data:string
@23368 = .data:0x816105A8; // type:object size:0x49 scope:local data:string
@23369 = .data:0x816105F1; // type:object size:0x4B scope:local data:string
@23376 = .data:0x8161063C; // type:object size:0x33 scope:local data:string
@23414 = .data:0x8161066F; // type:object size:0x36 scope:local data:string
@23486 = .data:0x816106A5; // type:object size:0x24 scope:local data:string
@23496 = .data:0x816106C9; // type:object size:0x2E scope:local data:string
@23499 = .data:0x816106F7; // type:object size:0x2E scope:local data:string
@23572 = .data:0x81610725; // type:object size:0x15 scope:local data:string
@23573 = .data:0x8161073A; // type:object size:0x36 scope:local data:string
@23575 = .data:0x81610770; // type:object size:0x2B scope:local data:string
@23576 = .data:0x8161079B; // type:object size:0xA scope:local data:string
@23577 = .data:0x816107A5; // type:object size:0xA scope:local data:string
@23578 = .data:0x816107AF; // type:object size:0x38 scope:local data:string
@23579 = .data:0x816107E7; // type:object size:0x22 scope:local data:string
@23580 = .data:0x81610809; // type:object size:0x35 scope:local data:string
@23593 = .data:0x8161083E; // type:object size:0x20 scope:local data:string
@23598 = .data:0x8161085E; // type:object size:0x1F scope:local data:string
@23689 = .data:0x8161087D; // type:object size:0x30 scope:local data:string
@23690 = .data:0x816108AD; // type:object size:0x30 scope:local data:string
@23691 = .data:0x816108DD; // type:object size:0x1B scope:local data:string
@23692 = .data:0x816108F8; // type:object size:0x24 scope:local data:string
@23693 = .data:0x8161091C; // type:object size:0x2F scope:local data:string
@23694 = .data:0x8161094B; // type:object size:0x2E scope:local data:string
@23695 = .data:0x81610979; // type:object size:0x25 scope:local data:string
@23710 = .data:0x8161099E; // type:object size:0x2D scope:local data:string
@23711 = .data:0x816109CB; // type:object size:0x2B scope:local data:string
@23712 = .data:0x816109F6; // type:object size:0x22 scope:local data:string
@23713 = .data:0x81610A18; // type:object size:0x27 scope:local data:string
@23719 = .data:0x81610A3F; // type:object size:0x21 scope:local data:string
@23724 = .data:0x81610A60; // type:object size:0x24 scope:local data:string
@23750 = .data:0x81610A84; // type:object size:0x25 scope:local data:string
@23766 = .data:0x81610AA9; // type:object size:0x1E scope:local data:string
@23767 = .data:0x81610AC7; // type:object size:0x2A scope:local data:string
@23772 = .data:0x81610AF1; // type:object size:0x26 scope:local data:string
@23777 = .data:0x81610B17; // type:object size:0x26 scope:local data:string
@23879 = .data:0x81610B3D; // type:object size:0x3B scope:local data:string
@23880 = .data:0x81610B78; // type:object size:0x29 scope:local data:string
@23881 = .data:0x81610BA1; // type:object size:0x30 scope:local data:string
lbl_81610BD8 = .data:0x81610BD8; // type:object size:0x1A8
jumptable_81610D80 = .data:0x81610D80; // type:object size:0x60 scope:local
lbl_81610DE0 = .data:0x81610DE0; // type:object size:0x80 scope:local
@@ -16159,9 +16384,24 @@ __vt__Q33ipl5scene7Setting = .data:0x8162C684; // type:object size:0xFC
@1909 = .data:0x8162C804; // type:object size:0x12 scope:local data:string
@1910 = .data:0x8162C816; // type:object size:0xC scope:local data:string
@1911 = .data:0x8162C822; // type:object size:0x16 scope:local data:string
lbl_8162C838 = .data:0x8162C838; // type:object size:0x21 data:string
lbl_8162C859 = .data:0x8162C859; // type:object size:0x1E data:string
lbl_8162C877 = .data:0x8162C877; // type:object size:0x111
@12223 = .data:0x8162C838; // type:object size:0x21 scope:local data:string
...data.0 = .data:0x8162C838; // type:label scope:local
@12284 = .data:0x8162C859; // type:object size:0x1E scope:local data:string
@12285 = .data:0x8162C877; // type:object size:0x22 scope:local data:string
@12300 = .data:0x8162C899; // type:object size:0x10 scope:local data:string
@12301 = .data:0x8162C8A9; // type:object size:0x9 scope:local data:string
@12303 = .data:0x8162C8B2; // type:object size:0xD scope:local data:string
@12306 = .data:0x8162C8BF; // type:object size:0xA scope:local data:string
@12308 = .data:0x8162C8C9; // type:object size:0xB scope:local data:string
@12310 = .data:0x8162C8D4; // type:object size:0xD scope:local data:string
@12312 = .data:0x8162C8E1; // type:object size:0x13 scope:local data:string
@12314 = .data:0x8162C8F4; // type:object size:0x11 scope:local data:string
@12316 = .data:0x8162C905; // type:object size:0x17 scope:local data:string
@12318 = .data:0x8162C91C; // type:object size:0x20 scope:local data:string
@12320 = .data:0x8162C93C; // type:object size:0x1E scope:local data:string
@12322 = .data:0x8162C95A; // type:object size:0xF scope:local data:string
@12324 = .data:0x8162C969; // type:object size:0xE scope:local data:string
@12326 = .data:0x8162C977; // type:object size:0xD scope:local data:string
lbl_8162C988 = .data:0x8162C988; // type:object size:0x1B data:string
lbl_8162C9A3 = .data:0x8162C9A3; // type:object size:0x1D data:string
__vt__Q33ipl5scene12APScanThread = .data:0x8162C9C0; // type:object size:0x30
@@ -19197,12 +19437,10 @@ lbl_81668B4B = .sdata2:0x81668B4B; // type:object size:0x5 data:byte
@10441 = .sdata2:0x81668BC0; // type:object size:0x4 scope:local align:4 data:float
@10442 = .sdata2:0x81668BC4; // type:object size:0x4 scope:local align:4 data:float
@10445 = .sdata2:0x81668BC8; // type:object size:0x8 scope:local align:8 data:double
lbl_81668BD0 = .sdata2:0x81668BD0; // type:object size:0x4 data:4byte
lbl_81668BD4 = .sdata2:0x81668BD4; // type:object size:0x4 data:4byte
lbl_81668BD8 = .sdata2:0x81668BD8; // type:object size:0x4 data:4byte
lbl_81668BDC = .sdata2:0x81668BDC; // type:object size:0x4 data:4byte
lbl_81668BE0 = .sdata2:0x81668BE0; // type:object size:0x4 align:4 data:float
lbl_81668BE8 = .sdata2:0x81668BE8; // type:object size:0x8 align:8 data:double
@13886 = .sdata2:0x81668BD0; // type:object size:0x8 scope:local data:4byte
@13978 = .sdata2:0x81668BD8; // type:object size:0x8 scope:local data:4byte
@23219 = .sdata2:0x81668BE0; // type:object size:0x4 scope:local align:4 data:float
@23221 = .sdata2:0x81668BE8; // type:object size:0x8 scope:local align:8 data:double
lbl_81668BF0 = .sdata2:0x81668BF0; // type:object size:0x4 align:4 data:float
lbl_81668BF4 = .sdata2:0x81668BF4; // type:object size:0x4 align:4 data:float
lbl_81668BF8 = .sdata2:0x81668BF8; // type:object size:0x8 align:4 data:float
@@ -20528,7 +20766,7 @@ lbl_8166A716 = .sdata:0x8166A716; // type:object size:0x6 data:string
@14129 = .sdata:0x8166A7AA; // type:object size:0x6 scope:local data:string
@14332 = .sdata:0x8166A7B0; // type:object size:0x6 scope:local data:string
c_banner_file_name__Q23ipl12NandSDWorker = .sdata:0x8166A7B8; // type:object size:0x4 data:4byte
lbl_8166A7BC = .sdata:0x8166A7BC; // type:object size:0x7 data:string
@12344 = .sdata:0x8166A7BC; // type:object size:0x7 scope:local data:string
c_nocopy_folder_name__Q23ipl12NandSDWorker = .sdata:0x8166A7C4; // type:object size:0x4 data:4byte
c_notransfer_folder_name__Q23ipl12NandSDWorker = .sdata:0x8166A7C8; // type:object size:0x4 data:4byte
c_wii_sd_title_root__Q23ipl12NandSDWorker = .sdata:0x8166A7CC; // type:object size:0x4 data:4byte
@@ -20537,17 +20775,17 @@ c_sd_app_file_name__Q23ipl12NandSDWorker = .sdata:0x8166A7D4; // type:object siz
c_succession_path__Q23ipl12NandSDWorker = .sdata:0x8166A7D8; // type:object size:0x4 data:4byte
c_transferid_path__Q23ipl12NandSDWorker = .sdata:0x8166A7DC; // type:object size:0x4 data:4byte
c_tmp_work_path__Q23ipl12NandSDWorker = .sdata:0x8166A7E0; // type:object size:0x4 data:4byte
lbl_8166A7E4 = .sdata:0x8166A7E4; // type:object size:0x6 data:string
lbl_8166A7EA = .sdata:0x8166A7EA; // type:object size:0x7 data:string
lbl_8166A7F1 = .sdata:0x8166A7F1; // type:object size:0x6 data:string
lbl_8166A7F7 = .sdata:0x8166A7F7; // type:object size:0x5 data:string
@12352 = .sdata:0x8166A7E4; // type:object size:0x6 scope:local data:string
@12353 = .sdata:0x8166A7EA; // type:object size:0x7 scope:local data:string
@12355 = .sdata:0x8166A7F1; // type:object size:0x6 scope:local data:string
@12356 = .sdata:0x8166A7F7; // type:object size:0x5 scope:local data:string
c_ignore_list_for_wiimenu__Q23ipl12NandSDWorker = .sdata:0x8166A7FC; // type:object size:0x8
c_wii_menu_save_path__Q23ipl12NandSDWorker = .sdata:0x8166A804; // type:object size:0x4 data:4byte
lbl_8166A808 = .sdata:0x8166A808; // type:object size:0x2 data:string
lbl_8166A80A = .sdata:0x8166A80A; // type:object size:0x3 data:string
lbl_8166A80D = .sdata:0x8166A80D; // type:object size:0x2 data:string
lbl_8166A80F = .sdata:0x8166A80F; // type:object size:0x5 data:string
lbl_8166A814 = .sdata:0x8166A814; // type:object size:0x4 data:string
@22157 = .sdata:0x8166A808; // type:object size:0x2 scope:local data:string
@22300 = .sdata:0x8166A80A; // type:object size:0x3 scope:local data:string
@22314 = .sdata:0x8166A80D; // type:object size:0x2 scope:local data:string
@23190 = .sdata:0x8166A80F; // type:object size:0x5 scope:local data:string
@23574 = .sdata:0x8166A814; // type:object size:0x4 scope:local data:string
lbl_8166A818 = .sdata:0x8166A818; // type:object size:0x4 data:string
lbl_8166A81C = .sdata:0x8166A81C; // type:object size:0x4
@10074 = .sdata:0x8166A820; // type:object size:0x4 scope:local data:string
@@ -21219,8 +21457,8 @@ lbl_8166B7E3 = .sdata:0x8166B7E3; // type:object size:0x6 data:string
lbl_8166B7E9 = .sdata:0x8166B7E9; // type:object size:0x7 data:string
lbl_8166B7F0 = .sdata:0x8166B7F0; // type:object size:0x3 data:string
lbl_8166B7F4 = .sdata:0x8166B7F4; // type:object size:0x8 data:wstring
lbl_8166B800 = .sdata:0x8166B800; // type:object size:0x5 data:string
lbl_8166B805 = .sdata:0x8166B805; // type:object size:0x5 data:string
@12299 = .sdata:0x8166B800; // type:object size:0x5 scope:local data:string
@12302 = .sdata:0x8166B805; // type:object size:0x5 scope:local data:string
lbl_8166B810 = .sdata:0x8166B810; // type:object size:0x4 data:string
lbl_8166B818 = .sdata:0x8166B818; // type:object size:0x8 data:4byte
lbl_8166B820 = .sdata:0x8166B820; // type:object size:0x4 data:4byte
@@ -22333,7 +22571,7 @@ ScrollState___Q23www9trasition = .sbss:0x8166CF9C; // type:object size:0x4 scope
gDpdWaitFrm = .sbss:0x8166CFA0; // type:object size:0x4 data:4byte
wiiFlag__Q23www10wiisetting = .sbss:0x8166CFA4; // type:object size:0x8 data:4byte
writeBackID__Q23www10wiisetting = .sbss:0x8166CFAC; // type:object size:0x1 data:byte
savedata_smth__Q23www10wiisetting = .sbss:0x8166CFAD; // type:object size:0x1 data:byte
saveData__Q23www10wiisetting = .sbss:0x8166CFAD; // type:object size:0x1 data:byte
funcResult__Q23www10wiisetting = .sbss:0x8166CFAE; // type:object size:0x1 data:byte
setupFlag__Q23www10wiisetting = .sbss:0x8166CFAF; // type:object size:0x1 data:byte
mQueue__Q23www10wiisetting = .sbss:0x8166CFB0; // type:object size:0x4 data:4byte

View File

@@ -1756,10 +1756,10 @@ list_sd_save_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348D78; // type:functio
list_sd_app_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348D8C; // type:function size:0x14
get_sd_save_banner_async__Q23ipl12NandSDWorkerFUlP17WIISaveBannerFile = .text:0x81348DA0; // type:function size:0x28
get_sd_app_thumbnail_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81348DC8; // type:function size:0x34
iplNandSD_81348DFC__Q23ipl12NandSDWorkerFUlPvPv = .text:0x81348DFC; // type:function size:0x34
update_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E30; // type:function size:0x14
read_loc_dat_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E44; // type:function size:0x14
iplNandSD_81348E58__Q23ipl12NandSDWorkerFUxPvPv = .text:0x81348E58; // type:function size:0x30
get_sd_app_meta_async__Q23ipl12NandSDWorkerFUlPUcPQ33ipl12NandSDWorker14SDAppMetaEntry = .text:0x81348DFC; // type:function size:0x34
update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E30; // type:function size:0x14
read_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E44; // type:function size:0x14
check_for_sd_app_to_nand_async__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker13AppBlocksInfoPQ33ipl12NandSDWorker13AppBlocksInfo = .text:0x81348E58; // type:function size:0x30
check_backup_fits_async__Q23ipl12NandSDWorkerFPQ33ipl12NandSDWorker11TitleIdListPQ33ipl12NandSDWorker11TitleIdList = .text:0x81348E88; // type:function size:0x20
iplNandSD_81348EA8__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348ED4; // type:function size:0x18
@@ -1776,7 +1776,7 @@ copy_sd_save_to_nand_async__Q23ipl12NandSDWorkerFUl = .text:0x81348FB4; // type:
format_sd_async__Q23ipl12NandSDWorkerFv = .text:0x81348FD0; // type:function size:0x8
get_sd_free_area_async__Q23ipl12NandSDWorkerFPUx = .text:0x81348FD8; // type:function size:0x14
list_nand_app_async__Q23ipl12NandSDWorkerFPUx = .text:0x81348FEC; // type:function size:0x14
iplNandSD_81349000__Q23ipl12NandSDWorkerFPvPv = .text:0x81349000; // type:function size:0x20
list_nand_apps_usage_async__Q23ipl12NandSDWorkerFPvPv = .text:0x81349000; // type:function size:0x20
get_nand_app_thumbnail_async__Q23ipl12NandSDWorkerFUxPvPQ33ipl7channel18SChanMgrMetaHeader = .text:0x81349020; // type:function size:0x30
delete_nand_app_async__Q23ipl12NandSDWorkerFUxb = .text:0x81349050; // type:function size:0x28
copy_nand_app_to_sd_async__Q23ipl12NandSDWorkerFUx = .text:0x81349078; // type:function size:0x20
@@ -1817,12 +1817,12 @@ check_nand_save_banner_exist__Q23ipl12NandSDWorkerFUx = .text:0x8134AF68; // typ
get_nand_save_banner__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8134B04C; // type:function size:0x3B0
do_get_sd_save_banner__Q23ipl12NandSDWorkerFv = .text:0x8134B3FC; // type:function size:0x160
do_get_sd_app_thumbnail__Q23ipl12NandSDWorkerFv = .text:0x8134B55C; // type:function size:0x1CC
do_unk_8134B728__Q23ipl12NandSDWorkerFv = .text:0x8134B728; // type:function size:0x1F4
do_update_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134B91C; // type:function size:0x344
do_read_loc_dat__Q23ipl12NandSDWorkerFv = .text:0x8134BC60; // type:function size:0x270
do_unk_8134BED0__Q23ipl12NandSDWorkerFv = .text:0x8134BED0; // type:function size:0x3C8
do_get_sd_app_meta__Q23ipl12NandSDWorkerFv = .text:0x8134B728; // type:function size:0x1F4
do_update_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134B91C; // type:function size:0x344
do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134BC60; // type:function size:0x270
do_check_for_sd_app_to_nand__Q23ipl12NandSDWorkerFv = .text:0x8134BED0; // type:function size:0x3C8
check_backup_fits__Q23ipl12NandSDWorkerFv = .text:0x8134C298; // type:function size:0x3D8
do_list_nand_apps_usages__Q23ipl12NandSDWorkerFv = .text:0x8134C670; // type:function size:0x1C8
do_list_nand_apps_usage__Q23ipl12NandSDWorkerFv = .text:0x8134C670; // type:function size:0x1C8
do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
do_get_nand_save_size__Q23ipl12NandSDWorkerFv = .text:0x8134CB08; // type:function size:0x260
do_get_nand_app_size__Q23ipl12NandSDWorkerFv = .text:0x8134CD68; // type:function size:0x1F4
@@ -1852,7 +1852,7 @@ delete_download_task__Q23ipl12NandSDWorkerFUl = .text:0x8134FC94; // type:functi
delete_nand_app_content__Q23ipl12NandSDWorkerFUx = .text:0x8134FEA8; // type:function size:0x134
do_copy_nand_app_to_sd__Q23ipl12NandSDWorkerFv = .text:0x8134FFDC; // type:function size:0x530
get_save_banner_for_data_only_title__Q23ipl12NandSDWorkerFUxP17WIISaveBannerFilePUl = .text:0x8135050C; // type:function size:0x160
get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker11SDAppBanner = .text:0x8135066C; // type:function size:0x480
get_app_banner_from_meta__Q23ipl12NandSDWorkerFUxPQ33ipl12NandSDWorker15SDAppBackupData = .text:0x8135066C; // type:function size:0x480
open_nand_app_content__Q23ipl12NandSDWorkerFUxUsPUlPP12ESTicketView = .text:0x81350AEC; // type:function size:0x21C
read_file__Q23ipl12NandSDWorkerFPvQ33ipl12NandSDWorker8FileKindlUlPv = .text:0x81350D08; // type:function size:0x158
search_meta_header__Q23ipl12NandSDWorkerFPCUc = .text:0x81350E60; // type:function size:0x54
@@ -1920,13 +1920,13 @@ check_nand_save_exist_lo__Q23ipl12NandSDWorkerFUl = .text:0x813546F8; // type:fu
get_nand_title_version__Q23ipl12NandSDWorkerFUxPUs = .text:0x813547C0; // type:function size:0x80
get_sd_title_version__Q23ipl12NandSDWorkerFUlPUs = .text:0x81354840; // type:function size:0xF4
check_sd_title_restorable__Q23ipl12NandSDWorkerFUl = .text:0x81354934; // type:function size:0x184
__ct__Q33ipl2ut8FreeListFv = .text:0x81354AB8; // type:function size:0x14
init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81354ACC; // type:function size:0x5C
get__Q33ipl2ut8FreeListFv = .text:0x81354B28; // type:function size:0x24
__ct__Q33ipl2ut5StackFv = .text:0x81354B4C; // type:function size:0x40
init__Q33ipl2ut5StackFPvUlUl = .text:0x81354B8C; // type:function size:0x4C
push__Q33ipl2ut5StackFPCv = .text:0x81354BD8; // type:function size:0x78
pop__Q33ipl2ut5StackFPv = .text:0x81354C50; // type:function size:0x80
__ct__Q33ipl2ut8FreeListFv = .text:0x81354AB8; // type:function size:0x14 scope:weak
init__Q33ipl2ut8FreeListFPvUlUl = .text:0x81354ACC; // type:function size:0x5C scope:weak
get__Q33ipl2ut8FreeListFv = .text:0x81354B28; // type:function size:0x24 scope:weak
__ct__Q33ipl2ut5StackFv = .text:0x81354B4C; // type:function size:0x40 scope:weak
init__Q33ipl2ut5StackFPvUlUl = .text:0x81354B8C; // type:function size:0x4C scope:weak
push__Q33ipl2ut5StackFPCv = .text:0x81354BD8; // type:function size:0x78 scope:weak
pop__Q33ipl2ut5StackFPv = .text:0x81354C50; // type:function size:0x80 scope:weak
getFirstController__Q23ipl8keyboardFv = .text:0x81354CD0; // type:function size:0x50
onCommand__Q33ipl8keyboard13EventObserverFQ39textinput15CommandReceiver13INPUT_COMMANDPv = .text:0x81354D20; // type:function size:0x34
onSE__Q33ipl8keyboard13EventObserverFQ39textinput5sound2SE = .text:0x81354D54; // type:function size:0x218
@@ -2607,8 +2607,8 @@ LeftScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginV
RightScroll___Q23www9trasitionFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x8136F980; // type:function size:0x3C
GetScrollState__Q23www9trasitionFv = .text:0x8136F9BC; // type:function size:0x8
ResetScrollState__Q23www9trasitionFv = .text:0x8136F9C4; // type:function size:0xC
www_wiisetting_8136F9D0 = .text:0x8136F9D0; // type:function size:0x24 scope:local
www_wiisetting_8136F9F4 = .text:0x8136F9F4; // type:function size:0x44 scope:local
DPDCallback2__Q23www10wiisettingFll = .text:0x8136F9D0; // type:function size:0x24 scope:local
DPDCallback__Q23www10wiisettingFll = .text:0x8136F9F4; // type:function size:0x44 scope:local
allow_access__Q23www10wiisettingFPCcPCci = .text:0x8136FA38; // type:function size:0x8
AddJsPlugin__Q23www10wiisettingFv = .text:0x8136FA40; // type:function size:0x88
globalGetter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x8136FAC8; // type:function size:0xC8
@@ -2617,9 +2617,9 @@ Getter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x81
Setter___Q23www10wiisettingFP14WWWJSPluginObjPCcP16WWWJSPluginValue = .text:0x813705B4; // type:function size:0x50C
wiiOSReport__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x81370AC0; // type:function size:0x5C
wiiWriteBack__Q23www10wiisettingFP14WWWJSPluginObjP14WWWJSPluginObjiP16WWWJSPluginValueP16WWWJSPluginValue = .text:0x81370B1C; // type:function size:0x344
www_wiisetting_81370E60 = .text:0x81370E60; // type:function size:0x54 scope:local
getKeyboardLanguage__Q23www10wiisettingFUc = .text:0x81370E60; // type:function size:0x54 scope:local
initWiiSetting__Q23www10wiisettingFv = .text:0x81370EB4; // type:function size:0x60
www_wiisetting_81370F14 = .text:0x81370F14; // type:function size:0x98 scope:local
getBytePropIndex__Q23www10wiisettingFPCc = .text:0x81370F14; // type:function size:0x98 scope:local
startFunc__Q23www10wiisettingFUc = .text:0x81370FAC; // type:function size:0x1A4
getWiiSettingData__Q23www10wiisettingFv = .text:0x81371150; // type:function size:0xC
getWiiSettingFlag__Q23www10wiisettingFv = .text:0x8137115C; // type:function size:0x8
@@ -13814,7 +13814,7 @@ lbl_8160D600 = .rodata:0x8160D600; // type:object size:0x20
scNumber__3ipl = .rodata:0x8160D620; // type:object size:0x16 data:wstring
c_es_encrypt_iv__Q23ipl12NandSDWorker = .rodata:0x8160D638; // type:object size:0x10
c_md5_secret_key__Q23ipl12NandSDWorker = .rodata:0x8160D648; // type:object size:0x10
lbl_8160D658 = .rodata:0x8160D658; // type:object size:0x10 data:4byte
@14986 = .rodata:0x8160D658; // type:object size:0x10 scope:local data:4byte
cDefaultChanList__3ipl = .rodata:0x8160D668; // type:object size:0x300 scope:local
odh_zigzag_order = .rodata:0x8160D968; // type:object size:0x40 scope:local data:byte
odh_natural_order = .rodata:0x8160D9A8; // type:object size:0x40 scope:local data:byte
@@ -13856,8 +13856,8 @@ scMonthToMessageID__Q23ipl5scene = .rodata:0x8160FB58; // type:object size:0x30
scNumber__Q23ipl5scene = .rodata:0x8160FB88; // type:object size:0x14 scope:local data:2byte
scAnmFrame__Q23ipl5scene = .rodata:0x8160FBA0; // type:object size:0x90 scope:local
scNumber__Q23ipl5scene = .rodata:0x8160FC30; // type:object size:0x14 scope:local data:2byte
scNumber__Q23ipl5scene = .rodata:0x8160FC48; // type:object size:0x14 scope:local data:2byte
scNumber2__Q23ipl5scene = .rodata:0x8160FC5C; // type:object size:0x14 scope:local data:2byte
@13129 = .rodata:0x8160FC48; // type:object size:0x14 scope:local data:2byte
@13171 = .rodata:0x8160FC5C; // type:object size:0x14 scope:local data:2byte
lbl_8160FC70 = .rodata:0x8160FC70; // type:object size:0x10
lbl_8160FC80 = .rodata:0x8160FC80; // type:object size:0x10
scNumber__Q23ipl5scene = .rodata:0x8160FC90; // type:object size:0x14 scope:local data:2byte
@@ -13869,9 +13869,9 @@ cfChanThumbOfss__Q23ipl5scene = .rodata:0x816102D0; // type:object size:0x10 sco
lbl_816102E0 = .rodata:0x816102E0; // type:object size:0x10 data:4byte
lbl_816102F0 = .rodata:0x816102F0; // type:object size:0x20 data:4byte
@10845 = .rodata:0x81610310; // type:object size:0x14 scope:local data:2byte
scNumber__Q23ipl5scene = .rodata:0x81610328; // type:object size:0x14 scope:local data:2byte
scNumber2__Q23ipl5scene = .rodata:0x8161033C; // type:object size:0x14 scope:local data:2byte
scNumber__Q23ipl5scene = .rodata:0x81610350; // type:object size:0x14 scope:local data:2byte
@13108 = .rodata:0x81610328; // type:object size:0x14 scope:local data:2byte
@13150 = .rodata:0x8161033C; // type:object size:0x14 scope:local data:2byte
@12843 = .rodata:0x81610350; // type:object size:0x14 scope:local data:2byte
scAnmName__Q23ipl5scene = .rodata:0x81610368; // type:object size:0xD8 scope:local
scTextboxToMessageID__Q23ipl5scene = .rodata:0x81610440; // type:object size:0x28 scope:local
scNumber__Q23ipl5scene = .rodata:0x81610468; // type:object size:0x14 scope:local data:2byte
@@ -14055,7 +14055,7 @@ g_SpecialsChars = .rodata:0x81618D70; // type:object size:0x10 data:byte
TtableInv = .rodata:0x81618D80; // type:object size:0x10 scope:local
VFipf_valid_fn_char = .rodata:0x81618D90; // type:object size:0x60
fat_special_values = .rodata:0x81618DF0; // type:object size:0x3C scope:local
cp932_to_unicode = .rodata:0x81618E30; // type:object size:0x4272 scope:local data:2byte
cp932_to_unicode = .rodata:0x81618E30; // type:object size:0x4272 scope:local data:2byte noreloc
ErrInfoTbl$4383 = .rodata:0x8161D0A8; // type:object size:0xD0 scope:local
l_nand_func = .rodata:0x8161D178; // type:object size:0x20 scope:local
pfd_sddrv_func = .rodata:0x8161D198; // type:object size:0x20 scope:local
@@ -14187,7 +14187,7 @@ ca_ppki = .rodata:0x8162DBB8; // type:object size:0x400 noreloc
ms_dpki = .rodata:0x8162DFB8; // type:object size:0x240 noreloc
ms_ppki = .rodata:0x8162E1F8; // type:object size:0x240 noreloc
@1272 = .rodata:0x8162E438; // type:object size:0x278 scope:local data:4byte
pf_valid_fn_char = .rodata:0x8162E6B0; // type:object size:0x60
pf_valid_fn_char = .rodata:0x8162E6B0; // type:object size:0x60 scope:local noreloc
fat_special_values = .rodata:0x8162E710; // type:object size:0x3C
cp932_to_unicode = .rodata:0x8162E750; // type:object size:0x4272 data:2byte
fa_nand_func = .rodata:0x816329C8; // type:object size:0x20
@@ -14397,288 +14397,289 @@ __vt__Q23ipl12DialogWindow = .data:0x81635A20; // type:object size:0x18
__vt__Q23gui12EventHandler = .data:0x81635A38; // type:object size:0x18 scope:weak
__vt__Q23gui9Interface = .data:0x81635A50; // type:object size:0x20 scope:weak
@10439 = .data:0x81635A70; // type:object size:0x12 scope:local data:string
lbl_81635A88 = .data:0x81635A88; // type:object size:0xB data:string
lbl_81635A93 = .data:0x81635A93; // type:object size:0xB data:string
lbl_81635A9E = .data:0x81635A9E; // type:object size:0x14 data:string
lbl_81635AB2 = .data:0x81635AB2; // type:object size:0x9 data:string
lbl_81635ABB = .data:0x81635ABB; // type:object size:0xC data:string
lbl_81635AC7 = .data:0x81635AC7; // type:object size:0x14 data:string
lbl_81635ADB = .data:0x81635ADB; // type:object size:0x20 data:string
lbl_81635AFB = .data:0x81635AFB; // type:object size:0x10 data:string
lbl_81635B0B = .data:0x81635B0B; // type:object size:0xC data:string
@12343 = .data:0x81635A88; // type:object size:0xB scope:local data:string
...data.0 = .data:0x81635A88; // type:label scope:local
@12345 = .data:0x81635A93; // type:object size:0xB scope:local data:string
@12346 = .data:0x81635A9E; // type:object size:0x14 scope:local data:string
@12347 = .data:0x81635AB2; // type:object size:0x9 scope:local data:string
@12348 = .data:0x81635ABB; // type:object size:0xC scope:local data:string
@12349 = .data:0x81635AC7; // type:object size:0x14 scope:local data:string
@12350 = .data:0x81635ADB; // type:object size:0x20 scope:local data:string
@12351 = .data:0x81635AFB; // type:object size:0x10 scope:local data:string
@12354 = .data:0x81635B0B; // type:object size:0xC scope:local data:string
c_ignore_list_for_shared2__Q23ipl12NandSDWorker = .data:0x81635B18; // type:object size:0x14
lbl_81635B2C = .data:0x81635B2C; // type:object size:0xC data:string
lbl_81635B38 = .data:0x81635B38; // type:object size:0xA data:string
lbl_81635B42 = .data:0x81635B42; // type:object size:0x1E data:string
lbl_81635B60 = .data:0x81635B60; // type:object size:0x22 data:string
lbl_81635B82 = .data:0x81635B82; // type:object size:0x22 data:string
lbl_81635BA4 = .data:0x81635BA4; // type:object size:0x16 data:string
lbl_81635BBA = .data:0x81635BBA; // type:object size:0x11 data:string
lbl_81635BCB = .data:0x81635BCB; // type:object size:0x19 data:string
lbl_81635BE4 = .data:0x81635BE4; // type:object size:0x1A data:string
lbl_81635BFE = .data:0x81635BFE; // type:object size:0x10 data:string
lbl_81635C0E = .data:0x81635C0E; // type:object size:0x21 data:string
lbl_81635C2F = .data:0x81635C2F; // type:object size:0x25 data:string
lbl_81635C54 = .data:0x81635C54; // type:object size:0x28 data:string
lbl_81635C7C = .data:0x81635C7C; // type:object size:0x1B data:string
lbl_81635C97 = .data:0x81635C97; // type:object size:0x1E data:string
lbl_81635CB5 = .data:0x81635CB5; // type:object size:0x29 data:string
lbl_81635CDE = .data:0x81635CDE; // type:object size:0x1F data:string
lbl_81635CFD = .data:0x81635CFD; // type:object size:0x1E data:string
lbl_81635D1B = .data:0x81635D1B; // type:object size:0x2F data:string
lbl_81635D4A = .data:0x81635D4A; // type:object size:0x34 data:string
lbl_81635D7E = .data:0x81635D7E; // type:object size:0x14 data:string
lbl_81635D92 = .data:0x81635D92; // type:object size:0x1B data:string
jumptable_81635DB0 = .data:0x81635DB0; // type:object size:0xD0 scope:local
lbl_81635E80 = .data:0x81635E80; // type:object size:0x21 data:string
lbl_81635EA1 = .data:0x81635EA1; // type:object size:0x22 data:string
lbl_81635EC3 = .data:0x81635EC3; // type:object size:0x30 data:string
lbl_81635EF3 = .data:0x81635EF3; // type:object size:0x3F data:string
lbl_81635F32 = .data:0x81635F32; // type:object size:0x33 data:string
lbl_81635F65 = .data:0x81635F65; // type:object size:0x30 data:string
lbl_81635F95 = .data:0x81635F95; // type:object size:0x2E data:string
lbl_81635FC3 = .data:0x81635FC3; // type:object size:0x28 data:string
lbl_81635FEB = .data:0x81635FEB; // type:object size:0x28 data:string
lbl_81636013 = .data:0x81636013; // type:object size:0x35 data:string
lbl_81636048 = .data:0x81636048; // type:object size:0x21 data:string
lbl_81636069 = .data:0x81636069; // type:object size:0x2F data:string
lbl_81636098 = .data:0x81636098; // type:object size:0x33 data:string
lbl_816360CB = .data:0x816360CB; // type:object size:0x3A data:string
lbl_81636105 = .data:0x81636105; // type:object size:0x3F data:string
lbl_81636144 = .data:0x81636144; // type:object size:0x2C data:string
lbl_81636170 = .data:0x81636170; // type:object size:0x32 data:string
lbl_816361A2 = .data:0x816361A2; // type:object size:0x29 data:string
lbl_816361CB = .data:0x816361CB; // type:object size:0x2D data:string
lbl_816361F8 = .data:0x816361F8; // type:object size:0x9 data:string
lbl_81636201 = .data:0x81636201; // type:object size:0x3C data:string
lbl_8163623D = .data:0x8163623D; // type:object size:0x28 data:string
lbl_81636265 = .data:0x81636265; // type:object size:0x29 data:string
lbl_8163628E = .data:0x8163628E; // type:object size:0x1D data:string
lbl_816362AB = .data:0x816362AB; // type:object size:0x1E data:string
lbl_816362C9 = .data:0x816362C9; // type:object size:0x1D data:string
lbl_816362E6 = .data:0x816362E6; // type:object size:0x24 data:string
lbl_8163630A = .data:0x8163630A; // type:object size:0x34 data:string
lbl_8163633E = .data:0x8163633E; // type:object size:0x1E data:string
lbl_8163635C = .data:0x8163635C; // type:object size:0x28 data:string
lbl_81636384 = .data:0x81636384; // type:object size:0x2B data:string
lbl_816363AF = .data:0x816363AF; // type:object size:0x1C data:string
lbl_816363CB = .data:0x816363CB; // type:object size:0x2D data:string
lbl_816363F8 = .data:0x816363F8; // type:object size:0x26 data:string
lbl_8163641E = .data:0x8163641E; // type:object size:0x2C data:string
lbl_8163644A = .data:0x8163644A; // type:object size:0x30 data:string
lbl_8163647A = .data:0x8163647A; // type:object size:0x30 data:string
lbl_816364AA = .data:0x816364AA; // type:object size:0x26 data:string
lbl_816364D0 = .data:0x816364D0; // type:object size:0x27 data:string
lbl_816364F7 = .data:0x816364F7; // type:object size:0x37 data:string
lbl_8163652E = .data:0x8163652E; // type:object size:0x15 data:string
lbl_81636543 = .data:0x81636543; // type:object size:0x15 data:string
lbl_81636558 = .data:0x81636558; // type:object size:0x2D data:string
lbl_81636585 = .data:0x81636585; // type:object size:0x30 data:string
lbl_816365B5 = .data:0x816365B5; // type:object size:0x4E data:string
lbl_81636603 = .data:0x81636603; // type:object size:0x40 data:string
lbl_81636643 = .data:0x81636643; // type:object size:0x2E data:string
lbl_81636671 = .data:0x81636671; // type:object size:0x37 data:string
lbl_816366A8 = .data:0x816366A8; // type:object size:0x4D data:string
lbl_816366F5 = .data:0x816366F5; // type:object size:0x25 data:string
lbl_8163671A = .data:0x8163671A; // type:object size:0x41 data:string
lbl_8163675B = .data:0x8163675B; // type:object size:0x30 data:string
lbl_8163678B = .data:0x8163678B; // type:object size:0x3D data:string
lbl_816367C8 = .data:0x816367C8; // type:object size:0x48 data:string
lbl_81636810 = .data:0x81636810; // type:object size:0x31 data:string
lbl_81636841 = .data:0x81636841; // type:object size:0x38 data:string
lbl_81636879 = .data:0x81636879; // type:object size:0x2F data:string
lbl_816368A8 = .data:0x816368A8; // type:object size:0x21 data:string
lbl_816368C9 = .data:0x816368C9; // type:object size:0x1F data:string
lbl_816368E8 = .data:0x816368E8; // type:object size:0x1E data:string
lbl_81636906 = .data:0x81636906; // type:object size:0x20 data:string
lbl_81636926 = .data:0x81636926; // type:object size:0x9 data:string
lbl_8163692F = .data:0x8163692F; // type:object size:0x37 data:string
lbl_81636966 = .data:0x81636966; // type:object size:0x34 data:string
lbl_8163699A = .data:0x8163699A; // type:object size:0xD data:string
lbl_816369A7 = .data:0x816369A7; // type:object size:0x3A data:string
lbl_816369E1 = .data:0x816369E1; // type:object size:0x31 data:string
lbl_81636A12 = .data:0x81636A12; // type:object size:0x2E data:string
lbl_81636A40 = .data:0x81636A40; // type:object size:0x2E data:string
lbl_81636A6E = .data:0x81636A6E; // type:object size:0x2B data:string
lbl_81636A99 = .data:0x81636A99; // type:object size:0x2C data:string
lbl_81636AC5 = .data:0x81636AC5; // type:object size:0x2B data:string
lbl_81636AF0 = .data:0x81636AF0; // type:object size:0x23 data:string
lbl_81636B13 = .data:0x81636B13; // type:object size:0x38 data:string
lbl_81636B4B = .data:0x81636B4B; // type:object size:0x2E data:string
lbl_81636B79 = .data:0x81636B79; // type:object size:0x2A data:string
lbl_81636BA3 = .data:0x81636BA3; // type:object size:0xF data:string
lbl_81636BB2 = .data:0x81636BB2; // type:object size:0x3C data:string
lbl_81636BEE = .data:0x81636BEE; // type:object size:0xF data:string
lbl_81636BFD = .data:0x81636BFD; // type:object size:0x3C data:string
lbl_81636C39 = .data:0x81636C39; // type:object size:0x2E data:string
lbl_81636C67 = .data:0x81636C67; // type:object size:0x33 data:string
lbl_81636C9A = .data:0x81636C9A; // type:object size:0x39 data:string
lbl_81636CD3 = .data:0x81636CD3; // type:object size:0x28 data:string
lbl_81636CFB = .data:0x81636CFB; // type:object size:0x2B data:string
lbl_81636D26 = .data:0x81636D26; // type:object size:0x30 data:string
lbl_81636D56 = .data:0x81636D56; // type:object size:0x38 data:string
lbl_81636D8E = .data:0x81636D8E; // type:object size:0x2F data:string
lbl_81636DBD = .data:0x81636DBD; // type:object size:0x2F data:string
lbl_81636DEC = .data:0x81636DEC; // type:object size:0x36 data:string
lbl_81636E22 = .data:0x81636E22; // type:object size:0x34 data:string
lbl_81636E56 = .data:0x81636E56; // type:object size:0x35 data:string
lbl_81636E8B = .data:0x81636E8B; // type:object size:0x2B data:string
lbl_81636EB6 = .data:0x81636EB6; // type:object size:0x32 data:string
lbl_81636EE8 = .data:0x81636EE8; // type:object size:0x21 data:string
lbl_81636F09 = .data:0x81636F09; // type:object size:0x21 data:string
lbl_81636F2A = .data:0x81636F2A; // type:object size:0x26 data:string
lbl_81636F50 = .data:0x81636F50; // type:object size:0x36 data:string
lbl_81636F86 = .data:0x81636F86; // type:object size:0x38 data:string
lbl_81636FBE = .data:0x81636FBE; // type:object size:0x2A data:string
lbl_81636FE8 = .data:0x81636FE8; // type:object size:0x31 data:string
lbl_81637019 = .data:0x81637019; // type:object size:0x33 data:string
lbl_8163704C = .data:0x8163704C; // type:object size:0x2F data:string
lbl_8163707B = .data:0x8163707B; // type:object size:0x31 data:string
lbl_816370AC = .data:0x816370AC; // type:object size:0x26 data:string
lbl_816370D2 = .data:0x816370D2; // type:object size:0x2F data:string
lbl_81637101 = .data:0x81637101; // type:object size:0x2B data:string
lbl_8163712C = .data:0x8163712C; // type:object size:0x2C data:string
lbl_81637158 = .data:0x81637158; // type:object size:0x4F data:string
lbl_816371A7 = .data:0x816371A7; // type:object size:0x28 data:string
lbl_816371CF = .data:0x816371CF; // type:object size:0x3A data:string
lbl_81637209 = .data:0x81637209; // type:object size:0x2D data:string
lbl_81637236 = .data:0x81637236; // type:object size:0x22 data:string
lbl_81637258 = .data:0x81637258; // type:object size:0x20 data:string
lbl_81637278 = .data:0x81637278; // type:object size:0x22 data:string
lbl_8163729A = .data:0x8163729A; // type:object size:0x27 data:string
lbl_816372C1 = .data:0x816372C1; // type:object size:0x23 data:string
lbl_816372E4 = .data:0x816372E4; // type:object size:0x3D data:string
lbl_81637321 = .data:0x81637321; // type:object size:0x27 data:string
lbl_81637348 = .data:0x81637348; // type:object size:0x2C data:string
lbl_81637374 = .data:0x81637374; // type:object size:0x30 data:string
lbl_816373A4 = .data:0x816373A4; // type:object size:0x26 data:string
lbl_816373CA = .data:0x816373CA; // type:object size:0x13 data:string
lbl_816373DD = .data:0x816373DD; // type:object size:0xD data:string
lbl_816373EA = .data:0x816373EA; // type:object size:0x9 data:string
lbl_816373F3 = .data:0x816373F3; // type:object size:0x18 data:string
lbl_8163740B = .data:0x8163740B; // type:object size:0x1C data:string
lbl_81637427 = .data:0x81637427; // type:object size:0x24 data:string
lbl_8163744B = .data:0x8163744B; // type:object size:0x2A data:string
lbl_81637475 = .data:0x81637475; // type:object size:0x28 data:string
lbl_8163749D = .data:0x8163749D; // type:object size:0x35 data:string
lbl_816374D2 = .data:0x816374D2; // type:object size:0x2C data:string
lbl_816374FE = .data:0x816374FE; // type:object size:0x34 data:string
lbl_81637532 = .data:0x81637532; // type:object size:0x35 data:string
lbl_81637567 = .data:0x81637567; // type:object size:0x2A data:string
lbl_81637591 = .data:0x81637591; // type:object size:0x38 data:string
lbl_816375C9 = .data:0x816375C9; // type:object size:0x53 data:string
lbl_8163761C = .data:0x8163761C; // type:object size:0x2A data:string
lbl_81637646 = .data:0x81637646; // type:object size:0x29 data:string
lbl_8163766F = .data:0x8163766F; // type:object size:0x27 data:string
lbl_81637696 = .data:0x81637696; // type:object size:0x28 data:string
lbl_816376BE = .data:0x816376BE; // type:object size:0x28 data:string
lbl_816376E6 = .data:0x816376E6; // type:object size:0x33 data:string
lbl_81637719 = .data:0x81637719; // type:object size:0x35 data:string
lbl_8163774E = .data:0x8163774E; // type:object size:0x2A data:string
lbl_81637778 = .data:0x81637778; // type:object size:0x20 data:string
lbl_81637798 = .data:0x81637798; // type:object size:0x39 data:string
lbl_816377D1 = .data:0x816377D1; // type:object size:0x41 data:string
lbl_81637812 = .data:0x81637812; // type:object size:0x3D data:string
lbl_8163784F = .data:0x8163784F; // type:object size:0x27 data:string
lbl_81637876 = .data:0x81637876; // type:object size:0x24 data:string
lbl_8163789A = .data:0x8163789A; // type:object size:0x28 data:string
lbl_816378C2 = .data:0x816378C2; // type:object size:0x24 data:string
lbl_816378E6 = .data:0x816378E6; // type:object size:0x22 data:string
lbl_81637908 = .data:0x81637908; // type:object size:0x21 data:string
lbl_81637929 = .data:0x81637929; // type:object size:0x39 data:string
lbl_81637962 = .data:0x81637962; // type:object size:0x3A data:string
lbl_8163799C = .data:0x8163799C; // type:object size:0x35 data:string
lbl_816379D1 = .data:0x816379D1; // type:object size:0x33 data:string
lbl_81637A04 = .data:0x81637A04; // type:object size:0x29 data:string
lbl_81637A2D = .data:0x81637A2D; // type:object size:0x38 data:string
lbl_81637A65 = .data:0x81637A65; // type:object size:0x2D data:string
lbl_81637A92 = .data:0x81637A92; // type:object size:0x39 data:string
lbl_81637ACB = .data:0x81637ACB; // type:object size:0x31 data:string
lbl_81637AFC = .data:0x81637AFC; // type:object size:0x2F data:string
lbl_81637B2B = .data:0x81637B2B; // type:object size:0x30 data:string
lbl_81637B5B = .data:0x81637B5B; // type:object size:0x46 data:string
lbl_81637BA1 = .data:0x81637BA1; // type:object size:0x2D data:string
lbl_81637BCE = .data:0x81637BCE; // type:object size:0x2D data:string
lbl_81637BFB = .data:0x81637BFB; // type:object size:0x2C data:string
lbl_81637C27 = .data:0x81637C27; // type:object size:0x34 data:string
lbl_81637C5B = .data:0x81637C5B; // type:object size:0x27 data:string
lbl_81637C82 = .data:0x81637C82; // type:object size:0x2B data:string
lbl_81637CAD = .data:0x81637CAD; // type:object size:0x1F data:string
lbl_81637CCC = .data:0x81637CCC; // type:object size:0x21 data:string
lbl_81637CED = .data:0x81637CED; // type:object size:0x26 data:string
lbl_81637D13 = .data:0x81637D13; // type:object size:0x29 data:string
lbl_81637D3C = .data:0x81637D3C; // type:object size:0xF data:string
lbl_81637D4B = .data:0x81637D4B; // type:object size:0x23 data:string
lbl_81637D6E = .data:0x81637D6E; // type:object size:0x2B data:string
lbl_81637D99 = .data:0x81637D99; // type:object size:0x23 data:string
lbl_81637DBC = .data:0x81637DBC; // type:object size:0x34 data:string
lbl_81637DF0 = .data:0x81637DF0; // type:object size:0x3B data:string
lbl_81637E2B = .data:0x81637E2B; // type:object size:0x30 data:string
lbl_81637E5B = .data:0x81637E5B; // type:object size:0x4D data:string
lbl_81637EA8 = .data:0x81637EA8; // type:object size:0x50 data:string
lbl_81637EF8 = .data:0x81637EF8; // type:object size:0x23 data:string
lbl_81637F1B = .data:0x81637F1B; // type:object size:0x24 data:string
lbl_81637F3F = .data:0x81637F3F; // type:object size:0x2E data:string
lbl_81637F6D = .data:0x81637F6D; // type:object size:0x2E data:string
lbl_81637F9B = .data:0x81637F9B; // type:object size:0x35 data:string
lbl_81637FD0 = .data:0x81637FD0; // type:object size:0x34 data:string
lbl_81638004 = .data:0x81638004; // type:object size:0x2C data:string
lbl_81638030 = .data:0x81638030; // type:object size:0x29 data:string
lbl_81638059 = .data:0x81638059; // type:object size:0x3E data:string
lbl_81638097 = .data:0x81638097; // type:object size:0x30 data:string
lbl_816380C7 = .data:0x816380C7; // type:object size:0x3C data:string
lbl_81638103 = .data:0x81638103; // type:object size:0x34 data:string
lbl_81638137 = .data:0x81638137; // type:object size:0x35 data:string
lbl_8163816C = .data:0x8163816C; // type:object size:0x32 data:string
lbl_8163819E = .data:0x8163819E; // type:object size:0x32 data:string
lbl_816381D0 = .data:0x816381D0; // type:object size:0x2D data:string
lbl_816381FD = .data:0x816381FD; // type:object size:0x32 data:string
lbl_8163822F = .data:0x8163822F; // type:object size:0x1F data:string
lbl_8163824E = .data:0x8163824E; // type:object size:0x3C data:string
lbl_8163828A = .data:0x8163828A; // type:object size:0x2F data:string
lbl_816382B9 = .data:0x816382B9; // type:object size:0x2E data:string
lbl_816382E7 = .data:0x816382E7; // type:object size:0x29 data:string
lbl_81638310 = .data:0x81638310; // type:object size:0x45 data:string
lbl_81638355 = .data:0x81638355; // type:object size:0x36 data:string
lbl_8163838B = .data:0x8163838B; // type:object size:0x2D data:string
lbl_816383B8 = .data:0x816383B8; // type:object size:0x49 data:string
lbl_81638401 = .data:0x81638401; // type:object size:0x4B data:string
lbl_8163844C = .data:0x8163844C; // type:object size:0x33 data:string
lbl_8163847F = .data:0x8163847F; // type:object size:0x36 data:string
lbl_816384B5 = .data:0x816384B5; // type:object size:0x24 data:string
lbl_816384D9 = .data:0x816384D9; // type:object size:0x2E data:string
lbl_81638507 = .data:0x81638507; // type:object size:0x2E data:string
lbl_81638535 = .data:0x81638535; // type:object size:0x15 data:string
lbl_8163854A = .data:0x8163854A; // type:object size:0x36 data:string
lbl_81638580 = .data:0x81638580; // type:object size:0x2B data:string
lbl_816385AB = .data:0x816385AB; // type:object size:0xA data:string
lbl_816385B5 = .data:0x816385B5; // type:object size:0xA data:string
lbl_816385BF = .data:0x816385BF; // type:object size:0x38 data:string
lbl_816385F7 = .data:0x816385F7; // type:object size:0x22 data:string
lbl_81638619 = .data:0x81638619; // type:object size:0x35 data:string
lbl_8163864E = .data:0x8163864E; // type:object size:0x20 data:string
lbl_8163866E = .data:0x8163866E; // type:object size:0x1F data:string
lbl_8163868D = .data:0x8163868D; // type:object size:0x30 data:string
lbl_816386BD = .data:0x816386BD; // type:object size:0x30 data:string
lbl_816386ED = .data:0x816386ED; // type:object size:0x1B data:string
lbl_81638708 = .data:0x81638708; // type:object size:0x24 data:string
lbl_8163872C = .data:0x8163872C; // type:object size:0x2F data:string
lbl_8163875B = .data:0x8163875B; // type:object size:0x2E data:string
lbl_81638789 = .data:0x81638789; // type:object size:0x25 data:string
lbl_816387AE = .data:0x816387AE; // type:object size:0x2D data:string
lbl_816387DB = .data:0x816387DB; // type:object size:0x2B data:string
lbl_81638806 = .data:0x81638806; // type:object size:0x22 data:string
lbl_81638828 = .data:0x81638828; // type:object size:0x27 data:string
lbl_8163884F = .data:0x8163884F; // type:object size:0x21 data:string
lbl_81638870 = .data:0x81638870; // type:object size:0x24 data:string
lbl_81638894 = .data:0x81638894; // type:object size:0x25 data:string
lbl_816388B9 = .data:0x816388B9; // type:object size:0x1E data:string
lbl_816388D7 = .data:0x816388D7; // type:object size:0x2A data:string
lbl_81638901 = .data:0x81638901; // type:object size:0x26 data:string
lbl_81638927 = .data:0x81638927; // type:object size:0x26 data:string
lbl_8163894D = .data:0x8163894D; // type:object size:0x3B data:string
lbl_81638988 = .data:0x81638988; // type:object size:0x29 data:string
lbl_816389B1 = .data:0x816389B1; // type:object size:0x30 data:string
@12357 = .data:0x81635B2C; // type:object size:0xC scope:local data:string
@12358 = .data:0x81635B38; // type:object size:0xA scope:local data:string
@12359 = .data:0x81635B42; // type:object size:0x1E scope:local data:string
@21503 = .data:0x81635B60; // type:object size:0x22 scope:local data:string
@21504 = .data:0x81635B82; // type:object size:0x22 scope:local data:string
@21767 = .data:0x81635BA4; // type:object size:0x16 scope:local data:string
@21770 = .data:0x81635BBA; // type:object size:0x11 scope:local data:string
@21777 = .data:0x81635BCB; // type:object size:0x19 scope:local data:string
@21780 = .data:0x81635BE4; // type:object size:0x1A scope:local data:string
@21783 = .data:0x81635BFE; // type:object size:0x10 scope:local data:string
@21788 = .data:0x81635C0E; // type:object size:0x21 scope:local data:string
@21789 = .data:0x81635C2F; // type:object size:0x25 scope:local data:string
@21792 = .data:0x81635C54; // type:object size:0x28 scope:local data:string
@21804 = .data:0x81635C7C; // type:object size:0x1B scope:local data:string
@21805 = .data:0x81635C97; // type:object size:0x1E scope:local data:string
@21806 = .data:0x81635CB5; // type:object size:0x29 scope:local data:string
@21917 = .data:0x81635CDE; // type:object size:0x1F scope:local data:string
@21918 = .data:0x81635CFD; // type:object size:0x1E scope:local data:string
@21919 = .data:0x81635D1B; // type:object size:0x2F scope:local data:string
@21920 = .data:0x81635D4A; // type:object size:0x34 scope:local data:string
@21921 = .data:0x81635D7E; // type:object size:0x14 scope:local data:string
@21922 = .data:0x81635D92; // type:object size:0x1B scope:local data:string
@21924 = .data:0x81635DB0; // type:object size:0xD0 scope:local
@21965 = .data:0x81635E80; // type:object size:0x21 scope:local data:string
@21966 = .data:0x81635EA1; // type:object size:0x22 scope:local data:string
@21967 = .data:0x81635EC3; // type:object size:0x30 scope:local data:string
@21968 = .data:0x81635EF3; // type:object size:0x3F scope:local data:string
@21969 = .data:0x81635F32; // type:object size:0x33 scope:local data:string
@21970 = .data:0x81635F65; // type:object size:0x30 scope:local data:string
@21971 = .data:0x81635F95; // type:object size:0x2E scope:local data:string
@21972 = .data:0x81635FC3; // type:object size:0x28 scope:local data:string
@21973 = .data:0x81635FEB; // type:object size:0x28 scope:local data:string
@21974 = .data:0x81636013; // type:object size:0x35 scope:local data:string
@21975 = .data:0x81636048; // type:object size:0x21 scope:local data:string
@21999 = .data:0x81636069; // type:object size:0x2F scope:local data:string
@22000 = .data:0x81636098; // type:object size:0x33 scope:local data:string
@22001 = .data:0x816360CB; // type:object size:0x3A scope:local data:string
@22002 = .data:0x81636105; // type:object size:0x3F scope:local data:string
@22028 = .data:0x81636144; // type:object size:0x2C scope:local data:string
@22029 = .data:0x81636170; // type:object size:0x32 scope:local data:string
@22030 = .data:0x816361A2; // type:object size:0x29 scope:local data:string
@22055 = .data:0x816361CB; // type:object size:0x2D scope:local data:string
@22056 = .data:0x816361F8; // type:object size:0x9 scope:local data:string
@22057 = .data:0x81636201; // type:object size:0x3C scope:local data:string
@22058 = .data:0x8163623D; // type:object size:0x28 scope:local data:string
@22106 = .data:0x81636265; // type:object size:0x29 scope:local data:string
@22107 = .data:0x8163628E; // type:object size:0x1D scope:local data:string
@22108 = .data:0x816362AB; // type:object size:0x1E scope:local data:string
@22109 = .data:0x816362C9; // type:object size:0x1D scope:local data:string
@22110 = .data:0x816362E6; // type:object size:0x24 scope:local data:string
@22134 = .data:0x8163630A; // type:object size:0x34 scope:local data:string
@22135 = .data:0x8163633E; // type:object size:0x1E scope:local data:string
@22136 = .data:0x8163635C; // type:object size:0x28 scope:local data:string
@22137 = .data:0x81636384; // type:object size:0x2B scope:local data:string
@22138 = .data:0x816363AF; // type:object size:0x1C scope:local data:string
@22158 = .data:0x816363CB; // type:object size:0x2D scope:local data:string
@22193 = .data:0x816363F8; // type:object size:0x26 scope:local data:string
@22194 = .data:0x8163641E; // type:object size:0x2C scope:local data:string
@22195 = .data:0x8163644A; // type:object size:0x30 scope:local data:string
@22196 = .data:0x8163647A; // type:object size:0x30 scope:local data:string
@22197 = .data:0x816364AA; // type:object size:0x26 scope:local data:string
@22198 = .data:0x816364D0; // type:object size:0x27 scope:local data:string
@22199 = .data:0x816364F7; // type:object size:0x37 scope:local data:string
@13884 = .data:0x8163652E; // type:object size:0x15 scope:local data:string
@13885 = .data:0x81636543; // type:object size:0x15 scope:local data:string
@22354 = .data:0x81636558; // type:object size:0x2D scope:local data:string
@22355 = .data:0x81636585; // type:object size:0x30 scope:local data:string
@22356 = .data:0x816365B5; // type:object size:0x4E scope:local data:string
@22357 = .data:0x81636603; // type:object size:0x40 scope:local data:string
@22358 = .data:0x81636643; // type:object size:0x2E scope:local data:string
@22359 = .data:0x81636671; // type:object size:0x37 scope:local data:string
@22360 = .data:0x816366A8; // type:object size:0x4D scope:local data:string
@22400 = .data:0x816366F5; // type:object size:0x25 scope:local data:string
@22401 = .data:0x8163671A; // type:object size:0x41 scope:local data:string
@22422 = .data:0x8163675B; // type:object size:0x30 scope:local data:string
@22423 = .data:0x8163678B; // type:object size:0x3D scope:local data:string
@22455 = .data:0x816367C8; // type:object size:0x48 scope:local data:string
@22476 = .data:0x81636810; // type:object size:0x31 scope:local data:string
@22477 = .data:0x81636841; // type:object size:0x38 scope:local data:string
@22497 = .data:0x81636879; // type:object size:0x2F scope:local data:string
@22513 = .data:0x816368A8; // type:object size:0x21 scope:local data:string
@22514 = .data:0x816368C9; // type:object size:0x1F scope:local data:string
@22536 = .data:0x816368E8; // type:object size:0x1E scope:local data:string
@22537 = .data:0x81636906; // type:object size:0x20 scope:local data:string
@22570 = .data:0x81636926; // type:object size:0x9 scope:local data:string
@22571 = .data:0x8163692F; // type:object size:0x37 scope:local data:string
@22572 = .data:0x81636966; // type:object size:0x34 scope:local data:string
@22573 = .data:0x8163699A; // type:object size:0xD scope:local data:string
@22574 = .data:0x816369A7; // type:object size:0x3A scope:local data:string
@22575 = .data:0x816369E1; // type:object size:0x31 scope:local data:string
@22576 = .data:0x81636A12; // type:object size:0x2E scope:local data:string
@22577 = .data:0x81636A40; // type:object size:0x2E scope:local data:string
@22578 = .data:0x81636A6E; // type:object size:0x2B scope:local data:string
@22579 = .data:0x81636A99; // type:object size:0x2C scope:local data:string
@22580 = .data:0x81636AC5; // type:object size:0x2B scope:local data:string
@22581 = .data:0x81636AF0; // type:object size:0x23 scope:local data:string
@22582 = .data:0x81636B13; // type:object size:0x38 scope:local data:string
@22583 = .data:0x81636B4B; // type:object size:0x2E scope:local data:string
@22584 = .data:0x81636B79; // type:object size:0x2A scope:local data:string
@22593 = .data:0x81636BA3; // type:object size:0xF scope:local data:string
@22594 = .data:0x81636BB2; // type:object size:0x3C scope:local data:string
@22595 = .data:0x81636BEE; // type:object size:0xF scope:local data:string
@22596 = .data:0x81636BFD; // type:object size:0x3C scope:local data:string
@22619 = .data:0x81636C39; // type:object size:0x2E scope:local data:string
@22620 = .data:0x81636C67; // type:object size:0x33 scope:local data:string
@22621 = .data:0x81636C9A; // type:object size:0x39 scope:local data:string
@22622 = .data:0x81636CD3; // type:object size:0x28 scope:local data:string
@22634 = .data:0x81636CFB; // type:object size:0x2B scope:local data:string
@22635 = .data:0x81636D26; // type:object size:0x30 scope:local data:string
@22647 = .data:0x81636D56; // type:object size:0x38 scope:local data:string
@22681 = .data:0x81636D8E; // type:object size:0x2F scope:local data:string
@22682 = .data:0x81636DBD; // type:object size:0x2F scope:local data:string
@22683 = .data:0x81636DEC; // type:object size:0x36 scope:local data:string
@22684 = .data:0x81636E22; // type:object size:0x34 scope:local data:string
@22685 = .data:0x81636E56; // type:object size:0x35 scope:local data:string
@22686 = .data:0x81636E8B; // type:object size:0x2B scope:local data:string
@22690 = .data:0x81636EB6; // type:object size:0x32 scope:local data:string
@22691 = .data:0x81636EE8; // type:object size:0x21 scope:local data:string
@22692 = .data:0x81636F09; // type:object size:0x21 scope:local data:string
@22693 = .data:0x81636F2A; // type:object size:0x26 scope:local data:string
@22701 = .data:0x81636F50; // type:object size:0x36 scope:local data:string
@22702 = .data:0x81636F86; // type:object size:0x38 scope:local data:string
@22703 = .data:0x81636FBE; // type:object size:0x2A scope:local data:string
@22730 = .data:0x81636FE8; // type:object size:0x31 scope:local data:string
@22731 = .data:0x81637019; // type:object size:0x33 scope:local data:string
@22732 = .data:0x8163704C; // type:object size:0x2F scope:local data:string
@22733 = .data:0x8163707B; // type:object size:0x31 scope:local data:string
@22789 = .data:0x816370AC; // type:object size:0x26 scope:local data:string
@22790 = .data:0x816370D2; // type:object size:0x2F scope:local data:string
@22791 = .data:0x81637101; // type:object size:0x2B scope:local data:string
@22792 = .data:0x8163712C; // type:object size:0x2C scope:local data:string
@22793 = .data:0x81637158; // type:object size:0x4F scope:local data:string
@22794 = .data:0x816371A7; // type:object size:0x28 scope:local data:string
@22795 = .data:0x816371CF; // type:object size:0x3A scope:local data:string
@22796 = .data:0x81637209; // type:object size:0x2D scope:local data:string
@22797 = .data:0x81637236; // type:object size:0x22 scope:local data:string
@22798 = .data:0x81637258; // type:object size:0x20 scope:local data:string
@22799 = .data:0x81637278; // type:object size:0x22 scope:local data:string
@22800 = .data:0x8163729A; // type:object size:0x27 scope:local data:string
@22801 = .data:0x816372C1; // type:object size:0x23 scope:local data:string
@22802 = .data:0x816372E4; // type:object size:0x3D scope:local data:string
@22803 = .data:0x81637321; // type:object size:0x27 scope:local data:string
@22815 = .data:0x81637348; // type:object size:0x2C scope:local data:string
@22816 = .data:0x81637374; // type:object size:0x30 scope:local data:string
@22817 = .data:0x816373A4; // type:object size:0x26 scope:local data:string
@14983 = .data:0x816373CA; // type:object size:0x13 scope:local data:string
@14984 = .data:0x816373DD; // type:object size:0xD scope:local data:string
@14985 = .data:0x816373EA; // type:object size:0x9 scope:local data:string
@22831 = .data:0x816373F3; // type:object size:0x18 scope:local data:string
@22832 = .data:0x8163740B; // type:object size:0x1C scope:local data:string
@22833 = .data:0x81637427; // type:object size:0x24 scope:local data:string
@22841 = .data:0x8163744B; // type:object size:0x2A scope:local data:string
@22842 = .data:0x81637475; // type:object size:0x28 scope:local data:string
@22914 = .data:0x8163749D; // type:object size:0x35 scope:local data:string
@22915 = .data:0x816374D2; // type:object size:0x2C scope:local data:string
@22916 = .data:0x816374FE; // type:object size:0x34 scope:local data:string
@22917 = .data:0x81637532; // type:object size:0x35 scope:local data:string
@22918 = .data:0x81637567; // type:object size:0x2A scope:local data:string
@22919 = .data:0x81637591; // type:object size:0x38 scope:local data:string
@22920 = .data:0x816375C9; // type:object size:0x53 scope:local data:string
@22921 = .data:0x8163761C; // type:object size:0x2A scope:local data:string
@22922 = .data:0x81637646; // type:object size:0x29 scope:local data:string
@22923 = .data:0x8163766F; // type:object size:0x27 scope:local data:string
@22924 = .data:0x81637696; // type:object size:0x28 scope:local data:string
@22925 = .data:0x816376BE; // type:object size:0x28 scope:local data:string
@22926 = .data:0x816376E6; // type:object size:0x33 scope:local data:string
@22927 = .data:0x81637719; // type:object size:0x35 scope:local data:string
@22947 = .data:0x8163774E; // type:object size:0x2A scope:local data:string
@22948 = .data:0x81637778; // type:object size:0x20 scope:local data:string
@22949 = .data:0x81637798; // type:object size:0x39 scope:local data:string
@22977 = .data:0x816377D1; // type:object size:0x41 scope:local data:string
@22978 = .data:0x81637812; // type:object size:0x3D scope:local data:string
@22979 = .data:0x8163784F; // type:object size:0x27 scope:local data:string
@22980 = .data:0x81637876; // type:object size:0x24 scope:local data:string
@22984 = .data:0x8163789A; // type:object size:0x28 scope:local data:string
@22985 = .data:0x816378C2; // type:object size:0x24 scope:local data:string
@23013 = .data:0x816378E6; // type:object size:0x22 scope:local data:string
@23014 = .data:0x81637908; // type:object size:0x21 scope:local data:string
@23015 = .data:0x81637929; // type:object size:0x39 scope:local data:string
@23016 = .data:0x81637962; // type:object size:0x3A scope:local data:string
@23017 = .data:0x8163799C; // type:object size:0x35 scope:local data:string
@23018 = .data:0x816379D1; // type:object size:0x33 scope:local data:string
@23019 = .data:0x81637A04; // type:object size:0x29 scope:local data:string
@23020 = .data:0x81637A2D; // type:object size:0x38 scope:local data:string
@23021 = .data:0x81637A65; // type:object size:0x2D scope:local data:string
@23035 = .data:0x81637A92; // type:object size:0x39 scope:local data:string
@23036 = .data:0x81637ACB; // type:object size:0x31 scope:local data:string
@23037 = .data:0x81637AFC; // type:object size:0x2F scope:local data:string
@23038 = .data:0x81637B2B; // type:object size:0x30 scope:local data:string
@23094 = .data:0x81637B5B; // type:object size:0x46 scope:local data:string
@23095 = .data:0x81637BA1; // type:object size:0x2D scope:local data:string
@23096 = .data:0x81637BCE; // type:object size:0x2D scope:local data:string
@23097 = .data:0x81637BFB; // type:object size:0x2C scope:local data:string
@23098 = .data:0x81637C27; // type:object size:0x34 scope:local data:string
@23123 = .data:0x81637C5B; // type:object size:0x27 scope:local data:string
@23124 = .data:0x81637C82; // type:object size:0x2B scope:local data:string
@23125 = .data:0x81637CAD; // type:object size:0x1F scope:local data:string
@23126 = .data:0x81637CCC; // type:object size:0x21 scope:local data:string
@23127 = .data:0x81637CED; // type:object size:0x26 scope:local data:string
@23128 = .data:0x81637D13; // type:object size:0x29 scope:local data:string
@23129 = .data:0x81637D3C; // type:object size:0xF scope:local data:string
@23130 = .data:0x81637D4B; // type:object size:0x23 scope:local data:string
@23131 = .data:0x81637D6E; // type:object size:0x2B scope:local data:string
@23132 = .data:0x81637D99; // type:object size:0x23 scope:local data:string
@23159 = .data:0x81637DBC; // type:object size:0x34 scope:local data:string
@23160 = .data:0x81637DF0; // type:object size:0x3B scope:local data:string
@23161 = .data:0x81637E2B; // type:object size:0x30 scope:local data:string
@23162 = .data:0x81637E5B; // type:object size:0x4D scope:local data:string
@23163 = .data:0x81637EA8; // type:object size:0x50 scope:local data:string
@23176 = .data:0x81637EF8; // type:object size:0x23 scope:local data:string
@23177 = .data:0x81637F1B; // type:object size:0x24 scope:local data:string
@23178 = .data:0x81637F3F; // type:object size:0x2E scope:local data:string
@23179 = .data:0x81637F6D; // type:object size:0x2E scope:local data:string
@23199 = .data:0x81637F9B; // type:object size:0x35 scope:local data:string
@23200 = .data:0x81637FD0; // type:object size:0x34 scope:local data:string
@23214 = .data:0x81638004; // type:object size:0x2C scope:local data:string
@23269 = .data:0x81638030; // type:object size:0x29 scope:local data:string
@23270 = .data:0x81638059; // type:object size:0x3E scope:local data:string
@23271 = .data:0x81638097; // type:object size:0x30 scope:local data:string
@23272 = .data:0x816380C7; // type:object size:0x3C scope:local data:string
@23273 = .data:0x81638103; // type:object size:0x34 scope:local data:string
@23278 = .data:0x81638137; // type:object size:0x35 scope:local data:string
@23279 = .data:0x8163816C; // type:object size:0x32 scope:local data:string
@23280 = .data:0x8163819E; // type:object size:0x32 scope:local data:string
@23281 = .data:0x816381D0; // type:object size:0x2D scope:local data:string
@23325 = .data:0x816381FD; // type:object size:0x32 scope:local data:string
@23326 = .data:0x8163822F; // type:object size:0x1F scope:local data:string
@23327 = .data:0x8163824E; // type:object size:0x3C scope:local data:string
@23328 = .data:0x8163828A; // type:object size:0x2F scope:local data:string
@23363 = .data:0x816382B9; // type:object size:0x2E scope:local data:string
@23364 = .data:0x816382E7; // type:object size:0x29 scope:local data:string
@23365 = .data:0x81638310; // type:object size:0x45 scope:local data:string
@23366 = .data:0x81638355; // type:object size:0x36 scope:local data:string
@23367 = .data:0x8163838B; // type:object size:0x2D scope:local data:string
@23368 = .data:0x816383B8; // type:object size:0x49 scope:local data:string
@23369 = .data:0x81638401; // type:object size:0x4B scope:local data:string
@23376 = .data:0x8163844C; // type:object size:0x33 scope:local data:string
@23414 = .data:0x8163847F; // type:object size:0x36 scope:local data:string
@23486 = .data:0x816384B5; // type:object size:0x24 scope:local data:string
@23496 = .data:0x816384D9; // type:object size:0x2E scope:local data:string
@23499 = .data:0x81638507; // type:object size:0x2E scope:local data:string
@23572 = .data:0x81638535; // type:object size:0x15 scope:local data:string
@23573 = .data:0x8163854A; // type:object size:0x36 scope:local data:string
@23575 = .data:0x81638580; // type:object size:0x2B scope:local data:string
@23576 = .data:0x816385AB; // type:object size:0xA scope:local data:string
@23577 = .data:0x816385B5; // type:object size:0xA scope:local data:string
@23578 = .data:0x816385BF; // type:object size:0x38 scope:local data:string
@23579 = .data:0x816385F7; // type:object size:0x22 scope:local data:string
@23580 = .data:0x81638619; // type:object size:0x35 scope:local data:string
@23593 = .data:0x8163864E; // type:object size:0x20 scope:local data:string
@23598 = .data:0x8163866E; // type:object size:0x1F scope:local data:string
@23689 = .data:0x8163868D; // type:object size:0x30 scope:local data:string
@23690 = .data:0x816386BD; // type:object size:0x30 scope:local data:string
@23691 = .data:0x816386ED; // type:object size:0x1B scope:local data:string
@23692 = .data:0x81638708; // type:object size:0x24 scope:local data:string
@23693 = .data:0x8163872C; // type:object size:0x2F scope:local data:string
@23694 = .data:0x8163875B; // type:object size:0x2E scope:local data:string
@23695 = .data:0x81638789; // type:object size:0x25 scope:local data:string
@23710 = .data:0x816387AE; // type:object size:0x2D scope:local data:string
@23711 = .data:0x816387DB; // type:object size:0x2B scope:local data:string
@23712 = .data:0x81638806; // type:object size:0x22 scope:local data:string
@23713 = .data:0x81638828; // type:object size:0x27 scope:local data:string
@23719 = .data:0x8163884F; // type:object size:0x21 scope:local data:string
@23724 = .data:0x81638870; // type:object size:0x24 scope:local data:string
@23750 = .data:0x81638894; // type:object size:0x25 scope:local data:string
@23766 = .data:0x816388B9; // type:object size:0x1E scope:local data:string
@23767 = .data:0x816388D7; // type:object size:0x2A scope:local data:string
@23772 = .data:0x81638901; // type:object size:0x26 scope:local data:string
@23777 = .data:0x81638927; // type:object size:0x26 scope:local data:string
@23879 = .data:0x8163894D; // type:object size:0x3B scope:local data:string
@23880 = .data:0x81638988; // type:object size:0x29 scope:local data:string
@23881 = .data:0x816389B1; // type:object size:0x30 scope:local data:string
sZiSysLangTable__Q23ipl8keyboard = .data:0x816389E8; // type:object size:0x58 scope:local
sZiOemLangTable__Q23ipl8keyboard = .data:0x81638A40; // type:object size:0x58 scope:local
lbl_81638A98 = .data:0x81638A98; // type:object size:0x1A8
@@ -16970,23 +16971,24 @@ __vt__Q33ipl5scene7Setting = .data:0x8165779C; // type:object size:0xFC
@1909 = .data:0x8165791C; // type:object size:0x12 scope:local data:string
@1910 = .data:0x8165792E; // type:object size:0xC scope:local data:string
@1911 = .data:0x8165793A; // type:object size:0x16 scope:local data:string
lbl_81657950 = .data:0x81657950; // type:object size:0x21 data:string
lbl_81657971 = .data:0x81657971; // type:object size:0x1E data:string
lbl_8165798F = .data:0x8165798F; // type:object size:0x22 data:string
lbl_816579B1 = .data:0x816579B1; // type:object size:0x10 data:string
lbl_816579C1 = .data:0x816579C1; // type:object size:0x9 data:string
lbl_816579CA = .data:0x816579CA; // type:object size:0xD data:string
lbl_816579D7 = .data:0x816579D7; // type:object size:0xA data:string
lbl_816579E1 = .data:0x816579E1; // type:object size:0xB data:string
lbl_816579EC = .data:0x816579EC; // type:object size:0xD data:string
lbl_816579F9 = .data:0x816579F9; // type:object size:0x13 data:string
lbl_81657A0C = .data:0x81657A0C; // type:object size:0x11 data:string
lbl_81657A1D = .data:0x81657A1D; // type:object size:0x17 data:string
lbl_81657A34 = .data:0x81657A34; // type:object size:0x20 data:string
lbl_81657A54 = .data:0x81657A54; // type:object size:0x1E data:string
lbl_81657A72 = .data:0x81657A72; // type:object size:0xF data:string
lbl_81657A81 = .data:0x81657A81; // type:object size:0xE data:string
lbl_81657A8F = .data:0x81657A8F; // type:object size:0xD data:string
@12223 = .data:0x81657950; // type:object size:0x21 scope:local data:string
...data.0 = .data:0x81657950; // type:label scope:local
@12284 = .data:0x81657971; // type:object size:0x1E scope:local data:string
@12285 = .data:0x8165798F; // type:object size:0x22 scope:local data:string
@12300 = .data:0x816579B1; // type:object size:0x10 scope:local data:string
@12301 = .data:0x816579C1; // type:object size:0x9 scope:local data:string
@12303 = .data:0x816579CA; // type:object size:0xD scope:local data:string
@12306 = .data:0x816579D7; // type:object size:0xA scope:local data:string
@12308 = .data:0x816579E1; // type:object size:0xB scope:local data:string
@12310 = .data:0x816579EC; // type:object size:0xD scope:local data:string
@12312 = .data:0x816579F9; // type:object size:0x13 scope:local data:string
@12314 = .data:0x81657A0C; // type:object size:0x11 scope:local data:string
@12316 = .data:0x81657A1D; // type:object size:0x17 scope:local data:string
@12318 = .data:0x81657A34; // type:object size:0x20 scope:local data:string
@12320 = .data:0x81657A54; // type:object size:0x1E scope:local data:string
@12322 = .data:0x81657A72; // type:object size:0xF scope:local data:string
@12324 = .data:0x81657A81; // type:object size:0xE scope:local data:string
@12326 = .data:0x81657A8F; // type:object size:0xD scope:local data:string
lbl_81657AA0 = .data:0x81657AA0; // type:object size:0x1B data:string
lbl_81657ABB = .data:0x81657ABB; // type:object size:0x1D data:string
__vt__Q33ipl5scene12APScanThread = .data:0x81657AD8; // type:object size:0x30
@@ -20088,10 +20090,10 @@ lbl_816944EB = .sdata2:0x816944EB; // type:object size:0x1 data:byte
@10441 = .sdata2:0x81694560; // type:object size:0x4 scope:local align:4 data:float
@10442 = .sdata2:0x81694564; // type:object size:0x4 scope:local align:4 data:float
@10445 = .sdata2:0x81694568; // type:object size:0x8 scope:local align:8 data:double
lbl_81694570 = .sdata2:0x81694570; // type:object size:0x8 data:8byte
lbl_81694578 = .sdata2:0x81694578; // type:object size:0x8 data:8byte
lbl_81694580 = .sdata2:0x81694580; // type:object size:0x4 align:4 data:float
lbl_81694588 = .sdata2:0x81694588; // type:object size:0x8 align:8 data:double
@13886 = .sdata2:0x81694570; // type:object size:0x8 scope:local data:8byte
@13978 = .sdata2:0x81694578; // type:object size:0x8 scope:local data:8byte
@23219 = .sdata2:0x81694580; // type:object size:0x4 scope:local align:4 data:float
@23221 = .sdata2:0x81694588; // type:object size:0x8 scope:local align:8 data:double
lbl_81694590 = .sdata2:0x81694590; // type:object size:0x4 align:4 data:float
lbl_81694594 = .sdata2:0x81694594; // type:object size:0x4 align:4 data:float
lbl_81694598 = .sdata2:0x81694598; // type:object size:0x4 align:4 data:float
@@ -21421,7 +21423,7 @@ lbl_816960F6 = .sdata:0x816960F6; // type:object size:0x6 data:string
@14129 = .sdata:0x8169618A; // type:object size:0x6 scope:local data:string
@14332 = .sdata:0x81696190; // type:object size:0x6 scope:local data:string
c_banner_file_name__Q23ipl12NandSDWorker = .sdata:0x81696198; // type:object size:0x4 data:4byte
lbl_8169619C = .sdata:0x8169619C; // type:object size:0x8 scope:local data:string
@12344 = .sdata:0x8169619C; // type:object size:0x7 scope:local data:string
c_nocopy_folder_name__Q23ipl12NandSDWorker = .sdata:0x816961A4; // type:object size:0x4 data:4byte
c_notransfer_folder_name__Q23ipl12NandSDWorker = .sdata:0x816961A8; // type:object size:0x4 data:4byte
c_wii_sd_title_root__Q23ipl12NandSDWorker = .sdata:0x816961AC; // type:object size:0x4 data:4byte
@@ -21430,17 +21432,17 @@ c_sd_app_file_name__Q23ipl12NandSDWorker = .sdata:0x816961B4; // type:object siz
c_succession_path__Q23ipl12NandSDWorker = .sdata:0x816961B8; // type:object size:0x4 data:4byte
c_transferid_path__Q23ipl12NandSDWorker = .sdata:0x816961BC; // type:object size:0x4 data:4byte
c_tmp_work_path__Q23ipl12NandSDWorker = .sdata:0x816961C0; // type:object size:0x4 data:4byte
lbl_816961C4 = .sdata:0x816961C4; // type:object size:0x6 data:string
lbl_816961CA = .sdata:0x816961CA; // type:object size:0x7 data:string
lbl_816961D1 = .sdata:0x816961D1; // type:object size:0x6 data:string
lbl_816961D7 = .sdata:0x816961D7; // type:object size:0x5 data:string
@12352 = .sdata:0x816961C4; // type:object size:0x6 scope:local data:string
@12353 = .sdata:0x816961CA; // type:object size:0x7 scope:local data:string
@12355 = .sdata:0x816961D1; // type:object size:0x6 scope:local data:string
@12356 = .sdata:0x816961D7; // type:object size:0x5 scope:local data:string
c_ignore_list_for_wiimenu__Q23ipl12NandSDWorker = .sdata:0x816961DC; // type:object size:0x8
c_wii_menu_save_path__Q23ipl12NandSDWorker = .sdata:0x816961E4; // type:object size:0x4 data:4byte
lbl_816961E8 = .sdata:0x816961E8; // type:object size:0x2 data:string
lbl_816961EA = .sdata:0x816961EA; // type:object size:0x3 data:string
lbl_816961ED = .sdata:0x816961ED; // type:object size:0x2 data:string
lbl_816961EF = .sdata:0x816961EF; // type:object size:0x5 data:string
lbl_816961F4 = .sdata:0x816961F4; // type:object size:0x4 data:string
@22157 = .sdata:0x816961E8; // type:object size:0x2 scope:local data:string
@22300 = .sdata:0x816961EA; // type:object size:0x3 scope:local data:string
@22314 = .sdata:0x816961ED; // type:object size:0x2 scope:local data:string
@23190 = .sdata:0x816961EF; // type:object size:0x5 scope:local data:string
@23574 = .sdata:0x816961F4; // type:object size:0x4 scope:local data:string
lbl_816961F8 = .sdata:0x816961F8; // type:object size:0x4 data:string
lbl_816961FC = .sdata:0x816961FC; // type:object size:0x4
@10074 = .sdata:0x81696200; // type:object size:0x4 scope:local data:string
@@ -22112,8 +22114,8 @@ lbl_816971C3 = .sdata:0x816971C3; // type:object size:0x6 data:string
lbl_816971C9 = .sdata:0x816971C9; // type:object size:0x7 data:string
lbl_816971D0 = .sdata:0x816971D0; // type:object size:0x3 data:string
lbl_816971D4 = .sdata:0x816971D4; // type:object size:0x8 data:wstring
lbl_816971E0 = .sdata:0x816971E0; // type:object size:0x5 data:string
lbl_816971E5 = .sdata:0x816971E5; // type:object size:0x5 data:string
@12299 = .sdata:0x816971E0; // type:object size:0x5 scope:local data:string
@12302 = .sdata:0x816971E5; // type:object size:0x5 scope:local data:string
lbl_816971F0 = .sdata:0x816971F0; // type:object size:0x4 data:string
lbl_816971F8 = .sdata:0x816971F8; // type:object size:0x4 data:4byte
lbl_81697200 = .sdata:0x81697200; // type:object size:0x4 data:4byte
@@ -23227,7 +23229,7 @@ ScrollState___Q23www9trasition = .sbss:0x81698984; // type:object size:0x4 scope
gDpdWaitFrm = .sbss:0x81698988; // type:object size:0x4 data:4byte
wiiFlag__Q23www10wiisetting = .sbss:0x8169898C; // type:object size:0x8 data:4byte
writeBackID__Q23www10wiisetting = .sbss:0x81698994; // type:object size:0x1 data:byte
savedata_smth__Q23www10wiisetting = .sbss:0x81698995; // type:object size:0x1 data:byte
saveData__Q23www10wiisetting = .sbss:0x81698995; // type:object size:0x1 data:byte
funcResult__Q23www10wiisetting = .sbss:0x81698996; // type:object size:0x1 data:byte
setupFlag__Q23www10wiisetting = .sbss:0x81698997; // type:object size:0x1 data:byte
mQueue__Q23www10wiisetting = .sbss:0x81698998; // type:object size:0x4 data:4byte

View File

@@ -639,7 +639,7 @@ config.libs = [
Object(Matching, "system/iplPointerCore.cpp"),
Object(Matching, "system/iplDialogWindow.cpp"),
Object(Matching, "system/iplHomeButtonMenu.cpp"),
Object(Equivalent, "system/iplNandSDWorker.cpp"),
Object(Matching, "system/iplNandSDWorker.cpp"),
Object(Equivalent, "system/iplKeyboard.cpp"),
Object(Matching, "system/iplErrorHandler.cpp"),
Object(Matching, "system/iplResetHandler.cpp"),
@@ -863,7 +863,7 @@ config.libs = [
Object(NonMatching, "scene/setting/iplSetting.cpp"),
Object(NonMatching, "scene/setting/iplSensitivity.cpp"),
Object(Matching, "scene/setting/iplNCDSetting.cpp"),
Object(NonMatching, "scene/setting/iplParental.cpp"),
Object(Matching, "scene/setting/iplParental.cpp"),
Object(NonMatching, "scene/setting/iplAPScanThread.cpp"),
Object(NonMatching, "scene/setting/iplUSBAP.cpp"),
Object(NonMatching, "scene/setting/iplUSBAPThread.cpp"),

View File

@@ -6,7 +6,7 @@
#include <revolution/arc.h>
#include <revolution/types.h>
#include "iplwww/www_js.h"
#include <revolution/www.h>
namespace www {
namespace arcreader {
@@ -25,7 +25,7 @@ namespace www {
private:
ARCHandle mHandles[4];
bool mFlags[4];
void* pScratch;
void* mpScratch;
};
extern const char* sProtocolName;

View File

@@ -4,41 +4,10 @@
#include <revolution/os.h>
#include <revolution/types.h>
#include "iplwww/www_js.h"
#include "iplwww/www_message.h"
#include "iplwww/www_thread.h"
typedef void (*WWWAddJSPluginFn)(const char*, WWWJSCap*, JSCallbackSet**);
typedef u32 (*WWWProtocolWriteFn)(void* wwwInternal, const void* data, u32 dataSize);
typedef u32 (*WWWProtocolFinalizeFn)(void*);
typedef int (*WWWAddProtocolFn)(const char*);
typedef void (*WWWBasicWindowFn)(WWWHandlewindow*);
typedef void (*WWWSetBrowserWindowRectFn)(WWWHandlewindow*, WWWRect*);
typedef void (*WWWSetImageModeFn)(WWWHandlewindow*, GXTexFmt);
typedef void (*WWWSetRenderingModeFn)(WWWHandlewindow*, int);
typedef BOOL (*WWWCreateBrowserWindowFn)(void*, WWWHandlewindow**, int);
typedef BOOL (*WWWCloseBrowserWindowFn)(void*, WWWHandlewindow*);
typedef void (*WWWOpenUrlFn)(WWWHandlewindow*, const char*);
typedef void (*WWWGetBrowserAllocationFunctionsFn)(void* heapBuf, u32 heapBufSize, void** allocOut, void (**freeOut)(void*), int (**availOut)());
typedef void (*WWWSetAllocationFunctionsFn)(void* allocA, void (*freeA)(void*), int (*avail)(), void* allocB, void (*freeB)(void*), void* allocC,
void (*freeC)(void*));
typedef int (*WWWSurfaceInitFn)(int w, int h, u32 rowSize, int, void* rasterBuf);
typedef int (*WWWSurfaceSetFlushCallbackFn)(void (*FlushCallback)(WWWRect*, int), int);
typedef void (*WWWSurfaceAddFontFn)(const char*);
typedef void (*WWWSurfaceUpdateScreenFn)(u32);
typedef void (*WWWSurfaceKeyboardEvtFn)(WWWKeyBtnCmd cmd, WWWKeySym sym, u32 unk);
typedef void (*WWWSurfaceMouseEvtFn)(WWWMouseCmd cmd, int x, int y, WWWMouseAttrib attrib, u32 unkA, u32 unkB);
typedef void (*WWWCommitImeFn)(int imeID, const char* str);
typedef void (*WWWUpdateImeFn)(int imeID, const char* str, u32 unk);
typedef BOOL (*WWWNotifyCallbackFn)(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData);
typedef void (*WWWCreateBrowserFn)(WWWHandle** browser, WWWNotifyCallbackFn notifyCallback, const char** fonts, const char* arc);
typedef BOOL (*WWWSimpleBrowserFn)(WWWHandle* browser);
#include <revolution/www.h>
extern WWWSurfaceInitFn WWWSurfaceInit;
extern void* WWWSurfaceNewScreen;
@@ -153,13 +122,19 @@ extern WWWProtocolFinalizeFn WWWProtocolFinished;
extern WWWProtocolFinalizeFn WWWProtocolFailed;
extern WWWAddProtocolFn WWWAddProtocol;
namespace www {
namespace arcreader {
class ArcContainer;
} // namespace arcreader
} // namespace www
namespace ext_ead {
namespace www {
typedef struct ImeData {
u32 unk_0x00; // 0x00
u32 imeID; // 0x04
char* text; // 0x08
u32 unk_0x0c; // 0x0c
u32 unk_0x0C; // 0x0c
u32 unk_0x10; // 0x10
u32 unk_0x14; // 0x14
u32 unk_0x18; // 0x18
@@ -191,7 +166,7 @@ namespace ext_ead {
struct {
u32 imeID;
char* str;
u32 unk_0x0c;
u32 unk_0x0C;
} updateIme; // ID 4
u32 raw[6];
} data;
@@ -203,7 +178,7 @@ namespace ext_ead {
virtual void* Run();
void RegisterArcFile(void* arcData);
void RegisterIniFile(void*, u32);
void RegisterIniFile(void* iniData, u32 iniLen);
void CreateThread(int w, int h, void* threadStack, u32 threadStackSize, int priority);
void StopThread();
bool IsThreadStopped();
@@ -214,12 +189,15 @@ namespace ext_ead {
void CreateImeData(ImeData* data, const WWWIMEData* wwwData);
void DisposeImeData(ImeData* data);
void CommitIme(ImeData* data, const char*);
void CommitIme(ImeData* data, const char* something);
void CommitImeCmdPacket(const CmdPacket* data);
void UpdateImeCmdPacket(const CmdPacket* data);
static void FlushCallback(WWWRect*, int);
static void FlushCallback(WWWRect* rect, int unk);
u32* GetRaster() { return mpRaster; }
WWWHandle* GetHandle() { return mpBrowserHandle; }
private:
static BOOL SNotifyCallback_(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData);
@@ -227,32 +205,36 @@ namespace ext_ead {
bool CheckThreadExit_();
void InitSurface_();
void InitFonts_(const char*);
void InitFonts_(const char* unk);
void SendKeyboardEvent_(u32 btnMask, u32 triggerFlag, u32 releaseFlag, WWWKeySym sym);
WWWKeySym GetKeyboardSym_(u32);
WWWKeySym GetKeyboardSym_(u32 input);
int ExecDpdEvent_(const CmdPacket&);
void ExecSpacialEvent_(const CmdPacket&);
inline bool WaitForNextUIEvent_(CmdPacket*);
void HandleUIEvent_();
OSMessageQueue mQueue; // 0x32c
OSMessage mQueueBuf[0x20]; // 0x34c
OSMessageQueue mQueue; // 0x32C
OSMessage mQueueBuf[0x20]; // 0x34C
ut_message_cmd<CmdPacket, 8> mCmdPacketQueue; // 0x510
ut_message_cmd<ImeData, 8> mImeDataQueue; // 0x510
u32* pRaster; // 0x674
void* pOperaHeapBuf; // 0x678
WWWHandle* pWwwBrowser; // 0x67c
public:
void* pBrowserWindows[4]; // 0x680
private:
int mWidth; // 0x690
int mHeight; // 0x694
void* pIniData; // 0x698
u32 mIniLen; // 0x69c
void* pArcContainer; // 0x6a0
void* pArcDecompressionScratch; // 0x6a4
u32* mpRaster; // 0x674
void* mpOperaHeapBuf; // 0x678
WWWHandle* mpBrowserHandle; // 0x67C
void* mpBrowserWindows[4]; // 0x680
int mWidth; // 0x690
int mHeight; // 0x694
void* mpIniData; // 0x698
u32 mIniLen; // 0x69C
::www::arcreader::ArcContainer* mpArcContainer; // 0x6a0
void* mpArcDecmpScratch; // 0x6a4
static OSMutex runSliceMutex_;
static int classInitialized_;

View File

@@ -1,175 +0,0 @@
#ifndef IPL_WWW_JS_H
#define IPL_WWW_JS_H
#include <decomp.h>
#include <revolution/types.h>
typedef union {
int jsInt;
double jsFloat;
double jsDouble;
void* jsObj;
const char* jsStr;
} WWWJSPluginValueData;
typedef struct WWWJSPluginObj {
} WWWJSPluginObj;
typedef struct WWWJSPluginValue {
s32 ty;
u8 unk_0x04[4];
WWWJSPluginValueData data;
} WWWJSPluginValue;
typedef int (*JSConstructorFn)(WWWJSPluginObj*, WWWJSPluginObj*, int, WWWJSPluginValue*, WWWJSPluginValue*);
typedef int (*JSGetterSetter)(WWWJSPluginObj*, const char*, WWWJSPluginValue*);
typedef bool (*JSAllowAccess)(const char*, const char*, int);
typedef int (*JSGlobalGetCallback)(WWWJSPluginObj*, int, int, JSConstructorFn, JSConstructorFn, const char*, int, WWWJSPluginValueData*);
typedef int (*JSConstructCallback)(WWWJSPluginObj*, JSGetterSetter, JSGetterSetter, int, WWWJSPluginValueData*);
typedef struct JSCallbackSet {
JSGlobalGetCallback globalGet;
JSConstructCallback construct;
} JSCallbackSet;
typedef struct WWWJSCap {
const char** name;
int unk_0x04;
JSGetterSetter getter;
void* unk_0x0c;
void* unk_0x10;
void* unk_0x14;
void* unk_0x18;
JSAllowAccess allowAccess;
} WWWJSCap;
typedef struct WWWProtocolData {
const char* filePath;
const char* protocolName;
void* wwwInternal;
} WWWProtocolData;
typedef struct WWWRect {
int x;
int y;
int w;
int h;
} WWWRect;
// typedef struct WWWWindow {
// } WWWWindow;
typedef struct WWWHandleEventData {
u32 data[6];
} WWWHandleEventData;
typedef struct WWWIMEData {
u32 imeID;
const char* text;
u32 unk_0x08;
u32 unk_0x0c;
u32 unk_0x10;
u32 unk_0x14;
u32 unk_0x18;
u32 maxLength;
} WWWIMEData;
enum WWWEvent {
WWW_EVT_CURSOR_CHANGE = 0x00,
WWW_EVT_WINDOW_CLOSE = 0x01,
WWW_EVT_WINDOW_NEW = 0x02,
WWW_EVT_WINDOW_REQUEST = 0x03,
WWW_EVT_AUTHENTICATION = 0x04,
WWW_EVT_URL_CHANGE = 0x05,
WWW_EVT_LOADING_START = 0x06,
WWW_EVT_LOADING_FINISHED = 0x07,
WWW_EVT_LOADING_PROGRESS = 0x08,
WWW_EVT_UPLOADING_START = 0x09,
WWW_EVT_UPLOADING_FINISHED = 0x0a,
WWW_EVT_DOCUMENT_TITLE = 0x0b,
WWW_EVT_DOCUMENT_SIZE = 0x0c,
WWW_EVT_DOCUMENT_ICON = 0x0d,
WWW_EVT_LINK_CLICKED = 0x0e,
WWW_EVT_SECURITY_MODE = 0x0f,
WWW_EVT_LINK_NAVIGATED = 0x10,
WWW_EVT_LINK_HOVER = 0x11,
WWW_EVT_UNK_0x13 = 0x13,
WWW_EVT_UNKNOWN_PROTOCOL = 0x16,
WWW_EVT_DOWNLOAD = 0x18,
WWW_EVT_ERROR = 0x1d,
WWW_EVT_IMECREATE = 0x1e,
WWW_EVT_IMEMOVE = 0x1f,
WWW_EVT_IMECANCEL = 0x20,
WWW_EVT_ASYNC_DIALOG = 0x21,
WWW_EVT_BLOCKING_DIALOG = 0x22,
WWW_EVT_OUT_OF_MEMORY = 0x23,
WWW_EVT_SOFT_OUT_OF_MEMORY = 0x24,
WWW_EVT_PROTOCOL_LOADING_START = 0x2c,
WWW_EVT_EXISTS_HISTORY = 0x2d,
WWW_EVT_EXTERNAL_ACTION = 0x2e,
WWW_EVT_SCREEN_INVALID = 0x34,
WWW_EVT_FILTERED_URL = 0x35,
};
// case ipl::controller::BTN_NEXT_LEFT:
// return (WWWKeySym)0xe001;
// case ipl::controller::BTN_NEXT_RIGHT:
// return (WWWKeySym)0xe02b;
// case ipl::controller::BTN_RIGHT:
// return (WWWKeySym)0xe03c;
// case ipl::controller::BTN_LEFT:
// return (WWWKeySym)0xe03d;
// case ipl::controller::BTN_UP:
// return (WWWKeySym)0xe03e;
// case ipl::controller::BTN_DOWN:
// return (WWWKeySym)0xe03f;
// case ipl::controller::REVO_BTN_1:
// return (WWWKeySym)0xe044;
// case ipl::controller::REVO_BTN_2:
// return (WWWKeySym)0xe045;
enum WWWKeySym {
KEY_SYM_BLANK = 0,
KEY_SYM_SOMETHING = 0xe001,
KEY_SYM_NEXT_RIGHT = 0xe02b,
KEY_SYM_NEXT_LEFT = 0xe02c,
KEY_SYM_RIGHT = 0xe03c,
KEY_SYM_LEFT = 0xe03d,
KEY_SYM_UP = 0xe03e,
KEY_SYM_DOWN = 0xe03f,
KEY_SYM_BTN1 = 0xe044,
KEY_SYM_BTN2 = 0xe045,
};
enum WWWKeyBtnCmd {
KEY_CMD_TRIGGER = 0,
KEY_CMD_RELEASE = 1,
};
enum WWWMouseCmd {
MOUSE_CMD_MOVE = 0,
MOUSE_CMD_TRIGGER = 1,
MOUSE_CMD_RELEASE = 2,
};
enum WWWMouseAttrib {
MOUSE_ATTRIB_BUTTON = 1,
MOUSE_ATTRIB_POSITION = 4,
};
typedef struct WWWHandle {
} WWWHandle;
typedef struct WWWHandlewindow {
} WWWHandlewindow;
#endif // IPL_WWW_JS_H

View File

@@ -9,6 +9,11 @@
namespace ext_ead {
namespace www {
// fakematch?
inline void ut_message_cmd_printerr_() {
OSReport("ERROR?\n");
}
class ut_message_base {
public:
virtual ~ut_message_base() {}
@@ -69,7 +74,7 @@ namespace ext_ead {
if (ReceiveMessage(&msg, 0)) {
entry = (BufferEntry*)msg;
if (entry->taken != -1) {
OSReport("ERROR?\n");
ut_message_cmd_printerr_();
}
*data = entry->value;
memset(entry, 0, sizeof(BufferEntry));

View File

@@ -11,6 +11,15 @@ namespace ext_ead {
void IPLWWWReport(int type, const char* format, ...);
void IPLWWWVReport(int type, const char* format, va_list args);
enum {
WWW_TICK_TIMER = 0,
WWW_WARNING,
WWW_INFO,
WWW_DEBUG,
WWW_EVENT,
WWW_REPORT, // ?
};
class TickTimer {
public:
TickTimer() : start(OSGetTick()) {}
@@ -21,10 +30,10 @@ namespace ext_ead {
va_list vlist;
va_start(vlist, fmt);
IPLWWWVReport(0, fmt, vlist);
IPLWWWVReport(WWW_TICK_TIMER, fmt, vlist);
va_end(vlist);
IPLWWWReport(5, " : %d[ms]\n", OSTicksToMilliseconds(end - start));
IPLWWWReport(WWW_REPORT, " : %d[ms]\n", OSTicksToMilliseconds(end - start));
}
private:
@@ -38,6 +47,7 @@ namespace ext_ead {
// };
extern const char* Message[6];
// TODO: sort out this messy match hack
#define IPL_WWW_REPORT_REDEFINE_MESSAGE(RESPECT_STRIP) \
char MSG_TICK_TIMER_TAG[12] = "[TickTimer]"; \
char MSG_WARNING_TAG[10] = "[Warning]"; \

View File

@@ -23,10 +23,10 @@ namespace ext_ead {
inline void init(void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize);
inline void destroy();
extern MEMiHeapHead* hMem1;
extern MEMiHeapHead* hMem2;
extern MEMHeapHandle hMem1;
extern MEMHeapHandle hMem2;
extern void* wwwalloc_;
extern void (*wwwfree_)(void*);
extern void (*wwwfree_)(void* buf);
extern int (*wwwavail_)();
extern u32 hFreeSize1;
@@ -52,29 +52,36 @@ namespace ext_ead {
bool IsThreadStopped();
void DisposeInstance_();
static SurfaceManager* Instance_;
BrowserThread* GetBrowserThread() { return mpBrowserThread; }
int GetWidth() { return mWidth; }
int GetHeight() { return mHeight; }
char* GetArcPath() { return mpArcPath; }
static SurfaceManager* GetInstance() { return Instance_; }
private:
SurfaceManager();
virtual ~SurfaceManager();
public:
static SurfaceManager* Instance_;
u32 mWidth; // 0x04
u32 mHeight; // 0x08
private:
u32 unk_0x0c; // 0x0c
OSMutex mMutex; // 0x10
public:
BrowserThread* pBrowserThread; // 0x28
private:
void* pOperaThreadStack; // 0x2c
void* pBss; // 0x30
void* pLibBuf; // 0x34
public:
char* pArcPath; // 0x38
u32 unk_0x0C; // 0x0C
OSMutex mMutex; // 0x10
BrowserThread* mpBrowserThread; // 0x28
void* mpOperaThreadStack; // 0x2C
void* mpRSOBss; // 0x30
void* mpLibBuffer; // 0x34
char* mpArcPath; // 0x38
};
static RSOExportFuncTable rsoSymbolList[] = {
static RSOExportFuncTable RsoExports[] = {
{"WWWSurfaceInit", (u32*)&WWWSurfaceInit},
{"WWWSurfaceNewScreen", (u32*)&WWWSurfaceNewScreen},
{"WWWSurfaceDeleteScreen", (u32*)&WWWSurfaceDeleteScreen},

View File

@@ -1,37 +1,37 @@
#ifndef IPL_WWW_THREAD
#define IPL_WWW_THREAD
#include <revolution/types.h>
#include <revolution/os.h>
#include <revolution/types.h>
namespace ext_ead {
namespace www {
class ut_thread {
public:
ut_thread();
public:
ut_thread();
virtual ~ut_thread(); // 0x08
virtual void* Run() = 0; // 0x0C
virtual void Create(void* pStack, u32 stackSize, int priority, bool bStartThread = true); // 0x10
virtual void Resume(); // 0x14
virtual void Suspend(); // 0x18
virtual BOOL WaitForThreadExit(); // 0x1C
virtual bool IsThreadTerminated(); // 0x20
virtual bool IsThreadSuspended(); // 0x24
private:
static void* ThreadMain_(void* param);
virtual ~ut_thread(); // 0x08
virtual void* Run() = 0; // 0x0C
virtual void Create(void* pStack, u32 stackSize, int priority, bool bStartThread = true); // 0x10
virtual void Resume(); // 0x14
virtual void Suspend(); // 0x18
virtual BOOL WaitForThreadExit(); // 0x1C
virtual bool IsThreadTerminated(); // 0x20
virtual bool IsThreadSuspended(); // 0x24
protected:
OSThread mThread; // 0x08
private:
void* mpStack; // 0x320
u32 mStackSize; // 0x324
int mPriority; // 0x328
private:
static void* ThreadMain_(void* param);
protected:
OSThread mThread; // 0x08
private:
void* mpStack; // 0x320
u32 mStackSize; // 0x324
int mPriority; // 0x328
};
}
}
} // namespace www
} // namespace ext_ead
#endif // IPL_WWW_THREAD
#endif // IPL_WWW_THREAD

View File

@@ -5,26 +5,17 @@
#include <revolution.h>
#include "iplwww/www_js.h"
#include "iplwww/www_browser.h"
#include "iplwww/www_wiisetting.h"
#include "iplwww/www_browser.h"
#include <revolution/www.h>
namespace www {
namespace trasition {
// typedef struct ScrollState {
// u8 unk_0x00[0x28];
// ext_ead::www::BrowserThread* unk_0x28;
// u32 unk_0x2c;
// u32 unk_0x30;
// u32 unk_0x34;
// u32 unk_0x38;
// } ScrollState;
enum ScrollState {
SCROLL_RESET = 0,
SCROLL_LEFT = 1,
SCROLL_RIGHT = 2,
SCROLL_LEFT,
SCROLL_RIGHT,
};
static WWWJSCap cap;

View File

@@ -7,10 +7,10 @@
#include <revolution/sc.h>
#include <revolution/types.h>
#include "iplwww/www_js.h"
#include "iplwww/www_print.h"
#include <revolution/www.h>
extern int gDpdWaitFrm;
extern BOOL gEnableDpd;
@@ -42,80 +42,82 @@ namespace www {
FORM_ID_DUMMY_SECURITY_KEY,
FORM_ID_VERSION,
FORM_ID_DIRECT_URL,
FORM_ID_MAX,
} WiiSettingFormID;
typedef enum WriteBackID {
WB_ID_RESET = 0x00,
WB_ID_SOUND_ID = 0x01, // SC Sound Mode
WB_ID_NWC24 = 0x02, // SC WCFlags enable bit
WB_ID_INTERNET = 0x3, // NCD Use Profile ID
WB_ID_STANDBY = 0x04, // Idle Mode Standby
WB_ID_LED = 0x05, // Idle Mode LED
WB_ID_DIS_WIDE = 0x06, // SC Aspect Ratio
WB_ID_DIS_POS = 0x07, // Display Position (Horizontal Offset)
WB_ID_PROGRESSIVE = 0x08, // Progressive Scan
WB_ID_SCREENSAVER = 0x09, // Screensaver Enable
WB_ID_SENSOR_BAR = 0x0a, // Sensor Bar on top Flag
WB_ID_LIGHT = 0x0b, // BlueTooth Pad Sensibility (I think this is how bright the wiimote player indicator light is???)
WB_ID_YEAR = 0x0c, // Year
WB_ID_MONTH = 0x0d, // Month
WB_ID_DATE = 0x0e, // Day of month
WB_ID_HOUR = 0x0f, // Hour (0 to 23 inclusive)
WB_ID_MINUTE = 0x10, // Minute
WB_ID_FORM_ID = 0x11, // TODO: What is this?
WB_ID_PAGE_ID = 0x12, // TODO: What is this?
WB_ID_MESSAGE = 0x13, // TODO: What is this?
WB_ID_TYPE = 0x14, // TODO: What is this?
WB_ID_CONNECT_TYPE = 0x15, // NCD "this connection" flag
WB_ID_CONNECT_TYPE_1 = 0x16, // NCD Flag 0 (This enum is 1-indexed for some reason)
WB_ID_CONNECT_TYPE_2 = 0x17, // NCD Flag 1 (This enum is 1-indexed for some reason)
WB_ID_CONNECT_TYPE_3 = 0x18, // NCD Flag 2 (This enum is 1-indexed for some reason)
WB_ID_PROFILE_ID = 0x19, // NCD Profile ID
WB_ID_SELECT_WIRE = 0x1a, // TODO: What is this?
WB_ID_WIFI_TYPE = 0x1b, // TODO: What is this?
WB_ID_FUNC_ID = 0x1c, // TODO: What is this?
WB_ID_FUNC_RESULT = 0x1d, // TODO: What is this?
WB_ID_SELECT_SEC_KEY = 0x1e, // NCD Privacy Mode
WB_ID_AUTO_IP = 0x1f, // NCD DHCP Flag
WB_ID_AUTO_DNS = 0x20, // NCD DNS Flag
WB_ID_IP = 0x21, // TODO: What is this?
WB_ID_BACKUP_NCD = 0x22, // Backup NCD Data
WB_ID_RESET_NCD = 0x23, // Reset NCD Data
WB_ID_AUTO_PROXY = 0x24, // NCD Proxy Flag
WB_ID_AUTO_BASIC = 0x25, // NCD Basic
WB_ID_BACK_SEC_KEY = 0x26, // TODO: What is this?
WB_ID_CHANGE_CONNECT_TYPE = 0x27, // TODO: What is this?
WB_ID_CHANGE_ENABLE = 0x28, // NCD Change Enable
WB_ID_PARE_FLAG = 0x29, // Parental Flags
WB_ID_SEC_Q = 0x2a, // Parental Security Question
WB_ID_SEC_Q_SAVE = 0x2b, // Parental Security Question Save????
WB_ID_OGN = 0x2c, // Parental OGN
WB_ID_RATE = 0x2d, // Parental Rating
WB_ID_RATE_SAVE = 0x2e, // Parental Rating Save????
WB_ID_PAL = 0x2f, // EU RGB60 Mode
WB_ID_LANGUAGE = 0x30, // Language
WB_ID_LANGUAGE_SAVE = 0x31, // Language save????
WB_ID_DTV = 0x32, // DTV Status
WB_ID_USE_ID = 0x33, // NCD useProfileID again for some reason
WB_ID_CONNECT_TEST = 0x34, // NCD Connect Test Flag
WB_ID_ERROR = 0x35, // TODO: What is this?
WB_ID_SET_STRING = 0x36, // TODO: What is this?
WB_ID_SE = 0x37, // TODO: What is this?
WB_ID_EXCSE = 0x38, // TODO: What is this?
WB_ID_FINISH = 0x39, // TODO: What is this?
WB_ID_FLUSH = 0x3a, // TODO: What is this?
WB_ID_INIT_FLAG = 0x3b, // Initial Setup Complete flag
WB_ID_COUNTRY = 0x3c, // Parental Country
WB_ID_COUNTRY_SAVE = 0x3d, // Parental Country Save????
WB_ID_MAC_AVAILABLE = 0x3e, // LAN MAC Addresss Available
WB_ID_UPDATE_TYPE = 0x3f, // SC Update Type
WB_ID_RESTRICTIONS = 0x40, // Parental Restrictions
WB_ID_ASSERT = 0x41, // TODO: What is this?
WB_ID_SUB_PAGE_ID = 0x42, // TODO: What is this?
WB_ID_PRODUCT_AREA = 0x43, // System Region
WB_ID_EULA = 0x44, // EULA Accepted
WB_ID_TVRC = 0x45, // TODO: What is this?
WB_ID_TVRC_MAKER = 0x46, // TODO: What is this?
WB_ID_TVRC_TYPE = 0x47, // TODO: What is this?
WB_ID_RESET = 0,
WB_ID_SOUND_ID, // Sound Mode
WB_ID_NWC24, // WCFlags enable bit
WB_ID_INTERNET, // NCD Use Profile ID
WB_ID_STANDBY, // Standby mode
WB_ID_DISC_LED, // Slot illumination
WB_ID_DIS_WIDE, // Aspect Ratio
WB_ID_DIS_POS, // Display Position (Horizontal Offset)
WB_ID_PROGRESSIVE, // Progressive Scan
WB_ID_SCREENSAVER, // Screensaver Enable
WB_ID_SENSOR_BAR, // Sensor Bar on top Flag
WB_ID_LIGHT, // BlueTooth Pad Sensibility (I think this is how bright the wiimote player indicator light is???)
WB_ID_YEAR, // Year
WB_ID_MONTH, // Month
WB_ID_DATE, // Day of month
WB_ID_HOUR, // Hour (0 to 23 inclusive)
WB_ID_MINUTE, // Minute
WB_ID_FORM_ID, // TODO: What is this?
WB_ID_PAGE_ID, // TODO: What is this?
WB_ID_MESSAGE, // TODO: What is this?
WB_ID_TYPE, // TODO: What is this?
WB_ID_CONNECT_TYPE, // NCD "this connection" flag
WB_ID_CONNECT_TYPE_1, // NCD Flag 0 (This enum is 1-indexed for some reason)
WB_ID_CONNECT_TYPE_2, // NCD Flag 1 (This enum is 1-indexed for some reason)
WB_ID_CONNECT_TYPE_3, // NCD Flag 2 (This enum is 1-indexed for some reason)
WB_ID_PROFILE_ID, // NCD Profile ID
WB_ID_SELECT_WIRE, // NCD Wired or Wireless?
WB_ID_WIFI_TYPE, // NCD Wifi Type
WB_ID_FUNC_ID, // TODO: What is this?
WB_ID_FUNC_RESULT, // TODO: What is this?
WB_ID_SELECT_SEC_KEY, // NCD Privacy Mode
WB_ID_AUTO_IP, // NCD DHCP Flag
WB_ID_AUTO_DNS, // NCD DNS Flag
WB_ID_IP, // NCD IP Address
WB_ID_BACKUP_NCD, // Backup NCD Data
WB_ID_RESET_NCD, // Reset NCD Data
WB_ID_AUTO_PROXY, // NCD Proxy Flag
WB_ID_AUTO_BASIC, // NCD Basic
WB_ID_BACK_SEC_KEY, // NCD Backup Security Key
WB_ID_CHANGE_CONNECT_TYPE, // NCD Connect Type
WB_ID_CHANGE_ENABLE, // NCD Change Enable
WB_ID_PARE_FLAG, // Parental Flags
WB_ID_SEC_Q, // Parental Security Question
WB_ID_SEC_Q_SAVE, // Parental Security Question Save?
WB_ID_OGN, // Parental OGN
WB_ID_RATE, // Parental Rating
WB_ID_RATE_SAVE, // Parental Rating Save?
WB_ID_PAL, // EU RGB60 Mode
WB_ID_LANGUAGE, // Language
WB_ID_LANGUAGE_SAVE, // Language save?
WB_ID_DTV, // DTV Status
WB_ID_USE_ID, // NCD useProfileID again for some reason
WB_ID_CONNECT_TEST, // NCD Connect Test Flag
WB_ID_ERROR, // TODO: What is this?
WB_ID_SET_STRING, // TODO: What is this?
WB_ID_SE, // Sound effect?
WB_ID_EXCSE, // Another Sound effect related thing?
WB_ID_FINISH, // TODO: What is this?
WB_ID_FLUSH, // SC Flush?
WB_ID_INIT_FLAG, // Initial Setup Complete flag
WB_ID_COUNTRY, // Parental Country
WB_ID_COUNTRY_SAVE, // Parental Country Save?
WB_ID_MAC_AVAILABLE, // LAN MAC Addresss Available
WB_ID_UPDATE_TYPE, // Update Type?
WB_ID_RESTRICTIONS, // Parental Restrictions
WB_ID_ASSERT, // Error assert?
WB_ID_SUB_PAGE_ID, // TODO: What is this?
WB_ID_PRODUCT_AREA, // System Region
WB_ID_EULA, // EULA Accepted
WB_ID_TVRC, // TV Remote Control Setup
WB_ID_TVRC_MAKER, // TV Remote Control Input TV manufacturer
WB_ID_TVRC_TYPE, // TV Remote Control Input TV type
} WriteBackID;
typedef struct WiiDataDate {
@@ -123,13 +125,13 @@ namespace www {
u8 month;
u8 mday;
} WiiDataDate;
typedef struct WiiDataTime {
u8 hour;
u8 min;
} WiiDataTime;
typedef struct WiiData {
public:
u8 data[0x48];
} WiiData;
@@ -174,15 +176,13 @@ namespace www {
static WiiFlag wiiFlag;
static u8 writeBackID;
static u8 savedata_smth;
static u8 saveData;
static u8 funcResult;
static u8 setupFlag;
static OSMessageQueue* mQueue;
static SetStringBuf* pString;
static JSCallbackSet* opera_callbacks;
// void www_wiisetting_8136F9D0(s32 chan, s32 result);
// void www_wiisetting_8136F9F4(s32 chan, s32 result);
bool allow_access(const char*, const char*, int);
void AddJsPlugin();
int globalGetter_(WWWJSPluginObj*, const char*, WWWJSPluginValue*);

View File

@@ -23,8 +23,10 @@ namespace ext_ead {
void SendNotifyEvent(WWWEvent event, WWWHandleEventData* dataHandle);
void ExecuteEvent();
void UpdateTexture();
void* GetTextureBuffer(int, bool, WWWRect**);
void SetWindowSize(int, int);
void* GetTextureBuffer(int a, bool b, WWWRect** rectPtrOut);
void SetWindowSize(int w, int h);
WWWHandlewindow* GetHandleWindow() { return mpWwwWindow; };
private:
void ExecWwwEvent_(int eventCode, WWWHandleEventData* dataHandle);
@@ -34,28 +36,30 @@ namespace ext_ead {
void ReportEventId_(int eventCode, void*);
struct WindowCmd {
public:
// u32 unk_0x00;
u32 mEventCode;
WWWHandleEventData* pHandleEventData;
u32 eventCode; // 0x00
WWWHandleEventData* pHandleEventData; // 0x04
};
u16 mWidth; // 0x004
u16 mHeight; // 0x006
BrowserThread* pThread; // 0x008
void* mTexBufArr[2][3]; // 0x00C
WWWRect mTexDisplayRects[2][3]; // 0x024
public:
WWWHandlewindow* pWwwWindow; // 0x084
u16 mWidth; // 0x04
u16 mHeight; // 0x06
BrowserThread* mpBrowserThread; // 0x08
void* mTexBufArr[2][3]; // 0x0C
WWWRect mTexDisplayRects[2][3]; // 0x24
WWWHandlewindow* mpWwwWindow; // 0x84
private:
ut_message_cmd<ext_ead::www::BrowserWindow::WindowCmd, 32> mMessage; // 0x088
u32 mRenderingMode; // 0x2ac
ut_message_cmd<ext_ead::www::BrowserWindow::WindowCmd, 32> mMessage; // 0x88
u32 mRenderingMode; // 0x2AC
public:
int unk_0x2b0; // 0x2b0
u32 unk_0x2b4[2]; // 0x2b4
u32 unk_0x2bc; // 0x2bc
u32 unk_0x2c0; // 0x2c0
u8 unk_0x2c4[6]; // 0x2c4
// u8[]
int unk_0x2B0; // 0x2B0
u32 unk_0x2B4[2]; // 0x2B4
u32 unk_0x2BC; // 0x2BC
u32 unk_0x2C0; // 0x2C0
u8 unk_0x2C4[6]; // 0x2C4
};
} // namespace www
} // namespace ext_ead

View File

@@ -8,21 +8,23 @@
namespace ipl {
namespace scene {
#define WAIT_FOR_ANIM_STATE(FN_NAME, ANIM, THEN) \
void FN_NAME() { \
if (is_animation(ANIM)) \
if (is_animation(ANIM)) { \
return; \
} \
THEN; \
}
struct Anm {
class Anm {
public:
inline Anm(ipl::layout::GroupAnimator* _animator) : animator(_animator) {}
ipl::layout::GroupAnimator* animator;
inline Anm(layout::GroupAnimator* _animator) : animator(_animator) {}
layout::GroupAnimator* animator;
nw4r::ut::Link mLink;
};
struct AnmPane {
typedef class AnmPane {
public:
enum AnimCommand {
ANIM_CMD_NONE = 0,
@@ -31,8 +33,8 @@ namespace ipl {
ANIM_CMD_CANCEL = 3,
};
inline AnmPane(const char* name, Anm* anmIn, Anm* anmOut)
: pName(name), mCurrState(ANIM_STATE_IDLE), mPrevState(ANIM_STATE_IDLE), mHoverCount(0), mCurrCmd(ANIM_CMD_NONE), pAnmCurr(NULL),
pAnmIn(anmIn), pAnmOut(anmOut) {}
: pName(name), mCurrState(ANIM_STATE_IDLE), mPrevState(ANIM_STATE_IDLE), mHoverCount(0), mCurrCmd(ANIM_CMD_NONE), mpAnmCurr(NULL),
mpAnmIn(anmIn), mpAnmOut(anmOut) {}
void calc();
void on_cmd_recv(AnimCommand);
@@ -50,21 +52,27 @@ namespace ipl {
ANIM_STATE_POINT = 1,
ANIM_STATE_LEFT = 2,
};
nw4r::ut::Link mLink; // 0x00
const char* pName; // 0x08
AnimState mCurrState; // 0x0c
const char* pName; // 0x08
AnimState mCurrState; // 0x0C
AnimState mPrevState; // 0x10
int mHoverCount; // 0x14
int mHoverCount; // 0x14
AnimCommand mCurrCmd; // 0x18
Anm* pAnmCurr; // 0x1c
Anm* pAnmIn; // 0x20
Anm* pAnmOut; // 0x24
};
Anm* mpAnmCurr; // 0x1C
Anm* mpAnmIn; // 0x20
Anm* mpAnmOut; // 0x24
} AnmPane;
class AnmController {
public:
inline AnmController(EGG::Heap* heap) : pHeap(heap) {
pLytObj = NULL;
inline AnmController(EGG::Heap* heap) : mpHeap(heap) {
mpLayout = NULL;
nw4r::ut::List_Init(&mAnmList, 4);
nw4r::ut::List_Init(&mPaneList, 0);
}
@@ -73,8 +81,9 @@ namespace ipl {
while (currAnm != NULL) {
nw4r::ut::List_Remove(&mAnmList, currAnm);
if (currAnm != NULL)
if (currAnm != NULL) {
delete currAnm;
}
currAnm = (Anm*)nw4r::ut::List_GetFirst(&mAnmList);
}
@@ -112,11 +121,13 @@ namespace ipl {
const nw4r::math::VEC2& get_scale(const char* pane);
protected:
layout::Object* pLytObj; // 0x04
ipl::gui::PaneManager* pPaneManager; // 0x08
nw4r::ut::List mAnmList; // 0x0c
nw4r::ut::List mPaneList; // 0x18
EGG::Heap* pHeap; // 0x24
layout::Object* mpLayout; // 0x04
gui::PaneManager* mpGui; // 0x08
nw4r::ut::List mAnmList; // 0x0c
nw4r::ut::List mPaneList; // 0x18
EGG::Heap* mpHeap; // 0x24
};
} // namespace scene
} // namespace ipl

View File

@@ -14,7 +14,7 @@ namespace ipl {
class ChanAppBase : public AnmController, private ::gui::EventHandler {
public:
ChanAppBase(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName);
ChanAppBase(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName);
virtual ~ChanAppBase();
void calc();
@@ -38,10 +38,38 @@ namespace ipl {
virtual void onEvent(u32 compId, u32 event, void* data) override;
inline layout::Object* getLytObject() { return pLytObj; }
inline bool isIdle() { return mState == CHANAPP_IDLE; }
inline layout::Object* getLytObject() { return mpLayout; }
inline bool isIdle() { return mState == STATE_IDLE; }
private:
enum {
ANIM_DATA_IN = 0,
ANIM_DATA_OUT,
ANIM_SELECT_IN,
ANIM_SELECT_WII_IN,
ANIM_SELECT_WII_OUT,
ANIM_SELECT_WII_FLASH,
ANIM_SELECT_SD_IN,
ANIM_SELECT_SD_OUT,
ANIM_SELECT_SD_FLASH,
ANIM_ARROWS_MOVE_L,
ANIM_ARROWS_MOVE_R,
ANIM_ARROW_R_SELECT,
ANIM_ARROW_L_SELECT,
ANIM_ARROW_R_FOCUS_ON,
ANIM_ARROW_L_FOCUS_ON,
ANIM_ARROW_R_FOCUS_OFF,
ANIM_ARROW_L_FOCUS_OFF,
ANIM_ARROW_R_LOOP,
ANIM_ARROW_R_END,
ANIM_ARROW_L_END,
ANIM_ARROW_R_LOST,
ANIM_ARROW_L_LOST,
ANIM_ERROR_TEXT_IN,
ANIM_ERROR_TEXT_OUT,
};
void on_fadein1st();
void on_fadein2nd();
@@ -56,21 +84,22 @@ namespace ipl {
void on_text_fadein();
void on_text_fadeout();
enum State {
CHANAPP_IDLE = 0, // 0x0
CHANAPP_FADEIN1ST, // 0x1
CHANAPP_FADEIN2ND, // 0x2
CHANAPP_FADEOUT, // 0x3
CHANAPP_CHANGE_SD_TO_WII, // 0x4
CHANAPP_CHANGE_WII_TO_SD, // 0x5
CHANAPP_SCROLL_R = 8, // 0x8
CHANAPP_SCROLL_L, // 0x9
CHANAPP_TEXT_FADEIN, // 0xa
CHANAPP_TEXT_FADEOUT, // 0xb
enum {
STATE_IDLE = 0,
STATE_FADE_IN_1ST,
STATE_FADE_IN_2ND,
STATE_FADE_OUT,
STATE_CHANGE_SD_TO_WII,
STATE_CHANGE_WII_TO_SD,
STATE_6,
STATE_7,
STATE_SCROLL_R = 8,
STATE_SCROLL_L,
STATE_TEXT_FADEIN,
STATE_TEXT_FADEOUT,
};
State mState; // 0x34
int mState; // 0x34
};
} // namespace scene
} // namespace ipl

View File

@@ -12,7 +12,7 @@ namespace ipl {
class ChanAppBox : public AnmController, public ::gui::EventHandler {
public:
ChanAppBox(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName);
ChanAppBox(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName);
virtual ~ChanAppBox();
void calc();
@@ -27,40 +27,55 @@ namespace ipl {
ChannelEdit* get_channel_edit();
Thumbnail* getThumbnail() const { return pThumbnail; }
void setThumbnail(Thumbnail* newThumbnail) { pThumbnail = newThumbnail; }
Thumbnail* getThumbnail() const { return mpThumbnail; }
void setThumbnail(Thumbnail* newThumbnail) { mpThumbnail = newThumbnail; }
const nw4r::math::VEC3& getTranslate() { return get_translate("N_All"); }
void setTranslate(const nw4r::math::VEC3& translate) { set_translate("N_All", translate); }
TextBalloon* getTextBalloon() { return pTextBalloon; }
void setTextBalloon(TextBalloon* balloon) { pTextBalloon = balloon; }
void terminateBalloon() {
mpBalloon->terminate();
mbInitBalloon = false;
}
bool getTextBalloonInitialized() { return mTextBalloonInitialized; }
void setTextBalloonInitialized(bool val) { mTextBalloonInitialized = val; }
TextBalloon* getTextBalloon() { return mpBalloon; }
void setTextBalloon(TextBalloon* balloon) { mpBalloon = balloon; }
inline bool isIdle() { return mState == BOX_STATE_IDLE; }
bool hasBalloonInitialized() { return mbInitBalloon; }
inline bool isIdle() { return mState == STATE_IDLE; }
static char s_all_pane_name[6];
private:
enum {
ANIM_DATA_IN = 0,
ANIM_DATA_OUT,
ANIM_DATA_FOCUS_IN,
ANIM_DATA_FOCUS_OUT,
};
void on_fadein();
void on_fadeout();
enum State {
BOX_STATE_HIDDEN = 0, // 0x0
BOX_STATE_IDLE, // 0x1
BOX_STATE_FADEIN, // 0x2
BOX_STATE_FADEOUT, // 0x3
enum {
STATE_HIDDEN = 0,
STATE_IDLE,
STATE_FADE_IN,
STATE_FADE_OUT,
};
public:
nw4r::ut::Link mLink; // 0x34
private:
State mState; // 0x3c
Thumbnail* pThumbnail; // 0x40
TextBalloon* pTextBalloon; // 0x44
bool mTextBalloonInitialized; // 0x48
int mState; // 0x3C
Thumbnail* mpThumbnail; // 0x40
TextBalloon* mpBalloon; // 0x44
bool mbInitBalloon; // 0x48
friend class ChannelEdit;
friend class Memory;
};
} // namespace scene
} // namespace ipl

View File

@@ -14,7 +14,7 @@ namespace ipl {
class ChanAppEdit : public AnmController, public ::gui::EventHandler {
public:
ChanAppEdit(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName);
ChanAppEdit(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName);
virtual ~ChanAppEdit();
void calc();
@@ -43,10 +43,29 @@ namespace ipl {
void clearAllThumbnails();
inline bool isIdle() { return mState == EDIT_STATE_IDLE; }
inline bool isIdle() { return mState == STATE_IDLE; }
private:
void change_button_text(u32);
enum {
ANIM_MASK_IN = 0,
ANIM_MASK_OUT,
ANIM_COPY_IN,
ANIM_COPY_OUT,
ANIM_COPY_FLASH,
ANIM_DEL_IN,
ANIM_DEL_OUT,
ANIM_DEL_FLASH,
ANIM_SELECT_OUT,
ANIM_TEXT_FADEIN,
ANIM_TEXT_FADEOUT,
ANIM_WAIT,
ANIM_COVER_IN,
ANIM_MOVE_IN,
ANIM_MOVE_OUT,
ANIM_MOVE_FLASH,
};
void change_button_text(u32 msgId);
void on_fadein();
void on_fadeout();
@@ -61,30 +80,31 @@ namespace ipl {
void on_trig_del();
void on_clear();
enum State {
EDIT_STATE_IDLE = 0, // 0x0
EDIT_STATE_FADEIN, // 0x1
EDIT_STATE_FADEOUT, // 0x2
EDIT_STATE_HIDE_BTN0_DIALOG, // 0x3
EDIT_STATE_SHOW_BTN2_DIALOG1ST, // 0x4
EDIT_STATE_SHOW_BTN2_DIALOG2ND, // 0x5
EDIT_STATE_SELECT_FADEIN, // 0x6
EDIT_STATE_SELECT_FADEOUT1ST, // 0x7
EDIT_STATE_SELECT_FADEOUT2ND, // 0x8
EDIT_STATE_TEXT_FADEIN, // 0x9
EDIT_STATE_TEXT_FADEOUT, // 0xa
EDIT_STATE_TRIG_DEL, // 0xb
EDIT_STATE_CLEAR, // 0xc
enum {
STATE_IDLE = 0,
STATE_FADEIN,
STATE_FADEOUT,
STATE_HIDE_BTN0_DIALOG,
STATE_SHOW_BTN2_DIALOG1ST,
STATE_SHOW_BTN2_DIALOG2ND,
STATE_SELECT_FADEIN,
STATE_SELECT_FADEOUT1ST,
STATE_SELECT_FADEOUT2ND,
STATE_TEXT_FADEIN,
STATE_TEXT_FADEOUT,
STATE_TRIG_DEL,
STATE_CLEAR,
};
public:
nw4r::ut::Link mLink; // 0x34
private:
State mState; // 0x3c
int mState; // 0x3C
math::LinearIntp<math::VEC3> mLinearInterp; // 0x40
ChanAppBox* pChanAppBox; // 0x78
ChanAppBox* mpChanAppBox; // 0x78
s32 mMsgId; // 0x7c
Thumbnail* pThumbnail; // 0x80
Thumbnail* mpThumbnail; // 0x80
};
} // namespace scene
} // namespace ipl

View File

@@ -14,39 +14,39 @@ namespace ipl {
namespace scene {
SCENE_CLASS(ChannelEdit) {
public:
enum State {
CHANEDIT_STATE_ON_NORMAL = 0, // 0x00
CHANEDIT_STATE_ON_FADEIN1ST, // 0x01
CHANEDIT_STATE_ON_FADEIN2ND, // 0x02
CHANEDIT_STATE_ON_FADEOUT1ST, // 0x03
CHANEDIT_STATE_ON_FADEOUT2ND, // 0x04
CHANEDIT_STATE_ON_SCROLL_R, // 0x05
CHANEDIT_STATE_ON_SCROLL_L, // 0x06
CHANEDIT_STATE_ON_CHANGE_TAG1ST, // 0x07
CHANEDIT_STATE_ON_CHANGE_TAG2ND, // 0x08
CHANEDIT_STATE_ON_TRIG_COPY, // 0x09
CHANEDIT_STATE_ON_EDIT, // 0x0a
CHANEDIT_STATE_ON_EDIT_FADEIN, // 0x0b
CHANEDIT_STATE_ON_EDIT_FADEOUT1ST, // 0x0c
CHANEDIT_STATE_ON_EDIT_FADEOUT2ND, // 0x0d
CHANEDIT_STATE_ON_VERIFY1ST, // 0x0e
CHANEDIT_STATE_ON_VERIFY2ND, // 0x0f
CHANEDIT_STATE_ON_VERIFY_COPY, // 0x10
CHANEDIT_STATE_ON_VERIFY_DEL, // 0x11
CHANEDIT_STATE_ON_VERIFY_FORMAT, // 0x12
CHANEDIT_STATE_ON_END_FORMAT, // 0x13
CHANEDIT_STATE_ON_END_DEL, // 0x14
CHANEDIT_STATE_ON_SD_MOUNT, // 0x15
CHANEDIT_STATE_ON_SD_MESSAGE1ST, // 0x16
CHANEDIT_STATE_ON_SD_MESSAGE2ND, // 0x17
CHANEDIT_STATE_ON_SD_MESSAGE3RD, // 0x18
CHANEDIT_STATE_ON_PROCESS, // 0x19
CHANEDIT_STATE_ON_END_PROCESS, // 0x1a
CHANEDIT_STATE_ON_EXIST_APP, // 0x1b
CHANEDIT_STATE_ON_SD_MOUNT_ONLY, // 0x1c
CHANEDIT_STATE_ON_TRIG_MOVE, // 0x1d
CHANEDIT_STATE_ON_VERIFY_MOVE, // 0x1e
CHANEDIT_STATE_ON_END_MOVE, // 0x1f
enum {
STATE_ON_NORMAL = 0,
STATE_ON_FADEIN1ST,
STATE_ON_FADEIN2ND,
STATE_ON_FADEOUT1ST,
STATE_ON_FADEOUT2ND,
STATE_ON_SCROLL_R,
STATE_ON_SCROLL_L,
STATE_ON_CHANGE_TAG1ST,
STATE_ON_CHANGE_TAG2ND,
STATE_ON_TRIG_COPY,
STATE_ON_EDIT,
STATE_ON_EDIT_FADEIN,
STATE_ON_EDIT_FADEOUT1ST,
STATE_ON_EDIT_FADEOUT2ND,
STATE_ON_VERIFY1ST,
STATE_ON_VERIFY2ND,
STATE_ON_VERIFY_COPY,
STATE_ON_VERIFY_DEL,
STATE_ON_VERIFY_FORMAT,
STATE_ON_END_FORMAT,
STATE_ON_END_DEL,
STATE_ON_SD_MOUNT,
STATE_ON_SD_MESSAGE1ST,
STATE_ON_SD_MESSAGE2ND,
STATE_ON_SD_MESSAGE3RD,
STATE_ON_PROCESS,
STATE_ON_END_PROCESS,
STATE_ON_EXIST_APP,
STATE_ON_SD_MOUNT_ONLY,
STATE_ON_TRIG_MOVE,
STATE_ON_VERIFY_MOVE,
STATE_ON_END_MOVE,
};
ChannelEdit(EGG::Heap * heap);
@@ -70,19 +70,27 @@ namespace ipl {
void update_nand_free();
void update_sd_free();
void onPoint(AnmPane*);
void onLeft(AnmPane*);
void onTrig(AnmPane*);
void onTrig(ChanAppBox*);
void onPoint(AnmPane * pane);
void onLeft(AnmPane * pane);
void onTrig(AnmPane * pane);
void onTrig(ChanAppBox * box);
void onTrigButton(bool isErr);
void onTrigDel();
void onTrigCopy();
void onTrigMove();
inline State getState() {
inline int getState() {
return mState;
}
nand::File* getHatenaLayout() {
return mpCorruptIconFile;
}
nand::File* geTmpTitleLayout() {
return mpTmpTitleIconFile;
}
private:
void start_scroll_r(bool playButtonAnm, bool playSound);
void start_scroll_l(bool playButtonAnm, bool playSound);
@@ -131,42 +139,54 @@ namespace ipl {
void on_end_move();
enum Page {
CHANEDIT_PAGE_WII = 0,
CHANEDIT_PAGE_SD = 1,
PAGE_WII = 0,
PAGE_SD = 1,
};
enum IntentType {
CHANEDIT_INTENT_NONE = 0,
CHANEDIT_INTENT_COPY = 1,
CHANEDIT_INTENT_MOVE = 2,
INTENT_NONE = 0,
INTENT_COPY,
INTENT_MOVE,
};
enum {
CHANEDIT_PROC_NUL = 0, // 0
CHANEDIT_PROC_CPY = 1, // 1
CHANEDIT_PROC_DEL = 2, // 2
CHANEDIT_PROC_FMT = 3, // 3
CHANEDIT_PROC_MOV = 4, // 4
PROC_NUL = 0,
PROC_CPY,
PROC_DEL,
PROC_FMT,
PROC_MOV,
};
State mState; // 0x54
nand::LayoutFile* pChanEditLytFile; // 0x58
nand::LayoutFile* pBalloonLytFile; // 0x5c
nand::File* pCorruptIconFile; // 0x60
nand::File* pTmptitleIconFile; // 0x64
ChanAppBase* pChanAppBase; // 0x68
ChanAppEdit* pChanAppEdit; // 0x6c
nw4r::ut::List mChanAppBoxList; // 0x70
NandSDCardManager* pNandSDCardManager; // 0x7c
TextBalloon* mTextBalloonArr[15]; // 0x80
Page mPage; // 0xbc
ChanAppBox* pCurrBox; // 0xc0
int mPageOffset; // 0xc4
int mSdState; // 0xc8
bool mArwRVisible; // 0xcc
bool mArwLVisible; // 0xcd
int mProcessType; // 0xd0
IntentType mActionIntent; // 0xd4
int mState; // 0x54
nand::LayoutFile* mpLayoutFile; // 0x58
nand::LayoutFile* mpBalloonFile; // 0x5C
nand::File* mpCorruptIconFile; // 0x60
nand::File* mpTmpTitleIconFile; // 0x64
ChanAppBase* mpChanAppBase; // 0x68
ChanAppEdit* mpChanAppEdit; // 0x6C
nw4r::ut::List mChanAppBoxList; // 0x70
NandSDCardManager* mpNandSDCardManager; // 0x7C
static const int MAX_BALLOONS = 15;
TextBalloon* mpBalloons[MAX_BALLOONS]; // 0x80
Page mPage; // 0xBC
ChanAppBox* mpCurrentBox; // 0xC0
int mPageOffset; // 0xC4
int mSDState; // 0xC8
bool mArwRVisible; // 0xCC
bool mArwLVisible; // 0xCD
int mProcessType; // 0xD0
IntentType mActionIntent; // 0xD4
};
} // namespace scene
} // namespace ipl

View File

@@ -16,11 +16,11 @@ namespace ipl {
class NandSDCardManager {
public:
enum Mode {
NAND_MANAGER_MODE_SAVES = 0,
NAND_MANAGER_MODE_APPS = 1,
NAND_MODE_SAVES = 0,
NAND_MODE_APPS,
};
NandSDCardManager(Mode);
NandSDCardManager(Mode mode);
~NandSDCardManager();
void calc();
@@ -36,138 +36,141 @@ namespace ipl {
void cmdGetNandFree();
void cmdGetSDFree();
void cmdCopySaveNandToSD(ESTitleId);
void cmdCopySaveSDToNand(ESTitleId32);
void cmdCopySaveNandToSD(ESTitleId titleId);
void cmdCopySaveSDToNand(ESTitleId32 titleId);
void cmdCopyAppNandToSD(ESTitleId);
void cmdCopyAppSDToNand(ESTitleId32);
void cmdCopyAppNandToSD(ESTitleId titleId);
void cmdCopyAppSDToNand(ESTitleId32 titleId);
void cmdDelNandApp(ChanAppBox*);
void cmdDelSDApp(ChanAppBox*);
void cmdDelNandApp(ChanAppBox* box);
void cmdDelSDApp(ChanAppBox* box);
void cmdDelNandSave(SavedataBox*);
void cmdDelSDSave(SavedataBox*);
void cmdDelNandSave(SavedataBox* box);
void cmdDelSDSave(SavedataBox* box);
void cmdCleanQueue();
void cmdListNand();
void cmdListSD();
void cmdExistNandApp(ESTitleId32);
void cmdExistNandSave(ESTitleId32);
void cmdExistSDApp(ESTitleId32);
void cmdExistSDSave(ESTitleId32);
void cmdExistNandApp(ESTitleId32 titleId);
void cmdExistNandSave(ESTitleId32 titleId);
void cmdExistSDApp(ESTitleId32 titleId);
void cmdExistSDSave(ESTitleId32 titleId);
void cmdMoveAppNandToSD(ChanAppBox*);
void cmdMoveAppSDToNand(ChanAppBox*);
void cmdMoveAppNandToSD(ChanAppBox* box);
void cmdMoveAppSDToNand(ChanAppBox* box);
void cmdMoveSaveNandToSD(SavedataBox*);
void cmdMoveSaveSDToNand(SavedataBox*);
void cmdMoveSaveNandToSD(SavedataBox* box);
void cmdMoveSaveSDToNand(SavedataBox* box);
bool isWorking() { return mState != MANAGER_STATE_NORMAL || mCmdQueue.get_current_index() > 0; }
bool isWorking() { return mState != STATE_NORMAL || mCmdQueue.get_current_index() > 0; }
int getAsyncResult();
NandSDWorker* getWorker() { return pWorker; }
NandSDWorker* getWorker() { return mpWorker; }
inline int getNandBlocksFree() { return mNandBlocksFree; }
inline int getSDBlocksFree() { return mSDBlocksFree; }
inline bool isSDWriteProtected() { return pWorker->is_sd_write_protected() == TRUE; }
inline bool isSDWriteProtected() { return mpWorker->is_sd_write_protected() == TRUE; }
inline bool isTerminated() { return mState == MANAGER_STATE_STOPPED; }
inline bool isTerminated() { return mState == STATE_STOPPED; }
inline BOOL sdWorkerReadyMaybe() { return mThumbCmdQueue.current == 0 && mCmdQueue.current == 0; }
inline ESTitleId getTmpTitle() { return mTmpTitleId; }
void disableThumbnailFetching() { mDisableThumbnailFetching = true; }
void enableThumbnailFetching() { mDisableThumbnailFetching = false; }
void disableThumbnailFetching() { mbDisableThumbFetch = true; }
void enableThumbnailFetching() { mbDisableThumbFetch = false; }
private:
enum State {
MANAGER_STATE_INIT = 0x00, // 0x00
MANAGER_STATE_STARTUP = 0x01, // 0x01
MANAGER_STATE_CHECK_EXIST = 0x02, // 0x02
MANAGER_STATE_MOUNT_SD = 0x03, // 0x03
MANAGER_STATE_LIST_NANDAPP = 0x04, // 0x04
MANAGER_STATE_LIST_SDAPP = 0x05, // 0x05
MANAGER_STATE_GET_NAND_FREE = 0x06, // 0x06
MANAGER_STATE_GET_SD_FREE = 0x07, // 0x07
MANAGER_STATE_NORMAL = 0x08, // 0x08
MANAGER_STATE_TERMINATE = 0x09, // 0x09
MANAGER_STATE_COPY_NANDSAVE_TO_SD = 0x0a, // 0x0a
MANAGER_STATE_COPY_SDSAVE_TO_NAND = 0x0b, // 0x0b
MANAGER_STATE_COPY_NANDAPP_TO_SD = 0x0d, // 0x0d
MANAGER_STATE_COPY_SDAPP_TO_NAND = 0x0e, // 0x0e
MANAGER_STATE_DEL_NANDAPP = 0x0f, // 0x0f
MANAGER_STATE_DEL_NANDSAVE = 0x10, // 0x10
MANAGER_STATE_DEL_SDAPP = 0x11, // 0x11
MANAGER_STATE_DEL_SDSAVE = 0x12, // 0x12
MANAGER_STATE_GET_THUMBNAIL = 0x13, // 0x13
MANAGER_STATE_GET_THUMBNAIL_SIZE = 0x14, // 0x14
MANAGER_STATE_GET_WIIBANNER = 0x15, // 0x15
MANAGER_STATE_GET_WIIBANNER_SIZE = 0x16, // 0x16
MANAGER_STATE_GET_WIIBANNER_PERMS = 0x17, // 0x17
MANAGER_STATE_SC_FLUSH = 0x18, // 0x18
MANAGER_STATE_CHANGE_NAND_APP_COUNT = 0x19, // 0x19
MANAGER_STATE_MOVE_NANDSAVE_TO_SD = 0x1a, // 0x1a
MANAGER_STATE_MOVE_SDSAVE_TO_NAND = 0x1b, // 0x1b
MANAGER_STATE_MOVE_NANDAPP_TO_SD = 0x1c, // 0x1c
MANAGER_STATE_MOVE_SDAPP_TO_NAND = 0x1d, // 0x1d
MANAGER_STATE_CHECK_SD_TITLE_RESTORABLE = 0x1e, // 0x1e
MANAGER_STATE_STOPPED = 0x1f, // 0x1f
enum {
STATE_INIT = 0,
STATE_STARTUP,
STATE_CHECK_EXIST,
STATE_MOUNT_SD,
STATE_LIST_NANDAPP,
STATE_LIST_SDAPP,
STATE_GET_NAND_FREE,
STATE_GET_SD_FREE,
STATE_NORMAL,
STATE_TERMINATE,
STATE_COPY_NANDSAVE_TO_SD,
STATE_COPY_SDSAVE_TO_NAND,
STATE_12,
STATE_COPY_NANDAPP_TO_SD,
STATE_COPY_SDAPP_TO_NAND,
STATE_DEL_NANDAPP,
STATE_DEL_NANDSAVE,
STATE_DEL_SDAPP,
STATE_DEL_SDSAVE,
STATE_GET_THUMBNAIL,
STATE_GET_THUMBNAIL_SIZE,
STATE_GET_WIIBANNER,
STATE_GET_WIIBANNER_SIZE,
STATE_GET_WIIBANNER_PERMS,
STATE_SC_FLUSH,
STATE_CHANGE_NAND_APP_COUNT,
STATE_MOVE_NANDSAVE_TO_SD,
STATE_MOVE_SDSAVE_TO_NAND,
STATE_MOVE_NANDAPP_TO_SD,
STATE_MOVE_SDAPP_TO_NAND,
STATE_CHECK_SD_TITLE_RESTORABLE,
STATE_STOPPED,
};
enum CommandTag {
CMD_NUL = 0x00, // 0x00
CMD_TERMINATE = 0x01, // 0x01
CMD_MOUNT_SD = 0x02, // 0x02
CMD_FORMAT_SD = 0x03, // 0x03
CMD_GET_NAND_FREE = 0x04, // 0x04
CMD_GET_SD_FREE = 0x05, // 0x05
CMD_COPY_NANDSAVE_TO_SD = 0x07, // 0x07
CMD_COPY_SDSAVE_TO_NAND = 0x08, // 0x08
CMD_COPY_SDAPP_TO_NAND = 0x09, // 0x09
CMD_COPY_NANDAPP_TO_SD = 0x0a, // 0x0a
CMD_DEL_NANDAPP = 0x0b, // 0x0b
CMD_DEL_NANDSAVE = 0x0c, // 0x0c
CMD_DEL_SDAPP = 0x0d, // 0x0d
CMD_DEL_SDSAVE = 0x0e, // 0x0e
CMD_CLEAN_QUEUE = 0x0f, // 0x0f
CMD_LIST_NAND = 0x10, // 0x10
CMD_LIST_SD = 0x11, // 0x11
CMD_NAND_APP_EXIST = 0x12, // 0x12
CMD_NAND_SAVE_EXIST = 0x13, // 0x13
CMD_SD_APP_EXIST = 0x14, // 0x14
CMD_SD_SAVE_EXIST = 0x15, // 0x15
CMD_MOVE_NANDSAVE_TO_SD = 0x16, // 0x16
CMD_MOVE_SDSAVE_TO_NAND = 0x17, // 0x17
CMD_MOVE_NANDAPP_TO_SD = 0x18, // 0x18
CMD_MOVE_SDAPP_TO_NAND = 0x19, // 0x19
};
struct Command {
public:
CommandTag mTag; // 0x00
ChanAppBox* pChanAppBox; // 0x04
SavedataBox* pSavedataBox; // 0x08
ESTitleId mWiiTitleId; // 0x10
ESTitleId32 mSDTitleId; // 0x18
CMD_NUL,
CMD_TERMINATE,
CMD_MOUNT_SD,
CMD_FORMAT_SD,
CMD_GET_NAND_FREE,
CMD_GET_SD_FREE,
CMD_6,
CMD_COPY_NANDSAVE_TO_SD,
CMD_COPY_SDSAVE_TO_NAND,
CMD_COPY_SDAPP_TO_NAND,
CMD_COPY_NANDAPP_TO_SD,
CMD_DEL_NANDAPP,
CMD_DEL_NANDSAVE,
CMD_DEL_SDAPP,
CMD_DEL_SDSAVE,
CMD_CLEAN_QUEUE,
CMD_LIST_NAND,
CMD_LIST_SD,
CMD_NAND_APP_EXIST,
CMD_NAND_SAVE_EXIST,
CMD_SD_APP_EXIST,
CMD_SD_SAVE_EXIST,
CMD_MOVE_NANDSAVE_TO_SD,
CMD_MOVE_SDSAVE_TO_NAND,
CMD_MOVE_NANDAPP_TO_SD,
CMD_MOVE_SDAPP_TO_NAND,
};
typedef struct Command {
CommandTag tag; // 0x00
ChanAppBox* chanAppBox; // 0x04
SavedataBox* savedataBox; // 0x08
ESTitleId wiiTitleId; // 0x10
ESTitleId32 sdTitleId; // 0x18
} Command;
typedef struct {
ChanAppBox* pChannelBox; // 0x00
SavedataBox* pSavedataBox; // 0x04
int mIdx; // 0x08
bool mIsWiiNotSD; // 0x0c
ChanAppBox* channelBox; // 0x00
SavedataBox* savedataBox; // 0x04
int idx; // 0x08
bool isWii; // 0x0C
} GetThumbnailCmd;
struct TitleListing {
public:
inline TitleListing(ESTitleId wiiTitleId) : mWiiTitleId(wiiTitleId) {}
inline TitleListing(ESTitleId32 sdTitleId) : mSDTitleId(sdTitleId) {}
ESTitleId mWiiTitleId; // 0x00
ESTitleId32 mSDTitleId; // 0x08
nw4r::ut::Link mLink; // 0x0c
inline TitleListing(ESTitleId wiiTitleId) : wiiTitleId(wiiTitleId) {}
inline TitleListing(ESTitleId32 sdTitleId) : sdTitleId(sdTitleId) {}
ESTitleId wiiTitleId; // 0x00
ESTitleId32 sdTitleId; // 0x08
nw4r::ut::Link link; // 0x0C
};
void on_init();
@@ -208,30 +211,39 @@ namespace ipl {
Thumbnail* get_free_thumbnail();
WiiBannerFileInfo* get_free_banner();
State mState; // 0x00000
Mode mMode; // 0x00004
NandSDWorker* pWorker; // 0x00008
void* pWorkerWorkBuf; // 0x0000c
void* pWorkerDataBuf; // 0x00010
ESTitleId* pNandTitleIds; // 0x00014
ESTitleId32* pSDTitleIds; // 0x00018
nw4r::ut::List mNandListingList; // 0x0001c
nw4r::ut::List mSDListingList; // 0x00028
undefined4 unk_0x00034; // 0x00034
Thumbnail mThumbnailArr[15]; // 0x00038
WiiBannerFileInfo mBannerArr[15]; // 0x05c90
ChanAppBox* pActiveChanAppBox; // 0xe85e0
Thumbnail* pActiveThumbnail; // 0xe85e4
SavedataBox* pActiveSavedataBox; // 0xe85e8
WiiBannerFileInfo* pActiveBanner; // 0xe85ec
utility::Queue<Command, 4> mCmdQueue; // 0xe85f0
utility::Queue<GetThumbnailCmd, 15> mThumbCmdQueue; // 0xe8680
int mNandBlocksFree; // 0xe8780
int mSDBlocksFree; // 0xe8784
u64 mSDBytesFree; // 0xe8788
bool mDisableThumbnailFetching; // 0xe8790
ESTitleId mTmpTitleId; // 0xe8798
bool unk_0xe87a0; // 0xe87a0
int mState; // 0x00
Mode mMode; // 0x04
NandSDWorker* mpWorker; // 0x08
void* mpWorkerWorkBuf; // 0x0C
void* mpWorkerDataBuf; // 0x10
ESTitleId* mpNandTitleIds; // 0x14
ESTitleId32* mpSDTitleIds; // 0x18
nw4r::ut::List mNandListingList; // 0x1C
nw4r::ut::List mSDListingList; // 0x28
undefined4 unk_0x34; // 0x34
Thumbnail mThumbnails[15]; // 0x38
WiiBannerFileInfo mBanners[15]; // 0x5C90
ChanAppBox* mpActiveChanAppBox; // 0xE85E0
Thumbnail* mpActiveThumbnail; // 0xE85E4
SavedataBox* mpActiveSavedataBox; // 0xE85E8
WiiBannerFileInfo* mpActiveBanner; // 0xE85EC
utility::Queue<Command, 4> mCmdQueue; // 0xE85F0
utility::Queue<GetThumbnailCmd, 15> mThumbCmdQueue; // 0xE8680
int mNandBlocksFree; // 0xE8780
int mSDBlocksFree; // 0xE8784
u64 mSDBytesFree; // 0xE8788
bool mbDisableThumbFetch; // 0xE8790
ESTitleId mTmpTitleId; // 0xE8798
bool unk_0xE87A0; // 0xE87a0
};
} // namespace scene
} // namespace ipl

View File

@@ -44,6 +44,7 @@ namespace ipl {
void* args; // 0x18
} CommandData;
typedef struct Command {
CommandData data; // 0x00

View File

@@ -45,10 +45,10 @@ namespace ipl {
virtual void draw() override;
virtual BOOL isResetAcceptable() const override;
void onPoint(AnmPane*);
void onLeft(AnmPane*);
void onTrig(AnmPane*);
void onTrig(SavedataBox*);
void onPoint(AnmPane * pane);
void onLeft(AnmPane * pane);
void onTrig(AnmPane * pane);
void onTrig(SavedataBox * box);
void onTrigButton(bool isErr);
void onTrigDel();
void onTrigCopy();
@@ -89,76 +89,88 @@ namespace ipl {
void on_verify_move();
private:
enum State {
MEMORY_STATE_ON_NORMAL = 0x00, // 0x00
MEMORY_STATE_ON_FADEIN1ST, // 0x01
MEMORY_STATE_ON_FADEIN2ND, // 0x02
MEMORY_STATE_ON_FADEOUT1ST, // 0x03
MEMORY_STATE_ON_FADEOUT2ND, // 0x04
MEMORY_STATE_ON_SCROLL_R, // 0x05
MEMORY_STATE_ON_SCROLL_L, // 0x06
MEMORY_STATE_ON_CHANGE_TAG1ST, // 0x07
MEMORY_STATE_ON_CHANGE_TAG2ND, // 0x08
MEMORY_STATE_ON_TRIG_COPY, // 0x09
MEMORY_STATE_ON_UNUSED_0x0A, // 0x0a
MEMORY_STATE_ON_EDIT, // 0x0b
MEMORY_STATE_ON_EDIT_FADEIN, // 0x0c
MEMORY_STATE_ON_EDIT_FADEOUT1ST, // 0x0d
MEMORY_STATE_ON_EDIT_FADEOUT2ND, // 0x0e
MEMORY_STATE_ON_VERIFY1ST, // 0x0f
MEMORY_STATE_ON_VERIFY2ND, // 0x10
MEMORY_STATE_ON_VERIFY_COPY, // 0x11
MEMORY_STATE_ON_VERIFY_DEL, // 0x12
MEMORY_STATE_ON_VERIFY_FORMAT, // 0x13
MEMORY_STATE_ON_END_FORMAT, // 0x14
MEMORY_STATE_ON_SD_MOUNT, // 0x15
MEMORY_STATE_ON_SD_MESSAGE1ST, // 0x16
MEMORY_STATE_ON_SD_MESSAGE2ND, // 0x17
MEMORY_STATE_ON_SD_MESSAGE3RD, // 0x18
MEMORY_STATE_ON_PROCESS, // 0x19
MEMORY_STATE_ON_END_PROCESS, // 0x1a
MEMORY_STATE_ON_EXIST_SAVE, // 0x1b
MEMORY_STATE_ON_SD_MOUNT_ONLY, // 0x1c
MEMORY_STATE_ON_TRIG_MOVE, // 0x1d
MEMORY_STATE_ON_VERIFY_MOVE, // 0x1e
enum {
STATE_ON_NORMAL = 0,
STATE_ON_FADEIN1ST,
STATE_ON_FADEIN2ND,
STATE_ON_FADEOUT1ST,
STATE_ON_FADEOUT2ND,
STATE_ON_SCROLL_R,
STATE_ON_SCROLL_L,
STATE_ON_CHANGE_TAG1ST,
STATE_ON_CHANGE_TAG2ND,
STATE_ON_TRIG_COPY,
STATE_10,
STATE_ON_EDIT,
STATE_ON_EDIT_FADEIN,
STATE_ON_EDIT_FADEOUT1ST,
STATE_ON_EDIT_FADEOUT2ND,
STATE_ON_VERIFY1ST,
STATE_ON_VERIFY2ND,
STATE_ON_VERIFY_COPY,
STATE_ON_VERIFY_DEL,
STATE_ON_VERIFY_FORMAT,
STATE_ON_END_FORMAT,
STATE_ON_SD_MOUNT,
STATE_ON_SD_MESSAGE1ST,
STATE_ON_SD_MESSAGE2ND,
STATE_ON_SD_MESSAGE3RD,
STATE_ON_PROCESS,
STATE_ON_END_PROCESS,
STATE_ON_EXIST_SAVE,
STATE_ON_SD_MOUNT_ONLY,
STATE_ON_TRIG_MOVE,
STATE_ON_VERIFY_MOVE,
};
enum Page {
enum {
MEMORY_PAGE_WII = 0,
MEMORY_PAGE_SD = 1,
MEMORY_PAGE_SD,
};
enum IntentType {
MEMORY_INTENT_NONE = 0,
MEMORY_INTENT_COPY = 1,
MEMORY_INTENT_MOVE = 2,
MEMORY_INTENT_COPY,
MEMORY_INTENT_MOVE,
};
enum {
MEMORY_PROC_NUL = 0, // 0
MEMORY_PROC_CPY = 1, // 1
MEMORY_PROC_DEL = 2, // 2
MEMORY_PROC_FMT = 3, // 3
MEMORY_PROC_MOV = 4, // 4
PROC_NUL = 0,
PROC_CPY,
PROC_DEL,
PROC_FMT,
PROC_MOV,
};
State mState; // 0x54
nand::LayoutFile* pWiiMemLytFile; // 0x58
nand::LayoutFile* pBalloonLytFile; // 0x5c
SavedataBase* pSavedataBase; // 0x60
nand::File* pCorruptTexFile; // 0x64
SavedataEdit* pSavedataEdit; // 0x68
nw4r::ut::List mSavedataBoxList; // 0x6c
NandSDCardManager* pNandSDCardManager; // 0x78
TextBalloon* mTextBalloonArr[15]; // 0x7c
Page mPage; // 0xb8
SavedataBox* pCurrBox; // 0xbc
int mPageOffset; // 0xc0
int mSdState; // 0xc4
bool mArwRVisible; // 0xc8
bool mArwLVisible; // 0xc9
int mProcessType; // 0xcc
IntentType mActionIntent; // 0xd0
int mState; // 0x54
nand::LayoutFile* mpLayout; // 0x58
nand::LayoutFile* mpBalloonFilm; // 0x5C
SavedataBase* mpSavedataBase; // 0x60
nand::File* mpCorruptFile; // 0x64
SavedataEdit* mpSavedataEdit; // 0x68
nw4r::ut::List mSavedataBoxList; // 0x6C
NandSDCardManager* mpNandSDCardManager; // 0x78
static const int MAX_BALLOONS = 15;
TextBalloon* mpBalloons[MAX_BALLOONS]; // 0x7C
int mPage; // 0xB8
SavedataBox* mpCurrentBox; // 0xBC
int mPageOffset; // 0xC0
int mSdState; // 0xC4
bool mArwRVisible; // 0xC8
bool mArwLVisible; // 0xC9
int mProcessType; // 0xCC
IntentType mActionIntent; // 0xD0
};
} // namespace scene
} // namespace ipl

View File

@@ -1,13 +1,13 @@
#ifndef IPL_SCENE_CONTEST_H
#define IPL_SCENE_CONTEST_H
#include <revolution/ncd.h>
#ifdef __cplusplus
extern "C" {
#endif
#include <revolution/ncd.h>
void IPLContestInitialize(void*, NCDProxyProfile*);
void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy);
void IPLContestStart();
int IPLContestProcess();
void IPLContestShutdown();

View File

@@ -37,26 +37,26 @@ namespace ipl {
static void nhttpfree(void* buf);
static void nhttpcleanupcallback();
NetSetup mNetSetup; // 0x0058
EGG::Heap* pAppHeap; // 0x2810
void* pAppHeapBuf; // 0x2814
void* pNetSetupHeapBuf; // 0x2818
void* pNUPHeapBuf; // 0x281c
MEMHeapHandle pNUPHeap; // 0x2820
MEMAllocator mNUPAllocator; // 0x2824
OSThread mConnTestThread; // 0x2838
void* pConnTestThreadStack; // 0x2b50
u32 mNetSetupLastErr; // 0x2b54
u32 mState; // 0x2b58
u32 mConnTestResult; // 0x2b5c
bool mFoundUpdate; // 0x2b60
u64 mAmtCompleted; // 0x2b68
u64 mAmtTotal; // 0x2b70
u16 mCurrVersion; // 0x2b78
void* pNUPInstance; // 0x2b7c
u32 unk_0x2b80; // 0x2b80
u32 unk_0x2b84; // 0x2b84
u32 unk_0x2b88; // 0x2b88
NetSetup mNetSetup; // 0x0058
EGG::Heap* mpAppHeap; // 0x2810
void* mpAppHeapBuf; // 0x2814
void* mpNetSetupHeapBuf; // 0x2818
void* mpNUPHeapBuf; // 0x281C
MEMHeapHandle mNUPHeap; // 0x2820
MEMAllocator mNUPAllocator; // 0x2824
OSThread mConnTestThread; // 0x2838
void* mpConnTestThreadStack; // 0x2B50
u32 mNetSetupLastErr; // 0x2B54
u32 mState; // 0x2B58
u32 mConnTestResult; // 0x2B5C
bool mFoundUpdate; // 0x2B60
u64 mAmtCompleted; // 0x2B68
u64 mAmtTotal; // 0x2B70
u16 mCurrVersion; // 0x2B78
void* mpNUPInstance; // 0x2B7C
u32 unk_0x2B80; // 0x2B80
u32 unk_0x2B84; // 0x2B84
u32 unk_0x2B88; // 0x2B88
static EGG::Heap* spHeap;
static BOOL sNHTTPFinished;

View File

@@ -12,11 +12,11 @@ namespace ipl {
public:
enum NetSetupState {
NET_SETUP_NOT_STARTED = 0,
NET_SETUP_REQUESTED_STARTUP = 1,
NET_SETUP_RUNNING = 2,
NET_SETUP_SUCCESS = 3,
NET_SETUP_UNK_4 = 4,
NET_SETUP_ERROR = 5,
NET_SETUP_REQUESTED_STARTUP,
NET_SETUP_RUNNING,
NET_SETUP_SUCCESS,
NET_SETUP_UNK_4,
NET_SETUP_ERROR,
};
NetSetup();
@@ -44,14 +44,14 @@ namespace ipl {
} StaticSOStartupInfo;
NCDConfig mNcdCfg; // 0x0004
u8 mProfileId; // 0x1b60
u32 mConnType; // 0x1b64
NCDIfConfig mNcdIfCfg; // 0x1b68
NCDIpConfig mNcdIpCfg; // 0x1cc8
NetSetupState mState; // 0x248c
u8 mProfileId; // 0x1B60
u32 mConnType; // 0x1B64
NCDIfConfig mNcdIfCfg; // 0x1B68
NCDIpConfig mNcdIpCfg; // 0x1CC8
NetSetupState mState; // 0x248C
int mLastErr; // 0x2490
OSThread mThread; // 0x2498
void* pThreadStack; // 0x27b0
void* mpThreadStack; // 0x27B0
static MEMHeapHandle sHeap;
static void* sHeapBuf;

View File

@@ -1,5 +1,5 @@
#ifndef IPL_SCENE_SAVEDATA_BASE_H
#define IPL_SCENE_SAVEDATA_BASE_H
#ifndef IPL_SCENE_STATE_BASE_H
#define IPL_SCENE_STATE_BASE_H
#include "scene/channelEdit/iplAnmController.h"
@@ -11,7 +11,7 @@ namespace ipl {
namespace scene {
class SavedataBase : public AnmController, public ::gui::EventHandler {
public:
SavedataBase(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName);
SavedataBase(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName);
virtual ~SavedataBase();
@@ -22,7 +22,7 @@ namespace ipl {
void update();
void anmFadein();
void anmFadeout(bool);
void anmFadeout(bool isErr);
void anmChangeWiitoSD();
void anmChangeSDtoWii();
@@ -36,10 +36,38 @@ namespace ipl {
void anmArwAppear(bool arwR, bool arwL);
void anmArwDisappear(bool arwR, bool arwL);
inline layout::Object* getLytObject() { return pLytObj; }
inline bool isIdle() { return mState == SAVEDATA_IDLE; }
inline layout::Object* getLytObject() { return mpLayout; }
inline bool isIdle() { return mState == STATE_IDLE; }
private:
enum {
ANIM_SWITCH = 0,
ANIM_DATA_IN,
ANIM_DATA_OUT,
ANIM_SELECT_IN,
ANIM_SELECT_WII_IN,
ANIM_SELECT_WII_OUT,
ANIM_SELECT_WII_FLASH,
ANIM_SELECT_SD_IN,
ANIM_SELECT_SD_OUT,
ANIM_SELECT_SD_FLASH,
ANIM_ARROWS_MOVE_L,
ANIM_ARROWS_MOVE_R,
ANIM_ARROW_R_SELECT,
ANIM_ARROW_L_SELECT,
ANIM_ARROW_R_FOCUS_ON,
ANIM_ARROW_L_FOCUS_ON,
ANIM_ARROW_R_FOCUS_OFF,
ANIM_ARROW_L_FOCUS_OFF,
ANIM_ARROW_R_LOOP,
ANIM_ARROW_R_END,
ANIM_ARROW_L_END,
ANIM_ARROW_R_LOST,
ANIM_ARROW_L_LOST,
ANIM_ERROR_TEXT_IN,
ANIM_ERROR_TEXT_OUT,
};
void on_fadein1st();
void on_fadein2nd();
void on_fadeout();
@@ -50,22 +78,24 @@ namespace ipl {
void on_text_fadein();
void on_text_fadeout();
enum State {
SAVEDATA_IDLE = 0x0, // 0x0
SAVEDATA_FADEIN1ST = 0x1, // 0x1
SAVEDATA_FADEIN2ND = 0x2, // 0x2
SAVEDATA_FADEOUT = 0x3, // 0x3
SAVEDATA_CHANGE_SD_TO_WII = 0x4, // 0x4
SAVEDATA_CHANGE_WII_TO_SD = 0x5, // 0x5
SAVEDATA_SCROLL_R = 0x8, // 0x8
SAVEDATA_SCROLL_L = 0x9, // 0x9
SAVEDATA_TEXT_FADEIN = 0xa, // 0xa
SAVEDATA_TEXT_FADEOUT = 0xb, // 0xb
enum {
STATE_IDLE = 0,
STATE_FADEIN1ST,
STATE_FADEIN2ND,
STATE_FADEOUT,
STATE_CHANGE_SD_TO_WII,
STATE_CHANGE_WII_TO_SD,
STATE_6,
STATE_7,
STATE_SCROLL_R,
STATE_SCROLL_L,
STATE_TEXT_FADEIN,
STATE_TEXT_FADEOUT,
};
State mState;
int mState;
};
} // namespace scene
} // namespace ipl
#endif // IPL_SCENE_SAVEDATA_BASE_H
#endif // IPL_SCENE_STATE_BASE_H

View File

@@ -12,7 +12,7 @@ namespace ipl {
namespace scene {
class SavedataBox : public AnmController, public ::gui::EventHandler {
public:
SavedataBox(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName);
SavedataBox(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName);
virtual ~SavedataBox();
void calc();
@@ -25,37 +25,49 @@ namespace ipl {
virtual void onEvent(u32 compId, u32 event, void* data) override;
void clearEvent();
WiiBannerFileInfo* getBanner() const { return pBannerFileInfo; }
void setBannerFileInfo(WiiBannerFileInfo* info) { pBannerFileInfo = info; }
WiiBannerFileInfo* getBanner() const { return mpBannerFileInfo; }
void setBannerFileInfo(WiiBannerFileInfo* info) { mpBannerFileInfo = info; }
const nw4r::math::VEC3& getTranslate() { return get_translate("N_Data_00"); }
void setTranslate(const nw4r::math::VEC3& translate) { set_translate("N_Data_00", translate); }
TextBalloon* getTextBalloon() { return pTextBalloon; }
void setTextBalloon(TextBalloon* balloon) { pTextBalloon = balloon; }
void terminateBalloon() {
mpBalloon->terminate();
mbInitBalloon = false;
}
bool getTextBalloonInitialized() { return mTextBalloonInitialized; }
void setTextBalloonInitialized(bool val) { mTextBalloonInitialized = val; }
TextBalloon* getTextBalloon() { return mpBalloon; }
void setTextBalloon(TextBalloon* balloon) { mpBalloon = balloon; }
inline bool isIdle() { return mState == BOX_STATE_IDLE; }
bool hasBalloonInitialized() { return mbInitBalloon; }
inline bool isIdle() { return mState == STATE_IDLE; }
private:
enum {
ANIM_DATA_IN,
ANIM_DATA_OUT,
ANIM_DATA_FOCUS_IN,
ANIM_DATA_FOCUS_OUT,
};
void on_fadein();
void on_fadeout();
enum State {
BOX_STATE_IDLE = 0x0, // 0x0
BOX_STATE_FADEIN = 0x1, // 0x1
BOX_STATE_FADEOUT = 0x2, // 0x2
enum {
STATE_IDLE = 0,
STATE_FADEIN,
STATE_FADEOUT,
};
public:
nw4r::ut::Link mLink; // 0x34
private:
State mState; // 0x3c
WiiBannerFileInfo* pBannerFileInfo; // 0x40
TextBalloon* pTextBalloon; // 0x44
bool mTextBalloonInitialized; // 0x48
int mState; // 0x3C
WiiBannerFileInfo* mpBannerFileInfo; // 0x40
TextBalloon* mpBalloon; // 0x44
bool mbInitBalloon; // 0x48
};
} // namespace scene
} // namespace ipl

View File

@@ -13,7 +13,7 @@ namespace ipl {
namespace scene {
class SavedataEdit : public AnmController, public ::gui::EventHandler {
public:
SavedataEdit(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName);
SavedataEdit(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName);
virtual ~SavedataEdit();
@@ -41,11 +41,29 @@ namespace ipl {
virtual void onEvent(u32 compId, u32 event, void* data) override;
void change_button_text(u32);
void change_button_text(u32 msgId);
inline bool isIdle() { return mState == EDIT_STATE_IDLE; }
inline bool isIdle() { return mState == STATE_IDLE; }
private:
enum {
ANIM_MASK_IN = 0,
ANIM_MASK_OUT,
ANIM_COPY_IN,
ANIM_COPY_OUT,
ANIM_COPY_FLASH,
ANIM_DEL_IN,
ANIM_DEL_OUT,
ANIM_DEL_FLASH,
ANIM_SELECT_OUT,
ANIM_TEXT_FADEIN,
ANIM_TEXT_FADEOUT,
ANIM_WAIT,
ANIM_MOVE_IN,
ANIM_MOVE_OUT,
ANIM_MOVE_FLASH,
};
void on_fadein();
void on_fadeout();
void on_hide_btn0_dialog();
@@ -58,27 +76,28 @@ namespace ipl {
void on_text_fadeout();
void on_trig_del();
enum State {
EDIT_STATE_IDLE = 0x0, // 0x0
EDIT_STATE_FADEIN = 0x1, // 0x1
EDIT_STATE_FADEOUT = 0x2, // 0x2
EDIT_STATE_HIDE_BTN0_DIALOG = 0x3, // 0x3
EDIT_STATE_SHOW_BTN2_DIALOG1ST = 0x4, // 0x4
EDIT_STATE_SHOW_BTN2_DIALOG2ND = 0x5, // 0x5
EDIT_STATE_SELECT_FADEIN = 0x6, // 0x6
EDIT_STATE_SELECT_FADEOUT1ST = 0x7, // 0x7
EDIT_STATE_SELECT_FADEOUT2ND = 0x8, // 0x8
EDIT_STATE_TEXT_FADEIN = 0x9, // 0x9
EDIT_STATE_TEXT_FADEOUT = 0xa, // 0xa
EDIT_STATE_TRIG_DEL = 0xb, // 0xb
enum {
STATE_IDLE = 0,
STATE_FADEIN,
STATE_FADEOUT,
STATE_HIDE_BTN0_DIALOG,
STATE_SHOW_BTN2_DIALOG1ST,
STATE_SHOW_BTN2_DIALOG2ND,
STATE_SELECT_FADEIN,
STATE_SELECT_FADEOUT1ST,
STATE_SELECT_FADEOUT2ND,
STATE_TEXT_FADEIN,
STATE_TEXT_FADEOUT,
STATE_TRIG_DEL,
};
public:
nw4r::ut::Link mLink; // 0x34
private:
State mState; // 0x3c
int mState; // 0x3C
math::LinearIntp<math::VEC3> mLinearInterp; // 0x40
SavedataBox* pSavedataBox; // 0x78
SavedataBox* mpSavedataBox; // 0x78
int mMsgId; // 0x7c
};
} // namespace scene

View File

@@ -4,46 +4,12 @@
#include <revolution/gx.h>
#include <revolution/types.h>
#include "system/iplSaveBanner.h"
#include "system/iplSystem.h"
#include <cstring>
#include <cwchar>
#define SAVE_NAME_LENGTH 32
#define SAVE_ICON_COUNT 8
#define SAVE_ICON_TEX_SIZE 0x1200
#define SAVE_ICON_TEX_WIDTH 48
#define SAVE_ICON_TEX_HEIGHT 48
#define SAVE_BANNER_TEX_SIZE 0x6000
#define SAVE_BANNER_TEX_WIDTH 192
#define SAVE_BANNER_TEX_HEIGHT 64
#define SAVE_ANIM_FRAME_TICK 4
typedef struct WIISaveBannerFile {
u32 magic; // 0x0000
u32 flags; // 0x0004
u16 speed; // 0x0008
u8 padding[22];
wchar_t name[SAVE_NAME_LENGTH]; // 0x0020
wchar_t subName[SAVE_NAME_LENGTH]; // 0x0060
u8 bannerData[SAVE_BANNER_TEX_SIZE]; // 0x00a0
u8 iconData0[SAVE_ICON_TEX_SIZE]; // 0x60a0
u8 iconData1[SAVE_ICON_TEX_SIZE]; // 0x72a0
u8 iconData2[SAVE_ICON_TEX_SIZE]; // 0x84a0
u8 iconData3[SAVE_ICON_TEX_SIZE]; // 0x96a0
u8 iconData4[SAVE_ICON_TEX_SIZE]; // 0xa8a0
u8 iconData5[SAVE_ICON_TEX_SIZE]; // 0xbaa0
u8 iconData6[SAVE_ICON_TEX_SIZE]; // 0xcca0
u8 iconData7[SAVE_ICON_TEX_SIZE]; // 0xdea0
} SData;
namespace ipl {
namespace scene {
class WiiBannerFileInfo {
@@ -51,22 +17,22 @@ namespace ipl {
WiiBannerFileInfo()
: mFrameCount(0), mFrameSpeed(0), mFlags(0), mAnim_Incrementer(0), mAnim_AltFlag(0), mAnim_AltForward(0), mAnim_AltBackward(0),
mBlockCount(0), mPerms(0), mIsCorrupt(false) {
wmemset(mSaveName, 0, SAVE_NAME_LENGTH + 1);
wmemset(mSaveSubName, 0, SAVE_NAME_LENGTH + 1);
wmemset(mSaveName, 0, WII_SAVE_BANNER_LENGTH + 1);
wmemset(mSaveSubName, 0, WII_SAVE_BANNER_LENGTH + 1);
mpBannerData = System::getMem2App()->alloc(SAVE_BANNER_TEX_SIZE, DEFAULT_ALIGN);
memset(mpBannerData, 0, SAVE_BANNER_TEX_SIZE);
mpBannerData = System::getMem2App()->alloc(WII_SAVE_BANNER_BNR_TEXSIZE, DEFAULT_ALIGN);
memset(mpBannerData, 0, WII_SAVE_BANNER_BNR_TEXSIZE);
for (int i = 0; i < SAVE_ICON_COUNT; i++) {
mpIconData[i] = System::getMem2App()->alloc(SAVE_ICON_TEX_SIZE, DEFAULT_ALIGN);
memset(mpIconData[i], 0, SAVE_ICON_TEX_SIZE);
for (int i = 0; i < WII_SAVE_BANNER_ICON_COUNT; i++) {
mpIconData[i] = System::getMem2App()->alloc(WII_SAVE_BANNER_ICON_TEXSIZE, DEFAULT_ALIGN);
memset(mpIconData[i], 0, WII_SAVE_BANNER_ICON_TEXSIZE);
}
memset(&mData, 0, sizeof(mData));
}
~WiiBannerFileInfo() {
for (int i = 0; i < SAVE_ICON_COUNT; i++) {
for (int i = 0; i < WII_SAVE_BANNER_ICON_COUNT; i++) {
System::getMem2App()->free(mpIconData[i]);
}
@@ -97,20 +63,15 @@ namespace ipl {
inline bool isCorrupt() const { return mIsCorrupt; }
inline void setCorrupt(bool newValue) { mIsCorrupt = newValue; }
inline SData* getDataRef() { return &mData; }
enum {
FLAG_LOCAL_SAVE = 0x00000001,
FLAG_ALTERNATE_ANIMATION = 0x00000010,
};
WIISaveBannerFile* getData() { return &mData; }
private:
void resolve_icon();
int get_iconspeed(int frame) const;
int get_iconspeed_ticks(int frame) { return get_iconspeed(frame) * SAVE_ANIM_FRAME_TICK; }
int get_iconspeed_ticks(int frame) { return get_iconspeed(frame) * WII_SAVE_BANNER_FRAME_TICK; }
int get_iconspeed_begin_tick(int frame) { return get_iconspeed(frame - 1) * SAVE_ANIM_FRAME_TICK; }
int get_iconspeed_begin_tick(int frame) { return get_iconspeed(frame - 1) * WII_SAVE_BANNER_FRAME_TICK; }
vu8 mFrameCount; // 0x00
@@ -127,11 +88,11 @@ namespace ipl {
u8 mAnim_AltForward; // 0x0E
u8 mAnim_AltBackward; // 0x0F
wchar_t mSaveName[SAVE_NAME_LENGTH + 1]; // 0x10
wchar_t mSaveSubName[SAVE_NAME_LENGTH + 1]; // 0x52
wchar_t mSaveName[WII_SAVE_BANNER_LENGTH + 1]; // 0x10
wchar_t mSaveSubName[WII_SAVE_BANNER_LENGTH + 1]; // 0x52
void* mpBannerData; // 0x94
void* mpIconData[SAVE_ICON_COUNT]; // 0x98
void* mpBannerData; // 0x94
void* mpIconData[WII_SAVE_BANNER_ICON_COUNT]; // 0x98
GXTexObj mCurIconTex; // 0xB8
GXTexObj mCurBannerTex; // 0xD8
@@ -140,7 +101,7 @@ namespace ipl {
ESTitleId32 mSDTitleId;
u32 mBlockCount;
SData mData; // 0x108
WIISaveBannerFile mData; // 0x108
u32 mPerms; // 0xf1a8
bool mIsCorrupt; // 0xf1ac

View File

@@ -13,57 +13,55 @@ namespace ipl {
namespace ncd {
class NCDSetting {
public:
static NCDConfig mConfig;
static NCDConfig mSaveConfig;
static u8 mMac[];
static u16 mID;
static u32 mMacNum;
static void init();
static void initSetID(u16);
static int checkFlag(int);
static void initSetID(u16 setID);
static int checkFlag(int id);
static int checkThisFlag();
static bool checkAllFlag();
static u8 checkConnectTestFlag();
static u8 checkDHCPFlag();
static u8 checkDNSFlag();
static void checkDHCP_();
static u8 checkProxyFlag();
static u8 checkBasic();
static bool checkChangeEnable();
static bool convert16toASCII(char, char, unsigned char*);
static int checkWEPKey(char*);
static bool checkProxy(char*);
static bool checkProxyBasic(char*);
static void adjustNCDData_();
static void adjustSelectMedia_(int);
static void adjustEnableFlag_(int);
static void setConnectTestFlag(bool);
static void setDHCPFlag(unsigned char);
static void setDNSFlag(unsigned char);
static void setProxyFlag(unsigned char);
static void setBasicFlag(unsigned char);
static int checkWEPKey(char* key);
static bool checkProxy(char* proxy);
static bool checkProxyBasic(char* proxy);
static void setConnectTestFlag(bool newFlag);
static void setDHCPFlag(u8 newFlag);
static void setDNSFlag(u8 newFlag);
static void setProxyFlag(u8 newFlag);
static void setBasicFlag(u8 newFlag);
static void setWired();
static void setWireless(unsigned char);
static void changeConnectType(unsigned char);
static void setSSID(u8*);
static void setPrivacyMode(u16);
static void setWDPrivacyMode(u16);
static void setPrivacy(unsigned char*, int);
static void setIP(NCDIpProfile*);
static void setDNS(NCDIpProfile*);
static void setMTU(long);
static void setProxy(NCDProxyServerProfile*);
static void setBasic(NCDProxyServerProfile*);
static void setWireless(u8 configMethod);
static void changeConnectType(u8 connectType);
static void setSSID(u8* newSSID);
static void setPrivacyMode(u16 newMode);
static void setWDPrivacyMode(u16 mode);
static void setPrivacy(u8* newKey, int len);
static void setIP(NCDIpProfile* ip);
static void setDNS(NCDIpProfile* ip);
static void setMTU(s32 mtu);
static void setProxy(NCDProxyServerProfile* proxyServerProfile);
static void setBasic(NCDProxyServerProfile* proxyServerProfile);
static void clearData();
static void clearLocal();
static void write();
static void backupData();
static void resetData();
static void setUseProfileID();
static void setAOSSParams(const NCDAossConfig&);
static void setRakuParams(const NCDApConfig&);
static void setAOSSParams(const NCDAossConfig& src);
static void setRakuParams(const NCDApConfig& src);
static u16 getID();
static NCDApConfig* getSSID();
static u16 getUseProfileID();
@@ -74,15 +72,34 @@ namespace ipl {
static NCDIpProfile* getIP();
static u32 getMacNum();
static u8* getMacAddr();
static void makeMacAddr();
static NCDProxyProfile* getProxy();
static s32 getMTU();
static NCDConfig* getData();
static bool getConnectEnableFlag();
static bool getEnableFlag();
static NCDErr adjustNWC24Flag();
private:
static void checkDHCP_();
static void adjustNCDData_();
static void adjustSelectMedia_(int exclude);
static void adjustEnableFlag_(int exclude);
static void adjustNWC24FlagEx_();
static bool convert16toASCII(char hexHi, char hexLo, u8* byte);
static NCDConfig mConfig;
static NCDConfig mSaveConfig;
static u8 mMac[0x20];
static u16 mID;
static u32 mMacNum;
#ifndef NON_MATCHING
static void matchHack();
#endif

View File

@@ -97,7 +97,9 @@ namespace ipl {
static const int META_DISK_IN_MESSAGE_LENGTH = 376;
static const int META_CURRENT_VERSION = 3;
#define META_PAD 64
static const int META_RESERVED_PADDING = 64;
#define IPL_META_MAGIC "IMET"
typedef struct SMetaBlockHeader {
char magic[4]; // 0x00 (Always "IMET"; "IPL Meta"?)
@@ -135,9 +137,11 @@ namespace ipl {
}; // 0x18
} SMetaBlockHeader;
static const int META_HEAD_BLOCK_SIZE = offsetof(SMetaBlockHeader, iconSize);
typedef struct SChanMgrMetaHeader {
u8 reserved0[META_PAD]; // 0x00
SMetaBlockHeader blockHdr; // 0x40
u8 reserved0[META_RESERVED_PADDING]; // 0x00
SMetaBlockHeader blockHdr; // 0x40
u16 names[SC_LANG_MAX][NAME_INDEX_MAX][META_CHANNEL_NAME_LENGTH + 1]; // 0x5C

View File

@@ -63,128 +63,128 @@ namespace ipl {
// clang-format on
class Base {
public:
Base(int chan, KPADStatus &arg1) {
this->mButton = 0;
this->mUnk8 = 0;
this->mLastRumbleTime = 0;
this->mRumbleType = -1;
this->mChan = chan;
this->mUnk18 = 2;
this->mUnk1C = 0;
public:
Base(int chan, KPADStatus& arg1) {
mButton = 0;
unk_0x08 = 0;
mLastRumbleTime = 0;
mRumbleType = -1;
mChan = chan;
unk_0x18 = 2;
unk_0x1C = 0;
KPADEnableDPD(chan);
KPADEnableDPD(chan);
this->mUnk1D = 0;
this->mUnk1E = 0;
this->mUnk20 = &arg1;
}
unk_0x1D = 0;
unk_0x1E = 0;
unk_0x20 = &arg1;
}
virtual ~Base(); // 0x08
virtual int getType() const; // 0x0C
virtual int getChannel() const; // 0x10
virtual int down(u32 button) const; // 0x14
virtual int downTrg(u32 button) const; // 0x18
virtual int upTrg(u32 button) const; // 0x1C
virtual int pinch() const; // 0x20
virtual int pinchTrg() const; // 0x24
virtual int pinchOffTrg() const; // 0x28
virtual int decide() const; // 0x2C
virtual int repeat(u32 button) const; // 0x30
virtual int rumble(int timer = 0); // 0x34
virtual void cancelRumbling(); // 0x38
virtual int getHoldFlag() const; // 0x3C
virtual int getTrigFlag() const; // 0x40
virtual int getReleaseFlag() const; // 0x44
virtual int getClassicHoldFlag() const; // 0x48
virtual int getClassicTrigFlag() const; // 0x4C
virtual int getClassicReleaseFlag() const; // 0x50
virtual math::VEC2 getDpdPos() const; // 0x54
/**
* @brief Gets the IR sensor position of the Wii Remote.
* @return The IR sensor X and Y as `ipl::math::VEC2`.
*/
virtual math::VEC2 getDpdProjectionPos() const; // 0x58
/**
* @brief Gets the Horizon of the Wii Remote.
* @return The Horizon X and Y as `ipl::math::VEC2`.
*/
virtual math::VEC2 getHorizon() const; // 0x5C
virtual int getDpdDistance() const; // 0x60
virtual KPADStatus* getKPADStatus() const; // 0x64
virtual PADStatus* getPADStatus() const; // 0x68
virtual bool isValidBtn() const; // 0x6C
virtual bool isValidDpd() const; // 0x70
virtual ~Base(); // 0x08
virtual int getType() const; // 0x0C
virtual int getChannel() const; // 0x10
virtual int down(u32 button) const; // 0x14
virtual int downTrg(u32 button) const; // 0x18
virtual int upTrg(u32 button) const; // 0x1C
virtual int pinch() const; // 0x20
virtual int pinchTrg() const; // 0x24
virtual int pinchOffTrg() const; // 0x28
virtual int decide() const; // 0x2C
virtual int repeat(u32 button) const; // 0x30
virtual BOOL rumble(int timer = 0); // 0x34
virtual void cancelRumbling(); // 0x38
virtual int getHoldFlag() const; // 0x3C
virtual int getTrigFlag() const; // 0x40
virtual int getReleaseFlag() const; // 0x44
virtual int getClassicHoldFlag() const; // 0x48
virtual int getClassicTrigFlag() const; // 0x4C
virtual int getClassicReleaseFlag() const; // 0x50
virtual math::VEC2 getDpdPos() const; // 0x54
/**
* @brief Gets the IR sensor position of the Wii Remote.
* @return The IR sensor X and Y as `ipl::math::VEC2`.
*/
virtual math::VEC2 getDpdProjectionPos() const; // 0x58
/**
* @brief Gets the Horizon of the Wii Remote.
* @return The Horizon X and Y as `ipl::math::VEC2`.
*/
virtual math::VEC2 getHorizon() const; // 0x5C
virtual int getDpdDistance() const; // 0x60
virtual KPADStatus* getKPADStatus() const; // 0x64
virtual PADStatus* getPADStatus() const; // 0x68
virtual bool isValidBtn() const; // 0x6C
virtual bool isValidDpd() const; // 0x70
virtual bool setForceInvalid(bool flag); // 0x74
virtual bool setForceInvalid(bool flag); // 0x74
virtual f32 getMainStickX() const; // 0x78
virtual f32 getMainStickY() const; // 0x7C
virtual f32 getMainStickX() const; // 0x78
virtual f32 getMainStickY() const; // 0x7C
virtual f32 getSubStickX() const; // 0x80
virtual f32 getSubStickY() const; // 0x84
virtual f32 getSubStickX() const; // 0x80
virtual f32 getSubStickY() const; // 0x84
virtual void read(); // 0x88
virtual void read(); // 0x88
// protected:
u8 mButton; // 0x4
u32 mUnk8; // 0x8
OSTick mLastRumbleTime; // 0xC
s32 mRumbleType; // 0x10
u32 mChan; // 0x14
u32 mUnk18; // 0x18
u8 mUnk1C;
u8 mUnk1D; // 0x1D
u8 mUnk1E; // 0x1E
KPADStatus *mUnk20; // 0x20
u8 mButton; // 0x4
u32 unk_0x08; // 0x8
OSTick mLastRumbleTime; // 0xC
s32 mRumbleType; // 0x10
u32 mChan; // 0x14
u32 unk_0x18; // 0x18
u8 unk_0x1C;
u8 unk_0x1D; // 0x1D
u8 unk_0x1E; // 0x1E
KPADStatus* unk_0x20; // 0x20
};
class Interface : public Base {
public:
Interface(int chan, KPADStatus &arg1) : Base(chan, arg1) {}
Interface(int chan, KPADStatus& arg1) : Base(chan, arg1) {}
~Interface() {}
virtual int down(u32 button) const override; // 0x10
virtual int downTrg(u32 button) const override; // 0x18
virtual int pinch() const override; // 0x1C
virtual KPADStatus* getKPADStatus() const override; // 0x64
virtual bool isValidBtn() const override; // 0x6C
virtual int down(u32 button) const override; // 0x10
virtual int downTrg(u32 button) const override; // 0x18
virtual int pinch() const override; // 0x1C
virtual KPADStatus* getKPADStatus() const override; // 0x64
virtual bool isValidBtn() const override; // 0x6C
};
class Revolution : public Interface {
public:
Revolution(int chan, KPADStatus &arg1) : Interface(chan, arg1) {}
Revolution(int chan, KPADStatus& arg1) : Interface(chan, arg1) {}
virtual ~Revolution();
virtual int down(u32 button) const override; // 0x10
virtual int down(u32 button) const override; // 0x10
virtual math::VEC2 getDpdProjectionPos() const override; // 0x58
virtual math::VEC2 getDpdProjectionPos() const override; // 0x58
virtual bool isValidBtn() const override; // 0x6C
virtual bool isValidDpd() const override; // 0x70
virtual bool isValidBtn() const override; // 0x6C
virtual bool isValidDpd() const override; // 0x70
virtual void read() override; // 0x88
virtual void read() override; // 0x88
};
class Classic : public Revolution {
public:
Classic(int arg0, KPADStatus &arg1);
Classic(int arg0, KPADStatus& arg1);
virtual int getClassicHoldFlag() const override; // 0x48
virtual int getClassicHoldFlag() const override; // 0x48
virtual math::VEC2 getDpdPos() const override; // 0x54
virtual math::VEC2 getDpdProjectionPos() const override;// 0x58
virtual math::VEC2 getHorizon() const override; // 0x5C
virtual math::VEC2 getDpdPos() const override; // 0x54
virtual math::VEC2 getDpdProjectionPos() const override; // 0x58
virtual math::VEC2 getHorizon() const override; // 0x5C
virtual void read() override; // 0x88
virtual void read() override; // 0x88
virtual BOOL isValidDpdClassic() const; // 0x8C
virtual BOOL isValidDpdClassic() const; // 0x8C
private:
math::VEC2 unk24;
int unk2C;
math::VEC2 unk_0x24;
int unk_0x2C;
};
class Manager {

View File

@@ -432,8 +432,8 @@ namespace ipl {
void start_left_event(const char* paneName);
void start_trig_event(const char* paneName);
State mState; // 0x0C
ipl::nand::LayoutFile* mpLayoutFile; // 0x10
State mState; // 0x0C
nand::LayoutFile* mpLayoutFile; // 0x10
BOOL mbBtnHovered[DIALOG_BTN_TYPE_MAX]; // 0x14

View File

@@ -2,65 +2,78 @@
#define IPL_NAND_SD_WORKER_H
#include <revolution.h>
#include <revolution/fa.h>
#include <revolution/net.h>
#include <revolution/wad.h>
// TODO: Move WIISaveBannerFile to a better place
#include "scene/saveDataEdit/iplWiiBannerFileInfo.h"
#include "system/iplSaveBanner.h"
#include "system/iplChannelManager.h"
namespace ipl {
class NandSDWorker {
public:
enum SDState {
SD_STATE_INITIAL = 0, // 0
SD_STATE_SLOT_EMPTY = 1, // 1
SD_STATE_NOT_MOUNTED = 2, // 2
SD_STATE_BROKEN_MEDIA = 3, // 3
SD_STATE_ILLEGAL_MEDIA = 4, // 4
SD_STATE_ERRORED = 5, // 5
SD_STATE_READY = 6, // 6
SD_STATE_MOUNTED = 7, // 7
};
typedef enum WorkSDState {
SD_STATE_INITIAL = 0,
SD_STATE_EJECTED,
SD_STATE_INSERTED,
SD_STATE_BROKEN,
SD_STATE_ILLEGAL,
SD_STATE_ERROR,
SD_STATE_READY,
SD_STATE_MOUNTED,
} WorkSDState;
struct TitleUsage {
ESTitleId mTitleId;
u32 mSize;
u32 mInode;
ESTitleId curTitleId;
u32 size;
u32 inode;
};
struct TitleIdList {
ESTitleId* pTitleIds;
u32 mCount;
ESTitleId* titleIds;
u32 count;
};
enum NandSDWorkerResult {
WORKER_RESULT_OK = 0, // 0
WORKER_RESULT_WORKING = -1, // -1
WORKER_RESULT_GENERIC_ERR = -2, // -2
WORKER_RESULT_BAD_FILE = -3, // -3
WORKER_RESULT_TOO_MANY_FILES = -4, // -4
WORKER_RESULT_NAND_CORRUPT = -5, // -5
WORKER_RESULT_ALREADY_EXISTS = -6, // -6
WORKER_RESULT_NO_SPACE = -7, // -7
WORKER_RESULT_SYSFILES_CORRUPT = -8, // -8
WORKER_RESULT_BROKEN_MEDIA = -9, // -9
WORKER_RESULT_ILLEGAL_MEDIA = -10, // -10
WORKER_RESULT_WRITE_PROTECTED = -11, // -11
WORKER_RESULT_UNK_N12 = -12, // -12
WORKER_RESULT_NOCOPY = -13, // -13
WORKER_RESULT_ES_ERROR = -14, // -14
WORKER_RESULT_NOT_TRANSFERRABLE = -15, // -15
WORKER_RESULT_VERSION_ERR = -16, // -16
WORKER_RESULT_UNK_N18 = -18, // -18
RESULT_OK = 0,
RESULT_WORKING = -1,
RESULT_FATAL_SD_ERROR = -2,
RESULT_BAD_FILE = -3,
RESULT_TOO_MANY_FILES = -4,
RESULT_NAND_CORRUPT = -5,
RESULT_ALREADY_EXISTS = -6,
RESULT_OUT_OF_SPACE = -7,
RESULT_FA_ERROR = -8, // Not used in NandSDWorker. Name from SDVFWorker
RESULT_BROKEN_MEDIA = -9,
RESULT_ILLEGAL_MEDIA = -10,
RESULT_WRITE_PROTECTED = -11,
RESULT_UNK_N12 = -12,
RESULT_NOCOPY = -13,
RESULT_ES_ERROR = -14,
RESULT_NOT_TRANSFERRABLE = -15,
RESULT_VERSION_ERR = -16,
RESULT_SD_APP_LOC_NOT_FOUND = -17,
RESULT_UNK_18 = -18,
};
typedef struct SDAppMetaEntry {
ESTitleId titleId;
channel::SChanMgrMetaHeader metaHdr;
} SDAppMetaEntry;
typedef struct AppBlocksInfo {
u32 bytes;
u32 blocks;
} AppBlocksInfo;
NandSDWorker();
~NandSDWorker();
void create(void* work, void* savesBuf, void* appsBuf, int prio);
void create(void* work, void* savesBuf, void* appsBuf, int priority);
int get_async_result();
SDState get_sd_state();
WorkSDState get_sd_state();
u32 get_nand_save_num();
u32 get_nand_app_num();
@@ -74,34 +87,34 @@ namespace ipl {
void mount_sd_async();
void format_sd_async();
void iplNandSD_81348DFC(ESTitleId32, void*, void*);
void update_loc_dat_async(ESTitleId32* titleIds);
void read_loc_dat_async(ESTitleId32* titleIds);
void iplNandSD_81348E58(ESTitleId, void*, void*);
void get_sd_app_meta_async(ESTitleId32 titleId, u8* thumbnailBuf, SDAppMetaEntry* paramB);
void update_sd_app_location_async(ESTitleId32* titleIds);
void read_sd_app_location_async(ESTitleId32* titleIds);
void check_for_sd_app_to_nand_async(ESTitleId titleId, AppBlocksInfo* usedBlocks, AppBlocksInfo* freeBlocks);
void check_backup_fits_async(TitleIdList* newTitles, TitleIdList* replacingTitles);
void iplNandSD_81348EA8(void*, void*, void*);
void iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC);
void iplNandSD_81349000(void*, void*);
void list_nand_apps_usage_async(void* ptrA, void* ptr);
void list_nand_app_async(ESTitleId*);
void list_nand_save_async(ESTitleId*);
void list_sd_app_async(ESTitleId32*);
void list_sd_save_async(ESTitleId32*);
void list_nand_app_async(ESTitleId* titleIdOut);
void list_nand_save_async(ESTitleId* titleIdOut);
void list_sd_app_async(ESTitleId32* titleIdOut);
void list_sd_save_async(ESTitleId32* titleIdOut);
void nand_app_exist_async(ESTitleId);
void sd_save_exist_async(ESTitleId32);
void nand_app_exist_async(ESTitleId titleId);
void sd_save_exist_async(ESTitleId32 titleId);
void nocopy_exist_nand_save_async(ESTitleId);
void nand_save_exist_async(ESTitleId);
void nand_save_exist_lo_async(ESTitleId32);
void sd_app_exist_async(ESTitleId32);
void both_app_exist_async(ESTitleId32);
void nocopy_exist_nand_save_async(ESTitleId titleId);
void nand_save_exist_async(ESTitleId titleId);
void nand_save_exist_lo_async(ESTitleId32 titleId);
void sd_app_exist_async(ESTitleId32 titleId);
void both_app_exist_async(ESTitleId32 titleId);
void get_nand_user_free_area_async();
void get_sd_free_area_async(u64* out);
void get_sd_free_area_async(ESTitleId* titleIdOut /*?*/);
void get_nand_app_thumbnail_async(ESTitleId titleId, void* lytBuf, channel::SChanMgrMetaHeader* file);
void get_sd_app_thumbnail_async(ESTitleId32 titleId, u8* lytBuf, channel::SChanMgrMetaHeader* file);
void get_nand_app_thumbnail_async(ESTitleId titleId, void* thumbnailBuf, channel::SChanMgrMetaHeader* file);
void get_sd_app_thumbnail_async(ESTitleId32 titleId, u8* thumbnailBuf, channel::SChanMgrMetaHeader* file);
void get_nand_save_banner_async(ESTitleId titleId, WIISaveBannerFile* file);
void get_sd_save_banner_async(ESTitleId32 titleId, WIISaveBannerFile* file);
@@ -111,11 +124,11 @@ namespace ipl {
void get_sd_save_size_async(ESTitleId32 titleId);
void copy_nand_app_to_sd_async(ESTitleId titleId);
void copy_sd_app_to_nand_async(ESTitleId32 titleId, bool);
void copy_sd_app_to_nand_async(ESTitleId32 titleId, bool hidden);
void copy_nand_save_to_sd_async(ESTitleId titleId);
void copy_sd_save_to_nand_async(ESTitleId32 titleId);
void delete_nand_app_async(ESTitleId titleId, bool);
void delete_nand_app_async(ESTitleId titleId, bool hidden);
void delete_sd_app_async(ESTitleId32 titleId);
void delete_nand_save_async(ESTitleId titleId);
@@ -144,183 +157,198 @@ namespace ipl {
static bool is_available_data_only_titleidlo(ESTitleId32 titleId);
inline static u32 workerWorkSize() { return sizeof(Work); }
inline static u32 heapSizeForAppWorker() { return appCacheHeapSize() + 0x40000; }
inline static u32 heapSizeForApmpWorker() { return appCacheHeapSize() + 0x40000; }
inline static u32 heapSizeForSaveWorker() { return saveCacheHeapSize() + 0x40000; }
static const int SD_MAX_APP_PAGE = 20;
static const int SD_MAX_APP_INDEX = 12;
static const int SD_MAX_APP_TOTAL = (SD_MAX_APP_PAGE * SD_MAX_APP_INDEX);
static const int SD_APP_BACKUP_THUMBNAIL_LENGTH = 0xC800;
protected:
enum WorkState {
WORKER_STATE_IDLE = 0x00, // 0x00
WORKER_STATE_WORKING = 0x01, // 0x01
};
static const int FAT_PAGES = 8;
static const int DATA_PAGES = 32;
static const int TOTAl_PAGES = (FAT_PAGES + DATA_PAGES);
static const int STACK_SIZE = 0x20000;
struct Work {
FACacheBuf mFatCacheBuf[40]; // 0x00000
FACachePage mFatCachePages[40]; // 0x05000
u8 mHeap19000Buf[100 * 1024]; // 0x05640
FADrvTbl mFatDriveTable; // 0x1e640
FACacheSetting mFatCacheSetting; // 0x1e64c
nw4r::ut::List mSavesListNand; // 0x1e660
nw4r::ut::List mSavesListSD; // 0x1e66c
nw4r::ut::List mAppsListNand; // 0x1e678
nw4r::ut::List mAppsListSD; // 0x1e684
MEMHeapHandle pHeap19000; // 0x1e690
MEMHeapHandle pSaveCacheHeap; // 0x1e694
MEMHeapHandle pAppCacheHeap; // 0x1e698
MEMHeapHandle pBothHeap; // 0x1e69c
MEMAllocator mBothHeapAllocator; // 0x1e6a0
u8 mThreadStack[0x20000]; // 0x1e6b0
OSThread mThread; // 0x3e6b0
OSMutex mMutex; // 0x3e9c8
OSMessageQueue mMsgQueue; // 0x3e9e0
OSMessage mMsgQueueBuf[8]; // 0x3ea00
WorkState mState; // 0x3ea20
s32 mAsyncResult; // 0x3ea24
int mNandSaveNum; // 0x3ea28
int mNandAppNum; // 0x3ea2c
int mSdSaveNum; // 0x3ea30
int mSdAppNum; // 0x3ea34
void* pParamA; // 0x3ea38
void* pParamB; // 0x3ea3c
void* pParamC; // 0x3ea40
u64 mTitleId; // 0x3ea48
u64 mUid; // 0x3ea50
BOOL mIsSDWriteProtected; // 0x3ea50
int mSdMountErr; // 0x3ea5c
};
typedef enum WorkState {
STATE_IDLE = 0,
STATE_WORKING
} WorkState;
struct AppCacheEntry {
u64 titleId; // 0x00000
s32 mFileSize; // 0x00008
s32 mThumbnailSize; // 0x0000c
nw4r::ut::Link mLink; // 0x00010
u8 mThumbnail[100 * 1024]; // 0x00018
channel::SChanMgrMetaHeader mMetaHdr; // 0x19018
u8 unk_0x19018[8]; // 0x19618
};
struct SaveCacheEntry {
WIISaveBannerFile mBanner; // 0x0000
u64 mTitleId; // 0xf0a0
s32 mSize; // 0xf0a8
nw4r::ut::Link mLink; // 0xf0ac
u8 unk_0xf0b4[12]; // 0xf0b4
};
typedef struct Work {
FACacheBuf cacheBuf[TOTAl_PAGES]; // 0x00
FACachePage cachePages[TOTAl_PAGES]; // 0x5000
u8 mHeap19000Buf[100 * 1024]; // 0x5640
FADrvTbl driveTable; // 0x1E640
FACacheSetting cacheSetting; // 0x1E64C
nw4r::ut::List nandSaveList; // 0x1E660
nw4r::ut::List sdSaveList; // 0x1E66C
nw4r::ut::List nandAppList; // 0x1E678
nw4r::ut::List sdAppList; // 0x1E684
MEMHeapHandle mainHeap; // 0x1E690
MEMHeapHandle saveCacheHeap; // 0x1E694
MEMHeapHandle appCacheHeap; // 0x1E698
MEMHeapHandle unkHeap; // 0x1E69C
MEMAllocator unkAllocator; // 0x1E6A0
u8 threadStack[STACK_SIZE]; // 0x1E6B0
OSThread thread; // 0x3e6B0
OSMutex mutex; // 0x3e9C8
OSMessageQueue msgQueue; // 0x3e9E0
OSMessage messages[8]; // 0x3EA00
WorkState state; // 0x3EA20
s32 asyncResult; // 0x3EA24
int nandSaveNum; // 0x3EA28
int nandAppNum; // 0x3EA2c
int sdSaveNum; // 0x3EA30
int sdAppNum; // 0x3EA34
void* paramA; // 0x3EA38
void* paramB; // 0x3EA3c
void* paramC; // 0x3EA40
ESTitleId curTitleId; // 0x3EA48
ESTitleId curUId; // 0x3EA50
BOOL sdWriteProtected; // 0x3EA50
int prevAsyncResult; // 0x3EA5C
} Work;
struct SDSaveBanner {
ESTitleId mTitleId; // 0x000
u32 mHdrSize; // 0x008
u8 mPerms; // 0x00c
u8 mAttrib; // 0x00d
u8 mMd5Digest[0x10]; // 0x00e
WIISaveBannerFile mBanner; // 0x020
};
struct SDAppBanner {
ESTitleId mTitleId; // 0x000
u32 mThumbnailSize; // 0x008
u8 mHdrMd5[0x10]; // 0x00c
u8 mIconMd5[0x10]; // 0x01c
u64 unk_0x030; // 0x030
u64 unk_0x038; // 0x038
channel::SChanMgrMetaHeader mMetaHdr; // 0x040
};
typedef struct AppCacheEntry {
u64 titleId; // 0x00
s32 fileSize; // 0x08
s32 thumbSize; // 0x0C
nw4r::ut::Link link; // 0x10
u8 thumbnail[100 * 1024]; // 0x18
channel::SChanMgrMetaHeader metaHdr; // 0x19018
u8 unk_0x19018[8]; // 0x19618
} AppCacheEntry;
struct ContentBin {
SDAppBanner hdr; // 0x0000
u8 icon[0xc800]; // 0x0640
};
typedef struct SaveCacheEntry {
WIISaveBannerFile banner; // 0x00
ESTitleId titleId; // 0xF0A0
s32 size; // 0xF0A8
nw4r::ut::Link link; // 0xF0AC
u8 unk_0xf0b4[12]; // 0xF0B4
} SaveCacheEntry;
struct LocDat {
char mMagic[4]; // 0x000
u8 mMd5Digest[0x10]; // 0x004
ESTitleId32 mTitleIds[240]; // 0x014
u8 mPadding[0xc]; // 0x3d4
};
typedef struct SDSaveBanner {
ESTitleId curTitleId; // 0x00
u32 headerSize; // 0x08
u8 perms; // 0x0C
u8 attr; // 0x0D
NETMD5Sum MD5Sum; // 0x0E
WIISaveBannerFile banner; // 0x20
} SDSaveBanner;
enum WorkMessage {
MSG_TERMINATE = 0x01, // 0x01
MSG_STARTUP = 0x02, // 0x02
MSG_MOUNT_SD = 0x03, // 0x03
MSG_LIST_NAND_SAVE = 0x04, // 0x04
MSG_GET_NAND_SAVE_BANNER = 0x05, // 0x05
MSG_LIST_SD_SAVE = 0x06, // 0x06
MSG_GET_SD_SAVE_BANNER = 0x07, // 0x07
MSG_GET_NAND_SAVE_SIZE = 0x08, // 0x08
MSG_DEL_NAND_SAVE = 0x09, // 0x09
MSG_GET_SD_SAVE_SIZE = 0x0a, // 0x0a
MSG_DEL_SD_SAVE = 0x0b, // 0x0b
MSG_INITIALIZE_NAND = 0x0c, // 0x0c
MSG_GET_NAND_USER_FREE_AREA = 0x0d, // 0x0d
MSG_COPY_NAND_SAVE_TO_SD = 0x0e, // 0x0e
MSG_COPY_SD_SAVE_TO_NAND = 0x0f, // 0x0f
MSG_FORMAT_SD = 0x10, // 0x10
MSG_GET_SD_FREE_AREA = 0x11, // 0x11
MSG_LIST_NAND_APP = 0x12, // 0x12
MSG_GET_NAND_APP_THUMBNAIL = 0x13, // 0x13
MSG_DEL_NAND_APP_A = 0x14, // 0x14
MSG_COPY_NAND_APP_TO_SD = 0x15, // 0x15
MSG_COPY_SD_APP_TO_NAND_A = 0x16, // 0x16
MSG_LIST_SD_APP = 0x17, // 0x17
MSG_DEL_SD_APP = 0x18, // 0x18
MSG_GET_SD_APP_SIZE = 0x19, // 0x19
MSG_GET_SD_APP_THUMBNAIL = 0x1a, // 0x1a
MSG_GET_NAND_APP_SIZE = 0x1b, // 0x1b
MSG_NOCOPY_EXIST_NAND_SAVE = 0x1c, // 0x1c
MSG_NAND_SAVE_EXIST = 0x1d, // 0x1d
MSG_NAND_SAVE_EXIST_LO = 0x1e, // 0x1e
MSG_NAND_APP_EXIST = 0x1f, // 0x1f
MSG_BOTH_APP_EXIST = 0x20, // 0x20
MSG_SD_SAVE_EXIST = 0x21, // 0x21
MSG_SD_APP_EXIST = 0x22, // 0x22
MSG_GET_NAND_SAVE_PERMS = 0x23, // 0x23
MSG_GET_SD_SAVE_PERMS = 0x24, // 0x24
MSG_MOVE_NAND_SAVE_TO_SD = 0x25, // 0x25
MSG_MOVE_SD_SAVE_TO_NAND = 0x26, // 0x26
MSG_MOVE_NAND_APP_TO_SD = 0x27, // 0x27
MSG_MOVE_SD_APP_TO_NAND = 0x28, // 0x28
MSG_UNK_x29 = 0x29, // 0x29
MSG_UPDATE_LOC_DAT = 0x2a, // 0x2a
MSG_READ_LOC_DAT = 0x2b, // 0x2b
MSG_UNK_x2c = 0x2c, // 0x2c
MSG_LIST_NAND_APPS_USAGES = 0x2d, // 0x2d
MSG_CHECK_BACKUP_FITS = 0x2e, // 0x2e
MSG_COPY_SD_APP_TO_NAND_B = 0x2f, // 0x2f
MSG_DEL_NAND_APP_B = 0x30, // 0x30
MSG_UNK_x31 = 0x31, // 0x31
MSG_CHANGE_NAND_APP_COUNT = 0x32, // 0x32
MSG_CHECK_SD_TITLE_RESTORABLE = 0x33, // 0x33
};
typedef struct SDAppBanner {
ESTitleId titleId; // 0x00
u32 thumbSize; // 0x08
NETMD5Sum headerMD5; // 0x0C
NETMD5Sum iconMD5; // 0x1C
u64 unk_0x30;
u64 unk_0x38;
channel::SChanMgrMetaHeader metaHdr; // 0x40
} SDAppBanner;
enum RecursiveProcess {
typedef struct SDAppBackupData {
SDAppBanner head; // 0x00
u8 thumbnail[SD_APP_BACKUP_THUMBNAIL_LENGTH]; // 0x640
} SDAppBackupData;
typedef struct SDAppLocation {
char signature[4]; // 0x00
NETMD5Sum MD5Sum; // 0x04
ESTitleId32 titleIds[SD_MAX_APP_TOTAL]; // 0x14
u8 padding[0xC]; // 0x3D4
} SDAppLocation;
typedef enum WorkMessage {
MESSAGE_NONE = 0,
MESSAGE_TERMINATE,
MESSAGE_STARTUP,
MESSAGE_MOUNT_SD,
MESSAGE_LIST_NAND_SAVE,
MESSAGE_GET_NAND_SAVE_BANNER,
MESSAGE_LIST_SD_SAVE,
MESSAGE_GET_SD_SAVE_BANNER,
MESSAGE_GET_NAND_SAVE_SIZE,
MESSAGE_DEL_NAND_SAVE,
MESSAGE_GET_SD_SAVE_SIZE,
MESSAGE_DEL_SD_SAVE,
MESSAGE_INITIALIZE_NAND,
MESSAGE_GET_NAND_USER_FREE_AREA,
MESSAGE_COPY_NAND_SAVE_TO_SD,
MESSAGE_COPY_SD_SAVE_TO_NAND,
MESSAGE_FORMAT_SD,
MESSAGE_GET_SD_FREE_AREA,
MESSAGE_LIST_NAND_APP,
MESSAGE_GET_NAND_APP_THUMBNAIL,
MESSAGE_DEL_NAND_APP,
MESSAGE_COPY_NAND_APP_TO_SD,
MESSAGE_COPY_SD_APP_TO_NAND_HIDDEN,
MESSAGE_LIST_SD_APP,
MESSAGE_DEL_SD_APP,
MESSAGE_GET_SD_APP_SIZE,
MESSAGE_GET_SD_APP_THUMBNAIL,
MESSAGE_GET_NAND_APP_SIZE,
MESSAGE_NOCOPY_EXIST_NAND_SAVE,
MESSAGE_NAND_SAVE_EXIST,
MESSAGE_NAND_SAVE_EXIST_LO,
MESSAGE_NAND_APP_EXIST,
MESSAGE_BOTH_APP_EXIST,
MESSAGE_SD_SAVE_EXIST,
MESSAGE_SD_APP_EXIST,
MESSAGE_GET_NAND_SAVE_PERMS,
MESSAGE_GET_SD_SAVE_PERMS,
MESSAGE_MOVE_NAND_SAVE_TO_SD,
MESSAGE_MOVE_SD_SAVE_TO_NAND,
MESSAGE_MOVE_NAND_APP_TO_SD,
MESSAGE_MOVE_SD_APP_TO_NAND,
MESSAGE_GET_SD_APP_META,
MESSAGE_UPDATE_SD_APP_LOCATION,
MESSAGE_READ_SD_APP_LOCATION,
MESSAGE_CHECK_FOR_SD_APP_TO_NAND,
MESSAGE_LIST_NAND_APPS_USAGE,
MESSAGE_CHECK_BACKUP_FITS,
MESSAGE_COPY_SD_APP_TO_NAND,
MESSAGE_DEL_NAND_APP_HIDDEN,
MESSAGE_UNK_49,
MESSAGE_CHANGE_NAND_APP_COUNT,
MESSAGE_CHECK_SD_TITLE_RESTORABLE
} WorkMessage;
typedef enum RecursiveProcess {
RECURSIVE_GET_SIZE = 0,
RECURSIVE_DELETE = 1,
RECURSIVE_MOVE = 2,
};
RECURSIVE_DELETE,
RECURSIVE_MOVE,
} RecursiveProcess;
enum FileKind {
FILEKIND_NAND = 1,
FILEKIND_ES_CONTENT = 2,
};
typedef enum FileKind {
FILEKIND_NONE = 0,
FILEKIND_NAND,
FILEKIND_ES_CONTENT,
} FileKind;
enum NandTitleExistence {
typedef enum NandTitleExistence {
EXISTENCE_NOEXIST = 0,
EXISTENCE_INCOMPLETE = 1,
EXISTENCE_COMPLETE = 2,
};
EXISTENCE_INCOMPLETE,
EXISTENCE_COMPLETE,
} NandTitleExistence;
inline static u32 appCacheHeapSize() { return MEMCalcHeapSizeForUnitHeap(sizeof(AppCacheEntry), 96, 0x20); }
inline static u32 saveCacheHeapSize() { return MEMCalcHeapSizeForUnitHeap(sizeof(SaveCacheEntry), 90, 0x20); }
static void sd_insert_callback(signed char driveLetter);
static void sd_eject_callback(signed char driveLetter);
static void sd_insert_callback(s8 driveLetter);
static void sd_eject_callback(s8 driveLetter);
static ESTitleId32 gamecode_to_titleid_lo(const char* gamecode);
static void* thread_main(void*);
static void* thread_main(void* work);
static int encrypt(const void* input, u32 inputSize, void* output);
static int decrypt(const void* input, u32 inputSize, void* output);
bool check_md5(const u8* digest, const u8* input, u32 inputSize);
bool check_nand_corrupt(s32 nandCode, s32* errcodeOut);
bool check_nand_corrupt(s32 nandErr, s32* result);
WorkState get_state();
void set_state(WorkState newState);
@@ -335,9 +363,9 @@ namespace ipl {
void delete_app_cache(nw4r::ut::List* list, ESTitleId titleId);
WIISaveBannerFile* get_cached_nand_save_banner(ESTitleId titleId);
void* get_cached_nand_app_thumbnail(ESTitleId titleId, u32*);
void* get_cached_nand_app_thumbnail(ESTitleId titleId, u32* sizeOut);
WIISaveBannerFile* get_cached_sd_save_banner(ESTitleId32 titleId);
void* get_cached_sd_app_thumbnail(ESTitleId32 titleId, u32*);
void* get_cached_sd_app_thumbnail(ESTitleId32 titleId, u32* sizeOut);
channel::SChanMgrMetaHeader* get_cached_nand_app_meta_header(ESTitleId titleId);
channel::SChanMgrMetaHeader* get_cached_sd_app_meta_header(ESTitleId32 titleId);
@@ -351,17 +379,12 @@ namespace ipl {
void* run();
/**
* @brief Verifies if the banner header is valid.
* @param pBnrData The buffer containing the banner data.
* @param headerSize Header file size.
*/
bool check_header_base(const u8* bnrData, u32* headerSize = NULL);
void send_work(WorkMessage);
void send_work(WorkMessage msg);
WorkMessage wait_work();
int get_nand_save_banner(ESTitleId titleId, WIISaveBannerFile* fileOut, u32* sizeOut);
int get_nand_save_banner(ESTitleId titleId, WIISaveBannerFile* bannerFile, u32* sizeOut);
int get_sd_save_banner(ESTitleId32 titleId, SDSaveBanner* bannerOut);
int get_sd_app_banner(ESTitleId32 titleId, SDAppBanner* bannerOut);
int get_save_banner_for_data_only_title(ESTitleId titleId, WIISaveBannerFile* fileOut, u32* sizeOut);
@@ -379,19 +402,19 @@ namespace ipl {
int get_sd_save_size(ESTitleId32 titleId);
int get_sd_app_size(ESTitleId32 titleId);
s32 get_nand_app_thumbnail(ESTitleId titleId, u8* thumbnailOut, channel::SChanMgrMetaHeader* metaHdrOut);
s32 get_nand_app_thumbnail(ESTitleId titleId, u8* thumbnailBuf, channel::SChanMgrMetaHeader* metaHdrOut);
int item_exist_nand_save_folder(ESTitleId titleId, const char* folderName);
bool check_nand_save_banner_exist(ESTitleId titleId);
bool nand_app_exist(ESTitleId titleId);
bool nand_app_exist(ESTitleId titleId) NO_INLINE;
int nand_app_exist_ex(ESTitleId titleId);
bool both_app_exist(ESTitleId32 titleId);
int sd_file_exist(const char* path, u32 size);
s32 nand_get_length(const char* path);
bool is_all_region(ESTitleId titleId);
bool is_same_title(ESTitleId titleIdA, ESTitleId titleIdB);
bool is_all_region(ESTitleId titleId) NO_INLINE;
bool is_same_title(ESTitleId titleIdA, ESTitleId titleIdB) NO_INLINE;
bool check_nand_save_exist_lo(ESTitleId32 titleId);
@@ -415,9 +438,9 @@ namespace ipl {
int handle_sd_error(FAError err, s32* out);
int handle_sd_error_for_entry(FAError err, s32* out);
s32 get_sd_app_thumbnail(const SDAppBanner* banner, u8* thumbnailOut);
s32 get_sd_app_thumbnail(const SDAppBanner* banner, u8* thumbnailBuf);
int get_sd_wad_header(ESTitleId32 titleid, WADBackupHeader*, u32 offset);
int get_sd_wad_header(ESTitleId32 titleid, WADBackupHeader* wadBackupHeader, u32 offset);
int get_nand_title_version(ESTitleId titleId, u16* versionOut);
int get_sd_title_version(ESTitleId32 titleId, u16* versionOut);
@@ -428,25 +451,25 @@ namespace ipl {
int delete_empty_title(ESTitleId titleId, bool force);
int create_sd_backup_dir(ESTitleId titleId);
int create_sd_dir(const char* base, const char* final);
int get_app_banner_from_meta(ESTitleId titleId, SDAppBanner* banner);
int get_app_banner_from_meta(ESTitleId titleId, SDAppBackupData* banner);
s32 open_nand_app_content(ESTitleId titleId, u16 contentIdx, u32* sizeOut, ESTicketView** ticketViewOut);
int read_file(void*, FileKind fileKind, s32, u32, void*);
int get_nand_app_tmdview(ESTitleId titleId, ESTmdView** tmdViewOut);
static bool content_exist(ESTmdView* tmdView, u32 contentIdx);
s32 search_meta_header(const u8* buf);
int search_meta_header(const u8* buffer);
bool check_header_md5(u8* buf);
s32 uncompress_app_thumbnail(const u8* cmpr, u32 uncmprSize, u8* uncmpr);
s32 get_sd_entry_list(const char* filename, ESTitleId32* titleIdsOut, u32 minSize);
s32 get_sd_entry_list(const char* fileName, ESTitleId32* titleIdsOut, u32 minSize);
static void decompress(const u8* in, void* out);
static bool is_compressed(const u8*);
static bool is_sli_compressed(const u8*);
static bool is_asr_compressed(const u8*);
static bool is_ash_compressed(const u8*);
static bool is_lz7_compressed(const u8*);
static u32 get_decode_size(const u8*);
static bool is_compressed(const u8* data);
static bool is_sli_compressed(const u8* data);
static bool is_asr_compressed(const u8* data);
static bool is_ash_compressed(const u8* data);
static bool is_lz7_compressed(const u8* data);
static u32 get_decode_size(const u8* data);
private:
// static void get_nand_save_path(ESTitleId titleId, char* outStr);
@@ -472,17 +495,17 @@ namespace ipl {
void do_copy_nand_save_to_sd();
void do_copy_sd_save_to_nand();
void do_copy_nand_app_to_sd();
void do_copy_sd_app_to_nand(bool ignoreSC);
void do_copy_sd_app_to_nand(bool changeAppCount);
void do_get_nand_app_size();
void do_format_sd();
void do_unk_8134B728();
void do_update_loc_dat();
void do_read_loc_dat();
void do_unk_8134BED0();
void do_get_sd_app_meta();
void do_update_sd_app_location();
void do_read_sd_app_location();
void do_check_for_sd_app_to_nand();
void check_backup_fits();
void do_list_nand_apps_usages();
void do_list_nand_apps_usage();
void do_unk_8134C838();
void do_move_nand_app_to_sd();
@@ -493,14 +516,14 @@ namespace ipl {
void change_nand_app_count(s32 delta);
bool change_uid(ESTitleId newTitleId);
bool is_fa_file(u8 stat);
bool is_fa_file(u8 stat) NO_INLINE;
int prepare_sd_copy(const char*);
int prepare_sd_copy(const char* path);
static void wad_backup_progress_callback(u32 completed, u32 total, BOOL done);
Work* pWork; // 0x0
bool unk_0x4; // 0x4
Work* myWork; // 0x00
bool unk_0x04; // 0x04
static const char* c_banner_file_name;
static const char* c_nocopy_folder_name;
@@ -518,7 +541,7 @@ namespace ipl {
static const u8 c_md5_secret_key[0x10];
static const u8 c_es_encrypt_iv[0x10];
static SDState s_sd_state;
static WorkSDState s_sd_state;
static int s_completion_pct;
};
} // namespace ipl

View File

@@ -8,11 +8,6 @@
#include <revolution/os.h>
namespace ipl {
#define FAT_PAGES 4
#define DATA_PAGES 4
#define TOTAl_PAGES (FAT_PAGES + DATA_PAGES)
#define STACK_SIZE 0x20000
class SDVFWorker {
public:
typedef enum WorkMessage {
@@ -31,27 +26,32 @@ namespace ipl {
} WorkState;
typedef enum WorkSDState {
SD_STATE_UNAVAILABLE = 0,
SD_STATE_INITIAL = 0,
SD_STATE_EJECTED,
SD_STATE_INSERTED,
SD_STATE_BROKEN,
SD_STATE_ERROR,
SD_STATE_AVAILABLE,
SD_STATE_READY,
} WorkSDState;
enum {
RESULT_SUCCESS = 0,
RESULT_STILL_WORKING = -1,
RESULT_WORKING = -1,
RESULT_FATAL_SD_ERROR = -2,
RESULT_NAND_CORRUPT = -5, // Unused but checked by CdbBackup
RESULT_OUT_OF_SPACE = -7,
RESULT_FA_ERROR = -8,
RESULT_SD_BROKEN = -9,
RESULT_BROKEN_MEDIA = -9,
RESULT_SD_ERROR = -10,
RESULT_WRITE_PROTECTED = -11,
};
private:
static const int FAT_PAGES = 4;
static const int DATA_PAGES = 4;
static const int TOTAl_PAGES = (FAT_PAGES + DATA_PAGES);
static const int STACK_SIZE = 0x20000;
typedef struct Work {
FACacheBuf cacheBuf[TOTAl_PAGES]; // 0x00
FACachePage cachePages[TOTAl_PAGES]; // 0x1000
@@ -68,8 +68,8 @@ namespace ipl {
OSMessageQueue msgQueue; // 0x21490
OSMessage messages[8]; // 0x214B0
WorkState workState; // 0x214D0
int asyncResult; // 0x214D4
WorkState state; // 0x214D0
s32 asyncResult; // 0x214D4
BOOL isWriteProtected; // 0x214D8
int prevAsyncResult; // 0x214DC
int priority; // 0x214E0
@@ -102,7 +102,7 @@ namespace ipl {
int call_fa_mount();
void send_work(WorkMessage messsage);
void send_work(WorkMessage message);
WorkMessage wait_work();
WorkState get_state();

View File

@@ -0,0 +1,51 @@
#ifndef IPL_SAVE_BANNER_H
#define IPL_SAVE_BANNER_H
#include <revolution/types.h>
#include <wchar.h>
// uhh idk :P
#define WII_SAVE_BANNER_SIGNATURE 'WIBN' /* WIi save BaNner? */
#define WII_SAVE_BANNER_LENGTH 32
#define WII_SAVE_BANNER_ICON_COUNT 8
#define WII_SAVE_BANNER_ICON_TEXSIZE 0x1200
#define WII_SAVE_BANNER_ICON_WIDTH 48
#define WII_SAVE_BANNER_ICON_HEIGHT 48
#define WII_SAVE_BANNER_BNR_TEXSIZE 0x6000
#define WII_SAVE_BANNER_BNR_WIDTH 192
#define WII_SAVE_BANNER_BNR_HEIGHT 64
#define WII_SAVE_BANNER_FRAME_TICK 4
#define WII_SAVE_BANNER_NORMAL_SIZE offsetof(WIISaveBannerFile, iconData1)
#define WII_SAVE_BANNER_FULL_SIZE sizeof(WIISaveBannerFile)
#define WII_SAVE_BANNER_FLAG_NOCOPY 0x01
#define WII_SAVE_BANNER_FLAG_ALTERNATE 0x10
typedef struct WIISaveBannerFile {
u32 signature; // 0x00
u32 flags; // 0x04
u16 speed; // 0x08
u8 padding[22];
wchar_t name[WII_SAVE_BANNER_LENGTH]; // 0x20
wchar_t subName[WII_SAVE_BANNER_LENGTH]; // 0x60
u8 bannerData[WII_SAVE_BANNER_BNR_TEXSIZE]; // 0xA0
u8 iconData[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0x60A0
u8 iconData1[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0x72A0
u8 iconData2[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0x84A0
u8 iconData3[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0x96A0
u8 iconData4[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0xA8A0
u8 iconData5[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0xBAA0
u8 iconData6[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0xCCA0
u8 iconData7[WII_SAVE_BANNER_ICON_TEXSIZE]; // 0xDEA0
} WIISaveBannerFile;
#endif // IPL_SAVE_BANNER_H

View File

@@ -4,16 +4,22 @@
#include <private/es/types.h>
// clang-format off
#define TITLE_TYPE_SYSTEM 0x00000001
#define TITLE_TYPE_DISC 0x00010000
#define TITLE_TYPE_CHANNEL 0x00010001
#define TITLE_TYPE_SYSTEM_CHANNEL 0x00010002
#define TITLE_TYPE_UNK3 0x00010003
#define TITLE_TYPE_DISC_CHANNEL 0x00010004
#define TITLE_TYPE_DLC 0x00010005
#define TITLE_TYPE_UNK6 0x00010006
#define TITLE_TYPE_UNK7 0x00010007
#define TITLE_TYPE_HIDDEN_CHANNEL 0x00010008
#define TITLE_HITYPE_SYSTEM 0x0000
#define TITLE_HITYPE_USER 0x0001
/* System */
#define TITLE_TYPE_SYSTEM ((TITLE_HITYPE_SYSTEM << 16) | 0x0001) /* 0x00000001 */
/* User */
#define TITLE_TYPE_DISC ((TITLE_HITYPE_USER << 16) | 0x0000) /* 0x00010000 */
#define TITLE_TYPE_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0001) /* 0x00010001 */
#define TITLE_TYPE_SYSTEM_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0002) /* 0x00010002 */
#define TITLE_TYPE_UNK3 ((TITLE_HITYPE_USER << 16) | 0x0003) /* 0x00010003 */
#define TITLE_TYPE_DISC_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0004) /* 0x00010004 */
#define TITLE_TYPE_SHARED ((TITLE_HITYPE_USER << 16) | 0x0005) /* 0x00010005 */
#define TITLE_TYPE_UNK6 ((TITLE_HITYPE_USER << 16) | 0x0006) /* 0x00010006 */
#define TITLE_TYPE_UNK7 ((TITLE_HITYPE_USER << 16) | 0x0007) /* 0x00010007 */
#define TITLE_TYPE_HIDDEN_CHANNEL ((TITLE_HITYPE_USER << 16) | 0x0008) /* 0x00010008 */
#define TITLE_REGION_ALL 'A'
#define TITLE_REGION_JPN 'J'
@@ -21,6 +27,9 @@
#define TITLE_REGION_EUR 'P'
#define TITLE_REGION_KOR 'K'
#define TITLE_TYPE_HI(x) ((((u32)(x) >> 16) & 0xFFFF))
#define TITLE_TYPE_LO(x) (((u32)(x) & 0xFFFF))
#define TITLE_NULL ((ESTitleId)0x0000000000000000)
/* Photo Channel 1.0 */
@@ -80,6 +89,9 @@
#define TITLE_PHOTO_2_CHECK_ALL ((ESTitleId)(TITLE_PHOTO_2_CHECK | TITLE_REGION_ALL))
#define TITLE_PHOTO_2_CHECK_KOR ((ESTitleId)(TITLE_PHOTO_2_CHECK | TITLE_REGION_KOR)) /* does such title even exist? */
/* Photo Channel 1.1 (Dummy) */
#define TITLE_UPDATE_PART ES_TITLE_ID(TITLE_TYPE_DISC, '\0UP\0')
#define TITLE_NOREGION_MASK (0xFFFFFFFFFFFFFF00)
#define TITLE_REGION_MASK (0x00000000000000FF)

View File

@@ -60,7 +60,7 @@ namespace ipl {
static u32 NumInodesSaveDirRoot(ESTitleId titleId);
static BOOL CheckSafeDeleteTitle(EGG::Heap* heap, ESTitleId titleId);
static s32 CheckSafeDeleteTitle(EGG::Heap* heap, ESTitleId titleId);
static ESError PrepareTitleDir(ESTitleId titleId, EGG::Heap* heap);

View File

@@ -14,12 +14,12 @@ namespace ipl {
u8 data[];
};
FreeList() : pFreeTop(NULL), mStride(0), pBuf(NULL) {}
FreeList() : mpFreeTop(NULL), mStride(0), mpBuffer(NULL) {}
void init(void* buf, u32 stride, u32 count) {
pFreeTop = (Block*)buf;
mpFreeTop = (Block*)buf;
Block* ptrBuf = pFreeTop;
Block* ptrBuf = mpFreeTop;
int i;
u32 ptrsStride = stride / sizeof(Block*);
for (i = 0; i < count - 1; i++) {
@@ -28,28 +28,28 @@ namespace ipl {
ptrBuf[ptrsStride * (count - 1)].next = NULL;
mStride = stride;
pBuf = buf;
mpBuffer = buf;
}
Block* get() {
Block* out = pFreeTop;
Block* out = mpFreeTop;
if (out == NULL)
return NULL;
pFreeTop = pFreeTop->next;
mpFreeTop = mpFreeTop->next;
return out;
}
void release(Block* block) {
block->next = pFreeTop;
pFreeTop = block;
block->next = mpFreeTop;
mpFreeTop = block;
}
void* getBuf() { return pBuf; }
void* getBuf() { return mpBuffer; }
private:
Block* pFreeTop; // 0x0
u32 mStride; // 0x4
void* pBuf; // 0x8
Block* mpFreeTop; // 0x00
u32 mStride; // 0x04
void* mpBuffer; // 0x08
};
class Stack : private FreeList {
@@ -64,6 +64,21 @@ namespace ipl {
mCount = 0;
}
bool pop(void* data) {
Block* popped = pStackTop;
if (popped != NULL) {
if (data != NULL) {
memcpy(data, popped->data, mStackElSize);
}
pStackTop = popped->next;
release(popped);
mCount--;
return true;
} else {
return false;
}
}
bool push(const void* data) {
FreeList::Block* newBlock = get();
if (newBlock != NULL) {
@@ -77,21 +92,6 @@ namespace ipl {
}
}
bool pop(void* data) {
Block* popped = this->pStackTop;
if (popped != NULL) {
if (data != NULL) {
memcpy(data, popped->data, mStackElSize);
}
pStackTop = popped->next;
release(popped);
mCount--;
return true;
} else {
return false;
}
}
void* getBuf() { return FreeList::getBuf(); }
static inline u32 getRequiredBufSize(u32 capacity, u32 elSize) { return (elSize + sizeof(FreeList::Block)) * capacity; }
@@ -101,17 +101,6 @@ namespace ipl {
u32 mStackElSize; // 0x10
u32 mCount; // 0x14
};
void CONCAT(FORCEACTIVE_ipl_ut_Stack, __LINE__)();
void CONCAT(FORCEACTIVE_ipl_ut_Stack, __LINE__)() {
ut::FreeList freeList;
freeList.init(NULL, 0, 0);
freeList.get();
ut::Stack stack;
stack.init(NULL, 0, 0);
stack.pop(NULL);
}
} // namespace ut
} // namespace ipl

View File

@@ -7,7 +7,7 @@ namespace ipl {
public:
Tree();
virtual ~Tree() {}; // 0x08
virtual ~Tree(){}; // 0x08
virtual Tree* getParent() { return mpParent; } // 0x0C
virtual Tree* getChild() { return mpChild; } // 0x10
@@ -47,8 +47,9 @@ namespace ipl {
mPtr = mPtr->getNext();
} else {
while ((mPtr = mPtr->getParent())) {
if (!mPtr->getNext())
if (!mPtr->getNext()) {
continue;
}
mPtr = mPtr->getNext();
break;

View File

@@ -4,7 +4,6 @@
#include <revolution/gx/GXStruct.h>
#include <revolution/types.h>
#include <nw4r/ut/binaryFileFormat.h>
#include <nw4r/lyt/resourceAccessor.h>

View File

@@ -1,206 +1,10 @@
#ifndef NW4R_UT_ARCHIVE_FONT_H
#define NW4R_UT_ARCHIVE_FONT_H
#include <nw4r/config.h>
#include <nw4r/ut/ResFont.h>
#include <revolution/cx.h>
#include <revolution/types.h>
#include "nw4r/ut/ArchiveFontBase.h"
namespace nw4r {
namespace ut {
namespace detail {
inline u32 CalcOffsetNameOffsetData() {
return offsetof(ArchiveFontBinaryLayout, glgr.inner.nameOffsets);
}
inline u32 CalcOffsetSheetData(u16 countNames) {
return ROUNDUP(CalcOffsetNameOffsetData() + countNames * sizeof(u16), 4);
}
inline u32 CalcOffset0AData(u16 countNames, u16 countSheets) {
return ROUNDUP(CalcOffsetSheetData(countNames) + countSheets * sizeof(u32), 4);
}
inline u32 CalcOffset0CData(u16 countNames, u16 countSheets, u16 count0A) {
return ROUNDUP(CalcOffset0AData(countNames, countSheets) + count0A * sizeof(u32), 4);
}
inline u32 CalcSizeFlagSet(u32 entries) {
return ((s32)entries + 0x1f) / 32 * 4;
}
inline u32 CalcOffsetSheetFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) {
return ROUNDUP(CalcOffset0CData(countNames, countSheets, count0A) + count0C * sizeof(u32), 4);
}
inline u32 CalcOffset0AFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) {
u32 offsetSheetFlags = CalcOffsetSheetFlags(countNames, countSheets, count0A, count0C);
u32 stepSheet = CalcSizeFlagSet(countSheets);
return ROUNDUP(offsetSheetFlags + stepSheet * countNames, 4);
}
inline u32 CalcOffset0CFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) {
u32 offset0AFlags = CalcOffset0AFlags(countNames, countSheets, count0A, count0C);
u32 step0A = CalcSizeFlagSet(count0A);
return ROUNDUP(offset0AFlags + step0A * countNames, 4);
}
inline u32 CalcSizeSheetOffsets(u32 countSheets) {
return ROUNDUP(countSheets * sizeof(u16), 4);
}
class ArchiveFontBase : public ResFontBase {
public:
ArchiveFontBase();
virtual ~ArchiveFontBase();
// protected:
typedef enum {
CONSTRUCT_STATE_DATA_REQUESTED = 0x00,
CONSTRUCT_STATE_DONE = 0x01,
CONSTRUCT_STATE_FATAL_ERR = 0x02,
CONSTRUCT_STATE_WORKING = 0x03,
} ConstructState;
typedef enum {
CONSTRUCT_CMD_DISPATCH = 0x00,
CONSTRUCT_CMD_ANALYZE_FILE_HEADER = 0x01,
CONSTRUCT_CMD_ANALYZE_GLGR = 0x02,
CONSTRUCT_CMD_ANALYZE_FINF = 0x03,
CONSTRUCT_CMD_ANALYZE_CMAP = 0x04,
CONSTRUCT_CMD_ANALYZE_CWDH = 0x05,
CONSTRUCT_CMD_ANALYZE_TGLP = 0x06,
CONSTRUCT_CMD_PREPAIR_COPY_SHEET = 0x07,
CONSTRUCT_CMD_PREPAIR_EXPAND_SHEET = 0x08,
CONSTRUCT_CMD_COPY = 0x09,
CONSTRUCT_CMD_SKIP = 0x0A,
CONSTRUCT_CMD_EXPAND = 0x0B,
CONSTRUCT_CMD_FATAL_ERR = 0x0C,
CONSTRUCT_CMD_MAX_CMD = 0x0D,
CONSTRUCT_CMD_INVALID = 0x0E,
} ConstructCmd;
class ConstructContext;
class CachedStreamReader {
public:
void Init();
void Attach(const void* data, u32 dataLen);
bool RequestData(ConstructContext* ctx, u32 len);
inline u32 amtAvailableData() const { return pDataEnd - pDataCurr; }
inline u32 amtAvailableCached() const { return pCachedEnd - pCachedStart; }
inline u32 amtAvailable() const { return amtAvailableData() + amtAvailableCached(); }
inline u32 getReaderOffset() const { return (pDataCurr - pDataStart) + (pCachedStart - pCachedBase); }
inline void memcpyToBuf(void* buf, u32 len);
inline void skip(u32 len);
u8* pDataStart; // 0x00
u8* pDataCurr; // 0x04
u8* pDataEnd; // 0x08
u8* pCachedBase; // 0x0C
u8* pCachedStart; // 0x10
u8* pCachedEnd; // 0x14
u32 unk_0x18; // 0x18
};
class ConstructContext {
public:
inline u32 getAdvanceSize(const CachedStreamReader* reader) const { return ut::Min(mNextCmdParam, reader->amtAvailable()); }
inline u32 remWorkSpace() const { return pWorkEnd - pWorkCurr; }
inline u32 getFullOffset(CachedStreamReader* reader) const { return mDataOffset + reader->getReaderOffset(); }
inline ConstructState requestNewData(CachedStreamReader* reader, u32 amt);
inline void getNumSheetsToLoad(u16* sheetsToLoad) const;
inline u32 updateTextureBlockPtr();
inline void enqueueCmds(ConstructCmd first, u32 firstParam, ConstructCmd after) {
mNextCmdParam = firstParam;
mNextCmd = first;
mQueuedCmd = after;
}
inline void pushCWDH() {
FontWidth* cwdh;
cwdh = (FontWidth*)pWorkCurr;
if (pLastWidth != NULL)
pLastWidth->pNext = cwdh;
else
pFontInfo->pWidth = cwdh;
pLastWidth = cwdh;
}
inline void pushCMAP() {
FontCodeMap* cmap;
cmap = (FontCodeMap*)pWorkCurr;
if (pLastMap != NULL)
pLastMap->pNext = cmap;
else
pFontInfo->pMap = cmap;
pLastMap = cmap;
}
FontInformation* pFontInfo; // 0x00
FontWidth* pLastWidth; // 0x04
FontCodeMap* pLastMap; // 0x08
u32 mNextCmd; // 0x0C
BinaryBlockHeader mNextBlockHdr; // 0x10
u32 mDataOffset; // 0x18
CachedStreamReader mReader; // 0x1C
CXUncompContextHuffman* pHuffmanCtx; // 0x38
const char* pIncludedGroups; // 0x3C
u16* pSheetOffsets; // 0x40
u8* pWorkStart; // 0x44
u8* pWorkEnd; // 0x48
u8* pWorkCurr; // 0x4C
u32 mQueuedCmd; // 0x50
u32 mNextCmdParam; // 0x54
u32 mTotalBlocks; // 0x58
u32 mBlocksParsed; // 0x5C
u16 mSheetsHandled; // 0x60
u16 mSheetCount; // 0x62
u16 mGlyphsPerSheet; // 0x64
};
static bool IsValidResource(const void* data, u32 maxPreFinfSize);
CharWidths GetCharWidths(u16 charcode) const;
void SetResourceBuffer(void* pUserBuffer, FontInformation* pFontInfo, u16* pSheetOffsets);
u16 AdjustIndex(u16 glyphIdx) const;
static bool IncludeName(const char* nameList, const char* testName);
protected:
static ConstructState ConstructOpDispatch(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeFileHeader(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeFINF(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeTGLP(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeCMAP(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeCWDH(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpPrepairCopySheet(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpPrepairExpandSheet(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpCopy(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpSkip(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpExpand(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpFatalError(ConstructContext* ctx, CachedStreamReader* reader);
static const char LOAD_GLYPH_ALL[1];
private:
inline static ConstructState handleAdvanceDry(ConstructContext* ctx, CachedStreamReader* reader, u32 advanced);
u16* pSheetOffsets; // 0x18
static const u16 VERSION = NW4R_VERSION(1, 4);
static const u32 SIGNATURE_FONT_ARCHIVE = 'RFNA';
static const u32 SIGNATURE_FONT_INFO = 'FINF'; /* Font INFormation */
static const u32 SIGNATURE_TEX_GLYPH = 'TGLP'; /* Texture GLyPh */
static const u32 SIGNATURE_CHAR_WIDTH = 'CWDH'; /* Character WiDtH */
static const u32 SIGNATURE_CODE_MAP = 'CMAP'; /* Code MAP */
static const u32 SIGNATURE_GLYPH_GROUPS = 'GLGR'; /* GLyph GRoups */
};
}; // namespace detail
class ArchiveFont : public detail::ArchiveFontBase {
public:
ArchiveFont();

View File

@@ -0,0 +1,208 @@
#ifndef NW4R_UT_ARCHIVE_FONT_BASE_H
#define NW4R_UT_ARCHIVE_FONT_BASE_H
#include <revolution/types.h>
#include <nw4r/config.h>
#include <nw4r/ut/ResFont.h>
#include <revolution/cx.h>
namespace nw4r {
namespace ut {
namespace detail {
static const int GLYPH_INDEX_NOT_FOUND = 0xFFFF;
inline u32 CalcOffsetNameOffsetData() {
return offsetof(ArchiveFontBinaryLayout, glgr.inner.nameOffsets);
}
inline u32 CalcOffsetSheetData(u16 countNames) {
return ROUNDUP(CalcOffsetNameOffsetData() + countNames * sizeof(u16), 4);
}
inline u32 CalcOffset0AData(u16 countNames, u16 countSheets) {
return ROUNDUP(CalcOffsetSheetData(countNames) + countSheets * sizeof(u32), 4);
}
inline u32 CalcOffset0CData(u16 countNames, u16 countSheets, u16 count0A) {
return ROUNDUP(CalcOffset0AData(countNames, countSheets) + count0A * sizeof(u32), 4);
}
inline u32 CalcSizeFlagSet(u32 entries) {
return ((s32)entries + 0x1f) / 32 * 4;
}
inline u32 CalcOffsetSheetFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) {
return ROUNDUP(CalcOffset0CData(countNames, countSheets, count0A) + count0C * sizeof(u32), 4);
}
inline u32 CalcOffset0AFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) {
u32 offsetSheetFlags = CalcOffsetSheetFlags(countNames, countSheets, count0A, count0C);
u32 stepSheet = CalcSizeFlagSet(countSheets);
return ROUNDUP(offsetSheetFlags + stepSheet * countNames, 4);
}
inline u32 CalcOffset0CFlags(u16 countNames, u16 countSheets, u16 count0A, u16 count0C) {
u32 offset0AFlags = CalcOffset0AFlags(countNames, countSheets, count0A, count0C);
u32 step0A = CalcSizeFlagSet(count0A);
return ROUNDUP(offset0AFlags + step0A * countNames, 4);
}
inline u32 CalcSizeSheetOffsets(u32 countSheets) {
return ROUNDUP(countSheets * sizeof(u16), 4);
}
class ArchiveFontBase : public ResFontBase {
public:
ArchiveFontBase();
virtual ~ArchiveFontBase();
typedef enum {
CONSTRUCT_STATE_DATA_REQUESTED = 0,
CONSTRUCT_STATE_DONE,
CONSTRUCT_STATE_FATAL_ERR,
CONSTRUCT_STATE_WORKING,
} ConstructState;
typedef enum {
CONSTRUCT_CMD_DISPATCH = 0,
CONSTRUCT_CMD_ANALYZE_FILE_HEADER,
CONSTRUCT_CMD_ANALYZE_GLGR,
CONSTRUCT_CMD_ANALYZE_FINF,
CONSTRUCT_CMD_ANALYZE_CMAP,
CONSTRUCT_CMD_ANALYZE_CWDH,
CONSTRUCT_CMD_ANALYZE_TGLP,
CONSTRUCT_CMD_PREPAIR_COPY_SHEET,
CONSTRUCT_CMD_PREPAIR_EXPAND_SHEET,
CONSTRUCT_CMD_COPY,
CONSTRUCT_CMD_SKIP,
CONSTRUCT_CMD_EXPAND,
CONSTRUCT_CMD_FATAL_ERR,
CONSTRUCT_CMD_MAX_CMD,
CONSTRUCT_CMD_INVALID,
} ConstructCmd;
class ConstructContext;
class CachedStreamReader {
public:
void Init();
void Attach(const void* data, u32 dataLen);
bool RequestData(ConstructContext* ctx, u32 len);
inline u32 amtAvailableData() const { return pDataEnd - pDataCurr; }
inline u32 amtAvailableCached() const { return pCachedEnd - pCachedStart; }
inline u32 amtAvailable() const { return amtAvailableData() + amtAvailableCached(); }
inline u32 getReaderOffset() const { return (pDataCurr - pDataStart) + (pCachedStart - pCachedBase); }
inline void memcpyToBuf(void* buf, u32 len);
inline void skip(u32 len);
u8* pDataStart; // 0x00
u8* pDataCurr; // 0x04
u8* pDataEnd; // 0x08
u8* pCachedBase; // 0x0C
u8* pCachedStart; // 0x10
u8* pCachedEnd; // 0x14
u32 unk_0x18; // 0x18
};
class ConstructContext {
public:
inline u32 getAdvanceSize(const CachedStreamReader* reader) const { return ut::Min(mNextCmdParam, reader->amtAvailable()); }
inline u32 remWorkSpace() const { return pWorkEnd - pWorkCurr; }
inline u32 getFullOffset(CachedStreamReader* reader) const { return mDataOffset + reader->getReaderOffset(); }
inline ConstructState requestNewData(CachedStreamReader* reader, u32 amt);
inline void getNumSheetsToLoad(u16* sheetsToLoad) const;
inline u32 updateTextureBlockPtr();
inline void enqueueCmds(ConstructCmd first, u32 firstParam, ConstructCmd after) {
mNextCmdParam = firstParam;
mNextCmd = first;
mQueuedCmd = after;
}
inline void pushCWDH() {
FontWidth* cwdh;
cwdh = (FontWidth*)pWorkCurr;
if (pLastWidth != NULL)
pLastWidth->pNext = cwdh;
else
pFontInfo->pWidth = cwdh;
pLastWidth = cwdh;
}
inline void pushCMAP() {
FontCodeMap* cmap;
cmap = (FontCodeMap*)pWorkCurr;
if (pLastMap != NULL)
pLastMap->pNext = cmap;
else
pFontInfo->pMap = cmap;
pLastMap = cmap;
}
FontInformation* pFontInfo; // 0x00
FontWidth* pLastWidth; // 0x04
FontCodeMap* pLastMap; // 0x08
u32 mNextCmd; // 0x0C
BinaryBlockHeader mNextBlockHdr; // 0x10
u32 mDataOffset; // 0x18
CachedStreamReader mReader; // 0x1C
CXUncompContextHuffman* pHuffmanCtx; // 0x38
const char* pIncludedGroups; // 0x3C
u16* pSheetOffsets; // 0x40
u8* pWorkStart; // 0x44
u8* pWorkEnd; // 0x48
u8* pWorkCurr; // 0x4C
u32 mQueuedCmd; // 0x50
u32 mNextCmdParam; // 0x54
u32 mTotalBlocks; // 0x58
u32 mBlocksParsed; // 0x5C
u16 mSheetsHandled; // 0x60
u16 mSheetCount; // 0x62
u16 mGlyphsPerSheet; // 0x64
};
static bool IsValidResource(const void* data, u32 maxPreFinfSize);
CharWidths GetCharWidths(u16 charcode) const;
void SetResourceBuffer(void* pUserBuffer, FontInformation* pFontInfo, u16* pSheetOffsets);
u16 AdjustIndex(u16 glyphIdx) const;
static bool IncludeName(const char* nameList, const char* testName);
protected:
static ConstructState ConstructOpDispatch(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeFileHeader(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeGLGR(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeFINF(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeTGLP(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeCMAP(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpAnalyzeCWDH(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpPrepairCopySheet(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpPrepairExpandSheet(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpCopy(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpSkip(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpExpand(ConstructContext* ctx, CachedStreamReader* reader);
static ConstructState ConstructOpFatalError(ConstructContext* ctx, CachedStreamReader* reader);
static const char LOAD_GLYPH_ALL[1];
private:
inline static ConstructState handleAdvanceDry(ConstructContext* ctx, CachedStreamReader* reader, u32 advanced);
u16* pSheetOffsets; // 0x18
static const u16 VERSION = NW4R_VERSION(1, 4);
static const u32 SIGNATURE_FONT_ARCHIVE = 'RFNA';
static const u32 SIGNATURE_FONT_INFO = 'FINF'; /* Font INFormation */
static const u32 SIGNATURE_TEX_GLYPH = 'TGLP'; /* Texture GLyPh */
static const u32 SIGNATURE_CHAR_WIDTH = 'CWDH'; /* Character WiDtH */
static const u32 SIGNATURE_CODE_MAP = 'CMAP'; /* Code MAP */
static const u32 SIGNATURE_GLYPH_GROUPS = 'GLGR'; /* GLyph GRoups */
};
}; // namespace detail
} // namespace ut
} // namespace nw4r
#endif // NW4R_UT_ARCHIVE_FONT_BASE_H

View File

@@ -10,9 +10,9 @@
namespace nw4r {
namespace ut {
#define GLYPH_INDEX_NOT_FOUND 0xFFFF
ArchiveFont::ArchiveFont() {
}
ArchiveFont::~ArchiveFont() {
}
@@ -34,7 +34,7 @@ namespace nw4r {
const u32* flags0A;
const u32* flags0C;
int wordI, j;
int i, j;
int entryI;
const HeaderedGlyphGroups* offsetPGlgr;
u32 loadedSheetCount, loadedSmth0ASize, loadedSmth0CSize;
@@ -48,8 +48,9 @@ namespace nw4r {
u32 neededCharacterSize;
u32 baseSize;
if (!ArchiveFontBase::IsValidResource(fontData, 0x4000))
if (!ArchiveFontBase::IsValidResource(fontData, 0x4000)) {
return 0;
}
font = (ArchiveFontBinaryLayout*)fontData;
pGlgr = &font->glgr;
@@ -83,8 +84,8 @@ namespace nw4r {
loadedSmth0CSize = 0;
// Get the NUMBER of sheets that should be loaded
for (wordI = 0, entryI = 0; entryI < pGlgr->inner.sheetCount; entryI += 0x20, wordI++) {
offsetFlags = (const u8*)flagsSheets + wordI * sizeof(u32);
for (i = 0, entryI = 0; entryI < pGlgr->inner.sheetCount; entryI += 0x20, i++) {
offsetFlags = (const u8*)flagsSheets + i * sizeof(u32);
flagWord = 0;
for (j = 0, offsetPGlgr = pGlgr; j < pGlgr->inner.nameCount;
@@ -100,8 +101,8 @@ namespace nw4r {
// getLoadedSheetCount(pGlgr, flagsSheets, stepSheets, fontData, includedGroups, &loadedSheetCount);
// Get the SIZE of unk_0x0a that should be loaded
for (wordI = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0a; entryI += 0x20, wordI++) {
offsetFlags = (const u8*)flags0A + wordI * sizeof(u32);
for (i = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0a; entryI += 32, i++) {
offsetFlags = (const u8*)flags0A + i * sizeof(u32);
flagWord = 0;
for (j = 0; j < pGlgr->inner.nameCount; j++) {
@@ -111,16 +112,17 @@ namespace nw4r {
}
}
offsetData = (const u32*)data0A + wordI * 32;
offsetData = (const u32*)data0A + i * 32;
for (j = 0; j < 32; j++) {
if ((flagWord << j) & 0x80000000U)
if ((flagWord << j) & 0x80000000U) {
loadedSmth0ASize += offsetData[j] - sizeof(BinaryBlockHeader);
}
}
}
// Get the SIZE of unk_0x0c that should be loaded
for (wordI = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0c; entryI += 0x20, wordI++) {
offsetFlags = (const u8*)flags0C + wordI * sizeof(u32);
// Get the SIZE of unk_0x0C that should be loaded
for (i = 0, entryI = 0; entryI < pGlgr->inner.smthCount_0x0c; entryI += 32, i++) {
offsetFlags = (const u8*)flags0C + i * sizeof(u32);
flagWord = 0;
for (j = 0; j < pGlgr->inner.nameCount; j++) {
@@ -130,10 +132,11 @@ namespace nw4r {
}
}
offsetData = (const u32*)data0C + wordI * 32;
offsetData = (const u32*)data0C + i * 32;
for (j = 0; j < 32; j++) {
if ((flagWord << j) & 0x80000000U)
if ((flagWord << j) & 0x80000000U) {
loadedSmth0CSize += offsetData[j] - sizeof(BinaryBlockHeader);
}
}
}
@@ -143,10 +146,11 @@ namespace nw4r {
loadedSheetsSize = ROUNDUP(loadedSheetCount * pGlgr->inner.uncompSheetSize, 4);
neededCharacterSize = sizeof(CXUncompContextHuffman);
if (loadedSmth0ASize + loadedSmth0CSize >= sizeof(CXUncompContextHuffman))
if (loadedSmth0ASize + loadedSmth0CSize >= sizeof(CXUncompContextHuffman)) {
neededCharacterSize = loadedSmth0ASize + loadedSmth0CSize;
}
baseSize = ROUNDUP(sizeof(FontInformation) + sizeof(FontTextureGlyph) + sheetOffsetsSize, 0x20);
baseSize = OSRoundUp32B(sizeof(FontInformation) + sizeof(FontTextureGlyph) + sheetOffsetsSize);
return baseSize + neededCharacterSize + loadedSheetsSize;
}
@@ -155,8 +159,9 @@ namespace nw4r {
CachedStreamReader* reader;
// If there's already data bound, exit early
if (mFontInfo != NULL)
if (mFontInfo != NULL) {
return ctx->mBlocksParsed < ctx->mTotalBlocks ? CONSTRUCT_STATE_FATAL_ERR : CONSTRUCT_STATE_DONE;
}
state = CONSTRUCT_STATE_WORKING;
reader = &ctx->mReader;
@@ -164,48 +169,62 @@ namespace nw4r {
while (state == CONSTRUCT_STATE_WORKING) {
switch (ctx->mNextCmd) {
case CONSTRUCT_CMD_DISPATCH:
case CONSTRUCT_CMD_DISPATCH: {
state = detail::ArchiveFontBase::ConstructOpDispatch(ctx, reader);
break;
case CONSTRUCT_CMD_ANALYZE_FILE_HEADER:
}
case CONSTRUCT_CMD_ANALYZE_FILE_HEADER: {
state = detail::ArchiveFontBase::ConstructOpAnalyzeFileHeader(ctx, reader);
break;
case CONSTRUCT_CMD_ANALYZE_GLGR:
}
case CONSTRUCT_CMD_ANALYZE_GLGR: {
state = detail::ArchiveFontBase::ConstructOpAnalyzeGLGR(ctx, reader);
break;
case CONSTRUCT_CMD_ANALYZE_FINF:
}
case CONSTRUCT_CMD_ANALYZE_FINF: {
state = detail::ArchiveFontBase::ConstructOpAnalyzeFINF(ctx, reader);
break;
case CONSTRUCT_CMD_ANALYZE_CMAP:
}
case CONSTRUCT_CMD_ANALYZE_CMAP: {
state = detail::ArchiveFontBase::ConstructOpAnalyzeCMAP(ctx, reader);
break;
case CONSTRUCT_CMD_ANALYZE_CWDH:
}
case CONSTRUCT_CMD_ANALYZE_CWDH: {
state = detail::ArchiveFontBase::ConstructOpAnalyzeCWDH(ctx, reader);
break;
case CONSTRUCT_CMD_ANALYZE_TGLP:
}
case CONSTRUCT_CMD_ANALYZE_TGLP: {
state = detail::ArchiveFontBase::ConstructOpAnalyzeTGLP(ctx, reader);
break;
case CONSTRUCT_CMD_PREPAIR_COPY_SHEET:
}
case CONSTRUCT_CMD_PREPAIR_COPY_SHEET: {
state = detail::ArchiveFontBase::ConstructOpPrepairCopySheet(ctx, reader);
break;
case CONSTRUCT_CMD_PREPAIR_EXPAND_SHEET:
}
case CONSTRUCT_CMD_PREPAIR_EXPAND_SHEET: {
state = detail::ArchiveFontBase::ConstructOpPrepairExpandSheet(ctx, reader);
break;
case CONSTRUCT_CMD_COPY:
}
case CONSTRUCT_CMD_COPY: {
state = detail::ArchiveFontBase::ConstructOpCopy(ctx, reader);
break;
case CONSTRUCT_CMD_SKIP:
}
case CONSTRUCT_CMD_SKIP: {
state = detail::ArchiveFontBase::ConstructOpSkip(ctx, reader);
break;
case CONSTRUCT_CMD_EXPAND:
}
case CONSTRUCT_CMD_EXPAND: {
state = detail::ArchiveFontBase::ConstructOpExpand(ctx, reader);
break;
case CONSTRUCT_CMD_FATAL_ERR:
}
case CONSTRUCT_CMD_FATAL_ERR: {
state = detail::ArchiveFontBase::ConstructOpFatalError(ctx, reader);
break;
default:
}
default: {
ctx->mNextCmd = CONSTRUCT_CMD_FATAL_ERR;
state = CONSTRUCT_STATE_FATAL_ERR;
}
}
}
@@ -213,16 +232,17 @@ namespace nw4r {
// buffer, adjust the alternate character index to respect unloaded
// sheets, and set the reader function (for displaying strings) to
// use the encoding in mFontInfo
if ((state == CONSTRUCT_STATE_DONE) && (mFontInfo == NULL)) {
if (state == CONSTRUCT_STATE_DONE && mFontInfo == NULL) {
DCFlushRange(ctx->pWorkStart, ctx->pWorkEnd - ctx->pWorkStart);
SetResourceBuffer(ctx->pWorkStart, ctx->pFontInfo, ctx->pSheetOffsets);
if (AdjustIndex(this->mFontInfo->alterCharIndex) == GLYPH_INDEX_NOT_FOUND) {
this->mFontInfo->alterCharIndex = 0;
if (AdjustIndex(mFontInfo->alterCharIndex) == detail::GLYPH_INDEX_NOT_FOUND) {
mFontInfo->alterCharIndex = 0;
}
Font::InitReaderFunc(GetEncoding());
}
return state;
}
bool ArchiveFont::Construct(void* work, u32 workSize, const void* fontData, const char* includedGroups) {
u32 fontDataSize = ((BinaryFileHeader*)fontData)->fileSize;
@@ -271,11 +291,12 @@ namespace nw4r {
u16 idx = ResFontBase::GetGlyphIndex(c);
GetGlyphFromIndex(glyph, idx);
}
void ArchiveFont::GetGlyphFromIndex(Glyph* glyph, u16 index) const {
FontTextureGlyph& tg = *mFontInfo->pGlyph;
u16 realIndex = ArchiveFontBase::AdjustIndex(index);
if (realIndex == GLYPH_INDEX_NOT_FOUND) {
if (realIndex == detail::GLYPH_INDEX_NOT_FOUND) {
index = mFontInfo->alterCharIndex;
realIndex = ArchiveFontBase::AdjustIndex(index);
}

View File

@@ -14,7 +14,6 @@ namespace nw4r {
if ((_ctx)->remWorkSpace() < (_size)) \
return CONSTRUCT_STATE_FATAL_ERR;
#define GLYPH_INDEX_NOT_FOUND 0xFFFF
typedef union {
u16 formatRaw;
struct {
@@ -23,7 +22,8 @@ namespace nw4r {
};
} FlaggedImageFormat;
// CachedStreamReader inlined
const char ArchiveFontBase::LOAD_GLYPH_ALL[1] = {0};
void ArchiveFontBase::CachedStreamReader::memcpyToBuf(void* buf, u32 copyLen) {
u32 cachedLen;
u8* pBuf;
@@ -42,6 +42,7 @@ namespace nw4r {
pDataCurr += dataLen;
}
}
void ArchiveFontBase::CachedStreamReader::skip(u32 skipLen) {
u32 dataLen, cachedLen;
@@ -55,71 +56,16 @@ namespace nw4r {
}
}
// CachedStreamReader retained
void ArchiveFontBase::CachedStreamReader::Init() {
pDataStart = NULL;
pDataCurr = NULL;
pDataEnd = NULL;
pCachedBase = NULL;
pCachedStart = NULL;
pCachedEnd = NULL;
unk_0x18 = 0;
}
void ArchiveFontBase::CachedStreamReader::Attach(const void* data, u32 dataLen) {
pDataStart = (u8*)data;
pDataCurr = (u8*)data;
pDataEnd = (u8*)data + dataLen;
}
bool ArchiveFontBase::CachedStreamReader::RequestData(ArchiveFontBase::ConstructContext* ctx, u32 offset) {
size_t dataLen;
size_t cachedLen;
size_t available;
u8* dst;
available = amtAvailableData() + amtAvailableCached();
if (available == 0) {
pCachedBase = NULL;
pCachedStart = NULL;
pCachedEnd = NULL;
unk_0x18 = 0;
} else {
if (ctx->remWorkSpace() < (offset << 1))
return false;
dst = ctx->pWorkCurr + offset;
cachedLen = pCachedEnd - pCachedStart;
if (cachedLen >= available) {
memmove(dst, pCachedStart, available);
pCachedStart += available;
} else {
dataLen = available - cachedLen;
memmove(dst, pCachedStart, cachedLen);
memmove(dst + cachedLen, pDataCurr, dataLen);
pCachedStart = pCachedEnd;
pDataCurr += dataLen;
}
pCachedBase = dst;
pCachedStart = dst;
pCachedEnd = dst + available;
unk_0x18 = offset;
}
return true;
}
// ConstructContext inlined
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructContext::requestNewData(CachedStreamReader* reader, u32 amt) {
mDataOffset = getFullOffset(reader);
bool requestSucceeded = reader->RequestData(this, amt);
if (requestSucceeded)
if (requestSucceeded) {
return CONSTRUCT_STATE_DATA_REQUESTED;
else
} else {
return CONSTRUCT_STATE_FATAL_ERR;
}
}
void ArchiveFontBase::ConstructContext::getNumSheetsToLoad(u16* sheetsToLoad) const {
*sheetsToLoad = 0;
for (int i = 0; i < mSheetCount; i++) {
@@ -127,6 +73,7 @@ namespace nw4r {
(*sheetsToLoad)++;
}
}
// u32 ArchiveFontBase::ConstructContext::updateTextureBlockPtr() {
// u32 imgDataOffset;
// imgDataOffset = (u32)pFontInfo->pGlyph->sheetImage;
@@ -137,9 +84,9 @@ namespace nw4r {
// return imgDataOffset;
// }
// ArchiveFontBase retained
ArchiveFontBase::ArchiveFontBase() : pSheetOffsets(NULL) {
}
ArchiveFontBase::~ArchiveFontBase() {
}
@@ -153,26 +100,31 @@ namespace nw4r {
}
return GetCharWidthsFromIndex(glyphIdx);
}
void ArchiveFontBase::SetResourceBuffer(void* pUserBuffer, FontInformation* pFontInfo, u16* pSheetOffsets) {
ResFontBase::SetResourceBuffer(pUserBuffer, pFontInfo);
this->pSheetOffsets = pSheetOffsets;
}
u16 ArchiveFontBase::AdjustIndex(u16 glyphIdx) const {
FontTextureGlyph* pTglp = mFontInfo->pGlyph;
s32 glyphsPerSheet = (u32)pTglp->sheetRow * (u32)pTglp->sheetLine;
u32 originalSheetIdx = (s32)glyphIdx / glyphsPerSheet;
if (pSheetOffsets[originalSheetIdx] != GLYPH_INDEX_NOT_FOUND)
if (pSheetOffsets[originalSheetIdx] != GLYPH_INDEX_NOT_FOUND) {
return glyphIdx - pSheetOffsets[originalSheetIdx];
else
} else {
return GLYPH_INDEX_NOT_FOUND;
}
}
bool ArchiveFontBase::IncludeName(const char* groupList, const char* group) {
u32 groupLen = strlen(group);
const char* substr = groupList - 1;
while (true) {
substr = strstr(substr + 1, group);
if (substr == NULL)
if (substr == NULL) {
return false;
}
// Check that there is nothing but spaces between the substr
// and the preceeding comma
@@ -194,10 +146,12 @@ namespace nw4r {
// @bug Should allow for leading spaces in groupList (maybe?)
if (substr != groupList) {
const char* backsearchStr = substr - 1;
while (backsearchStr > groupList && *backsearchStr == ' ')
while (backsearchStr > groupList && *backsearchStr == ' ') {
backsearchStr--;
if (*backsearchStr != ',')
}
if (*backsearchStr != ',') {
continue;
}
}
// Get the length of the section up until the next comma or
@@ -207,10 +161,11 @@ namespace nw4r {
// - substr = "foo" -> sectionLen = 3
const char* nextComma = strchr(substr, ',');
u32 sectionLen;
if (nextComma != NULL)
if (nextComma != NULL) {
sectionLen = nextComma - substr;
else
} else {
sectionLen = strlen(substr);
}
// Check to make sure there is nothing except spaces between
// the end of the group name and the next comma:
@@ -224,13 +179,16 @@ namespace nw4r {
// - substr = "foo, baz"
// - group = "foo"
const char* sectionEnd = substr + groupLen;
while (sectionEnd < substr + sectionLen && (*sectionEnd == ' '))
while (sectionEnd < substr + sectionLen && (*sectionEnd == ' ')) {
sectionEnd++;
}
if (sectionEnd == substr + sectionLen)
if (sectionEnd == substr + sectionLen) {
return true;
}
}
}
bool ArchiveFontBase::IsValidResource(const void* data, u32 maxPreFinfSize) {
const u8* fileBuf = (u8*)data;
const BinaryFileHeader* hdr = (const BinaryFileHeader*)fileBuf;
@@ -247,35 +205,43 @@ namespace nw4r {
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpDispatch(ConstructContext* ctx, CachedStreamReader* reader) {
void* nextBlockHdr;
if (ctx->mBlocksParsed >= ctx->mTotalBlocks)
if (ctx->mBlocksParsed >= ctx->mTotalBlocks) {
return CONSTRUCT_STATE_DONE;
}
ENSURE_READER_HAS_SIZE(ctx, reader, sizeof(BinaryBlockHeader));
reader->memcpyToBuf(&ctx->mNextBlockHdr, sizeof(BinaryBlockHeader));
switch (ctx->mNextBlockHdr.kind) {
case SIGNATURE_GLYPH_GROUPS:
case SIGNATURE_GLYPH_GROUPS: {
ctx->mNextCmd = CONSTRUCT_CMD_ANALYZE_GLGR;
break;
case SIGNATURE_FONT_INFO:
}
case SIGNATURE_FONT_INFO: {
ctx->mNextCmd = CONSTRUCT_CMD_ANALYZE_FINF;
break;
case SIGNATURE_CODE_MAP:
}
case SIGNATURE_CODE_MAP: {
ctx->mNextCmd = CONSTRUCT_CMD_ANALYZE_CMAP;
break;
case SIGNATURE_CHAR_WIDTH:
}
case SIGNATURE_CHAR_WIDTH: {
ctx->mNextCmd = CONSTRUCT_CMD_ANALYZE_CWDH;
break;
case SIGNATURE_TEX_GLYPH:
}
case SIGNATURE_TEX_GLYPH: {
ctx->mNextCmd = CONSTRUCT_CMD_ANALYZE_TGLP;
break;
default:
}
default: {
ctx->mNextCmd = CONSTRUCT_CMD_FATAL_ERR;
return CONSTRUCT_STATE_FATAL_ERR;
}
}
ctx->mBlocksParsed++;
ctx->pWorkCurr = (u8*)(((u32)ctx->pWorkCurr + 3) & (~3));
return CONSTRUCT_STATE_WORKING;
}
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeFileHeader(ConstructContext* ctx, CachedStreamReader* reader) {
ENSURE_READER_HAS_SIZE(ctx, reader, sizeof(BinaryFileHeader));
ENSURE_WORK_HAS_SIZE(ctx, sizeof(BinaryFileHeader));
@@ -290,30 +256,36 @@ namespace nw4r {
for (int sheetI = 0; sheetI < glgr->sheetCount; sheetI++) {
u32 groupBitIdx = sheetI + groupIdx * flagsStep * 8;
const u32* bitBlockPtr = sheetFlags + (groupBitIdx & ~0x1f) / 32;
const u32* bitBlockPtr = sheetFlags + (groupBitIdx & ~0x1F) / 32;
u32 bitBlock = *(u32*)bitBlockPtr;
if (((bitBlock << (groupBitIdx & 0x1f)) & 0x80000000) != 0)
if (((bitBlock << (groupBitIdx & 0x1F)) & 0x80000000) != 0) {
sheetOffsets[sheetI] = 1;
}
}
}
inline void setSheetOffsetBooleans(const ArchiveFontBase::ConstructContext* ctx, const void* glgrHdr, const void* hdr, u16* sheetOffsets,
const u32* bitBlocksPtr, u32 sheetFlagsSize) {
HeaderedGlyphGroups* pGlgr = (HeaderedGlyphGroups*)glgrHdr;
for (int i = 0; i < pGlgr->inner.sheetCount; i++)
for (int i = 0; i < pGlgr->inner.sheetCount; i++) {
sheetOffsets[i] = 0;
}
for (int i = 0; i < pGlgr->inner.nameCount; i++) {
const char* includedGroups = ctx->pIncludedGroups;
u16 offset = pGlgr->inner.nameOffsets[i];
char* name = (char*)((u8*)hdr + offset);
if (*includedGroups != 0)
if (!ArchiveFontBase::IncludeName(includedGroups, name))
if (*includedGroups != 0) {
if (!ArchiveFontBase::IncludeName(includedGroups, name)) {
continue;
}
}
updateSheetFlags(glgrHdr, i, sheetOffsets, sheetFlagsSize, bitBlocksPtr);
}
}
inline void convertSheetOffsetBooleansToOffsets(const void* glgrHdr, u16* sheetOffsets) {
HeaderedGlyphGroups* pGlgr = (HeaderedGlyphGroups*)glgrHdr;
u16 glyphIdxOffset = 0;
@@ -326,12 +298,14 @@ namespace nw4r {
}
}
}
inline void copyFlagOffsets(ArchiveFontBase::ConstructContext* ctx, u16* sheetOffsetsScratch, u32 workSize, u32 scratchSize) {
u8* sheetOffsets = ctx->pWorkCurr;
ctx->pWorkCurr = sheetOffsets + workSize;
memmove(sheetOffsets, sheetOffsetsScratch, scratchSize);
ctx->pSheetOffsets = (u16*)sheetOffsets;
}
// inline u32 getOffsetSize(void* fontData, u32 remWorkSpace, u16 countSheet, u16** sheetOffsetsScratch) {
// u32 sheetOffsetsSize = ROUNDUP(countSheet * sizeof(u16), 4);
// *sheetOffsetsScratch = (u16*)ROUNDDOWN((u32)((u8*)fontData + remWorkSpace) - sheetOffsetsSize, 2);
@@ -350,8 +324,9 @@ namespace nw4r {
glgrInnerLen = ctx->mNextBlockHdr.size - sizeof(BinaryBlockHeader);
// Check for RFNA
if (font->hdr.signature != SIGNATURE_FONT_ARCHIVE)
if (font->hdr.signature != SIGNATURE_FONT_ARCHIVE) {
return CONSTRUCT_STATE_FATAL_ERR;
}
// Check that there's enough data available, and the space to
// put that data
@@ -369,8 +344,9 @@ namespace nw4r {
reader->memcpyToBuf(&pGlgr->inner, glgrInnerLen);
}
if (!ArchiveFontBase::IsValidResource(font, expectedMaxSize))
if (!ArchiveFontBase::IsValidResource(font, expectedMaxSize)) {
return CONSTRUCT_STATE_FATAL_ERR;
}
// Before here is fine (other than regswaps)
// u16 sheetGlyphCount = FORCE_REACCESS_2(font->glgr.inner.sheetGlyphCount, u16); // 0x1C
@@ -406,24 +382,26 @@ namespace nw4r {
font->glgr.inner.smthCount_0x0c);
flagsSheets = (const u32*)font + (flagsSheetsOff >> 2);
// sheetOffsetsSize = ;
pGlgr = &font->glgr;
ENSURE_WORK_HAS_SIZE(ctx, glgrEnd - (u8*)font + sheetOffsetsSize);
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize)
// if (ctx->pWorkEnd - workCurr < fontSizeToEndOfGlgr + sheetOffsetsSize) {
// return CONSTRUCT_STATE_FATAL_ERR;
// }
// Clear sheet offsets scratch
// for (s32 i = 0; i < pGlgr->inner.sheetCount; i++)
// for (s32 i = 0; i < pGlgr->inner.sheetCount; i++) {
// sheetOffsetsScratch[i] = 0;
// }
// for (s32 i = 0; i < pGlgr->inner.nameCount; i++) {
// // const char* includedGroups = ctx->pIncludedGroups;
// u16 offset = pGlgr->inner.nameOffsets[i];
// const char* name = (char*)((u8*)font + offset);
// if (*ctx->pIncludedGroups != 0)
// if (!ArchiveFontBase::IncludeName(ctx->pIncludedGroups, name))
// if (*ctx->pIncludedGroups != 0) {
// if (!ArchiveFontBase::IncludeName(ctx->pIncludedGroups, name)) {
// continue;
// }
// }
// updateSheetFlags(pGlgr, i, sheetOffsetsScratch, stepSheetFlags, flagsSheets);
// }
@@ -464,6 +442,7 @@ namespace nw4r {
ctx->enqueueCmds(CONSTRUCT_CMD_COPY, innerSize, CONSTRUCT_CMD_DISPATCH);
return CONSTRUCT_STATE_WORKING;
}
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeCMAP(ConstructContext* ctx, CachedStreamReader* reader) {
u32 innerSize;
@@ -475,6 +454,7 @@ namespace nw4r {
ctx->enqueueCmds(CONSTRUCT_CMD_COPY, innerSize, CONSTRUCT_CMD_DISPATCH);
return CONSTRUCT_STATE_WORKING;
}
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpAnalyzeCWDH(ConstructContext* ctx, CachedStreamReader* reader) {
u32 innerSize;
@@ -537,6 +517,7 @@ namespace nw4r {
ctx->mSheetsHandled++;
return CONSTRUCT_STATE_WORKING;
}
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpPrepairExpandSheet(ConstructContext* ctx, CachedStreamReader* reader) {
u32 compressedSize, uncompressedSize;
u8 compressedSizeBuf[4];
@@ -569,13 +550,15 @@ namespace nw4r {
advanced = ut::Min(advanced, ctx->mNextCmdParam);
ctx->mNextCmdParam -= advanced;
if (ctx->mNextCmdParam == 0)
if (ctx->mNextCmdParam == 0) {
ctx->mNextCmd = ctx->mQueuedCmd;
else
} else {
return ctx->requestNewData(reader, ctx->mNextCmdParam);
}
return ArchiveFontBase::CONSTRUCT_STATE_WORKING;
}
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpCopy(ConstructContext* ctx, CachedStreamReader* reader) {
u32 copySize;
copySize = ut::Min((u32)(reader->pDataEnd - reader->pDataCurr), ctx->mNextCmdParam);
@@ -586,6 +569,7 @@ namespace nw4r {
return handleAdvanceDry(ctx, reader, copySize);
}
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpSkip(ConstructContext* ctx, CachedStreamReader* reader) {
u32 skipSize;
skipSize = ctx->getAdvanceSize(reader);
@@ -593,6 +577,7 @@ namespace nw4r {
return handleAdvanceDry(ctx, reader, skipSize);
}
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpExpand(ConstructContext* ctx, CachedStreamReader* reader) {
u32 cmprSize;
u8* src;
@@ -606,10 +591,68 @@ namespace nw4r {
return handleAdvanceDry(ctx, reader, cmprSize);
}
ArchiveFontBase::ConstructState ArchiveFontBase::ConstructOpFatalError(ConstructContext* ctx, CachedStreamReader* reader) {
ctx->mNextCmd = CONSTRUCT_CMD_FATAL_ERR;
return CONSTRUCT_STATE_FATAL_ERR;
}
void ArchiveFontBase::CachedStreamReader::Init() {
pDataStart = NULL;
pDataCurr = NULL;
pDataEnd = NULL;
pCachedBase = NULL;
pCachedStart = NULL;
pCachedEnd = NULL;
unk_0x18 = 0;
}
void ArchiveFontBase::CachedStreamReader::Attach(const void* data, u32 dataLen) {
pDataStart = (u8*)data;
pDataCurr = (u8*)data;
pDataEnd = (u8*)data + dataLen;
}
bool ArchiveFontBase::CachedStreamReader::RequestData(ArchiveFontBase::ConstructContext* ctx, u32 offset) {
size_t dataLen;
size_t cachedLen;
size_t available;
u8* dst;
available = amtAvailableData() + amtAvailableCached();
if (available == 0) {
pCachedBase = NULL;
pCachedStart = NULL;
pCachedEnd = NULL;
unk_0x18 = 0;
} else {
if (ctx->remWorkSpace() < (offset << 1)) {
return false;
}
dst = ctx->pWorkCurr + offset;
cachedLen = pCachedEnd - pCachedStart;
if (cachedLen >= available) {
memmove(dst, pCachedStart, available);
pCachedStart += available;
} else {
dataLen = available - cachedLen;
memmove(dst, pCachedStart, cachedLen);
memmove(dst + cachedLen, pDataCurr, dataLen);
pCachedStart = pCachedEnd;
pDataCurr += dataLen;
}
pCachedBase = dst;
pCachedStart = dst;
pCachedEnd = dst + available;
unk_0x18 = offset;
}
return true;
}
} // namespace detail
} // namespace ut
} // namespace nw4r

View File

@@ -2,6 +2,7 @@
#define REVOLUTION_WWW_OPERA_H
#include <revolution/www_types.h>
#include <revolution/www_api.h>
#endif // REVOLUTION_WWW_OPERA_H
#endif // REVOLUTION_WWW_OPERA_H

View File

@@ -1,8 +1,50 @@
#ifndef REVOLUTION_WWW_OPERA_API_H
#define REVOLUTION_WWW_OPERA_API_H
#define DLL_SYMBOL(ret, sym) typedef ret (*sym)
#include <revolution/www_types.h>
#include <revolution/gx/GXEnum.h>
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
typedef void (*WWWAddJSPluginFn)(const char*, WWWJSCap*, JSCallbackSet**);
typedef u32 (*WWWProtocolWriteFn)(void* wwwInternal, const void* data, u32 dataSize);
typedef u32 (*WWWProtocolFinalizeFn)(void*);
typedef int (*WWWAddProtocolFn)(const char*);
typedef void (*WWWBasicWindowFn)(WWWHandlewindow*);
typedef void (*WWWSetBrowserWindowRectFn)(WWWHandlewindow*, WWWRect*);
typedef void (*WWWSetImageModeFn)(WWWHandlewindow*, GXTexFmt);
typedef void (*WWWSetRenderingModeFn)(WWWHandlewindow*, int);
typedef BOOL (*WWWCreateBrowserWindowFn)(void*, WWWHandlewindow**, int);
typedef BOOL (*WWWCloseBrowserWindowFn)(void*, WWWHandlewindow*);
typedef void (*WWWOpenUrlFn)(WWWHandlewindow*, const char*);
typedef void (*WWWGetBrowserAllocationFunctionsFn)(void* heapBuf, u32 heapBufSize, void** allocOut, void (**freeOut)(void*), int (**availOut)());
typedef void (*WWWSetAllocationFunctionsFn)(void* allocA, void (*freeA)(void*), int (*avail)(), void* allocB, void (*freeB)(void*), void* allocC,
void (*freeC)(void*));
typedef int (*WWWSurfaceInitFn)(int w, int h, u32 rowSize, int, void* rasterBuf);
typedef int (*WWWSurfaceSetFlushCallbackFn)(void (*FlushCallback)(WWWRect*, int), int);
typedef void (*WWWSurfaceAddFontFn)(const char*);
typedef void (*WWWSurfaceUpdateScreenFn)(u32);
typedef void (*WWWSurfaceKeyboardEvtFn)(WWWKeyBtnCmd cmd, WWWKeySym sym, u32 unk);
typedef void (*WWWSurfaceMouseEvtFn)(WWWMouseCmd cmd, int x, int y, WWWMouseAttrib attrib, u32 unkA, u32 unkB);
typedef void (*WWWCommitImeFn)(int imeID, const char* str);
typedef void (*WWWUpdateImeFn)(int imeID, const char* str, u32 unk);
typedef BOOL (*WWWNotifyCallbackFn)(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData);
typedef void (*WWWCreateBrowserFn)(WWWHandle** browser, WWWNotifyCallbackFn notifyCallback, const char** fonts, const char* arc);
typedef BOOL (*WWWSimpleBrowserFn)(WWWHandle* browser);
/* TODO */
#endif // REVOLUTION_WWW_OPERA_API_H
#ifdef __cplusplus
}
#endif // __cplusplus
#endif // REVOLUTION_WWW_OPERA_API_H

View File

@@ -1,84 +1,187 @@
#ifndef REVOLUTION_WWW_OPERA_TYPES_H
#define REVOLUTION_WWW_OPERA_TYPES_H
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
#include <revolution/types.h>
/*** ENUMS ***/
typedef enum WWWEvent {
WWW_EVT_CURSOR_CHANGE = 0,
WWW_EVT_WINDOW_CLOSE,
WWW_EVT_WINDOW_NEW,
WWW_EVT_WINDOW_REQUEST,
WWW_EVT_AUTHENTICATION,
WWW_EVT_URL_CHANGE,
WWW_EVT_LOADING_START,
WWW_EVT_LOADING_FINISHED,
WWW_EVT_LOADING_PROGRESS,
WWW_EVT_UPLOADING_START,
WWW_EVT_UPLOADING_FINISHED,
WWW_EVT_DOCUMENT_TITLE,
WWW_EVT_DOCUMENT_SIZE,
WWW_EVT_DOCUMENT_ICON,
WWW_EVT_LINK_CLICKED,
WWW_EVT_SECURITY_MODE,
WWW_EVT_LINK_NAVIGATED,
WWW_EVT_LINK_HOVER,
WWW_EVT_UNKNOWN_18,
WWW_EVT_UNKNOWN_19,
WWW_EVT_UNKNOWN_20,
WWW_EVT_UNKNOWN_21,
WWW_EVT_UNKNOWN_PROTOCOL,
WWW_EVT_UNKNOWN_23,
WWW_EVT_DOWNLOAD,
WWW_EVT_UNKNOWN_25,
WWW_EVT_UNKNOWN_26,
WWW_EVT_UNKNOWN_27,
WWW_EVT_UNKNOWN_28,
WWW_EVT_ERROR,
WWW_EVT_IMECREATE,
WWW_EVT_IMEMOVE,
WWW_EVT_IMECANCEL,
WWW_EVT_ASYNC_DIALOG,
WWW_EVT_BLOCKING_DIALOG,
WWW_EVT_OUT_OF_MEMORY,
WWW_EVT_SOFT_OUT_OF_MEMORY,
WWW_EVT_UNKNOWN_37,
WWW_EVT_UNKNOWN_38,
WWW_EVT_UNKNOWN_39,
WWW_EVT_UNKNOWN_40,
WWW_EVT_UNKNOWN_41,
WWW_EVT_UNKNOWN_42,
WWW_EVT_UNKNOWN_43,
WWW_EVT_PROTOCOL_LOADING_START,
WWW_EVT_EXISTS_HISTORY,
WWW_EVT_EXTERNAL_ACTION,
WWW_EVT_UNKNOWN_47,
WWW_EVT_UNKNOWN_48,
WWW_EVT_UNKNOWN_49,
WWW_EVT_UNKNOWN_50,
WWW_EVT_UNKNOWN_51,
WWW_EVT_SCREEN_INVALID,
WWW_EVT_FILTERED_URL
WWW_EVT_CURSOR_CHANGE = 0,
WWW_EVT_WINDOW_CLOSE,
WWW_EVT_WINDOW_NEW,
WWW_EVT_WINDOW_REQUEST,
WWW_EVT_AUTHENTICATION,
WWW_EVT_URL_CHANGE,
WWW_EVT_LOADING_START,
WWW_EVT_LOADING_FINISHED,
WWW_EVT_LOADING_PROGRESS,
WWW_EVT_UPLOADING_START,
WWW_EVT_UPLOADING_FINISHED,
WWW_EVT_DOCUMENT_TITLE,
WWW_EVT_DOCUMENT_SIZE,
WWW_EVT_DOCUMENT_ICON,
WWW_EVT_LINK_CLICKED,
WWW_EVT_SECURITY_MODE,
WWW_EVT_LINK_NAVIGATED,
WWW_EVT_LINK_HOVER,
WWW_EVT_UNKNOWN_18,
WWW_EVT_UNKNOWN_19,
WWW_EVT_UNKNOWN_20,
WWW_EVT_UNKNOWN_21,
WWW_EVT_UNKNOWN_PROTOCOL,
WWW_EVT_UNKNOWN_23,
WWW_EVT_DOWNLOAD,
WWW_EVT_UNKNOWN_25,
WWW_EVT_UNKNOWN_26,
WWW_EVT_UNKNOWN_27,
WWW_EVT_UNKNOWN_28,
WWW_EVT_ERROR,
WWW_EVT_IMECREATE,
WWW_EVT_IMEMOVE,
WWW_EVT_IMECANCEL,
WWW_EVT_ASYNC_DIALOG,
WWW_EVT_BLOCKING_DIALOG,
WWW_EVT_OUT_OF_MEMORY,
WWW_EVT_SOFT_OUT_OF_MEMORY,
WWW_EVT_UNKNOWN_37,
WWW_EVT_UNKNOWN_38,
WWW_EVT_UNKNOWN_39,
WWW_EVT_UNKNOWN_40,
WWW_EVT_UNKNOWN_41,
WWW_EVT_UNKNOWN_42,
WWW_EVT_UNKNOWN_43,
WWW_EVT_PROTOCOL_LOADING_START,
WWW_EVT_EXISTS_HISTORY,
WWW_EVT_EXTERNAL_ACTION,
WWW_EVT_UNKNOWN_47,
WWW_EVT_UNKNOWN_48,
WWW_EVT_UNKNOWN_49,
WWW_EVT_UNKNOWN_50,
WWW_EVT_UNKNOWN_51,
WWW_EVT_SCREEN_INVALID,
WWW_EVT_FILTERED_URL
} WWWEvent;
typedef enum WWWError {
WWW_ERROR_OK = 0
} WWWError;
typedef enum WWWKeySym {
KEY_SYM_BLANK = 0,
KEY_SYM_SOMETHING = 0xE001,
KEY_SYM_NEXT_RIGHT = 0xE02B,
KEY_SYM_NEXT_LEFT = 0xE02C,
KEY_SYM_RIGHT = 0xE03C,
KEY_SYM_LEFT = 0xE03D,
KEY_SYM_UP = 0xE03E,
KEY_SYM_DOWN = 0xE03F,
KEY_SYM_BTN1 = 0xE044,
KEY_SYM_BTN2 = 0xE045,
} WWWKeySym;
typedef enum WWWKeyBtnCmd {
KEY_CMD_TRIGGER = 0,
KEY_CMD_RELEASE,
} WWWKeyBtnCmd;
typedef enum WWWMouseCmd {
MOUSE_CMD_MOVE = 0,
MOUSE_CMD_TRIGGER,
MOUSE_CMD_RELEASE,
} WWWMouseCmd;
typedef enum WWWMouseAttrib {
MOUSE_ATTRIB_BUTTON = 1,
MOUSE_ATTRIB_POSITION = 4,
} WWWMouseAttrib;
/*** STRUCTS ***/
typedef struct WWWHandleWindow {
/* TODO */
} WWWHandleWindow;
typedef struct WWWHandleEventData {
/* TODO */
} WWWHandleEventData;
typedef struct WWWHandle {
/* TODO */
} WWWHandle;
typedef struct WWWHandlewindow {
} WWWHandlewindow;
typedef struct WWWHandleEventData {
u32 data[6];
} WWWHandleEventData;
typedef struct WWWRect {
int left; // 0x00
int top; // 0x04
int right; // 0x08
int botom; // 0x0C
int x; // 0x00
int y; // 0x04
int w; // 0x08
int h; // 0x0C
} WWWRect;
#endif // REVOLUTION_WWW_OPERA_TYPES_H
typedef struct WWWProtocolData {
const char* filePath; // 0x00
const char* protocolName; // 0x04
void* wwwInternal; // 0x08
} WWWProtocolData;
typedef struct WWWIMEData {
u32 imeID; // 0x00
const char* text; // 0x04
u32 unk_0x08;
u32 unk_0x0C;
u32 unk_0x10;
u32 unk_0x14;
u32 unk_0x18;
u32 maxLength; // 0x1C
} WWWIMEData;
/*** JS TYPES ***/
typedef struct WWWJSPluginObj {
} WWWJSPluginObj;
typedef union {
int jsInt;
f64 /* ok */ jsFloat;
f64 jsDouble;
void* jsObj;
const char* jsStr;
} WWWJSPluginValueData;
typedef struct WWWJSPluginValue {
s32 ty;
u8 unk_0x04[4];
WWWJSPluginValueData data;
} WWWJSPluginValue;
typedef int (*JSConstructorFn)(WWWJSPluginObj*, WWWJSPluginObj*, int, WWWJSPluginValue*, WWWJSPluginValue*);
typedef int (*JSGetterSetter)(WWWJSPluginObj*, const char*, WWWJSPluginValue*);
typedef bool (*JSAllowAccess)(const char*, const char*, int);
typedef int (*JSGlobalGetCallback)(WWWJSPluginObj*, int, int, JSConstructorFn, JSConstructorFn, const char*, int, WWWJSPluginValueData*);
typedef int (*JSConstructCallback)(WWWJSPluginObj*, JSGetterSetter, JSGetterSetter, int, WWWJSPluginValueData*);
typedef struct JSCallbackSet {
JSGlobalGetCallback globalGet;
JSConstructCallback construct;
} JSCallbackSet;
typedef struct WWWJSCap {
const char** name;
int unk_0x04;
JSGetterSetter getter;
void* unk_0x0C;
void* unk_0x10;
void* unk_0x14;
void* unk_0x18;
JSAllowAccess allowAccess;
} WWWJSCap;
#ifdef __cplusplus
}
#endif // __cplusplus
#endif // REVOLUTION_WWW_OPERA_TYPES_H

View File

@@ -23,7 +23,7 @@ typedef struct WPADMemBlock {
int unk_0x00; // 0x00
int unk_0x04; // 0x04
s16 unk_0x08; // 0x08
int unk_0x0c; // 0x0C
int unk_0x0C; // 0x0C
WPADCallback unk_0x10; // 0x10
} WPADMemBlock;

View File

@@ -19,7 +19,7 @@ typedef struct CXUncompContextRL {
u8* unk_0x00; // 0x00
int unk_0x04; // 0x04
int unk_0x08; // 0x08
u16 unk_0x0c; // 0x0C
u16 unk_0x0C; // 0x0C
u8 unk_0x0e; // 0x0E
u8 unk_0x0f; // 0x0F
} CXUncompContextRL;
@@ -28,7 +28,7 @@ typedef struct CXUncompContextLZ {
u8* unk_0x00; // 0x00
int unk_0x04; // 0x04
int unk_0x08; // 0x08
int unk_0x0c; // 0x0C
int unk_0x0C; // 0x0C
u8 unk_0x10; // 0x10
u8 unk_0x11; // 0x11
u8 unk_0x12; // 0x12

View File

@@ -22,7 +22,7 @@ FAError FADetach(s8 drive);
FAError FAMount(s8 drive);
FAError FAUnmount(s8 drive, u32 force);
FAError FAGetdev(s8 drive, u32* data);
FAError FAGetdev(s8 drive, FADevInf* data);
FAError FAFormat(s8 drive, u32 unk);

View File

@@ -48,16 +48,10 @@ enum {
FA_DEVICE_NAND,
};
enum {
FA_STATUS_INSERTED = (1 << 4),
};
enum {
FA_FLAG_FILENAME_CHECK = (1 << 17),
};
#define FA_INSERTED(driveTable) (driveTable.stat & FA_STATUS_INSERTED)
typedef void FAFILE;
typedef void FADIR;
typedef void FAVOLUME;
@@ -198,6 +192,12 @@ typedef struct FADrvTbl {
u8 stat; // 0x09
} FADrvTbl;
enum {
FA_DRV_TBL_STAT_INSERTED = (1 << 4),
};
#define FA_INSERTED(driveTable) (driveTable.stat & FA_DRV_TBL_STAT_INSERTED)
typedef struct FAFileInfo {
u8 unknown[32];
} FAFileInfo;
@@ -243,6 +243,11 @@ typedef struct FAFileStat {
u8 stat; // 0x10
} FAFileStat;
enum {
FA_FILE_UNK_1 = (1 << 1),
FA_FILE_STAT_DIR = (1 << 4)
};
#ifdef __cplusplus
}
#endif

View File

@@ -27,6 +27,9 @@ extern "C" {
#define NAND_MB_TO_BYTES(x) (((x) * 1024) * 1024)
#define NAND_MB_TO_BLOCKS(x) (NAND_MB_TO_BYTES(x) / NAND_BLOCK_SIZE)
#define NAND_BYTES_TO_BLOCKS(x) ((x) / NAND_BLOCK_SIZE)
#define NAND_BLOCKS_TO_BYTES(x) ((x) * NAND_BLOCK_SIZE)
// The amount of blocks of the entire area of the System Memory.
#define NAND_MAX_BLOCKS NAND_MB_TO_BLOCKS(512) /* 32768 blocks / 4096 data management blocks */

View File

@@ -0,0 +1,21 @@
#ifndef REVOLUTION_NUP_H
#define REVOLUTION_NUP_H
#include <revolution/types.h>
#include <revolution/mem/allocator.h>
#ifdef __cplusplus
extern "C" {
#endif
void* NUP_Init(MEMAllocator* allocator);
int NUP_Start(void* instance, const char* nus, const char* isoCountryCode, void* productAreaString, int);
int NUP_GetStatus(void* instance, u64*);
int NUP_Finish(void* instance);
#ifdef __cplusplus
}
#endif
#endif // REVOLUTION_NUP_H

View File

@@ -0,0 +1,16 @@
#ifndef REVOLUTION_SC_UTIL_H
#define REVOLUTION_SC_UTIL_H
#include <revolution/types.h>
#ifdef __cplusplus
extern "C" {
#endif
const char* SCUTILGetISOCountryCodeA2();
#ifdef __cplusplus
}
#endif
#endif // REVOLUTION_SC_UTIL_H

View File

@@ -8,7 +8,6 @@ extern "C" {
#include <revolution/vi/vifuncs.h>
#include <revolution/vi/vitypes.h>
#ifdef __cplusplus
}
#endif

View File

@@ -21,6 +21,9 @@ extern "C" {
#define VI_MAX_WIDTH_EURGB60 VI_MAX_WIDTH_NTSC
#define VI_MAX_HEIGHT_EURGB60 VI_MAX_HEIGHT_NTSC
#define VI_MAX_WIDTH_FRAMEBUFFER 608
#define VI_MAX_HEIGHT_FRAMEBUFFER 456
enum {
VI_NTSC = 0,
VI_PAL,

View File

@@ -15,6 +15,12 @@ extern "C" {
#define WAD_IMPORT_TYPE_SOFTWARE "Is" /* "Import software" */
#define WAD_IMPORT_TYPE_BACKUP "Bk" /* "Backup"*/
enum {
WAD_ERROR_OK = 0,
WAD_ERROR_NOCOPY = -3002, /*?*/
WAD_ERROR_INCORRECT_DEVICE = -3008, /*?*/
};
typedef struct WADHeader {
u32 hdrSize; // 0x00 (Always 32)
@@ -53,31 +59,34 @@ typedef struct WADBackupHeader {
} WADBackupHeader;
typedef enum {
WAD_LOC_DVD = 0x1, // 0x1
WAD_LOC_NANDPRIVATE = 0x2, // 0x2
WAD_LOC_SD_CARD = 0x3, // 0x3
WAD_LOC_DVDCONTENT = 0x4, // 0x4
WAD_LOC_NANDCONTENT = 0x5, // 0x5
WAD_LOCATION_DVD = 1,
WAD_LOCATION_NAND,
WAD_LOCATION_SD_CARD,
WAD_LOCATION_CNT_DVD,
WAD_LOCATION_CNT_NAND,
} WADLocation;
typedef struct {
u16 unkBlocks; // 0x0
u16 unkInodes; // 0x2
u16 privateBlocks; // 0x4
u16 privateInodes; // 0x6
u16 sharedBlocks; // 0x8
u16 sharedInodes; // 0xa
u16 fileBlocks; // 0xc
u16 fileInodes; // 0xe
u16 unkBlocks; // 0x00
u16 unkInodes; // 0x02
u16 privateBlocks; // 0x04
u16 privateInodes; // 0x06
u16 sharedBlocks; // 0x08
u16 sharedInodes; // 0x0A
u16 fileBlocks; // 0x0C
u16 fileInodes; // 0x0E
} WADBlocks;
typedef void (*WADProgressCb)(u32 completed, u32 total, BOOL done);
typedef void (*WADProcessCallback)(u32 completed, u32 total, BOOL done);
int WADGetTitleVersionEx(char* path, u64* titleIdOut, u16* titleVersionOut, WADLocation location, u32 offset);
int WADBackupEx(u64 titleId, u32 param_2, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 param_7,
WADProgressCb progressCb);
s32 WADGetTitleVersionEx(char* path, ESTitleId* titleId, u16* titleVersion, WADLocation location, u32 offset);
s32 WADBackupEx(u64 titleId, u32 param_2, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 param_7,
WADProcessCallback processCB);
int WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 param_5, WADBlocks* blocksOut, u32* param_7);
int WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 param_4, u32 param_5, WADProgressCb progressCb);
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 param_5, WADBlocks* blocks, u32* param_7);
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 param_4, u32 param_5, WADProcessCallback processCB);
s32 WADGetInstalledVersion(ESTitleId titleID, u16* version);
#ifdef __cplusplus
}

View File

@@ -8,7 +8,7 @@ void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
context->unk_0x00 = param_2;
context->unk_0x04 = 0;
context->unk_0x0e = 0;
context->unk_0x0c = 0;
context->unk_0x0C = 0;
context->unk_0x0f = 8;
context->unk_0x08 = 0;
}
@@ -18,7 +18,7 @@ void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2) {
context->unk_0x04 = 0;
context->unk_0x11 = 0;
context->unk_0x12 = 0;
context->unk_0x0c = 0;
context->unk_0x0C = 0;
context->unk_0x10 = 3;
context->unk_0x13 = 8;
context->unk_0x14 = 0;
@@ -66,10 +66,10 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
while (context->unk_0x04 > 0) {
if (!(context->unk_0x0e & 0x80)) {
while (context->unk_0x0c) {
while (context->unk_0x0C) {
*context->unk_0x00++ = *pSrc++;
context->unk_0x0c--;
context->unk_0x0C--;
context->unk_0x04--;
size--;
@@ -77,14 +77,14 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
return context->unk_0x04;
}
}
} else if (context->unk_0x0c) {
} else if (context->unk_0x0C) {
u8 b = *pSrc++;
size--;
while (context->unk_0x0c) {
while (context->unk_0x0C) {
*context->unk_0x00++ = b;
context->unk_0x0c--;
context->unk_0x0C--;
context->unk_0x04--;
}
@@ -95,20 +95,20 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
context->unk_0x0e = *pSrc++;
size--;
context->unk_0x0c = context->unk_0x0e & 0x7f;
context->unk_0x0C = context->unk_0x0e & 0x7f;
if (context->unk_0x0e & 0x80) {
context->unk_0x0c += 3;
context->unk_0x0C += 3;
} else {
context->unk_0x0c += 1;
context->unk_0x0C += 1;
}
if (context->unk_0x0c > context->unk_0x04) {
if (context->unk_0x0C > context->unk_0x04) {
if (!context->unk_0x08) {
return CX_STREAMING_ERR_BAD_FILE_SIZE;
}
context->unk_0x0c = context->unk_0x04;
context->unk_0x0C = context->unk_0x04;
}
if (size) {
@@ -205,34 +205,34 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
context->unk_0x10--;
if (!context->unk_0x14) {
context->unk_0x0c = *pSrc++;
context->unk_0x0c += 0x30;
context->unk_0x0C = *pSrc++;
context->unk_0x0C += 0x30;
context->unk_0x10 = 0;
} else {
switch (context->unk_0x10) {
case 2: {
context->unk_0x0c = *pSrc++;
context->unk_0x0C = *pSrc++;
if (context->unk_0x0c >> 4 == 1) {
context->unk_0x0c = (context->unk_0x0c & 0x0F) << 16;
context->unk_0x0c += 0x1110;
} else if (context->unk_0x0c >> 4 == 0) {
context->unk_0x0c = (context->unk_0x0c & 0x0F) << 8;
context->unk_0x0c += 0x110;
if (context->unk_0x0C >> 4 == 1) {
context->unk_0x0C = (context->unk_0x0C & 0x0F) << 16;
context->unk_0x0C += 0x1110;
} else if (context->unk_0x0C >> 4 == 0) {
context->unk_0x0C = (context->unk_0x0C & 0x0F) << 8;
context->unk_0x0C += 0x110;
context->unk_0x10 = 1;
} else {
context->unk_0x0c += 0x10;
context->unk_0x0C += 0x10;
context->unk_0x10 = 0;
}
break;
}
case 1: {
context->unk_0x0c += *pSrc++ << 8;
context->unk_0x0C += *pSrc++ << 8;
break;
}
case 0: {
context->unk_0x0c += *pSrc++;
context->unk_0x0C += *pSrc++;
break;
}
}
@@ -244,26 +244,26 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
}
}
a = (context->unk_0x0c & 0x0F) << 8;
context->unk_0x0c >>= 4;
a = (context->unk_0x0C & 0x0F) << 8;
context->unk_0x0C >>= 4;
a = (a | *pSrc++) + 1;
size--;
context->unk_0x10 = 3;
if (context->unk_0x0c > context->unk_0x04) {
if (context->unk_0x0C > context->unk_0x04) {
if (!context->unk_0x08) {
return CX_STREAMING_ERR_BAD_FILE_SIZE;
}
context->unk_0x0c = context->unk_0x04;
context->unk_0x0C = context->unk_0x04;
}
while (context->unk_0x0c > 0) {
while (context->unk_0x0C > 0) {
*context->unk_0x00 = context->unk_0x00[-a];
context->unk_0x00++;
context->unk_0x04--;
context->unk_0x0c--;
context->unk_0x0C--;
}
there:

View File

@@ -1,4 +1,5 @@
#include <revolution/sc.h>
#include <revolution/scutil.h>
char* countryIdToISOA2[] = {
NULL, "JP", NULL, NULL, NULL, NULL, NULL, NULL, "AI", "AG", "AR", "AW", "BS", "BB", "BZ", "BO", "BR", "VG", "CA", "KY", "CL", "CO", "CR",
@@ -11,7 +12,7 @@ char* countryIdToISOA2[] = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, "AE", "IN", "EG", "OM", "QA", "KW", "SA", "SY", "BH", "JO",
};
char* SCUTILGetISOCountryCodeA2() {
const char* SCUTILGetISOCountryCodeA2() {
u32 countryID, addressID = SCGetSimpleAddressID();
if (addressID == 0xFFFFFFFF) {
return NULL;

View File

@@ -777,7 +777,7 @@ static void __ClearControlBlock(s32 chan) {
_wmb[chan].unk_0x00 = 0;
_wmb[chan].unk_0x04 = 0;
_wmb[chan].unk_0x08 = 0;
_wmb[chan].unk_0x0c = 0;
_wmb[chan].unk_0x0C = 0;
_wmb[chan].unk_0x10 = NULL;
_rumbleCnt[chan] = 0;

View File

@@ -6,13 +6,13 @@
typedef s32 NCDErr;
enum {
NCD_MODE_NONE = 0, // 0
NCD_MODE_WEP40 = 1, // 1
NCD_MODE_WEP104 = 2, // 2
NCD_MODE_INVALID3 = 3, // 3
NCD_MODE_WPA_PSK_TKIP = 4, // 4
NCD_MODE_WPA2_PSK_TKIP = 5, // 5
NCD_MODE_WPA_PSK_AES = 6, // 6
NCD_MODE_NONE = 0,
NCD_MODE_WEP40,
NCD_MODE_WEP104,
NCD_MODE_INVALID3,
NCD_MODE_WPA_PSK_TKIP,
NCD_MODE_WPA2_PSK_TKIP,
NCD_MODE_WPA_PSK_AES,
};
enum {
NCD_LINKSTATUS_WIRED = 3, // ?
@@ -20,6 +20,7 @@ enum {
enum {
NCD_RESULT_SUCCESS = 0,
NCD_RESULT_4 = -4,
NCD_RESULT_INPROGRESS = -8,
};

View File

@@ -10,6 +10,7 @@ extern "C" {
int NETGetWirelessMacAddress(void* data);
int NETGetStartupErrorCode(int);
int NETGetStartupErrorCodeEx(int, int);
#ifdef __cplusplus

View File

@@ -1,9 +1,11 @@
#ifndef D_NHTTP_H
#define D_NHTTP_H
#ifndef REVOLUTION_NHTTP_H
#define REVOLUTION_NHTTP_H
#include <revolution/types.h>
#include <revolution/nhttp/nhttp_err.h>
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
@@ -52,4 +54,4 @@ int NHTTPSetClientCertDefault(NHTTPRequest* request);
}
#endif // __cplusplus
#endif // D_NHTTP_H
#endif // REVOLUTION_NHTTP_H

View File

@@ -1,6 +1,10 @@
#ifndef REVOLUTION_SSL_H
#define REVOLUTION_SSL_H
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
#include <revolution/types.h>
typedef int SSLResult;
@@ -37,4 +41,8 @@ SSLResult SSLSetRootCA(SSLId sslId, const char* rootCAData, u32 rootCASize);
SSLResult SSLSetBuiltinRootCA(SSLId sslId, u32 rootCAId);
SSLResult SSLSetBuiltinClientCert(SSLId sslId, u32 clientCertId);
#ifdef __cplusplus
}
#endif // __cplusplus
#endif // REVOLUTION_SSL_H

View File

@@ -1,6 +1,10 @@
#ifndef REVOLUTION_VF_H
#define REVOLUTION_VF_H
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
#include <revolution/vf/types.h>
void VFInit();
@@ -60,4 +64,8 @@ VFErr VFGetLastDeviceError(const char* drive);
const char* VFGetApiErrorString(VFErr error);
#ifdef __cplusplus
}
#endif // __cplusplus
#endif // REVOLUTION_VF_H

View File

@@ -1,6 +1,10 @@
#ifndef REVOLUTION_VF_TYPES_H
#define REVOLUTION_VF_TYPES_H
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
#include <revolution/types.h>
enum {
@@ -90,4 +94,8 @@ typedef struct VFDta {
s8 pad[2]; // 0x442
} VFDta;
#ifdef __cplusplus
}
#endif // __cplusplus
#endif // REVOLUTION_VF_TYPES_H

View File

@@ -11,12 +11,13 @@ namespace www {
static u32 sStatus;
void AddProtocol() {
if ((*WWWAddProtocol)(sProtocolName) == 0) {
ext_ead::www::print::IPLWWWReport(3, " - %s protocol added successfully \n", sProtocolName);
if (WWWAddProtocol(sProtocolName) == 0) {
ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, " - %s protocol added successfully \n", sProtocolName);
} else {
ext_ead::www::print::IPLWWWReport(3, " - %s protocol added failed- \n", sProtocolName);
ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, " - %s protocol added failed- \n", sProtocolName);
}
}
bool ReadRequest(const WWWProtocolData* protocolData, ArcContainer* container) {
u32 chunkSize;
bool ret = 0;
@@ -25,60 +26,65 @@ namespace www {
const u8* fileData;
sStatus = 0;
ext_ead::www::print::IPLWWWReport(3, " Read: %s\n", protocolData->filePath);
ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, " Read: %s\n", protocolData->filePath);
if (strcmp(protocolData->protocolName, sProtocolName) == 0) {
ret = true;
// Strip the protocol base folder (marc/) and remove any leading
// slashes to get just the subpath
path = protocolData->filePath + strlen(sProtocolName) + 1;
while (*path == '/')
while (*path == '/') {
path++;
ext_ead::www::print::IPLWWWReport(3, " filename: %s\n", path);
}
ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, " filename: %s\n", path);
fileData = (const u8*)container->find(path, &fileSize);
if (fileData != NULL) {
for (; fileSize != 0; fileSize -= chunkSize) {
chunkSize = 0x7fff;
if (fileSize <= 0x7fff) {
chunkSize = 0x7FFF;
if (fileSize <= 0x7FFF) {
chunkSize = fileSize;
}
sStatus = (*WWWProtocolWrite)(protocolData->wwwInternal, fileData, chunkSize);
sStatus = WWWProtocolWrite(protocolData->wwwInternal, fileData, chunkSize);
if (sStatus != 0) {
(*WWWProtocolFailed)(protocolData->wwwInternal);
WWWProtocolFailed(protocolData->wwwInternal);
sStatus = 1;
return true;
}
fileData += chunkSize;
// sStatus = 0;
}
sStatus = (*WWWProtocolFinished)(protocolData->wwwInternal);
sStatus = WWWProtocolFinished(protocolData->wwwInternal);
return true;
} else {
(*WWWProtocolFailed)(protocolData->wwwInternal);
WWWProtocolFailed(protocolData->wwwInternal);
sStatus = 1;
}
}
return ret;
}
ArcContainer::ArcContainer(void* scratchSpace) {
pScratch = scratchSpace;
mpScratch = scratchSpace;
for (int i = 0; i < ARRAY_LENGTH(mFlags); i++) {
mFlags[i] = false;
}
}
void ArcContainer::RegisterArcFile(const void* data) {
int i;
for (i = 0; i < ARRAY_LENGTH(mFlags); i++) {
if (mFlags[i])
continue;
if (ARCInitHandle((void*)data, this->mHandles + i) != 0) {
if (ARCInitHandle((void*)data, mHandles + i) != 0) {
mFlags[i] = true;
}
break;
}
if (i == 4 || !mFlags[i]) {
OSPanic("www_arcreader.cpp", 0x8e, " the file cannot registered\n");
OSHalt(" the file cannot registered\n", 142);
}
}
@@ -92,10 +98,12 @@ namespace www {
*fileSize = 0;
for (i = 0; i < (int)ARRAY_LENGTH(mFlags); i++) {
if (!mFlags[i])
if (!mFlags[i]) {
continue;
if (ARCOpen(&mHandles[i], path, &fileInfo) == 0)
}
if (!ARCOpen(&mHandles[i], path, &fileInfo)) {
continue;
}
filePtr = ARCGetStartAddrInMem(&fileInfo);
*fileSize = ARCGetLength(&fileInfo);
@@ -106,9 +114,9 @@ namespace www {
const char* lz77Hdr = (const char*)filePtr;
if (lz77Hdr[0] == 'L' && lz77Hdr[1] == 'Z' && lz77Hdr[2] == '7' && lz77Hdr[3] == '7') {
uncompressedSize = CXGetUncompressedSize((const u8*)filePtr + 4);
CXUncompressLZ((const u8*)filePtr + 4, pScratch);
CXUncompressLZ((const u8*)filePtr + 4, mpScratch);
*fileSize = uncompressedSize;
return pScratch;
return mpScratch;
}
}

View File

@@ -131,68 +131,76 @@ namespace ext_ead {
IPL_WWW_REPORT_REDEFINE_MESSAGE(false)
}
// TODO: What does this magic number mean?
static const u32 MSG_MAGIC = 0x798ADFE1;
OSMutex BrowserThread::runSliceMutex_ = {};
int BrowserThread::classInitialized_ = false;
BOOL BrowserThread::SNotifyCallback_(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData) {
return SurfaceManager::Instance_->pBrowserThread->NotifyCallback_(wwwBrowser, wwwWindow, event, eventData);
return SurfaceManager::GetInstance()->GetBrowserThread()->NotifyCallback_(wwwBrowser, wwwWindow, event, eventData);
}
BOOL BrowserThread::NotifyCallback_(WWWHandle* wwwBrowser, WWWHandlewindow* wwwWindow, WWWEvent event, WWWHandleEventData* eventData) {
BrowserWindow* pWindow;
for (int i = 0; i < ARRAY_LENGTH(pBrowserWindows); i++) {
pWindow = (BrowserWindow*)pBrowserWindows[i];
if (pWindow != NULL && pWindow->pWwwWindow == wwwWindow)
for (int i = 0; i < ARRAY_LENGTH(mpBrowserWindows); i++) {
pWindow = (BrowserWindow*)mpBrowserWindows[i];
if (pWindow != NULL && pWindow->GetHandleWindow() == wwwWindow) {
break;
}
}
if (event == 0x2c) {
::www::arcreader::ReadRequest((WWWProtocolData*)eventData, (::www::arcreader::ArcContainer*)this->pArcContainer);
if (event == WWW_EVT_PROTOCOL_LOADING_START) {
::www::arcreader::ReadRequest((WWWProtocolData*)eventData, mpArcContainer);
}
if (pWindow != NULL) {
pWindow->SendNotifyEvent(event, eventData);
if (event == 7) {
print::IPLWWWReport(3, " EVT_FINISHED: %d/%d %d/%d s:%d\n", eventData->data[1], eventData->data[0], eventData->data[3],
eventData->data[2], eventData->data[6]);
if (event == WWW_EVT_LOADING_FINISHED) {
print::IPLWWWReport(print::WWW_DEBUG, " EVT_FINISHED: %d/%d %d/%d s:%d\n", eventData->data[1], eventData->data[0],
eventData->data[3], eventData->data[2], eventData->data[6]);
}
}
return false;
}
BrowserThread::BrowserThread()
: pRaster(NULL), pOperaHeapBuf(NULL), mWidth(0), mHeight(0), pIniData(NULL), mIniLen(0), pArcContainer(NULL),
pArcDecompressionScratch(NULL) {
: mpRaster(NULL), mpOperaHeapBuf(NULL), mWidth(0), mHeight(0), mpIniData(NULL), mIniLen(0), mpArcContainer(NULL),
mpArcDecmpScratch(NULL) {
if (!classInitialized_) {
OSInitMutex(&runSliceMutex_);
}
classInitialized_++;
}
BrowserThread::~BrowserThread() {
classInitialized_--;
if (!classInitialized_) {
if (this->pRaster != NULL) {
Heap::freeMem1(pRaster);
pRaster = NULL;
if (mpRaster != NULL) {
Heap::freeMem1(mpRaster);
mpRaster = NULL;
}
if (pOperaHeapBuf != NULL) {
Heap::freeMem2(pOperaHeapBuf);
pOperaHeapBuf = NULL;
if (mpOperaHeapBuf != NULL) {
Heap::freeMem2(mpOperaHeapBuf);
mpOperaHeapBuf = NULL;
}
if (this->pArcContainer != NULL) {
Heap::freeMem1(pArcContainer);
Heap::freeMem1(pArcDecompressionScratch);
if (mpArcContainer != NULL) {
Heap::freeMem1(mpArcContainer);
Heap::freeMem1(mpArcDecmpScratch);
}
}
}
void BrowserThread::RegisterArcFile(void* arcData) {
if (pArcContainer == NULL) {
pArcContainer = (::www::arcreader::ArcContainer*)Heap::allocMem1(0x78, 4);
pArcDecompressionScratch = Heap::allocMem1(0x20000, 4);
new (pArcContainer)::www::arcreader::ArcContainer(pArcDecompressionScratch);
if (mpArcContainer == NULL) {
mpArcContainer = (::www::arcreader::ArcContainer*)Heap::allocMem1(sizeof(::www::arcreader::ArcContainer), 4);
mpArcDecmpScratch = Heap::allocMem1(0x20000, 4);
new (mpArcContainer)::www::arcreader::ArcContainer(mpArcDecmpScratch);
}
((::www::arcreader::ArcContainer*)pArcContainer)->RegisterArcFile(arcData);
mpArcContainer->RegisterArcFile(arcData);
return;
}
void BrowserThread::RegisterIniFile(void* iniData, u32 iniLen) {
pIniData = iniData;
mpIniData = iniData;
mIniLen = iniLen;
}
@@ -200,15 +208,16 @@ namespace ext_ead {
mWidth = w;
mHeight = h;
OSInitMessageQueue(&mQueue, mQueueBuf, ARRAY_LENGTH(mQueueBuf));
memset(pBrowserWindows, 0, 0x10);
memset(mpBrowserWindows, 0, sizeof(mpBrowserWindows));
ut_thread::Create(threadStack, threadStackSize, priority, false);
}
void BrowserThread::StopThread() {
if (!IsThreadTerminated()) {
// TODO: What does this magic number mean?
OSSendMessage(&mQueue, (void*)0x798adfe1, 0);
OSSendMessage(&mQueue, (void*)MSG_MAGIC, 0);
}
}
bool BrowserThread::IsThreadStopped() {
bool isStopped = IsThreadTerminated();
if (isStopped != 0) {
@@ -220,49 +229,52 @@ namespace ext_ead {
bool BrowserThread::CheckThreadExit_() {
OSMessage msg = NULL;
if (OSReceiveMessage(&mQueue, &msg, 0)) {
print::IPLWWWReport(3, "BrowserThread:: msg received.\n");
if ((u32)msg == 0x798adfe1)
return 1;
print::IPLWWWReport(print::WWW_DEBUG, "BrowserThread:: msg received.\n");
if ((u32)msg == MSG_MAGIC) {
return true;
}
}
return 0;
return false;
}
void BrowserThread::InitSurface_() {
u32 surfaceW, surfaceH;
int surfaceInitRet, setFlushCbRet;
int rasterRowSize, rasterSize;
void* pvVar1;
u32* rasterPtr;
surfaceW = SurfaceManager::Instance_->mWidth;
surfaceH = SurfaceManager::Instance_->mHeight;
SurfaceManager::Instance_->ResolveRsoModule();
surfaceW = SurfaceManager::GetInstance()->GetWidth();
surfaceH = SurfaceManager::GetInstance()->GetHeight();
SurfaceManager::GetInstance()->ResolveRsoModule();
rasterRowSize = surfaceW * sizeof(u32);
rasterSize = rasterRowSize * surfaceH;
rasterPtr = (u32*)Heap::allocMem1(rasterSize, 4);
pRaster = rasterPtr;
print::IPLWWWReport(3, "www_surface: OperaFrameBuffer: ptr:%p, size:%d\n", rasterPtr, rasterSize);
mpRaster = rasterPtr;
print::IPLWWWReport(print::WWW_DEBUG, "www_surface: OperaFrameBuffer: ptr:%p, size:%d\n", rasterPtr, rasterSize);
pOperaHeapBuf = Heap::allocMem2(0x6e0000, 0x20);
memset(pOperaHeapBuf, 0, 0x6e0000);
print::IPLWWWReport(3, "www_surface: OperaHeapBuffer : ptr:%p \n", pOperaHeapBuf);
mpOperaHeapBuf = Heap::allocMem2(0x6E0000, 0x20);
memset(mpOperaHeapBuf, 0, 0x6E0000);
print::IPLWWWReport(print::WWW_DEBUG, "www_surface: OperaHeapBuffer : ptr:%p \n", mpOperaHeapBuf);
(*WWWGetBrowserAllocationFunctions)(this->pOperaHeapBuf, 0x6e0000, &Heap::wwwalloc_, &Heap::wwwfree_, &Heap::wwwavail_);
(*WWWSetAllocationFunctions)(Heap::wwwalloc_, Heap::wwwfree_, Heap::wwwavail_, Heap::wwwalloc_, Heap::wwwfree_, Heap::wwwalloc_,
Heap::wwwfree_);
WWWGetBrowserAllocationFunctions(mpOperaHeapBuf, 0x6E0000, &Heap::wwwalloc_, &Heap::wwwfree_, &Heap::wwwavail_);
WWWSetAllocationFunctions(Heap::wwwalloc_, Heap::wwwfree_, Heap::wwwavail_, Heap::wwwalloc_, Heap::wwwfree_, Heap::wwwalloc_,
Heap::wwwfree_);
print::TickTimer tt;
tt.reset();
surfaceInitRet = (*WWWSurfaceInit)(surfaceW, surfaceH, rasterRowSize, 0, this->pRaster);
surfaceInitRet = WWWSurfaceInit(surfaceW, surfaceH, rasterRowSize, 0, mpRaster);
tt.report("WWWSurfaceInit");
if (surfaceInitRet != 0)
if (surfaceInitRet != WWW_ERROR_OK) {
OSReport("WWWSurfaceInit %d\n", surfaceInitRet);
}
tt.reset();
setFlushCbRet = (*WWWSurfaceSetFlushCallback)(FlushCallback, 0);
setFlushCbRet = WWWSurfaceSetFlushCallback(FlushCallback, 0);
tt.report("WWWSurfaceSetFlushCallback");
if (setFlushCbRet != 0)
if (setFlushCbRet != WWW_ERROR_OK) {
OSReport("WWWSurfaceSetFlushCallback %d\n", setFlushCbRet);
}
}
void* BrowserThread::Run() {
@@ -270,7 +282,7 @@ namespace ext_ead {
InitSurface_();
InitFonts_("/operafonts/");
print::IPLWWWReport(3, "BrowserThread:: executed\n");
print::IPLWWWReport(print::WWW_DEBUG, "BrowserThread:: executed\n");
tt.reset();
@@ -281,88 +293,97 @@ namespace ext_ead {
fonts[4] = "Wii NTLG Gothic";
fonts[1] = "Wii NTLG PGothic";
fonts[0] = "Wii NTLG PGothic";
(*WWWCreateBrowser)(&pWwwBrowser, SNotifyCallback_, fonts, "/tmp/www.arc/nand");
WWWCreateBrowser(&mpBrowserHandle, SNotifyCallback_, fonts, "/tmp/www.arc/nand");
tt.report("WWWCreateBrowser");
::www::trasition::AddJsPlugin();
::www::wiisetting::AddJsPlugin();
::www::arcreader::AddProtocol();
SurfaceManager* surface = SurfaceManager::Instance_;
pBrowserWindows[0] = (BrowserWindow*)Heap::allocMem1(0x2cc, 4);
new (pBrowserWindows[0]) BrowserWindow(this);
((BrowserWindow*)pBrowserWindows[0])->CreateWindow(mWidth, mHeight, surface->mWidth, surface->mHeight);
SurfaceManager* surface = SurfaceManager::GetInstance();
mpBrowserWindows[0] = (BrowserWindow*)Heap::allocMem1(sizeof(BrowserWindow), 4);
new (mpBrowserWindows[0]) BrowserWindow(this);
((BrowserWindow*)mpBrowserWindows[0])->CreateWindow(mWidth, mHeight, surface->GetWidth(), surface->GetHeight());
Heap::reportHeap();
while (true) {
if (CheckThreadExit_())
if (CheckThreadExit_()) {
break;
}
HandleUIEvent_();
OSLockMutex(&runSliceMutex_);
int i = 0;
BOOL sliceRes;
do {
sliceRes = (*WWWRunSlice)(pWwwBrowser);
sliceRes = WWWRunSlice(mpBrowserHandle);
i++;
((BrowserWindow*)pBrowserWindows[0])->ExecuteEvent();
((BrowserWindow*)mpBrowserWindows[0])->ExecuteEvent();
} while (sliceRes == 0);
if (i > 10) {
print::IPLWWWReport(3, "+++ too many WWWRunSlice called. %d\n", i);
print::IPLWWWReport(print::WWW_DEBUG, "+++ too many WWWRunSlice called. %d\n", i);
}
OSUnlockMutex(&runSliceMutex_);
(*WWWSurfaceUpdateScreen)(0);
(*WWWSurfaceUpdateScreen)(0);
(*WWWSurfaceUpdateScreen)(0);
WWWSurfaceUpdateScreen(0);
WWWSurfaceUpdateScreen(0);
WWWSurfaceUpdateScreen(0);
((BrowserWindow*)pBrowserWindows[0])->ExecuteEvent();
((BrowserWindow*)pBrowserWindows[0])->UpdateTexture();
if (*(u32*)mThread.stackEnd != -0x21524542) {
print::IPLWWWReport(3, "This thread stack has overflowed.\n");
((BrowserWindow*)mpBrowserWindows[0])->ExecuteEvent();
((BrowserWindow*)mpBrowserWindows[0])->UpdateTexture();
if (*(u32*)mThread.stackEnd != 0xDEADBABE) {
print::IPLWWWReport(print::WWW_DEBUG, "This thread stack has overflowed.\n");
}
OSSleepMilliseconds(5);
}
((BrowserWindow*)pBrowserWindows[0])->CloseWindow();
((BrowserWindow*)pBrowserWindows[0])->~BrowserWindow();
((BrowserWindow*)mpBrowserWindows[0])->CloseWindow();
((BrowserWindow*)mpBrowserWindows[0])->~BrowserWindow();
Heap::freeMem1(pBrowserWindows[0]);
pBrowserWindows[0] = NULL;
Heap::freeMem1(mpBrowserWindows[0]);
mpBrowserWindows[0] = NULL;
(*WWWTerminateBrowser)(pWwwBrowser);
WWWTerminateBrowser(mpBrowserHandle);
return this;
}
void BrowserThread::SendKeyboardEvent_(u32 btnMask, u32 triggerFlag, u32 releaseFlag, WWWKeySym sym) {
if (triggerFlag & btnMask) {
(*WWWSurfaceKeyboardEvt)(KEY_CMD_TRIGGER, sym, 0);
WWWSurfaceKeyboardEvt(KEY_CMD_TRIGGER, sym, 0);
} else if (releaseFlag & btnMask) {
(*WWWSurfaceKeyboardEvt)(KEY_CMD_RELEASE, sym, 0);
WWWSurfaceKeyboardEvt(KEY_CMD_RELEASE, sym, 0);
}
}
WWWKeySym BrowserThread::GetKeyboardSym_(u32 input) {
switch (input) {
case ipl::controller::BTN_NEXT_RIGHT:
case ipl::controller::BTN_NEXT_RIGHT: {
return KEY_SYM_NEXT_RIGHT;
case ipl::controller::BTN_NEXT_LEFT:
}
case ipl::controller::BTN_NEXT_LEFT: {
// return KEY_SYM_NEXT_LEFT;
return KEY_SYM_SOMETHING;
case ipl::controller::BTN_UP:
}
case ipl::controller::BTN_UP: {
return KEY_SYM_UP;
case ipl::controller::BTN_DOWN:
}
case ipl::controller::BTN_DOWN: {
return KEY_SYM_DOWN;
case ipl::controller::BTN_LEFT:
}
case ipl::controller::BTN_LEFT: {
return KEY_SYM_LEFT;
case ipl::controller::BTN_RIGHT:
}
case ipl::controller::BTN_RIGHT: {
return KEY_SYM_RIGHT;
case ipl::controller::REVO_BTN_1:
}
case ipl::controller::REVO_BTN_1: {
return KEY_SYM_BTN1;
case ipl::controller::REVO_BTN_2:
}
case ipl::controller::REVO_BTN_2: {
return KEY_SYM_BTN2;
default:
}
default: {
return KEY_SYM_BLANK;
}
}
}
@@ -373,34 +394,37 @@ namespace ext_ead {
x = cmd.data.controller.irX;
y = cmd.data.controller.irY;
if (cmd.data.controller.btnTrigger & ipl::controller::BTN_INTERACT) {
(*WWWSurfaceMouseEvt)(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0);
(*WWWSurfaceMouseEvt)(MOUSE_CMD_TRIGGER, x, y, MOUSE_ATTRIB_BUTTON, 1, 0);
(*WWWSurfaceMouseEvt)(MOUSE_CMD_RELEASE, x, y, MOUSE_ATTRIB_BUTTON, 1, 0);
WWWSurfaceMouseEvt(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0);
WWWSurfaceMouseEvt(MOUSE_CMD_TRIGGER, x, y, MOUSE_ATTRIB_BUTTON, 1, 0);
WWWSurfaceMouseEvt(MOUSE_CMD_RELEASE, x, y, MOUSE_ATTRIB_BUTTON, 1, 0);
somethingClicked = 1;
} else if (cmd.data.controller.btnRelease & ipl::controller::BTN_INTERACT) {
(*WWWSurfaceMouseEvt)(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0);
(*WWWSurfaceMouseEvt)(MOUSE_CMD_RELEASE, x, y, MOUSE_ATTRIB_BUTTON, 1, 0);
WWWSurfaceMouseEvt(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0);
WWWSurfaceMouseEvt(MOUSE_CMD_RELEASE, x, y, MOUSE_ATTRIB_BUTTON, 1, 0);
} else {
(*WWWSurfaceMouseEvt)(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0);
WWWSurfaceMouseEvt(MOUSE_CMD_MOVE, x, y, MOUSE_ATTRIB_POSITION, 0, 0);
if (gDpdWaitFrm >= 4 && (cmd.data.controller.btnTrigger & ipl::controller::BTN_NEXT_LEFT)) {
(*WWWSurfaceKeyboardEvt)(KEY_CMD_RELEASE, KEY_SYM_NEXT_RIGHT, 0);
(*WWWSurfaceKeyboardEvt)(KEY_CMD_TRIGGER, KEY_SYM_NEXT_RIGHT, 0);
WWWSurfaceKeyboardEvt(KEY_CMD_RELEASE, KEY_SYM_NEXT_RIGHT, 0);
WWWSurfaceKeyboardEvt(KEY_CMD_TRIGGER, KEY_SYM_NEXT_RIGHT, 0);
} else if (gDpdWaitFrm >= 4 && (cmd.data.controller.btnTrigger & ipl::controller::BTN_NEXT_RIGHT)) {
(*WWWSurfaceKeyboardEvt)(KEY_CMD_RELEASE, KEY_SYM_NEXT_LEFT, 0);
(*WWWSurfaceKeyboardEvt)(KEY_CMD_TRIGGER, KEY_SYM_NEXT_LEFT, 0);
WWWSurfaceKeyboardEvt(KEY_CMD_RELEASE, KEY_SYM_NEXT_LEFT, 0);
WWWSurfaceKeyboardEvt(KEY_CMD_TRIGGER, KEY_SYM_NEXT_LEFT, 0);
}
}
if (gEnableDpd && ++gDpdWaitFrm > 4) {
gDpdWaitFrm = 4;
}
return somethingClicked;
}
void BrowserThread::ExecSpacialEvent_(const CmdPacket& cmd) {
if (cmd.data.controller.btnTrigger & ipl::controller::BTN_NEXT_RIGHT) {
((BrowserWindow*)pBrowserWindows[0])->PrevPage();
((BrowserWindow*)mpBrowserWindows[0])->PrevPage();
}
if (cmd.data.controller.btnTrigger & ipl::controller::BTN_NEXT_LEFT) {
((BrowserWindow*)pBrowserWindows[0])->GotoHome();
((BrowserWindow*)mpBrowserWindows[0])->GotoHome();
}
#define SEND_KEYBOARD_EVENT_FROM_CONTROLLER_CODE(CONTROLLER_CODE, CMD) \
SendKeyboardEvent_(CONTROLLER_CODE, (CMD).data.controller.btnTrigger, (CMD).data.controller.btnRelease, GetKeyboardSym_(CONTROLLER_CODE));
@@ -412,98 +436,112 @@ namespace ext_ead {
SEND_KEYBOARD_EVENT_FROM_CONTROLLER_CODE(ipl::controller::REVO_BTN_1, cmd);
SEND_KEYBOARD_EVENT_FROM_CONTROLLER_CODE(ipl::controller::REVO_BTN_2, cmd);
}
void BrowserThread::HandleUIEvent_() {
CmdPacket cmd;
while (mCmdPacketQueue.TryReceiveTypedMessage(&cmd)) {
BrowserWindow* pBrowserWindow = (BrowserWindow*)pBrowserWindows[0];
BrowserWindow* pBrowserWindow = (BrowserWindow*)mpBrowserWindows[0];
bool something = false;
if ((pBrowserWindow->unk_0x2c4[2] != '\0') && (pBrowserWindow->unk_0x2c4[3] != '\0')) {
if ((pBrowserWindow->unk_0x2C4[2] != '\0') && (pBrowserWindow->unk_0x2C4[3] != '\0')) {
something = true;
}
if (something || pBrowserWindow->unk_0x2c4[0] != '\0') {
if (something || pBrowserWindow->unk_0x2C4[0] != '\0') {
continue;
}
int retVal = 0;
switch (cmd.type) {
case 0:
case 0: {
retVal = ExecDpdEvent_(cmd);
break;
case 1:
}
case 1: {
ExecSpacialEvent_(cmd);
break;
case 2:
}
case 2: {
pBrowserWindow->SetWindowSize(cmd.data.setWindowSize.width, cmd.data.setWindowSize.height);
break;
case 3:
}
case 3: {
CommitImeCmdPacket(&cmd);
break;
case 4:
}
case 4: {
UpdateImeCmdPacket(&cmd);
break;
default:
print::IPLWWWReport(3, "BrowserThread::HandleUIEvent_: Unknown type: %d\n", cmd.type);
}
default: {
print::IPLWWWReport(print::WWW_DEBUG, "BrowserThread::HandleUIEvent_: Unknown type: %d\n", cmd.type);
break;
}
}
if (retVal != 0)
if (retVal != 0) {
break;
}
}
}
void BrowserThread::SendUIEvent(CmdPacket* packet) {
mCmdPacketQueue.SendTypedMessage(packet);
}
void BrowserThread::InitFonts_(const char*) {
void BrowserThread::InitFonts_(const char* unk) {
print::TickTimer tt;
tt.reset();
(*WWWSurfaceAddFont)("DirectUniversal");
WWWSurfaceAddFont("DirectUniversal");
tt.report("WWWSurfaceAddFont:font1");
}
void* BrowserThread::GetTextureBuffer(int val, WWWRect** rectPtrOut) {
if (pBrowserWindows[0] == NULL)
if (mpBrowserWindows[0] == NULL) {
return NULL;
return ((BrowserWindow*)pBrowserWindows[0])->GetTextureBuffer(val, false, rectPtrOut);
}
return ((BrowserWindow*)mpBrowserWindows[0])->GetTextureBuffer(val, false, rectPtrOut);
}
void BrowserThread::FlushCallback(WWWRect*, int) {
void BrowserThread::FlushCallback(WWWRect* rect, int unk) {
BOOL level;
BrowserWindow* pBrowserWindow;
pBrowserWindow = (BrowserWindow*)SurfaceManager::Instance_->pBrowserThread->pBrowserWindows[0];
if ((pBrowserWindow->unk_0x2c4[0] == '\0') && (pBrowserWindow->unk_0x2c4[1] == '\0')) {
pBrowserWindow = (BrowserWindow*)SurfaceManager::GetInstance()->GetBrowserThread()->mpBrowserWindows[0];
if ((pBrowserWindow->unk_0x2C4[0] == '\0') && (pBrowserWindow->unk_0x2C4[1] == '\0')) {
level = OSDisableInterrupts();
if (pBrowserWindow->unk_0x2c4[2] == '\0') {
if (pBrowserWindow->unk_0x2c4[4] == '\0') {
pBrowserWindow->unk_0x2c0 = pBrowserWindow->unk_0x2b0;
pBrowserWindow->unk_0x2bc = (int)(pBrowserWindow->unk_0x2b4[pBrowserWindow->unk_0x2b0] + 1) % 3;
if (pBrowserWindow->unk_0x2C4[2] == '\0') {
if (pBrowserWindow->unk_0x2C4[4] == '\0') {
pBrowserWindow->unk_0x2C0 = pBrowserWindow->unk_0x2B0;
pBrowserWindow->unk_0x2BC = (int)(pBrowserWindow->unk_0x2B4[pBrowserWindow->unk_0x2B0] + 1) % 3;
}
pBrowserWindow->unk_0x2c4[4] = 1;
pBrowserWindow->unk_0x2C4[4] = 1;
}
pBrowserWindow->unk_0x2c4[1] = 1;
pBrowserWindow->unk_0x2C4[1] = 1;
OSRestoreInterrupts(level);
}
return;
}
bool BrowserThread::SendEventFromWindow(ImeData* imeData) {
if (!mImeDataQueue.SendTypedMessage(imeData)) {
print::IPLWWWReport(3, "WARNING: Too Many Ime commands. cannot send request.\n");
print::IPLWWWReport(print::WWW_DEBUG, "WARNING: Too Many Ime commands. cannot send request.\n");
return false;
} else {
return true;
}
}
bool BrowserThread::ReceiveWindowEvent(ImeData* imeData) {
return mImeDataQueue.TryReceiveTypedMessage(imeData);
}
void BrowserThread::CreateImeData(ImeData* data, const WWWIMEData* wwwData) {
memset(data, 0, sizeof(ImeData));
print::IPLWWWReport(3, "WWWIMEData imeID:%p\n", wwwData->imeID);
print::IPLWWWReport(3, "WWWIMEData text:%p\n", wwwData->text);
print::IPLWWWReport(3, "WWWIMEData maxlength:%d\n", wwwData->maxLength);
print::IPLWWWReport(print::WWW_DEBUG, "WWWIMEData imeID:%p\n", wwwData->imeID);
print::IPLWWWReport(print::WWW_DEBUG, "WWWIMEData text:%p\n", wwwData->text);
print::IPLWWWReport(print::WWW_DEBUG, "WWWIMEData maxlength:%d\n", wwwData->maxLength);
// @bug I think this was supposed to access a different member of
// the struct
print::IPLWWWReport(3, "WWWIMEData format:%p\n", wwwData->text);
print::IPLWWWReport(3, "WWWIMEData text_string:%s\n", wwwData->text);
print::IPLWWWReport(print::WWW_DEBUG, "WWWIMEData format:%p\n", wwwData->text);
print::IPLWWWReport(print::WWW_DEBUG, "WWWIMEData text_string:%s\n", wwwData->text);
if (wwwData->text) {
data->text = (char*)Heap::allocMem2(strlen(wwwData->text) + 1, 4);
@@ -514,8 +552,8 @@ namespace ext_ead {
data->imeID = wwwData->imeID;
data->unk_0x00 = 0;
data->unk_0x0c = wwwData->unk_0x08;
data->unk_0x10 = wwwData->unk_0x0c;
data->unk_0x0C = wwwData->unk_0x08;
data->unk_0x10 = wwwData->unk_0x0C;
data->unk_0x14 = wwwData->unk_0x10;
data->unk_0x18 = wwwData->unk_0x14;
data->maxLength = wwwData->maxLength;
@@ -536,18 +574,22 @@ namespace ext_ead {
} else {
packet.data.commitIme.str = NULL;
}
packet.type = 3;
packet.data.commitIme.imeID = data->imeID;
SendUIEvent(&packet);
}
void BrowserThread::CommitImeCmdPacket(const CmdPacket* packet) {
(*WWWCommitIme)(packet->data.commitIme.imeID, packet->data.commitIme.str);
WWWCommitIme(packet->data.commitIme.imeID, packet->data.commitIme.str);
if (packet->data.commitIme.str != NULL) {
Heap::freeMem1(packet->data.commitIme.str);
}
}
void BrowserThread::UpdateImeCmdPacket(const CmdPacket* packet) {
(*WWWUpdateIme)(packet->data.updateIme.imeID, packet->data.updateIme.str, packet->data.updateIme.unk_0x0c);
WWWUpdateIme(packet->data.updateIme.imeID, packet->data.updateIme.str, packet->data.updateIme.unk_0x0C);
if (packet->data.updateIme.str != NULL) {
Heap::freeMem1(packet->data.updateIme.str);
}

View File

@@ -3,6 +3,8 @@
#include "iplwww/www_print.h"
#include "iplwww/www_trasition.h"
#include <revolution/vi.h>
#include <new>
#include <string.h>
@@ -28,7 +30,7 @@ namespace ext_ead {
MEMiHeapHead* hMem1;
MEMiHeapHead* hMem2;
void* wwwalloc_;
void (*wwwfree_)(void*);
void (*wwwfree_)(void* buf);
int (*wwwavail_)();
u32 hFreeSize1;
@@ -40,6 +42,7 @@ namespace ext_ead {
void* Heap::allocMem1(u32 size, int align) {
return MEMAllocFromExpHeapEx(hMem1, size, align);
}
void Heap::freeMem1(void* block) {
return MEMFreeToExpHeap(hMem1, block);
}
@@ -47,6 +50,7 @@ namespace ext_ead {
void* Heap::allocMem2(u32 size, int align) {
return MEMAllocFromExpHeapEx(hMem2, size, align);
}
void Heap::freeMem2(void* block) {
return MEMFreeToExpHeap(hMem2, block);
}
@@ -65,6 +69,7 @@ namespace ext_ead {
hFreeSize2 = MEMGetTotalFreeSizeForExpHeap(hMem2);
}
}
void Heap::reportLeaHeap() {
if (wwwavail_ != NULL) {
OSReport(" ++++++++++++++++++++++++++++++++++\n");
@@ -80,36 +85,34 @@ namespace ext_ead {
wwwfree_ = 0;
wwwavail_ = 0;
}
void SurfaceManager::CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf,
u32 mem2BufSize, void* libBuf, const char* arcPath) {
int iVar1;
undefined4 uVar2;
if (Instance_ == NULL) {
Heap::init(mem1Buf, mem1BufSize, mem2Buf, mem2BufSize);
Instance_ = (SurfaceManager*)Heap::allocMem1(sizeof(SurfaceManager), 4);
new (Instance_) SurfaceManager();
if (libBuf != NULL) {
Instance_->pLibBuf = (RSOObjectHeader*)libBuf;
Instance_->mpLibBuffer = (RSOObjectHeader*)libBuf;
}
if (arcPath != NULL) {
u32 arcPathLen = strlen(arcPath);
Instance_->pArcPath = (char*)Heap::allocMem1(arcPathLen + 1, 4);
strcpy(Instance_->pArcPath, arcPath);
Instance_->mpArcPath = (char*)Heap::allocMem1(arcPathLen + 1, 4);
strcpy(Instance_->mpArcPath, arcPath);
}
Instance_->InitInstance_(surfaceW, surfaceH, browserW, browserH);
}
return;
}
void Heap::destroy() {
MEMDestroyExpHeap(Heap::hMem1);
MEMDestroyExpHeap(Heap::hMem2);
}
void SurfaceManager::DisposeManager() {
if (Instance_ != NULL) {
Heap::freeMem1(Instance_->pArcPath);
Heap::freeMem1(Instance_->mpArcPath);
Instance_->DisposeInstance_();
Instance_->UnresolveRsoModule();
Instance_->~SurfaceManager();
@@ -120,20 +123,21 @@ namespace ext_ead {
Heap::destroy();
}
}
void SurfaceManager::ResolveRsoModule() {
int i;
RSOExportFuncTable* symRef;
print::TickTimer tt;
RSOObjectHeader* rso;
rso = (RSOObjectHeader*)pLibBuf;
rso = (RSOObjectHeader*)mpLibBuffer;
if (rso->bssSize != NULL) {
pBss = Heap::allocMem1(rso->bssSize, 0x20);
memset(pBss, 0, rso->bssSize);
mpRSOBss = Heap::allocMem1(rso->bssSize, 32);
memset(mpRSOBss, 0, rso->bssSize);
}
tt.reset();
RSOLinkList(rso, pBss);
RSOLinkList(rso, mpRSOBss);
tt.report("RSOLinkList");
if (RSOIsImportSymbolResolvedAll(rso))
OSReport("moduleD's ImportSymbol is resolved all.\n");
@@ -145,86 +149,100 @@ namespace ext_ead {
tt.report("RSO_prolog");
tt.reset();
for (i = 0; i < ARRAY_LENGTH(rsoSymbolList); i++) {
symRef = &rsoSymbolList[i];
for (i = 0; i < ARRAY_LENGTH(RsoExports); i++) {
symRef = &RsoExports[i];
*symRef->symbol_ptr = (u32)RSOFindExportSymbolAddr(rso, symRef->symbol_name);
}
tt.report("ResolveModule_www");
}
void SurfaceManager::UnresolveRsoModule() {
RSOObjectHeader* rso = (RSOObjectHeader*)pLibBuf;
if (pLibBuf != NULL) {
RSOObjectHeader* rso = (RSOObjectHeader*)mpLibBuffer;
if (mpLibBuffer != NULL) {
if (rso->epilog != NULL) {
((void (*)())rso->epilog)();
}
for (u32 i = 0; i < ARRAY_LENGTH(rsoSymbolList); i++) {
*rsoSymbolList[i].symbol_ptr = (u32)::unresolved_www;
for (u32 i = 0; i < ARRAY_LENGTH(RsoExports); i++) {
*RsoExports[i].symbol_ptr = (u32)::unresolved_www;
}
RSOUnLinkList(rso);
Heap::freeMem1(pBss);
Heap::freeMem1(mpRSOBss);
}
return;
}
SurfaceManager::SurfaceManager()
: mWidth(0x260), mHeight(0x1c8), unk_0x0c(0), pBrowserThread(NULL), pOperaThreadStack(NULL), pBss(NULL), pLibBuf(NULL), pArcPath(NULL) {
: mWidth(VI_MAX_WIDTH_FRAMEBUFFER), mHeight(VI_MAX_HEIGHT_FRAMEBUFFER), unk_0x0C(0), mpBrowserThread(NULL), mpOperaThreadStack(NULL),
mpRSOBss(NULL), mpLibBuffer(NULL), mpArcPath(NULL) {
OSInitMutex(&mMutex);
}
SurfaceManager::~SurfaceManager() {
}
void SurfaceManager::InitInstance_(int surfaceW, int surfaceH, int browserW, int browserH) {
mWidth = surfaceW;
mHeight = surfaceH;
pOperaThreadStack = Heap::allocMem1(0x20000, 0x20);
memset(pOperaThreadStack, 0, 0x20000);
print::IPLWWWReport(3, "www_surface: OperaThreadStack: ptr:%p\n", this->pOperaThreadStack);
mpOperaThreadStack = Heap::allocMem1(0x20000, 32);
memset(mpOperaThreadStack, 0, 0x20000);
print::IPLWWWReport(print::WWW_DEBUG, "www_surface: OperaThreadStack: ptr:%p\n", mpOperaThreadStack);
pBrowserThread = (BrowserThread*)Heap::allocMem1(0x6a8, 4);
new (pBrowserThread) BrowserThread();
mpBrowserThread = (BrowserThread*)Heap::allocMem1(sizeof(BrowserThread), 4);
new (mpBrowserThread) BrowserThread();
pBrowserThread->CreateThread(browserW, browserH, this->pOperaThreadStack, 0x20000, 0x14);
mpBrowserThread->CreateThread(browserW, browserH, mpOperaThreadStack, 0x20000, 20);
return;
}
void SurfaceManager::RegisterArcFile(void* fileBuf) {
if (Instance_ == NULL)
if (GetInstance() == NULL) {
return;
Instance_->pBrowserThread->RegisterArcFile(fileBuf);
}
GetInstance()->mpBrowserThread->RegisterArcFile(fileBuf);
}
void SurfaceManager::RegisterIniFile(void* fileBuf, u32 fileLen) {
if (Instance_ == NULL)
if (GetInstance() == NULL) {
return;
Instance_->pBrowserThread->RegisterIniFile(fileBuf, fileLen);
}
GetInstance()->mpBrowserThread->RegisterIniFile(fileBuf, fileLen);
}
void SurfaceManager::RegisterFontFile(int fontIdx, void* fileBuf, u32 fileLen) {
WWW_FONT_FILE_DATA_TABLE__[fontIdx].start = fileBuf;
WWW_FONT_FILE_DATA_TABLE__[fontIdx].end = (u8*)fileBuf + fileLen + 1;
}
void SurfaceManager::StartThread() {
if (Instance_ == NULL)
if (GetInstance() == NULL) {
return;
Instance_->pBrowserThread->Resume();
}
void SurfaceManager::StopThreadAsync() {
if (pBrowserThread)
pBrowserThread->StopThread();
}
bool SurfaceManager::IsThreadStopped() {
if (pBrowserThread)
return pBrowserThread->IsThreadStopped();
else
return true;
}
void SurfaceManager::DisposeInstance_() {
if (pBrowserThread != NULL) {
pBrowserThread->StopThread();
pBrowserThread->~BrowserThread();
Heap::freeMem1(pBrowserThread);
pBrowserThread = NULL;
}
if (pOperaThreadStack != NULL) {
Heap::freeMem1(pOperaThreadStack);
pOperaThreadStack = NULL;
GetInstance()->mpBrowserThread->Resume();
}
void SurfaceManager::StopThreadAsync() {
if (mpBrowserThread) {
mpBrowserThread->StopThread();
}
}
bool SurfaceManager::IsThreadStopped() {
if (mpBrowserThread) {
return mpBrowserThread->IsThreadStopped();
} else {
return true;
}
}
void SurfaceManager::DisposeInstance_() {
if (mpBrowserThread != NULL) {
mpBrowserThread->StopThread();
mpBrowserThread->~BrowserThread();
Heap::freeMem1(mpBrowserThread);
mpBrowserThread = NULL;
}
if (mpOperaThreadStack != NULL) {
Heap::freeMem1(mpOperaThreadStack);
mpOperaThreadStack = NULL;
}
}
} // namespace www

View File

@@ -38,7 +38,7 @@ namespace ext_ead {
BOOL ut_thread::WaitForThreadExit() {
BOOL result = FALSE;
if (OSJoinThread(&mThread, (void*)&result)) {
print::IPLWWWReport(3, "ut_thread: joined successfully.\n");
print::IPLWWWReport(print::WWW_DEBUG, "ut_thread: joined successfully.\n");
}
return result;
}

View File

@@ -5,54 +5,59 @@
namespace www {
namespace trasition {
bool allow_access(const char*, const char*, int) {
return 1;
return true;
}
static const char* globalNames[2] = {"wiiTrasition", NULL};
void AddJsPlugin() {
cap.name = globalNames;
cap.unk_0x04 = NULL;
cap.getter = &globalGetter_;
cap.unk_0x0c = NULL;
cap.unk_0x0C = NULL;
cap.unk_0x10 = NULL;
cap.unk_0x14 = NULL;
cap.unk_0x18 = NULL;
cap.allowAccess = allow_access;
(*WWWAddJSPlugin)("wiiTrasition.dll", &cap, &opera_callbacks);
WWWAddJSPlugin("wiiTrasition.dll", &cap, &opera_callbacks);
ScrollState_ = SCROLL_RESET;
OSReport("WWW_TRASITION: AddJSPlugin()\n");
return;
}
int globalGetter_(WWWJSPluginObj* obj, const char* str, WWWJSPluginValue* val) {
// int iVar1;
WWWJSPluginValueData data;
if (strcmp(str, "wiiTrasition") == 0) {
OSReport("WWW_TRASITION: call globalGetter_()\n");
if (opera_callbacks->globalGet(obj, 0, 0, 0, ObjectConstructor_, "", 0, &data) < 0) {
return 0xa;
// is this WWWError or it's own thing?
return 10;
} else {
val->ty = 0;
val->data.jsObj = data.jsObj;
return 0x7;
return 7;
}
} else {
return 0x8;
return 8;
}
}
int ObjectConstructor_(WWWJSPluginObj* objA, WWWJSPluginObj* objB, int valInt, WWWJSPluginValue* valA, WWWJSPluginValue* valB) {
WWWJSPluginValueData data;
if (valInt != 0)
return 0x13;
if (opera_callbacks->construct(objB, Getter_, 0, 0, &data) < 0)
return 0x12;
if (valInt != 0) {
return 19;
}
if (opera_callbacks->construct(objB, Getter_, 0, 0, &data) < 0) {
return 18;
}
valB->ty = 0;
valB->data.jsObj = data.jsObj;
*(u32*)data.jsObj = 0;
return 0x10;
return 16;
}
int Getter_(WWWJSPluginObj* obj, const char* str, WWWJSPluginValue* val) {
@@ -60,38 +65,42 @@ namespace www {
void* objRight;
if (strcmp(str, "LeftScroll") == 0) {
if (opera_callbacks->globalGet(obj, 0, 0, LeftScroll_, LeftScroll_, "", 0, (WWWJSPluginValueData*)&objLeft) < 0)
return 0x0a;
if (opera_callbacks->globalGet(obj, 0, 0, LeftScroll_, LeftScroll_, "", 0, (WWWJSPluginValueData*)&objLeft) < 0) {
return 10;
}
val->ty = 0;
val->data.jsObj = objLeft;
return 7;
}
if (strcmp(str, "RightScroll") == 0) {
if (opera_callbacks->globalGet(obj, 0, 0, RightScroll_, RightScroll_, "", 0, (WWWJSPluginValueData*)&objRight) < 0)
return 0x0a;
if (opera_callbacks->globalGet(obj, 0, 0, RightScroll_, RightScroll_, "", 0, (WWWJSPluginValueData*)&objRight) < 0) {
return 10;
}
val->ty = 0;
val->data.jsObj = objRight;
return 0x07;
return 7;
}
return 0x08;
return 8;
}
int LeftScroll_(WWWJSPluginObj*, WWWJSPluginObj*, int, WWWJSPluginValue*, WWWJSPluginValue*) {
ext_ead::www::print::IPLWWWReport(3, "Left Scroll Set!!\n");
ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, "Left Scroll Set!!\n");
ScrollState_ = SCROLL_LEFT;
return 0x11;
return 17;
}
int RightScroll_(WWWJSPluginObj*, WWWJSPluginObj*, int, WWWJSPluginValue*, WWWJSPluginValue*) {
ext_ead::www::print::IPLWWWReport(3, "Right Scroll Set.!!\n");
ext_ead::www::print::IPLWWWReport(ext_ead::www::print::WWW_DEBUG, "Right Scroll Set.!!\n");
ScrollState_ = SCROLL_RIGHT;
return 0x11;
return 17;
}
ScrollState GetScrollState() {
return ScrollState_;
}
void ResetScrollState() {
ScrollState_ = SCROLL_RESET;
}

File diff suppressed because it is too large Load Diff

View File

@@ -11,32 +11,34 @@ namespace ext_ead {
namespace window {
IPL_WWW_REPORT_REDEFINE_MESSAGE(true);
}
BrowserWindow::BrowserWindow(BrowserThread* thread) : pWwwWindow(NULL), pThread(thread) {
unk_0x2b0 = 0;
BrowserWindow::BrowserWindow(BrowserThread* thread) : mpWwwWindow(NULL), mpBrowserThread(thread) {
unk_0x2B0 = 0;
mRenderingMode = 6;
unk_0x2c4[0] = 0;
unk_0x2c4[1] = 0;
unk_0x2c4[2] = 0;
unk_0x2c4[3] = 0;
unk_0x2c4[4] = 0;
unk_0x2c4[5] = 0;
unk_0x2C4[0] = 0;
unk_0x2C4[1] = 0;
unk_0x2C4[2] = 0;
unk_0x2C4[3] = 0;
unk_0x2C4[4] = 0;
unk_0x2C4[5] = 0;
int i, j;
for (i = 0; i < 2; i++) {
for (j = 0; j < 3; j++) {
for (i = 0; i < (int)ARRAY_LENGTH(mTexBufArr); i++) {
for (j = 0; j < (int)ARRAY_LENGTH(mTexBufArr[0]); j++) {
mTexBufArr[i][j] = NULL;
}
unk_0x2b4[i] = NULL;
unk_0x2B4[i] = NULL;
}
unk_0x2bc = 0;
unk_0x2c0 = 0;
unk_0x2BC = 0;
unk_0x2C0 = 0;
struct {
int v0, v1;
} unused = {0, 0};
}
BrowserWindow::~BrowserWindow() {
CloseWindow();
}
@@ -45,52 +47,54 @@ namespace ext_ead {
mWidth = w;
mHeight = h;
WWWRect rect;
rect.x = 0;
rect.y = 0;
rect.w = 0;
rect.h = 0;
WWWRect rect = {0, 0, 0, 0};
rect.w = mWidth;
rect.h = mHeight;
for (int i = 0; i < 2; i++) {
for (int j = 0; j < 3; j++) {
for (int i = 0; i < (int)ARRAY_LENGTH(mTexBufArr); i++) {
for (int j = 0; j < (int)ARRAY_LENGTH(mTexBufArr[0]); j++) {
mTexDisplayRects[i][j] = rect;
u32 texBufSize = GXGetTexBufferSize(texW, texH, GX_TF_RGB565, 0, 0);
mTexBufArr[i][j] = Heap::allocMem2(texBufSize, 0x20);
mTexBufArr[i][j] = Heap::allocMem2(texBufSize, 32);
memset(mTexBufArr[i][j], 0, texBufSize);
DCStoreRange(mTexBufArr[i][j], texBufSize);
print::IPLWWWReport(3, " TextureBuffer_ %d:%d ptr:%p\n", j, i, mTexBufArr[i][j]);
print::IPLWWWReport(print::WWW_DEBUG, " TextureBuffer_ %d:%d ptr:%p\n", j, i, mTexBufArr[i][j]);
}
}
if ((*WWWCreateBrowserWindow)(*(void**)((u8*)pThread + 0x67c), &pWwwWindow, 0)) {
print::IPLWWWReport(1, "INFO: cannot create browser window\n");
if (WWWCreateBrowserWindow(mpBrowserThread->GetHandle(), &mpWwwWindow, 0)) {
print::IPLWWWReport(print::WWW_WARNING, "INFO: cannot create browser window\n");
return NULL;
} else {
WWWRect rect;
rect.x = 0;
rect.y = 0;
rect.w = 0;
rect.h = 0;
WWWRect rect = {0, 0, 0, 0};
rect.w = mWidth;
rect.h = mHeight;
(*WWWSetBrowserWindowRect)(pWwwWindow, &rect);
(*WWWSetImageMode)(pWwwWindow, GX_TF_RGB565);
(*WWWSetRenderingMode)(pWwwWindow, mRenderingMode);
(*WWWShowBrowserWindow)(pWwwWindow);
(*WWWRaiseBrowserWindow)(pWwwWindow);
(*WWWSetFocus)(pWwwWindow);
WWWSetBrowserWindowRect(mpWwwWindow, &rect);
WWWSetImageMode(mpWwwWindow, GX_TF_RGB565);
WWWSetRenderingMode(mpWwwWindow, mRenderingMode);
WWWShowBrowserWindow(mpWwwWindow);
WWWRaiseBrowserWindow(mpWwwWindow);
WWWSetFocus(mpWwwWindow);
GotoHome();
return pWwwWindow;
return mpWwwWindow;
}
}
void BrowserWindow::CloseWindow() {
(*WWWCloseBrowserWindow)(*(void**)((u8*)pThread + 0x67c), pWwwWindow);
pWwwWindow = NULL;
WWWCloseBrowserWindow(mpBrowserThread->GetHandle(), mpWwwWindow);
mpWwwWindow = NULL;
int i;
for (i = 0; i < 2; i++) {
for (int j = 0; j < 3; j++) {
for (i = 0; i < (int)ARRAY_LENGTH(mTexBufArr); i++) {
for (int j = 0; j < (int)ARRAY_LENGTH(mTexBufArr[0]); j++) {
void* currTexBuf = mTexBufArr[i][j];
if (currTexBuf != NULL) {
Heap::freeMem2(currTexBuf);
@@ -101,68 +105,74 @@ namespace ext_ead {
}
void BrowserWindow::PrevPage() {
(*WWWPrevPage)(pWwwWindow);
WWWPrevPage(mpWwwWindow);
}
void BrowserWindow::GotoHome() {
if (SurfaceManager::Instance_->pArcPath != NULL) {
(*WWWOpenUrl)(pWwwWindow, SurfaceManager::Instance_->pArcPath);
if (SurfaceManager::GetInstance()->GetArcPath() != NULL) {
WWWOpenUrl(mpWwwWindow, SurfaceManager::GetInstance()->GetArcPath());
} else {
(*WWWOpenUrl)(pWwwWindow, "file:dvd/html/startup.html");
WWWOpenUrl(mpWwwWindow, "file:dvd/html/startup.html");
}
}
void BrowserWindow::SendNotifyEvent(WWWEvent event, WWWHandleEventData* dataHandle) {
ExecWwwEvent_(event, dataHandle);
}
void BrowserWindow::ExecuteEvent() {
HandleNotifyEvent_();
}
void BrowserWindow::UpdateTexture() {
if (unk_0x2c4[0] == 0 && unk_0x2c4[1] != 0) {
print::IPLWWWReport(3, " XXX BrowserWindow::CopyToTextureBuffer\n");
if (unk_0x2C4[0] == 0 && unk_0x2C4[1] != 0) {
print::IPLWWWReport(print::WWW_DEBUG, " XXX BrowserWindow::CopyToTextureBuffer\n");
TileBlit_();
unk_0x2c4[1] = 0;
unk_0x2C4[1] = 0;
}
}
void BrowserWindow::ExecWwwEvent_(int eventCode, WWWHandleEventData* dataHandle) {
switch (eventCode) {
case 5:
if (unk_0x2c4[2] == '\0') {
unk_0x2c0 = (unk_0x2b0 + 1) % 2;
unk_0x2bc = unk_0x2b4[unk_0x2c0];
case WWW_EVT_URL_CHANGE: {
if (unk_0x2C4[2] == '\0') {
unk_0x2C0 = (unk_0x2B0 + 1) % 2;
unk_0x2BC = unk_0x2B4[unk_0x2C0];
}
unk_0x2c4[4] = 1;
unk_0x2c4[2] = 1;
unk_0x2c4[0] = 1;
unk_0x2C4[4] = 1;
unk_0x2C4[2] = 1;
unk_0x2C4[0] = 1;
break;
case 6:
if (unk_0x2c4[2] == '\0') {
if (unk_0x2c4[4] == '\0') {
unk_0x2c0 = unk_0x2b0;
unk_0x2bc = (int)(unk_0x2b4[unk_0x2b0] + 1) % 3;
}
case WWW_EVT_LOADING_START: {
if (unk_0x2C4[2] == '\0') {
if (unk_0x2C4[4] == '\0') {
unk_0x2C0 = unk_0x2B0;
unk_0x2BC = (int)(unk_0x2B4[unk_0x2B0] + 1) % 3;
}
unk_0x2c4[4] = 1;
unk_0x2c4[0] = 1;
print::IPLWWWReport(2, " LoadinStart: %d\n", unk_0x2b4[unk_0x2b0]);
unk_0x2C4[4] = 1;
unk_0x2C4[0] = 1;
print::IPLWWWReport(2, " LoadinStart: %d\n", unk_0x2B4[unk_0x2B0]);
}
break;
case 7: {
}
case WWW_EVT_LOADING_FINISHED: {
BOOL level = OSDisableInterrupts();
if (unk_0x2c4[0] != '\0') {
unk_0x2c4[0] = 0;
unk_0x2c4[1] = 1;
if (unk_0x2C4[0] != '\0') {
unk_0x2C4[0] = 0;
unk_0x2C4[1] = 1;
}
OSRestoreInterrupts(level);
break;
}
case 0x1e:
case WWW_EVT_IMECREATE: {
ImeData data;
pThread->CreateImeData(&data, (WWWIMEData*)dataHandle);
pThread->SendEventFromWindow(&data);
mpBrowserThread->CreateImeData(&data, (WWWIMEData*)dataHandle);
mpBrowserThread->SendEventFromWindow(&data);
break;
}
}
ReportEventId_(eventCode, dataHandle);
return;
}
void BrowserWindow::HandleNotifyEvent_() {
@@ -176,25 +186,26 @@ namespace ext_ead {
// goto TRY_RECEIVE;
while (mMessage.TryReceiveTypedMessage(&cmd)) {
if ((cmd.mEventCode & 0xf0000000) == 0x10000000) {
ExecWwwEvent_(cmd.mEventCode & 0xfffffff, cmd.pHandleEventData);
if ((cmd.eventCode & 0xf0000000) == 0x10000000) {
ExecWwwEvent_(cmd.eventCode & 0xFFFFFFf, cmd.pHandleEventData);
}
};
}
void BrowserWindow::TileBlit_() {
typedef u32 SubRow[4];
if (unk_0x2c4[0] != '\0')
if (unk_0x2C4[0] != '\0') {
return;
}
u32 srcBlockAdvance;
u32 srcRowAdvance;
void* rasterSrc;
u16* blockRowDst;
srcRowAdvance = SurfaceManager::Instance_->mWidth * sizeof(u32);
srcRowAdvance = SurfaceManager::GetInstance()->GetWidth() * sizeof(u32);
rasterSrc = *(void**)((u8*)pThread + 0x674);
rasterSrc = mpBrowserThread->GetRaster();
blockRowDst = (u16*)GetTextureBuffer(0, TRUE, NULL);
srcBlockAdvance = srcRowAdvance * sizeof(u32);
@@ -206,55 +217,55 @@ namespace ext_ead {
SubRow* blockRowD = (SubRow*)((u8*)blockRowC + srcRowAdvance);
for (int blockX = 0; blockX < mWidth; blockX += 4) {
blockDst[0x0] = convertToRGB565((*blockRowA)[0]);
blockDst[0x1] = convertToRGB565((*blockRowA)[1]);
blockDst[0x2] = convertToRGB565((*blockRowA)[2]);
blockDst[0x3] = convertToRGB565((*blockRowA++)[3]);
blockDst[0] = convertToRGB565((*blockRowA)[0]);
blockDst[1] = convertToRGB565((*blockRowA)[1]);
blockDst[2] = convertToRGB565((*blockRowA)[2]);
blockDst[3] = convertToRGB565((*blockRowA++)[3]);
blockDst[0x4] = convertToRGB565((*blockRowB)[0]);
blockDst[0x5] = convertToRGB565((*blockRowB)[1]);
blockDst[0x6] = convertToRGB565((*blockRowB)[2]);
blockDst[0x7] = convertToRGB565((*blockRowB++)[3]);
blockDst[4] = convertToRGB565((*blockRowB)[0]);
blockDst[5] = convertToRGB565((*blockRowB)[1]);
blockDst[6] = convertToRGB565((*blockRowB)[2]);
blockDst[7] = convertToRGB565((*blockRowB++)[3]);
blockDst[0x8] = convertToRGB565((*blockRowC)[0]);
blockDst[0x9] = convertToRGB565((*blockRowC)[1]);
blockDst[0xa] = convertToRGB565((*blockRowC)[2]);
blockDst[0xb] = convertToRGB565((*blockRowC++)[3]);
blockDst[8] = convertToRGB565((*blockRowC)[0]);
blockDst[9] = convertToRGB565((*blockRowC)[1]);
blockDst[10] = convertToRGB565((*blockRowC)[2]);
blockDst[11] = convertToRGB565((*blockRowC++)[3]);
blockDst[0xc] = convertToRGB565((*blockRowD)[0]);
blockDst[0xd] = convertToRGB565((*blockRowD)[1]);
blockDst[0xe] = convertToRGB565((*blockRowD)[2]);
blockDst[0xf] = convertToRGB565((*blockRowD++)[3]);
blockDst[12] = convertToRGB565((*blockRowD)[0]);
blockDst[13] = convertToRGB565((*blockRowD)[1]);
blockDst[14] = convertToRGB565((*blockRowD)[2]);
blockDst[15] = convertToRGB565((*blockRowD++)[3]);
blockDst += 0x10;
blockDst += 16;
}
rasterSrc = (u8*)rasterSrc + srcBlockAdvance;
blockRowDst += mWidth * 4;
}
WWWRect* newRect;
WWWRect rect;
DCStoreRange(GetTextureBuffer(0, true, &newRect), mWidth * mHeight * 2);
rect.x = 0;
rect.y = 0;
rect.w = 0;
rect.h = 0;
WWWRect rect = {0, 0, 0, 0};
rect.w = mWidth;
rect.h = mHeight;
*newRect = rect;
BOOL level = OSDisableInterrupts();
if (unk_0x2c4[2] != '\0') {
unk_0x2c4[2] = 0;
unk_0x2c4[3] = 1;
if (unk_0x2C4[2] != '\0') {
unk_0x2C4[2] = 0;
unk_0x2C4[3] = 1;
}
unk_0x2c4[4] = 0;
unk_0x2b0 = unk_0x2c0;
unk_0x2b4[unk_0x2c0] = unk_0x2bc;
unk_0x2c4[5] = 1;
unk_0x2C4[4] = 0;
unk_0x2B0 = unk_0x2C0;
unk_0x2B4[unk_0x2C0] = unk_0x2BC;
unk_0x2C4[5] = 1;
OSRestoreInterrupts(level);
}
u16 BrowserWindow::convertToRGB565(u32 argb) {
union {
u32 argb;
@@ -267,155 +278,183 @@ namespace ext_ead {
} bytes;
bytes.argb = argb;
u32 r = (bytes.r >> 3) & 0x1f;
u32 g = (bytes.g >> 2) & 0x3f;
u32 b = (bytes.b >> 3) & 0x1f;
u32 r = (bytes.r >> 3) & 0x1F;
u32 g = (bytes.g >> 2) & 0x3F;
u32 b = (bytes.b >> 3) & 0x1F;
return (r << 11) | (g << 5) | b;
}
void BrowserWindow::ReportEventId_(int eventCode, void* somePtr) {
switch (eventCode) {
case WWW_EVT_CURSOR_CHANGE:
print::IPLWWWReport(4, "WWW_EVT_CURSOR_CHANGE\n");
return;
case WWW_EVT_WINDOW_CLOSE:
print::IPLWWWReport(4, "WWW_EVT_WINDOW_CLOSE\n");
return;
case WWW_EVT_WINDOW_NEW:
print::IPLWWWReport(4, "WWW_EVT_WINDOW_NEW\n");
return;
case WWW_EVT_WINDOW_REQUEST:
print::IPLWWWReport(4, "WWW_EVT_WINDOW_REQUEST\n");
return;
case WWW_EVT_AUTHENTICATION:
print::IPLWWWReport(4, "WWW_EVT_AUTHENTICATION\n");
return;
case WWW_EVT_URL_CHANGE:
print::IPLWWWReport(4, "WWW_EVT_URL_CHANGE\n");
return;
case WWW_EVT_LOADING_START:
print::IPLWWWReport(4, "WWW_EVT_LOADING_START\n");
return;
case WWW_EVT_LOADING_FINISHED:
print::IPLWWWReport(4, "WWW_EVT_LOADING_FINISHED\n");
return;
case WWW_EVT_LOADING_PROGRESS:
print::IPLWWWReport(4, "WWW_EVT_LOADING_PROGRESS\n");
return;
case WWW_EVT_UPLOADING_START:
print::IPLWWWReport(4, "WWW_EVT_UPLOADING_START\n");
return;
case WWW_EVT_UPLOADING_FINISHED:
print::IPLWWWReport(4, "WWW_EVT_UPLOADING_FINISHED\n");
return;
case WWW_EVT_DOCUMENT_TITLE:
print::IPLWWWReport(4, "WWW_EVT_DOCUMENT_TITLE\n");
return;
case WWW_EVT_DOCUMENT_SIZE:
print::IPLWWWReport(4, "WWW_EVT_DOCUMENT_SIZE\n");
return;
case WWW_EVT_DOCUMENT_ICON:
print::IPLWWWReport(4, "WWW_EVT_DOCUMENT_ICON\n");
return;
case WWW_EVT_LINK_CLICKED:
print::IPLWWWReport(4, "WWW_EVT_LINK_CLICKED\n");
return;
case WWW_EVT_SECURITY_MODE:
print::IPLWWWReport(4, "WWW_EVT_SECURITY_MODE\n");
return;
case WWW_EVT_LINK_NAVIGATED:
print::IPLWWWReport(4, "WWW_EVT_LINK_NAVIGATED\n");
return;
case WWW_EVT_LINK_HOVER:
// @bug this should include a format argument but it doesn't
print::IPLWWWReport(4, "WWW_EVT_LINK_HOVER %p\n", somePtr);
return;
case WWW_EVT_UNKNOWN_PROTOCOL:
print::IPLWWWReport(4, "WWW_EVT_UNKNOWN_PROTOCOL\n");
return;
case WWW_EVT_DOWNLOAD:
print::IPLWWWReport(4, "WWW_EVT_DOWNLOAD\n");
return;
case WWW_EVT_ERROR:
print::IPLWWWReport(4, "WWW_EVT_ERROR\n");
return;
case WWW_EVT_IMECREATE:
print::IPLWWWReport(4, "WWW_EVT_IMECREATE\n");
return;
case WWW_EVT_IMEMOVE:
print::IPLWWWReport(4, "WWW_EVT_IMEMOVE\n");
return;
case WWW_EVT_IMECANCEL:
print::IPLWWWReport(4, "WWW_EVT_IMECANCEL\n");
return;
case WWW_EVT_ASYNC_DIALOG:
print::IPLWWWReport(4, "WWW_EVT_ASYNC_DIALOG\n");
return;
case WWW_EVT_BLOCKING_DIALOG:
print::IPLWWWReport(4, "WWW_EVT_BLOCKING_DIALOG\n");
return;
case WWW_EVT_OUT_OF_MEMORY:
print::IPLWWWReport(4, "WWW_EVT_OUT_OF_MEMORY\n");
return;
case WWW_EVT_SOFT_OUT_OF_MEMORY:
print::IPLWWWReport(4, "WWW_EVT_SOFT_OUT_OF_MEMORY\n");
return;
case WWW_EVT_PROTOCOL_LOADING_START:
print::IPLWWWReport(4, "WWW_EVT_PROTOCOL_LOADING_START\n");
return;
case WWW_EVT_EXISTS_HISTORY:
print::IPLWWWReport(4, "WWW_EVT_EXISTS_HISTORY\n");
return;
case WWW_EVT_EXTERNAL_ACTION:
print::IPLWWWReport(4, "WWW_EVT_EXTERNAL_ACTION\n");
return;
case WWW_EVT_SCREEN_INVALID:
print::IPLWWWReport(4, "WWW_EVT_SCREEN_INVALID\n");
return;
case WWW_EVT_FILTERED_URL:
print::IPLWWWReport(4, "WWW_EVT_FILTERED_URL\n");
return;
default:
print::IPLWWWReport(4, "RecvNotifyEvent: %d\n", eventCode);
return;
case WWW_EVT_UNK_0x13:
return;
case WWW_EVT_CURSOR_CHANGE: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_CURSOR_CHANGE\n");
break;
}
case WWW_EVT_WINDOW_CLOSE: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_WINDOW_CLOSE\n");
break;
}
case WWW_EVT_WINDOW_NEW: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_WINDOW_NEW\n");
break;
}
case WWW_EVT_WINDOW_REQUEST: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_WINDOW_REQUEST\n");
break;
}
case WWW_EVT_AUTHENTICATION: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_AUTHENTICATION\n");
break;
}
case WWW_EVT_URL_CHANGE: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_URL_CHANGE\n");
break;
}
case WWW_EVT_LOADING_START: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LOADING_START\n");
break;
}
case WWW_EVT_LOADING_FINISHED: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LOADING_FINISHED\n");
break;
}
case WWW_EVT_LOADING_PROGRESS: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LOADING_PROGRESS\n");
break;
}
case WWW_EVT_UPLOADING_START: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_UPLOADING_START\n");
break;
}
case WWW_EVT_UPLOADING_FINISHED: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_UPLOADING_FINISHED\n");
break;
}
case WWW_EVT_DOCUMENT_TITLE: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_DOCUMENT_TITLE\n");
break;
}
case WWW_EVT_DOCUMENT_SIZE: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_DOCUMENT_SIZE\n");
break;
}
case WWW_EVT_DOCUMENT_ICON: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_DOCUMENT_ICON\n");
break;
}
case WWW_EVT_LINK_CLICKED: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LINK_CLICKED\n");
break;
}
case WWW_EVT_SECURITY_MODE: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_SECURITY_MODE\n");
break;
}
case WWW_EVT_LINK_NAVIGATED: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LINK_NAVIGATED\n");
break;
}
case WWW_EVT_LINK_HOVER: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_LINK_HOVER %p\n", somePtr);
break;
}
case WWW_EVT_UNKNOWN_PROTOCOL: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_UNKNOWN_PROTOCOL\n");
break;
}
case WWW_EVT_DOWNLOAD: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_DOWNLOAD\n");
break;
}
case WWW_EVT_ERROR: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_ERROR\n");
break;
}
case WWW_EVT_IMECREATE: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_IMECREATE\n");
break;
}
case WWW_EVT_IMEMOVE: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_IMEMOVE\n");
break;
}
case WWW_EVT_IMECANCEL: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_IMECANCEL\n");
break;
}
case WWW_EVT_ASYNC_DIALOG: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_ASYNC_DIALOG\n");
break;
}
case WWW_EVT_BLOCKING_DIALOG: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_BLOCKING_DIALOG\n");
break;
}
case WWW_EVT_OUT_OF_MEMORY: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_OUT_OF_MEMORY\n");
break;
}
case WWW_EVT_SOFT_OUT_OF_MEMORY: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_SOFT_OUT_OF_MEMORY\n");
break;
}
case WWW_EVT_PROTOCOL_LOADING_START: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_PROTOCOL_LOADING_START\n");
break;
}
case WWW_EVT_EXISTS_HISTORY: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_EXISTS_HISTORY\n");
break;
}
case WWW_EVT_EXTERNAL_ACTION: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_EXTERNAL_ACTION\n");
break;
}
case WWW_EVT_SCREEN_INVALID: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_SCREEN_INVALID\n");
break;
}
case WWW_EVT_FILTERED_URL: {
print::IPLWWWReport(print::WWW_EVENT, "WWW_EVT_FILTERED_URL\n");
break;
}
default: {
print::IPLWWWReport(print::WWW_EVENT, "RecvNotifyEvent: %d\n", eventCode);
break;
}
case WWW_EVT_UNKNOWN_19: {
break;
}
}
return;
}
void* BrowserWindow::GetTextureBuffer(int a, bool b, WWWRect** rectPtrOut) {
u32 i;
u32 j;
if (!b && unk_0x2c4[5] == 0)
if (!b && unk_0x2C4[5] == 0)
return NULL;
if (unk_0x2c4[4] != 0 && b) {
i = unk_0x2c0;
j = unk_0x2bc;
if (unk_0x2C4[4] != 0 && b) {
i = unk_0x2C0;
j = unk_0x2BC;
} else {
i = (unk_0x2b0 + 2 - a) % 2;
j = unk_0x2b4[i];
i = (unk_0x2B0 + 2 - a) % 2;
j = unk_0x2B4[i];
}
if (rectPtrOut != NULL) {
*rectPtrOut = &mTexDisplayRects[i][j];
}
return this->mTexBufArr[i][j];
return mTexBufArr[i][j];
}
void BrowserWindow::SetWindowSize(int w, int h) {
WWWRect rect;
mWidth = w;
mHeight = h;
rect.x = 0;
rect.y = 0;
rect.w = 0;
rect.h = 0;
WWWRect rect = {0, 0, 0, 0};
rect.w = mWidth;
rect.h = mHeight;
(*WWWSetBrowserWindowRect)(pWwwWindow, &rect);
WWWSetBrowserWindowRect(mpWwwWindow, &rect);
}
} // namespace www

View File

@@ -24,7 +24,7 @@ namespace ipl {
System::getProjectionRect(&projRect);
// Get Cursor Position
ipl::math::VEC2 conProjPos = con->getDpdProjectionPos();
math::VEC2 conProjPos = con->getDpdProjectionPos();
if ((projRect.left > conProjPos.x || conProjPos.x > projRect.right) ||
(projRect.top > conProjPos.y && conProjPos.y > projRect.bottom)) {
conProjPos.y = IPL_MATH_NULL_FLOAT;

View File

@@ -117,7 +117,7 @@ namespace ipl {
}
void BoardObject::create(nand::LayoutFile* file, u8* recordData, u32 gameCode, const CDBId& cdbId, const CDBRecordKey& recordKey,
const ipl::utility::Date& date) {
const utility::Date& date) {
mpRecordData = recordData;
mpLayoutFile = file;
@@ -219,7 +219,7 @@ namespace ipl {
mMoveAnim.calc();
ipl::math::VEC2 finalPos = offsetPos + mBoardPos + mMoveSpeed + mMoveAnim.get2();
math::VEC2 finalPos = offsetPos + mBoardPos + mMoveSpeed + mMoveAnim.get();
finalPos.x *= locationAdjust;
mpLayout->GetRootPane()->SetTranslate(finalPos);
mpLayout->calc();

View File

@@ -21,7 +21,7 @@ namespace ipl {
sdWorker->mount_sd_async();
break;
}
case SDVFWorker::SD_STATE_AVAILABLE: {
case SDVFWorker::SD_STATE_READY: {
mSDState = SD_STATE_INSERTED;
sdWorker->prepare_cdb_backup_to_sd_async();
mState = STATE_PREPARE_RESULT;

View File

@@ -5,60 +5,66 @@
namespace ipl {
namespace scene {
void AnmPane::calc() {
if (pAnmCurr != NULL && !pAnmCurr->animator->isPlaying()) {
pAnmCurr = NULL;
if (mpAnmCurr != NULL && !mpAnmCurr->animator->isPlaying()) {
mpAnmCurr = NULL;
on_cmd_recv(ANIM_CMD_CANCEL);
}
on_cmd_recv(mCurrCmd);
}
void AnmPane::on_cmd_recv(AnimCommand cmd) {
if (cmd == ANIM_CMD_POINT || cmd == ANIM_CMD_LEFT) {
mCurrCmd = cmd;
}
switch (mCurrState) {
case ANIM_STATE_IDLE:
case ANIM_STATE_IDLE: {
if (cmd == ANIM_CMD_POINT) {
pAnmCurr = pAnmIn;
pAnmCurr->animator->play();
mpAnmCurr = mpAnmIn;
mpAnmCurr->animator->play();
mPrevState = mCurrState;
mCurrState = ANIM_STATE_POINT;
} else if (cmd == ANIM_CMD_LEFT) {
pAnmCurr = pAnmOut;
pAnmCurr->animator->play();
mpAnmCurr = mpAnmOut;
mpAnmCurr->animator->play();
mPrevState = mCurrState;
mCurrState = ANIM_STATE_LEFT;
}
break;
case ANIM_STATE_POINT:
if (cmd != ANIM_CMD_CANCEL)
}
case ANIM_STATE_POINT: {
if (cmd != ANIM_CMD_CANCEL) {
break;
}
if (mCurrCmd == ANIM_CMD_POINT)
if (mCurrCmd == ANIM_CMD_POINT) {
mCurrCmd = ANIM_CMD_NONE;
}
mPrevState = mCurrState;
mCurrState = ANIM_STATE_IDLE;
break;
case ANIM_STATE_LEFT:
if (cmd != ANIM_CMD_CANCEL)
}
case ANIM_STATE_LEFT: {
if (cmd != ANIM_CMD_CANCEL) {
break;
}
if (mCurrCmd == ANIM_CMD_LEFT)
if (mCurrCmd == ANIM_CMD_LEFT) {
mCurrCmd = ANIM_CMD_NONE;
}
mPrevState = mCurrState;
mCurrState = ANIM_STATE_IDLE;
break;
}
}
}
void AnmController::add_animation(const char* brlan, const char* group) {
layout::GroupAnimator* animator = pLytObj->bindToGroup(brlan, group, false);
nw4r::ut::List_Append(&mAnmList, new (pHeap) Anm(animator));
layout::GroupAnimator* animator = mpLayout->bindToGroup(brlan, group, false);
nw4r::ut::List_Append(&mAnmList, new (mpHeap) Anm(animator));
}
void AnmController::do_animation(int idx, int anmType, bool calc) {
@@ -66,8 +72,9 @@ namespace ipl {
anm->animator->setAnmType(anmType);
anm->animator->play();
if (calc)
pLytObj->calc();
if (calc) {
mpLayout->calc();
}
}
void AnmController::stop_animation(int idx) {
@@ -85,7 +92,7 @@ namespace ipl {
}
void AnmController::add_anmpane(const char* name, Anm* anmIn, Anm* anmOut) {
nw4r::ut::List_Append(&mPaneList, new (pHeap) AnmPane(name, anmIn, anmOut));
nw4r::ut::List_Append(&mPaneList, new (mpHeap) AnmPane(name, anmIn, anmOut));
}
AnmPane* AnmController::get_anmpane(const char* name) {
@@ -101,7 +108,7 @@ namespace ipl {
void AnmController::clear_anmpane(const char* name) {
AnmPane* pane = get_anmpane(name);
pPaneManager->initPane(pLytObj->FindPaneByName(name));
mpGui->initPane(mpLayout->FindPaneByName(name));
if (pane->hoverCount() >= 1) {
pane->on_cmd_recv(AnmPane::ANIM_CMD_LEFT);
}
@@ -109,34 +116,37 @@ namespace ipl {
}
void AnmController::set_textbox(const char* name, u32 msgId) {
nw4r::lyt::TextBox* textbox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(pLytObj->FindPaneByName(name));
nw4r::lyt::TextBox* textbox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(name));
textbox->SetString(System::getMessage(msgId));
}
void AnmController::set_textbox(const char* name, const wchar_t* msg) {
nw4r::lyt::TextBox* textbox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(pLytObj->FindPaneByName(name));
nw4r::lyt::TextBox* textbox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(name));
textbox->SetString(msg);
}
void AnmController::set_texture(const char* name, const GXTexObj& tex) {
pLytObj->FindPaneByName(name)->FindMaterialByName(name)->SetTexture(0, tex);
mpLayout->FindPaneByName(name)->FindMaterialByName(name)->SetTexture(0, tex);
}
void AnmController::set_visible(const char* name, bool visibility) {
pLytObj->FindPaneByName(name)->SetVisible(visibility);
mpLayout->FindPaneByName(name)->SetVisible(visibility);
}
bool AnmController::get_visible(const char* name) {
return pLytObj->FindPaneByName(name)->IsVisible();
return mpLayout->FindPaneByName(name)->IsVisible();
}
void AnmController::set_translate(const char* name, const nw4r::math::VEC3& translate) {
pLytObj->FindPaneByName(name)->SetTranslate(translate);
mpLayout->FindPaneByName(name)->SetTranslate(translate);
}
const nw4r::math::VEC3& AnmController::get_translate(const char* name) {
return pLytObj->FindPaneByName(name)->GetTranslate();
return mpLayout->FindPaneByName(name)->GetTranslate();
}
const nw4r::math::VEC2& AnmController::get_scale(const char* name) {
return pLytObj->FindPaneByName(name)->GetScale();
return mpLayout->FindPaneByName(name)->GetScale();
}
} // namespace scene
} // namespace ipl

View File

@@ -4,36 +4,9 @@
namespace ipl {
namespace scene {
enum ChanAppBaseAnimIdx {
ANIM_DATA_IN = 0, // 0x00
ANIM_DATA_OUT, // 0x01
ANIM_SELECT_IN, // 0x02
ANIM_SELECT_WII_IN, // 0x03
ANIM_SELECT_WII_OUT, // 0x04
ANIM_SELECT_WII_FLASH, // 0x05
ANIM_SELECT_SD_IN, // 0x06
ANIM_SELECT_SD_OUT, // 0x07
ANIM_SELECT_SD_FLASH, // 0x08
ANIM_ARROWS_MOVE_L, // 0x09
ANIM_ARROWS_MOVE_R, // 0x0a
ANIM_ARROW_R_SELECT, // 0x0b
ANIM_ARROW_L_SELECT, // 0x0c
ANIM_ARROW_R_FOCUS_ON, // 0x0d
ANIM_ARROW_L_FOCUS_ON, // 0x0e
ANIM_ARROW_R_FOCUS_OFF, // 0x0f
ANIM_ARROW_L_FOCUS_OFF, // 0x10
ANIM_ARROW_R_LOOP, // 0x11
ANIM_ARROW_R_END, // 0x12
ANIM_ARROW_L_END, // 0x13
ANIM_ARROW_R_LOST, // 0x14
ANIM_ARROW_L_LOST, // 0x15
ANIM_ERROR_TEXT_IN, // 0x16
ANIM_ERROR_TEXT_OUT, // 0x17
};
ChanAppBase::ChanAppBase(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName)
: AnmController(heap), ::gui::EventHandler(), mState(CHANAPP_IDLE) {
pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName);
ChanAppBase::ChanAppBase(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName)
: AnmController(heap), ::gui::EventHandler(), mState(STATE_IDLE) {
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
add_animation("it_ObjChannelEdit_a_DataIn.brlan", "G_DataAll");
add_animation("it_ObjChannelEdit_a_DataOut.brlan", "G_DataAll");
@@ -62,7 +35,7 @@ namespace ipl {
get_animation(ANIM_SELECT_WII_OUT)->animator->setAnmType(ANIM_TYPE_BACKWARD);
get_animation(ANIM_SELECT_SD_OUT)->animator->setAnmType(ANIM_TYPE_BACKWARD);
pLytObj->finishBinding();
mpLayout->finishBinding();
set_textbox("T_SelectWii_00", MESG_SAVEDATA_EDIT_WII);
set_textbox("T_SelectWii_01", MESG_SAVEDATA_EDIT_WII);
@@ -76,14 +49,14 @@ namespace ipl {
set_visible("N_Capa_00", false);
set_visible("T_Capa_00", false);
pPaneManager = new (heap) ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true);
pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt());
pPaneManager->setAllComponentTriggerTarget(false);
mpGui = new (heap) gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_ArwR"), true);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_ArwL"), true);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_SelectWii_00"), true);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_SelectSd_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_ArwR"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_ArwL"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_SelectWii_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_SelectSd_00"), true);
add_anmpane("B_ArwR", get_animation(ANIM_ARROW_R_FOCUS_ON), get_animation(ANIM_ARROW_R_FOCUS_OFF));
add_anmpane("B_ArwL", get_animation(ANIM_ARROW_L_FOCUS_ON), get_animation(ANIM_ARROW_L_FOCUS_OFF));
@@ -92,102 +65,122 @@ namespace ipl {
}
ChanAppBase::~ChanAppBase() {
delete pLytObj;
delete pPaneManager;
delete mpLayout;
delete mpGui;
}
void ChanAppBase::calc() {
AnmPane* anmPane;
pLytObj->calc();
pPaneManager->calc();
mpLayout->calc();
mpGui->calc();
anmPane = NULL;
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL)
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) {
anmPane->calc();
}
switch (mState) {
case CHANAPP_IDLE:
case STATE_IDLE: {
break;
case CHANAPP_FADEIN1ST:
}
case STATE_FADE_IN_1ST: {
on_fadein1st();
break;
case CHANAPP_FADEIN2ND:
}
case STATE_FADE_IN_2ND: {
on_fadein2nd();
break;
case CHANAPP_FADEOUT:
}
case STATE_FADE_OUT: {
on_fadeout();
break;
case CHANAPP_CHANGE_SD_TO_WII:
}
case STATE_CHANGE_SD_TO_WII: {
on_change_sd_to_wii();
break;
case CHANAPP_CHANGE_WII_TO_SD:
}
case STATE_CHANGE_WII_TO_SD: {
on_change_wii_to_sd();
break;
case CHANAPP_SCROLL_R:
}
case STATE_SCROLL_R: {
on_scroll_r();
break;
case CHANAPP_SCROLL_L:
}
case STATE_SCROLL_L: {
on_scroll_l();
break;
case CHANAPP_TEXT_FADEIN:
}
case STATE_TEXT_FADEIN: {
on_text_fadein();
break;
case CHANAPP_TEXT_FADEOUT:
}
case STATE_TEXT_FADEOUT: {
on_text_fadeout();
break;
}
default: {
break;
}
}
}
void ChanAppBase::draw() {
pLytObj->draw();
mpLayout->draw();
}
void ChanAppBase::update() {
pPaneManager->update();
mpGui->update();
}
void ChanAppBase::anmFadein() {
do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true);
mState = CHANAPP_FADEIN1ST;
mState = STATE_FADE_IN_1ST;
}
void ChanAppBase::anmFadeout(bool isErr) {
do_animation(ANIM_DATA_OUT, ANIM_TYPE_FORWARD, true);
if (isErr) {
do_animation(ANIM_ERROR_TEXT_OUT, ANIM_TYPE_FORWARD, true);
}
mState = CHANAPP_FADEOUT;
mState = STATE_FADE_OUT;
}
void ChanAppBase::anmChangeWiitoSD() {
do_animation(ANIM_SELECT_SD_FLASH, ANIM_TYPE_FORWARD, true);
mState = CHANAPP_CHANGE_WII_TO_SD;
mState = STATE_CHANGE_WII_TO_SD;
}
void ChanAppBase::anmChangeSDtoWii() {
do_animation(ANIM_SELECT_WII_FLASH, ANIM_TYPE_FORWARD, true);
mState = CHANAPP_CHANGE_SD_TO_WII;
mState = STATE_CHANGE_SD_TO_WII;
}
void ChanAppBase::anmScrollR(bool playButtonAnm) {
do_animation(ANIM_ARROWS_MOVE_L, ANIM_TYPE_FORWARD, true);
if (playButtonAnm)
if (playButtonAnm) {
do_animation(ANIM_ARROW_R_SELECT, ANIM_TYPE_FORWARD, true);
mState = CHANAPP_SCROLL_R;
}
mState = STATE_SCROLL_R;
}
void ChanAppBase::anmScrollL(bool playButtonAnm) {
do_animation(ANIM_ARROWS_MOVE_R, ANIM_TYPE_FORWARD, true);
if (playButtonAnm)
if (playButtonAnm) {
do_animation(ANIM_ARROW_L_SELECT, ANIM_TYPE_FORWARD, true);
mState = CHANAPP_SCROLL_L;
}
mState = STATE_SCROLL_L;
}
void ChanAppBase::anmTextFadein(u32 msgId) {
set_textbox("T_Error_00", msgId);
do_animation(ANIM_ERROR_TEXT_IN, ANIM_TYPE_FORWARD, true);
mState = CHANAPP_TEXT_FADEIN;
mState = STATE_TEXT_FADEIN;
}
void ChanAppBase::anmTextFadeout() {
do_animation(ANIM_ERROR_TEXT_OUT, ANIM_TYPE_FORWARD, true);
mState = CHANAPP_TEXT_FADEOUT;
mState = STATE_TEXT_FADEOUT;
}
void ChanAppBase::anmArwAppear(bool arwR, bool arwL) {
@@ -215,60 +208,61 @@ namespace ipl {
gui::PaneComponent* paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId);
const char* paneName = paneComponent->getPane()->GetName();
controller::Interface* con = (controller::Interface*)data;
AnmPane* anmPane;
switch (event) {
case ON_POINT:
case ON_POINT: {
anmPane = get_anmpane(paneName);
if (anmPane != NULL) {
ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT);
sceneChannelEdit->onPoint(anmPane);
}
break;
case ON_LEFT:
}
case ON_LEFT: {
anmPane = get_anmpane(paneName);
if (anmPane != NULL) {
ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT);
sceneChannelEdit->onLeft(anmPane);
}
break;
case ON_TRIG:
if (!((controller::Interface*)data)->downTrg(controller::BTN_INTERACT))
}
case ON_TRIG: {
if (!con->downTrg(controller::BTN_INTERACT)) {
break;
}
anmPane = get_anmpane(paneName);
if (anmPane != NULL) {
ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT);
sceneChannelEdit->onTrig(anmPane);
}
break;
}
}
}
WAIT_FOR_ANIM_STATE(ChanAppBase::on_fadein1st, ANIM_DATA_IN, {
do_animation(ANIM_SELECT_IN, ANIM_TYPE_FORWARD, true);
mState = CHANAPP_FADEIN2ND;
mState = STATE_FADE_IN_2ND;
});
WAIT_FOR_ANIM_STATE(ChanAppBase::on_fadein2nd, ANIM_SELECT_IN, mState = CHANAPP_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBase::on_fadeout, ANIM_DATA_OUT, mState = CHANAPP_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBase::on_change_wii_to_sd, ANIM_SELECT_SD_FLASH, mState = CHANAPP_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBase::on_change_sd_to_wii, ANIM_SELECT_WII_FLASH, mState = CHANAPP_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBase::on_fadein2nd, ANIM_SELECT_IN, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBase::on_fadeout, ANIM_DATA_OUT, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBase::on_change_wii_to_sd, ANIM_SELECT_SD_FLASH, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBase::on_change_sd_to_wii, ANIM_SELECT_WII_FLASH, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBase::on_scroll_r, ANIM_ARROWS_MOVE_L, {
get_animation(ANIM_ARROWS_MOVE_L)->animator->init();
pLytObj->calc();
mpLayout->calc();
mState = CHANAPP_IDLE;
mState = STATE_IDLE;
});
WAIT_FOR_ANIM_STATE(ChanAppBase::on_scroll_l, ANIM_ARROWS_MOVE_R, {
get_animation(ANIM_ARROWS_MOVE_L)->animator->init();
pLytObj->calc();
mpLayout->calc();
mState = CHANAPP_IDLE;
mState = STATE_IDLE;
});
WAIT_FOR_ANIM_STATE(ChanAppBase::on_text_fadein, ANIM_ERROR_TEXT_IN, mState = CHANAPP_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBase::on_text_fadeout, ANIM_ERROR_TEXT_OUT, mState = CHANAPP_IDLE);
// void ChanAppBase::precleanup() {
// delete pLytObj;
// delete pPaneManager;
// }
WAIT_FOR_ANIM_STATE(ChanAppBase::on_text_fadein, ANIM_ERROR_TEXT_IN, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBase::on_text_fadeout, ANIM_ERROR_TEXT_OUT, mState = STATE_IDLE);
} // namespace scene
} // namespace ipl

View File

@@ -4,66 +4,58 @@
namespace ipl {
namespace scene {
enum SavedataBoxAnimIdx {
ANIM_DATA_IN = 0x0, // 0x0
ANIM_DATA_OUT = 0x1, // 0x1
ANIM_DATA_FOCUS_IN = 0x2, // 0x2
ANIM_DATA_FOCUS_OUT = 0x3, // 0x3
};
DECOMP_FORCE_LITERAL(iplChanAppBox_cpp, 0.5f);
DECOMP_FORCE_LITERAL(iplChanAppBox_cpp, 2.0f);
// FIXME: Figure out how to do this in a less fakematch-y way
void SAVEDATA_BOX_floatHoisting(u32 in) {
f32 a = 0.5f;
f32 b = 2.0f;
f32 c = in;
}
ChanAppBox::ChanAppBox(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName)
: AnmController(heap), ::gui::EventHandler(), mState(BOX_STATE_HIDDEN), pThumbnail(NULL), pTextBalloon(NULL),
mTextBalloonInitialized(false) {
pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName);
ChanAppBox::ChanAppBox(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName)
: AnmController(heap), ::gui::EventHandler(), mState(STATE_HIDDEN), mpThumbnail(NULL), mpBalloon(NULL), mbInitBalloon(false) {
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
add_animation("it_ObjChannelEdit_b_SaveDataIn.brlan", "G_Data");
add_animation("it_ObjChannelEdit_b_SaveDataOut.brlan", "G_Data");
add_animation("it_ObjChannelEdit_b_SaveDataFoucusIn.brlan", "G_Data");
add_animation("it_ObjChannelEdit_b_SaveDataFoucusOut.brlan", "G_Data");
pLytObj->finishBinding();
mpLayout->finishBinding();
set_visible("N_Data16x9", false);
set_visible("N_Data4x3", false);
pPaneManager = new ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true);
pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt());
pPaneManager->setAllComponentTriggerTarget(false);
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Data_01"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Data_01"), true);
add_anmpane("B_Data_01", get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
} else {
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Data_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Data_00"), true);
add_anmpane("B_Data_00", get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
}
}
// static wchar_t CORRUPT_TITLE[] = L"???";
ChanAppBox::~ChanAppBox() {
delete pLytObj;
delete pPaneManager;
delete mpLayout;
delete mpGui;
}
void ChanAppBox::calc() {
AnmPane* anmPane;
pLytObj->calc();
pPaneManager->calc();
mpLayout->calc();
mpGui->calc();
anmPane = NULL;
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != 0)
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) {
anmPane->calc();
}
if (mState != BOX_STATE_HIDDEN && pThumbnail != NULL && pThumbnail->getLytObj() != NULL) {
if (mState != STATE_HIDDEN && mpThumbnail != NULL && mpThumbnail->getLytObj() != NULL) {
nw4r::ut::Rect rect4x3;
System::getProjectionRect4x3(&rect4x3);
nw4r::ut::Rect rect16x9;
@@ -78,10 +70,10 @@ namespace ipl {
translate.x *= widescreenScale;
}
pThumbnail->getLytObj()->GetRootPane()->SetTranslate(translate);
pThumbnail->calc();
mpThumbnail->getLytObj()->GetRootPane()->SetTranslate(translate);
mpThumbnail->calc();
nw4r::math::VEC2 scale = pThumbnail->getLytObj()->GetRootPane()->GetScale();
nw4r::math::VEC2 scale = mpThumbnail->getLytObj()->GetRootPane()->GetScale();
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
scale *= get_scale("N_Atari16x9").x;
scale *= get_scale("N_Data_01").x;
@@ -89,19 +81,22 @@ namespace ipl {
scale *= get_scale("N_Atari4x3").x;
scale *= get_scale("N_Data_00").x;
}
pThumbnail->getLytObj()->GetRootPane()->SetScale(scale);
mpThumbnail->getLytObj()->GetRootPane()->SetScale(scale);
}
switch (mState) {
case BOX_STATE_HIDDEN:
case BOX_STATE_IDLE:
case STATE_HIDDEN:
case STATE_IDLE: {
break;
case BOX_STATE_FADEIN:
}
case STATE_FADE_IN: {
on_fadein();
break;
case BOX_STATE_FADEOUT:
}
case STATE_FADE_OUT: {
on_fadeout();
break;
}
}
}
@@ -109,35 +104,35 @@ namespace ipl {
{38.400000f, 28.800001f},
{51.000004f, 28.800001f},
};
void ChanAppBox::draw() {
if (mState == BOX_STATE_HIDDEN)
if (mState == STATE_HIDDEN)
return;
pLytObj->draw();
mpLayout->draw();
set_visible("DataBaseCover_00", false);
set_visible("DataBaseCover_01", false);
ChannelEdit* sceneChannelEdit = get_channel_edit();
if (sceneChannelEdit->getState() == ChannelEdit::CHANEDIT_STATE_ON_SCROLL_R ||
sceneChannelEdit->getState() == ChannelEdit::CHANEDIT_STATE_ON_SCROLL_L)
if (sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_R || sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_L)
return;
if (mState == BOX_STATE_FADEIN)
if (mState == STATE_FADE_IN)
return;
if (mState == BOX_STATE_FADEOUT)
if (mState == STATE_FADE_OUT)
return;
if (!get_visible("N_Data4x3") && !get_visible("N_Data16x9"))
return;
if (pThumbnail == NULL)
if (mpThumbnail == NULL) {
return;
if (pThumbnail->getLytObj() == NULL)
}
if (mpThumbnail->getLytObj() == NULL) {
return;
}
f32 fScisHalfW;
f32 fScisHalfH;
fScisHalfW = offsets[SCGetAspectRatio()][0];
fScisHalfH = offsets[SCGetAspectRatio()][1];
f32 fScisHalfW = offsets[SCGetAspectRatio()][0];
f32 fScisHalfH = offsets[SCGetAspectRatio()][1];
nw4r::ut::Rect projRect;
System::getProjectionRect(&projRect);
@@ -147,7 +142,7 @@ namespace ipl {
u32 fbW = renderModeObj->fbWidth;
u32 efbH = renderModeObj->efbHeight;
nw4r::math::VEC3 translate = pThumbnail->getLytObj()->GetRootPane()->GetTranslate();
nw4r::math::VEC3 translate = mpThumbnail->getLytObj()->GetRootPane()->GetTranslate();
f32 scisL = (translate.x - fScisHalfW) * (fbW / projRect.GetWidth()) + fbW / 2.f;
f32 scisT = efbH / 2.f - translate.y - fScisHalfH;
@@ -155,22 +150,22 @@ namespace ipl {
f32 scisH = fScisHalfH * 2.f;
GXSetScissor(scisL, scisT, scisW, scisH);
pThumbnail->getLytObj()->GetRootPane()->CalculateMtx(*pLytObj->getDrawInfo());
pThumbnail->draw();
mpThumbnail->getLytObj()->GetRootPane()->CalculateMtx(*mpLayout->getDrawInfo());
mpThumbnail->draw();
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
set_visible("DataBaseCover_01", true);
pLytObj->draw("DataBaseCover_01");
mpLayout->draw("DataBaseCover_01");
} else {
set_visible("DataBaseCover_00", true);
pLytObj->draw("DataBaseCover_00");
mpLayout->draw("DataBaseCover_00");
}
GXSetScissor(0, 0, System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight);
}
void ChanAppBox::update() {
pPaneManager->update();
mpGui->update();
}
void ChanAppBox::anmFadein() {
@@ -182,24 +177,22 @@ namespace ipl {
set_visible("N_Data4x3", true);
}
do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true);
mState = BOX_STATE_FADEIN;
mState = STATE_FADE_IN;
}
void ChanAppBox::anmFadeout() {
if (pTextBalloon != NULL)
pTextBalloon->terminate();
if (mpBalloon != NULL) {
mpBalloon->terminate();
}
do_animation(ANIM_DATA_OUT, ANIM_TYPE_FORWARD, true);
mState = BOX_STATE_FADEOUT;
mState = STATE_FADE_OUT;
}
void ChanAppBox::onEvent(u32 compId, u32 event, void* data) {
const char* paneName;
gui::PaneComponent* paneComponent;
// ChannelEdit* sceneChannelEdit;
// AnmPane* anmPane;
gui::PaneComponent* paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId);
const char* paneName = paneComponent->getPane()->GetName();
paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId);
paneName = paneComponent->getPane()->GetName();
controller::Interface* con = (controller::Interface*)data;
switch (event) {
case ON_POINT: {
@@ -210,69 +203,73 @@ namespace ipl {
anmPane->incHoverCount();
get_channel_edit()->onPoint(anmPane);
if (pTextBalloon == NULL || pThumbnail == NULL || mTextBalloonInitialized)
if (mpBalloon == NULL || mpThumbnail == NULL || mbInitBalloon) {
break;
}
mTextBalloonInitialized = true;
if (pThumbnail->getIsCorrupt()) {
pTextBalloon->init(L"???");
mbInitBalloon = true;
if (mpThumbnail->getIsCorrupt()) {
mpBalloon->init(L"???");
} else {
if (pThumbnail->getMatchesTmpTitle()) {
pTextBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
if (mpThumbnail->getMatchesTmpTitle()) {
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
} else {
pTextBalloon->init(pThumbnail->getTitle(0));
mpBalloon->init(mpThumbnail->getTitle(0));
}
}
pTextBalloon->fadein();
mpBalloon->fadein();
break;
}
case ON_MOVE: {
AnmPane* anmPane = get_anmpane(paneName);
if (anmPane == NULL)
if (anmPane == NULL) {
break;
if (pTextBalloon == NULL || pThumbnail == NULL)
}
if (mpBalloon == NULL || mpThumbnail == NULL) {
break;
if (mTextBalloonInitialized)
}
if (mbInitBalloon) {
break;
}
mTextBalloonInitialized = true;
if (pThumbnail->getIsCorrupt()) {
pTextBalloon->init(L"???");
mbInitBalloon = true;
if (mpThumbnail->getIsCorrupt()) {
mpBalloon->init(L"???");
} else {
if (pThumbnail->getMatchesTmpTitle()) {
pTextBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
if (mpThumbnail->getMatchesTmpTitle()) {
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
} else {
pTextBalloon->init(pThumbnail->getTitle(0));
mpBalloon->init(mpThumbnail->getTitle(0));
}
}
pTextBalloon->fadein();
mpBalloon->fadein();
break;
}
case ON_LEFT: {
AnmPane* anmPane = get_anmpane(paneName);
if (anmPane == NULL)
if (anmPane == NULL) {
break;
}
anmPane->decHoverCount();
get_channel_edit()->onLeft(anmPane);
mTextBalloonInitialized = false;
if (pTextBalloon == NULL || pThumbnail == NULL)
mbInitBalloon = false;
if (mpBalloon == NULL || mpThumbnail == NULL) {
break;
}
pTextBalloon->fadeout();
mpBalloon->fadeout();
break;
}
case ON_TRIG: {
if (!((controller::Interface*)data)->downTrg(controller::BTN_INTERACT))
if (!con->downTrg(controller::BTN_INTERACT)) {
break;
}
AnmPane* anmPane = get_anmpane(paneName);
if (anmPane == NULL || pThumbnail == NULL)
if (anmPane == NULL || mpThumbnail == NULL)
break;
get_channel_edit()->onTrig(this);
@@ -288,9 +285,9 @@ namespace ipl {
clear_anmpane("B_Data_00");
}
if (pTextBalloon != NULL) {
pTextBalloon->terminate();
mTextBalloonInitialized = false;
if (mpBalloon != NULL) {
mpBalloon->terminate();
mbInitBalloon = false;
}
}
@@ -298,11 +295,11 @@ namespace ipl {
return (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT);
}
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadein, ANIM_DATA_IN, mState = BOX_STATE_IDLE);
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("N_Data16x9", false);
set_visible("N_Data4x3", false);
mState = BOX_STATE_IDLE;
mState = STATE_IDLE;
});
char ChanAppBox::s_all_pane_name[6] = "N_All";

View File

@@ -8,42 +8,18 @@
namespace ipl {
namespace scene {
const f32 offsets[2][2] = {
{64.000000f, 48.000000f},
{85.000000f, 48.000000f},
{64.f, 48.f},
{85.f, 48.f},
};
typedef struct {
wchar_t digits[10];
} SCNumber;
static const SCNumber scNumber = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'};
// TODO: Figure out what this might've been/why it isn't inlining
void CHANAPPEDIT_dummyFunctionToKeepAConstructorStuffFromInlining(nw4r::math::VEC3& vec) {
math::VEC3 end(vec);
}
enum ChanAppEditAnimIdx {
ANIM_MASK_IN = 0, // 0x0
ANIM_MASK_OUT, // 0x1
ANIM_COPY_IN, // 0x2
ANIM_COPY_OUT, // 0x3
ANIM_COPY_FLASH, // 0x4
ANIM_DEL_IN, // 0x5
ANIM_DEL_OUT, // 0x6
ANIM_DEL_FLASH, // 0x7
ANIM_SELECT_OUT, // 0x8
ANIM_TEXT_FADEIN, // 0x9
ANIM_TEXT_FADEOUT, // 0xa
ANIM_WAIT, // 0xb
ANIM_COVER_IN, // 0xc
ANIM_MOVE_IN, // 0xd
ANIM_MOVE_OUT, // 0xe
ANIM_MOVE_FLASH, // 0xf
};
ChanAppEdit::ChanAppEdit(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName)
: AnmController(heap), ::gui::EventHandler(), mState(EDIT_STATE_IDLE), mLinearInterp(), pChanAppBox(NULL), mMsgId(0), pThumbnail(NULL) {
pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName);
ChanAppEdit::ChanAppEdit(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName)
: AnmController(heap), ::gui::EventHandler(), mState(STATE_IDLE), mLinearInterp(), mpChanAppBox(NULL), mMsgId(0), mpThumbnail(NULL) {
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
add_animation("mn_ChannelDetail_a_SeenIn.brlan", "G_Mask");
add_animation("mn_ChannelDetail_a_SeenOut.brlan", "G_Mask");
@@ -62,7 +38,7 @@ namespace ipl {
add_animation("mn_ChannelDetail_a_MoveFoucusOut.brlan", "G_Move");
add_animation("mn_ChannelDetail_a_MoveFlash.brlan", "G_MoveFlash");
pLytObj->finishBinding();
mpLayout->finishBinding();
set_textbox("T_Move_00", MESG_SAVEDATA_EDIT_MOVE);
set_textbox("T_Copy_00", MESG_SAVEDATA_EDIT_COPY);
set_textbox("T_Del_00", MESG_SAVEDATA_EDIT_DEL);
@@ -87,13 +63,13 @@ namespace ipl {
set_visible("T_Move_off", false);
set_visible("T_Move_off_00", false);
pPaneManager = new ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true);
pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt());
pPaneManager->setAllComponentTriggerTarget(false);
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Move_00"), true);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Copy_00"), true);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Del_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Move_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Copy_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Del_00"), true);
add_anmpane("B_Move_00", get_animation(ANIM_MOVE_IN), get_animation(ANIM_MOVE_OUT));
add_anmpane("B_Copy_00", get_animation(ANIM_COPY_IN), get_animation(ANIM_COPY_OUT));
@@ -101,86 +77,100 @@ namespace ipl {
}
ChanAppEdit::~ChanAppEdit() {
delete pLytObj;
delete pPaneManager;
delete mpLayout;
delete mpGui;
}
void ChanAppEdit::calc() {
AnmPane* anmPane;
pLytObj->calc();
pPaneManager->calc();
mpLayout->calc();
mpGui->calc();
anmPane = NULL;
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL)
anmPane->calc();
if (pThumbnail != NULL)
pThumbnail->calc();
if (mpThumbnail != NULL)
mpThumbnail->calc();
switch (mState) {
case EDIT_STATE_IDLE:
case STATE_IDLE: {
break;
case EDIT_STATE_FADEIN:
}
case STATE_FADEIN: {
on_fadein();
break;
case EDIT_STATE_FADEOUT:
}
case STATE_FADEOUT: {
on_fadeout();
break;
case EDIT_STATE_HIDE_BTN0_DIALOG:
}
case STATE_HIDE_BTN0_DIALOG: {
on_hide_btn0_dialog();
break;
case EDIT_STATE_SHOW_BTN2_DIALOG1ST:
}
case STATE_SHOW_BTN2_DIALOG1ST: {
on_show_btn2_dialog1st();
break;
case EDIT_STATE_SHOW_BTN2_DIALOG2ND:
}
case STATE_SHOW_BTN2_DIALOG2ND: {
on_show_btn2_dialog2nd();
break;
case EDIT_STATE_SELECT_FADEIN:
}
case STATE_SELECT_FADEIN: {
on_select_fadein();
break;
case EDIT_STATE_SELECT_FADEOUT1ST:
}
case STATE_SELECT_FADEOUT1ST: {
on_select_fadeout1st();
break;
case EDIT_STATE_SELECT_FADEOUT2ND:
}
case STATE_SELECT_FADEOUT2ND: {
on_select_fadeout2nd();
break;
case EDIT_STATE_TEXT_FADEIN:
}
case STATE_TEXT_FADEIN: {
on_text_fadein();
break;
case EDIT_STATE_TEXT_FADEOUT:
}
case STATE_TEXT_FADEOUT: {
on_text_fadeout();
break;
case EDIT_STATE_TRIG_DEL:
}
case STATE_TRIG_DEL: {
on_trig_del();
break;
case EDIT_STATE_CLEAR:
}
case STATE_CLEAR: {
on_clear();
break;
}
}
return;
}
void ChanAppEdit::draw() {
pLytObj->draw();
mpLayout->draw();
// set_visible("DataBaseCover_00", false);
// set_visible("DataBaseCover_01", false);
// ChannelEdit* sceneChannelEdit = get_channel_edit();
// if (sceneChannelEdit->getState() == ChannelEdit::CHANEDIT_STATE_ON_UNK_x05 ||
// sceneChannelEdit->getState() == ChannelEdit::CHANEDIT_STATE_ON_UNK_x06)
// if (sceneChannelEdit->getState() == ChannelEdit::CHANSTATE_ON_UNK_x05 ||
// sceneChannelEdit->getState() == ChannelEdit::CHANSTATE_ON_UNK_x06)
// return;
if (!(mState != EDIT_STATE_FADEIN || get_animation(ANIM_MASK_IN)->animator->getCurrentFrame() > 15))
if (!(mState != STATE_FADEIN || get_animation(ANIM_MASK_IN)->animator->getCurrentFrame() > 15)) {
return;
if (pThumbnail == NULL)
}
if (mpThumbnail == NULL) {
return;
if (pThumbnail->getLytObj() == NULL)
}
if (mpThumbnail->getLytObj() == NULL) {
return;
}
f32 fScisHalfW;
f32 fScisHalfH;
fScisHalfW = offsets[SCGetAspectRatio()][0];
fScisHalfH = offsets[SCGetAspectRatio()][1];
f32 fScisHalfW = offsets[SCGetAspectRatio()][0];
f32 fScisHalfH = offsets[SCGetAspectRatio()][1];
nw4r::ut::Rect projRect;
System::getProjectionRect(&projRect);
@@ -190,7 +180,7 @@ namespace ipl {
u32 fbW = renderModeObj->fbWidth;
u32 efbH = renderModeObj->efbHeight;
nw4r::math::VEC3 translate = pThumbnail->getLytObj()->GetRootPane()->GetTranslate();
nw4r::math::VEC3 translate = mpThumbnail->getLytObj()->GetRootPane()->GetTranslate();
f32 scisL = (translate.x - fScisHalfW) * (fbW / projRect.GetWidth()) + fbW / 2.f;
f32 scisT = efbH / 2.f - translate.y - fScisHalfH;
@@ -198,20 +188,20 @@ namespace ipl {
f32 scisH = fScisHalfH * 2.f;
GXSetScissor(scisL, scisT, scisW, scisH);
pThumbnail->getLytObj()->GetRootPane()->CalculateMtx(*pLytObj->getDrawInfo());
pThumbnail->draw();
mpThumbnail->getLytObj()->GetRootPane()->CalculateMtx(*mpLayout->getDrawInfo());
mpThumbnail->draw();
GXSetScissor(0, 0, System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight);
pLytObj->draw(SCGetAspectRatio() == SC_ASPECT_RATIO_16x9 ? "N_Mask16x9" : "N_Mask4x3");
mpLayout->draw(SCGetAspectRatio() == SC_ASPECT_RATIO_16x9 ? "N_Mask16x9" : "N_Mask4x3");
}
void ChanAppEdit::update() {
pPaneManager->update();
mpGui->update();
}
void ChanAppEdit::anmFadein(ChanAppBox* box) {
pChanAppBox = box;
mpChanAppBox = box;
set_visible("Mask_00", true);
set_visible("N_Window", true);
set_visible("Cover_16x9_del", false);
@@ -252,25 +242,31 @@ namespace ipl {
set_visible("BlockLine", true);
}
pThumbnail = new (System::getMem2App(), 4) Thumbnail();
mpThumbnail = new (System::getMem2App(), 4) Thumbnail();
pThumbnail->create(box->getThumbnail()->getLytHeapBufRef());
mpThumbnail->create(box->getThumbnail()->getLytHeapBufRef());
pThumbnail->getLytObj()->GetRootPane()->SetTranslate(
mpThumbnail->getLytObj()->GetRootPane()->SetTranslate(
get_translate(SCGetAspectRatio() == SC_ASPECT_RATIO_16x9 ? "N_Atari16x9" : "N_Atari4x3"));
u32 blockCount = box->getThumbnail()->getBlockCount();
SCNumber scNumberData = scNumber;
const wchar_t scNumber[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'};
wchar_t blockTextDigits[5] = L"";
wchar_t blockText[5] = L"";
blockTextDigits[0] = scNumberData.digits[blockCount / 1000];
blockTextDigits[1] = scNumberData.digits[blockCount / 100 % 10];
blockTextDigits[2] = scNumberData.digits[blockCount / 10 % 10];
blockTextDigits[3] = scNumberData.digits[blockCount % 10];
blockTextDigits[0] = scNumber[blockCount / 1000];
blockTextDigits[1] = scNumber[blockCount / 100 % 10];
blockTextDigits[2] = scNumber[blockCount / 10 % 10];
blockTextDigits[3] = scNumber[blockCount % 10];
int zeroOffset;
for (zeroOffset = 0; zeroOffset < 3; zeroOffset++)
if (blockTextDigits[zeroOffset] != L'0')
for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) {
if (blockTextDigits[zeroOffset] != L'0') {
break;
}
}
wcscpy(blockText, blockTextDigits + zeroOffset);
set_textbox("T_Block_00", blockText);
@@ -283,34 +279,38 @@ namespace ipl {
change_button_text(MESG_CMN_BACK_ALT_3);
AnmPane* anmPane = NULL;
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL)
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) {
clear_anmpane(anmPane->getName());
}
do_animation(ANIM_MASK_IN, ANIM_TYPE_FORWARD, true);
mState = EDIT_STATE_FADEIN;
mState = STATE_FADEIN;
}
void ChanAppEdit::anmFadeout() {
pChanAppBox = NULL;
mpChanAppBox = NULL;
change_button_text(MESG_CMN_BACK_ALT);
if (pThumbnail != NULL) {
delete pThumbnail;
pThumbnail = NULL;
if (mpThumbnail != NULL) {
delete mpThumbnail;
mpThumbnail = NULL;
}
do_animation(ANIM_MASK_OUT, ANIM_TYPE_FORWARD, true);
mState = EDIT_STATE_FADEOUT;
mState = STATE_FADEOUT;
}
void ChanAppEdit::anmHideBtn0Dialog() {
System::getDialog()->terminate();
mState = EDIT_STATE_HIDE_BTN0_DIALOG;
mState = STATE_HIDE_BTN0_DIALOG;
}
void ChanAppEdit::anmShowBtn0Dialog(u32 msgId, bool dontWait, bool showLoading) {
System::getDialog()->callBtn0(msgId, dontWait ? 0 : 180, showLoading);
}
void ChanAppEdit::anmShowS2Btn2Dialog(u32 msgId) {
set_textbox("T_Message_00", msgId);
mState = EDIT_STATE_SHOW_BTN2_DIALOG1ST;
mState = STATE_SHOW_BTN2_DIALOG1ST;
}
void ChanAppEdit::anmSelectFadein() {
@@ -320,20 +320,21 @@ namespace ipl {
change_button_text(MESG_CMN_BACK_ALT_3);
AnmPane* anmPane = NULL;
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL)
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) {
clear_anmpane(anmPane->getName());
}
mState = EDIT_STATE_SELECT_FADEIN;
mState = STATE_SELECT_FADEIN;
}
void ChanAppEdit::anmSelectFadeout(u32 msgId) {
set_textbox("T_Message_00", msgId);
mState = EDIT_STATE_SELECT_FADEOUT1ST;
mState = STATE_SELECT_FADEOUT1ST;
}
void ChanAppEdit::anmTextFadein(u32 msgId) {
mMsgId = msgId;
do_animation(ANIM_TEXT_FADEIN, ANIM_TYPE_FORWARD, true);
mState = EDIT_STATE_TEXT_FADEIN;
mState = STATE_TEXT_FADEIN;
}
void ChanAppEdit::anmTextFadeout() {
do_animation(ANIM_TEXT_FADEOUT, ANIM_TYPE_FORWARD, true);
@@ -342,12 +343,12 @@ namespace ipl {
sceneSettingButton->reserve(SettingButton::CMD_SET_TEXT, MESG_CMN_BACK_ALT);
sceneSettingButton->reserve(SettingButton::CMD_SHOW_BTN, 0);
if (pThumbnail != NULL) {
delete pThumbnail;
pThumbnail = NULL;
if (mpThumbnail != NULL) {
delete mpThumbnail;
mpThumbnail = NULL;
}
mState = EDIT_STATE_TEXT_FADEOUT;
mState = STATE_TEXT_FADEOUT;
}
void ChanAppEdit::anmStartWaitAnm() {
@@ -372,13 +373,13 @@ namespace ipl {
set_visible(SCGetAspectRatio() == SC_ASPECT_RATIO_16x9 ? "Cover_16x9_del" : "Cover_4x3_del", true);
do_animation(ANIM_COVER_IN, ANIM_TYPE_FORWARD, true);
mState = EDIT_STATE_CLEAR;
mState = STATE_CLEAR;
}
void ChanAppEdit::clearAllThumbnails() {
if (pThumbnail != NULL) {
delete pThumbnail;
pThumbnail = NULL;
if (mpThumbnail != NULL) {
delete mpThumbnail;
mpThumbnail = NULL;
}
}
@@ -386,47 +387,51 @@ namespace ipl {
gui::PaneComponent* paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId);
const char* paneName = paneComponent->getPane()->GetName();
if (mState == EDIT_STATE_TRIG_DEL)
controller::Interface* con = (controller::Interface*)data;
if (mState == STATE_TRIG_DEL) {
return;
}
AnmPane* anmPane;
switch (event) {
case ON_POINT:
case ON_POINT: {
anmPane = get_anmpane(paneName);
if (anmPane != NULL) {
ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT);
sceneChannelEdit->onPoint(anmPane);
((ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT))->onPoint(anmPane);
}
break;
case ON_LEFT:
}
case ON_LEFT: {
anmPane = get_anmpane(paneName);
if (anmPane != NULL) {
ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT);
sceneChannelEdit->onLeft(anmPane);
}
break;
case ON_TRIG:
if (!((controller::Interface*)data)->downTrg(controller::BTN_INTERACT))
}
case ON_TRIG: {
if (!con->downTrg(controller::BTN_INTERACT)) {
break;
}
anmPane = get_anmpane(paneName);
if (anmPane != NULL) {
if (strcmp(anmPane->getName(), "B_Copy_00") == 0) {
snd::getSystem()->startSE("WIPL_SE_DECIDE");
do_animation(ANIM_COPY_FLASH, ANIM_TYPE_FORWARD, true);
ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT);
sceneChannelEdit->onTrigCopy();
((ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT))->onTrigCopy();
} else if (strcmp(anmPane->getName(), "B_Move_00") == 0) {
snd::getSystem()->startSE("WIPL_SE_DECIDE");
do_animation(ANIM_MOVE_FLASH, ANIM_TYPE_FORWARD, true);
ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT);
sceneChannelEdit->onTrigMove();
} else if (strcmp(anmPane->getName(), "B_Del_00") == 0 && mState != EDIT_STATE_TRIG_DEL) {
((ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT))->onTrigMove();
} else if (strcmp(anmPane->getName(), "B_Del_00") == 0 && mState != STATE_TRIG_DEL) {
snd::getSystem()->startSE("WIPL_SE_DECIDE");
do_animation(ANIM_DEL_FLASH, ANIM_TYPE_FORWARD, true);
mState = EDIT_STATE_TRIG_DEL;
mState = STATE_TRIG_DEL;
}
}
break;
}
}
}
@@ -438,53 +443,57 @@ namespace ipl {
switch (msgId) {
case MESG_CMN_BACK_ALT_3:
case MESG_CMN_BACK_ALT:
case MESG_CMN_BACK_ALT: {
sceneSettingButton->setSoundType(SettingButton::CANCEL);
break;
case MESG_CMN_OK:
}
case MESG_CMN_OK: {
sceneSettingButton->setSoundType(SettingButton::DECIDE);
break;
}
}
}
void ChanAppEdit::on_fadein() {
mLinearInterp.calc();
set_translate("N_Window", mLinearInterp.get());
if (is_animation(ANIM_MASK_IN))
if (is_animation(ANIM_MASK_IN)) {
return;
if (mLinearInterp.isPlaying())
}
if (mLinearInterp.isPlaying()) {
return;
mState = EDIT_STATE_IDLE;
}
mState = STATE_IDLE;
}
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_fadeout, ANIM_MASK_OUT, mState = EDIT_STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_fadeout, ANIM_MASK_OUT, mState = STATE_IDLE);
void ChanAppEdit::on_hide_btn0_dialog() {
if (System::getDialog()->getLastResult() != DialogWindow::RESULT_PROGRESS &&
System::getDialog()->getLastResult() != DialogWindow::RESULT_TERMINATED)
return;
mState = EDIT_STATE_IDLE;
mState = STATE_IDLE;
}
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_show_btn2_dialog1st, ANIM_COPY_FLASH, {
do_animation(ANIM_SELECT_OUT, ANIM_TYPE_FORWARD, true);
SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON);
sceneSettingButton->hideBtn();
mState = EDIT_STATE_SHOW_BTN2_DIALOG2ND;
mState = STATE_SHOW_BTN2_DIALOG2ND;
});
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_show_btn2_dialog2nd, ANIM_SELECT_OUT, {
System::getDialog()->callS2Btn2(MESG_CMN_NO, MESG_CMN_YES, true);
mState = EDIT_STATE_IDLE;
mState = STATE_IDLE;
});
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_select_fadein, ANIM_SELECT_OUT, mState = EDIT_STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_select_fadein, ANIM_SELECT_OUT, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_select_fadeout1st, ANIM_COPY_FLASH, {
do_animation(ANIM_SELECT_OUT, ANIM_TYPE_FORWARD, true);
change_button_text(MESG_CMN_OK);
mState = EDIT_STATE_SELECT_FADEOUT2ND;
mState = STATE_SELECT_FADEOUT2ND;
});
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_select_fadeout2nd, ANIM_SELECT_OUT, mState = EDIT_STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_select_fadeout2nd, ANIM_SELECT_OUT, mState = STATE_IDLE);
void ChanAppEdit::on_text_fadein() {
if (get_animation(ANIM_TEXT_FADEIN)->animator->getCurrentFrame() >= 20.0f) {
@@ -495,20 +504,20 @@ namespace ipl {
return;
stop_animation(ANIM_TEXT_FADEIN);
mState = EDIT_STATE_IDLE;
mState = STATE_IDLE;
}
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_text_fadeout, ANIM_TEXT_FADEOUT, mState = EDIT_STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_text_fadeout, ANIM_TEXT_FADEOUT, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_trig_del, ANIM_DEL_FLASH, {
mState = EDIT_STATE_IDLE;
mState = STATE_IDLE;
ChannelEdit* sceneChannelEdit = (ChannelEdit*)System::getScene(SCENE_CHANNEL_EDIT);
sceneChannelEdit->onTrigDel();
});
WAIT_FOR_ANIM_STATE(ChanAppEdit::on_clear, ANIM_COVER_IN, {
if (pThumbnail != NULL) {
delete pThumbnail;
pThumbnail = NULL;
if (mpThumbnail != NULL) {
delete mpThumbnail;
mpThumbnail = NULL;
}
mState = EDIT_STATE_IDLE;
mState = STATE_IDLE;
});
} // namespace scene
} // namespace ipl

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -8,6 +8,8 @@
#include "iplSystem.h"
#include "utility/iplGraphics.h"
#include "system/iplSaveBanner.h"
namespace ipl {
namespace kitayama {
class NandSDWorker_AutoTest {
@@ -93,7 +95,6 @@ namespace ipl {
}
break;
}
case 2: {
s32 result;
NANDFileInfo bannerInfo;
@@ -105,82 +106,82 @@ namespace ipl {
ISFS_OpenLib();
nand::wrapper::Delete("/title/00010000/30303030/data/banner.bin");
result = nand::wrapper::Create("/title/00010000/30303030/data/banner.bin", 0x3F, 0);
result = nand::wrapper::Create("/title/00010000/30303030/data/banner.bin", NAND_PERM_ALL_RW, 0);
if (result == 0) {
result = nand::wrapper::Open("/title/00010000/30303030/data/banner.bin", &bannerInfo, 2);
result = nand::wrapper::Open("/title/00010000/30303030/data/banner.bin", &bannerInfo, NAND_ACCESS_WRITE);
if (result != 0) {
OSReport(" NANDOpen failed: %d\n", result);
OSPanic("iplKitayamaTest.cpp", 0xAD, "Terminated.\n");
OSHalt("Terminated.\n", 173);
}
buffer = (u8*)unk_0x58->alloc(0xF0A0, 0x20);
memset(buffer, 0x55, 0xF0A0);
((u32*)buffer)[0] = 0x5749424E;
buffer = (u8*)unk_0x58->alloc(sizeof(WIISaveBannerFile), 32);
memset(buffer, 0x55, sizeof(WIISaveBannerFile));
((u32*)buffer)[0] = 'WBIN';
((u32*)buffer)[1] = 0;
result = nand::wrapper::Write(&bannerInfo, buffer, 0xF0A0);
if ((u32)result != 0xF0A0) {
OSReport(" NANDWrite failed: %d\n", result);
OSPanic("iplKitayamaTest.cpp", 0xB8, "Terminated.\n");
u32 read = nand::wrapper::Write(&bannerInfo, buffer, sizeof(WIISaveBannerFile));
if (read != sizeof(WIISaveBannerFile)) {
OSReport(" NANDWrite failed: %d\n", read);
OSHalt("Terminated.\n", 184);
}
result = nand::wrapper::Close(&bannerInfo);
if (result != 0) {
if (result != NAND_RESULT_OK) {
OSReport(" NANDClose failed: %d\n", result);
OSPanic("iplKitayamaTest.cpp", 0xBE, "Terminated.\n");
OSHalt("Terminated.\n", 190);
}
unk_0x58->free(buffer);
} else if (result == -6) {
} else if (result == NAND_RESULT_EXISTS) {
OSReport("banner.bin already exist.\n");
} else {
OSReport(" NANDCreate failed: %d\n", result);
OSPanic("iplKitayamaTest.cpp", 0xC6, "Terminated.\n");
OSHalt("Terminated.\n", 198);
}
result = nand::wrapper::Create("/title/00010000/30303030/data/test1.bin", 0x3F, 0);
result = nand::wrapper::Create("/title/00010000/30303030/data/test1.bin", NAND_PERM_ALL_RW, 0);
if (result == 0) {
result = nand::wrapper::Open("/title/00010000/30303030/data/test1.bin", &testInfo, 2);
result = nand::wrapper::Open("/title/00010000/30303030/data/test1.bin", &testInfo, NAND_ACCESS_WRITE);
if (result != 0) {
OSReport(" NANDOpen failed: %d\n", result);
OSPanic("iplKitayamaTest.cpp", 0xD5, "Terminated.\n");
OSHalt("Terminated.\n", 213);
}
buffer = (u8*)unk_0x58->alloc(0xF0A0, 0x20);
memset(buffer, 0x55, 0xF0A0);
((u32*)buffer)[0] = 0x5749424E;
buffer = (u8*)unk_0x58->alloc(sizeof(WIISaveBannerFile), 32);
memset(buffer, 0x55, sizeof(WIISaveBannerFile));
((u32*)buffer)[0] = 'WBIN';
((u32*)buffer)[1] = 0;
result = nand::wrapper::Write(&testInfo, buffer, 0xF0A0);
if ((u32)result != 0xF0A0) {
OSReport(" NANDWrite failed: %d\n", result);
OSPanic("iplKitayamaTest.cpp", 0xE0, "Terminated.\n");
u32 read = nand::wrapper::Write(&testInfo, buffer, sizeof(WIISaveBannerFile));
if (read != sizeof(WIISaveBannerFile)) {
OSReport(" NANDWrite failed: %d\n", read);
OSHalt("Terminated.\n", 224);
}
result = nand::wrapper::Close(&testInfo);
if (result != 0) {
OSReport(" NANDClose failed: %d\n", result);
OSPanic("iplKitayamaTest.cpp", 0xE6, "Terminated.\n");
OSHalt("Terminated.\n", 230);
}
unk_0x58->free(buffer);
} else if (result == -6) {
} else if (result == NAND_RESULT_EXISTS) {
OSReport("test1.bin already exist.\n");
} else {
OSReport(" NANDCreate failed: %d\n", result);
OSPanic("iplKitayamaTest.cpp", 0xEE, "Terminated.\n");
OSHalt("Terminated.\n", 238);
}
result = nand::wrapper::CreateDir("/title/00010000/30303030/data/nocopy", 0x3F, 0);
if (result != 0 && result != -6) {
result = nand::wrapper::CreateDir("/title/00010000/30303030/data/nocopy", NAND_PERM_ALL_RW, 0);
if (result != 0 && result != NAND_RESULT_EXISTS) {
OSReport(" NANDCreateDir failed: %d\n", result);
OSPanic("iplKitayamaTest.cpp", 0xF8, "Terminated.\n");
OSHalt("Terminated.\n", 248);
}
result = nand::wrapper::Create("/title/00010000/30303030/data/nocopy/test1.txt", 0x3F, 0);
if (result != 0 && result != -6) {
result = nand::wrapper::Create("/title/00010000/30303030/data/nocopy/test1.txt", NAND_PERM_ALL_RW, 0);
if (result != 0 && result != NAND_RESULT_EXISTS) {
OSReport(" NANDCreate failed: %d\n", result);
OSPanic("iplKitayamaTest.cpp", 0xFE, "Terminated.\n");
OSHalt("Terminated.\n", 254);
}
ES_SetUid(SYSMENU_TITLE_ID);
@@ -193,13 +194,11 @@ namespace ipl {
unk_0x60 = 3;
break;
}
case 3: {
unk_0x64->start_save_test((void*)unk_0x68, (void*)unk_0x6C, 0x18);
unk_0x60 = 4;
break;
}
case 4: {
if (unk_0x64->process() == 0x51) {
unk_0x60 = 12;
@@ -208,13 +207,11 @@ namespace ipl {
}
break;
}
case 5: {
unk_0x64->start_app_test((void*)unk_0x68, (void*)unk_0x6C, 0x18);
unk_0x60 = 6;
break;
}
case 6: {
if (unk_0x64->process() == 0x51) {
unk_0x60 = 12;
@@ -223,14 +220,12 @@ namespace ipl {
}
break;
}
case 7: {
System::stopReceiveSchedule();
unk_0x68 = (u32)System::getMem2App()->alloc(0x3EA60, 0x40);
unk_0x60 = 8;
break;
}
case 8: {
if (System::isReceiveScheduleStopped()) {
System::getNandManager()->closeContentsAll();
@@ -249,14 +244,12 @@ namespace ipl {
}
break;
}
case 9: {
if (unk_0x64->process() == 0x51 || unk_0x64->process() == 0x52) {
unk_0x60 = 10;
}
break;
}
case 10: {
int result = unk_0x64->get_result();
System::getNandManager()->openContentsAll();
@@ -272,7 +265,6 @@ namespace ipl {
}
break;
}
case 11:
case 12: {
if (controller->downTrg(controller::REVO_BTN_1)) {

File diff suppressed because it is too large Load Diff

View File

@@ -5,16 +5,16 @@
#include "gamespy/natneg/natneg.h"
#include <revolution/mem/expHeap.h>
#include <revolution/nhttp/d_nhttp.h>
#include <revolution/nhttp.h>
#include <revolution/os.h>
typedef enum {
HTTP_TEST_NOT_STARTED = 0,
HTTP_TEST_STARTED = 1,
HTTP_TEST_REQUEST_MADE = 2,
HTTP_TEST_RESPONSE_RECEIVED = 3,
HTTP_TEST_RESPONSE_ERRORED = 4,
HTTP_TEST_DONE = 5,
HTTP_TEST_STARTED,
HTTP_TEST_REQUEST_MADE,
HTTP_TEST_RESPONSE_RECEIVED,
HTTP_TEST_RESPONSE_ERRORED,
HTTP_TEST_DONE,
} HTTPTestState;
typedef struct {
@@ -29,7 +29,7 @@ typedef struct {
undefined4 unk_0x034;
undefined4 unk_0x038;
undefined4 unk_0x03c;
s64 detectStartTime;
OSTime detectStartTime;
NHTTPConnection httpConnection;
NHTTPRequest* httpRequest;
NHTTPResponse* httpResponse;
@@ -67,7 +67,7 @@ void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
g_session.heap = MEMCreateExpHeapEx(heapBuf, 0x10000, 0);
OSInitMutex(&g_session.mutex);
g_session.state = 0;
g_session.result = 0xff00;
g_session.result = 0xFF00;
g_session.errCode = 0;
g_session.httpTestState = HTTP_TEST_NOT_STARTED;
g_session.unk_0x030 = 0;
@@ -85,20 +85,22 @@ void IPLContestStart() {
g_session.state = 1;
}
int IPLContestProcess(void) {
int IPLContestProcess() {
const char* xOrganizationHeader;
u32 total;
u32 complete;
switch (g_session.state) {
case 0:
case 0: {
break;
case 1:
}
case 1: {
g_session.state = 2;
case 2:
}
case 2: {
switch (g_session.httpTestState) {
case HTTP_TEST_NOT_STARTED:
if (NHTTPStartup(IPLContestNHTTPAlloc, IPLContestNHTTPFree, 0x11) == -1) {
case HTTP_TEST_NOT_STARTED: {
if (NHTTPStartup(IPLContestNHTTPAlloc, IPLContestNHTTPFree, 17) == NHTTP_ERROR_SYSTEM) {
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
g_session.result |= 4;
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200;
@@ -109,7 +111,8 @@ int IPLContestProcess(void) {
OSReport("Starting HTTP conectting test.\n");
}
break;
case HTTP_TEST_STARTED:
}
case HTTP_TEST_STARTED: {
g_session.httpRequest =
NHTTPCreateRequest("http://conntest.nintendowifi.net/", 0, g_session.unk_0x7f0, 0x400, sNHTTPReqCallback, 0);
if (g_session.httpRequest == 0) {
@@ -117,7 +120,7 @@ int IPLContestProcess(void) {
g_session.result |= 4;
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200;
OSReport("[error] Failed to create request.\n");
} else if (g_session.proxy.http.mode == 1 && NHTTPSetProxyDefault(g_session.httpRequest) != 0) {
} else if (g_session.proxy.http.mode == 1 && NHTTPSetProxyDefault(g_session.httpRequest) != NHTTP_ERROR_NONE) {
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
g_session.result |= 4;
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52400;
@@ -140,16 +143,19 @@ int IPLContestProcess(void) {
}
}
break;
case HTTP_TEST_REQUEST_MADE:
}
case HTTP_TEST_REQUEST_MADE: {
NHTTPGetProgress(&complete, &total);
OSReport("received:%d/%d\n", complete, total);
if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks(90000LL) || g_session.httpConnection < 0)
if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks((OSTime)90000) || g_session.httpConnection < 0) {
break;
}
NHTTPCancelRequestAsync(g_session.httpConnection);
OSReport("[error] NHTTP timeout.\n");
g_session.httpConnection = -1;
break;
case HTTP_TEST_RESPONSE_RECEIVED:
}
case HTTP_TEST_RESPONSE_RECEIVED: {
if (NHTTPGetHeaderField(g_session.httpResponse, "X-Organization", &xOrganizationHeader) == strlen("Nintendo") &&
strcmp("Nintendo", xOrganizationHeader) == 0) {
if (g_session.httpResponse != NULL) {
@@ -170,7 +176,8 @@ int IPLContestProcess(void) {
OSReport("[error] Invalid response header.\n");
}
break;
case HTTP_TEST_RESPONSE_ERRORED:
}
case HTTP_TEST_RESPONSE_ERRORED: {
if (g_session.httpResponse != NULL) {
NHTTPDestroyResponse(g_session.httpResponse);
g_session.httpResponse = NULL;
@@ -183,78 +190,94 @@ int IPLContestProcess(void) {
NHTTPCleanupAsync(sNHTTPCleanupCallback);
OSReport("HTTP test has been completed with error.\n");
break;
case HTTP_TEST_DONE:
}
case HTTP_TEST_DONE: {
break;
}
}
break;
case 3:
if (((g_session.result & 1) != 0) || ((g_session.result & 4) != 0)) {
}
case 3: {
if ((g_session.result & 1) || (g_session.result & 4)) {
g_session.state = 4;
g_session.result = g_session.result & 0xffff00ff;
g_session.result = g_session.result & 0xFFFF00FF;
OSReport("Port mapping detectioning test has been skipped.\n");
} else
switch (g_session.unk_0x030) {
case 0:
case 0: {
gsiMemoryCallbacksSet(IPLContestGSMalloc, IPLContestGSFree, IPLContestGSRealloc, IPLContestGSMemalign);
GSIStartAvailableCheckA("wiinat");
g_session.unk_0x030 = 1;
OSReport("Starting GameSpy available check.\n");
break;
case 1:
}
case 1: {
switch (GSIAvailableCheckThink()) {
case GSIACWaiting:
case GSIACWaiting: {
break;
case GSIACAvailable:
}
case GSIACAvailable: {
g_session.unk_0x034 = 1;
g_session.unk_0x030 = 2;
OSReport("GameSpy server is currently available.\n");
break;
default:
}
default: {
g_session.unk_0x034 = 0;
g_session.unk_0x030 = 5;
OSReport("GameSpy server is currently unavailable.\n");
break;
}
}
break;
case 2:
}
case 2: {
NNStartNatDetection(iplContest_813D54F8);
g_session.unk_0x030 = 3;
OSReport("Port mapping detectioning test has been started.\n");
g_session.detectStartTime = OSGetTime();
break;
case 3:
}
case 3: {
NNThink();
if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks(90000LL))
if (OSGetTime() - g_session.detectStartTime < OSMillisecondsToTicks((OSTime)90000)) {
break;
}
g_session.unk_0x030 = 5;
g_session.unk_0x038 = 1;
OSReport("[error] NAT timeout.\n");
break;
case 4:
}
case 4: {
NNFreeNegotiateList();
g_session.state = 4;
g_session.result = g_session.result & 0xffff00ff;
g_session.result = g_session.result & 0xFFFF00FF;
OSReport("Port mapping detectioning test has been completed.\n");
break;
case 5:
}
case 5: {
g_session.state = 4;
g_session.result = g_session.result & 0xffff00ff;
g_session.result = g_session.result & 0xFFFF00FF;
break;
}
}
break;
case 4:
}
case 4: {
break;
}
}
return g_session.state;
}
int IPLContestGetResult() {
if ((g_session.result & 0xff00) != 0) {
return 0xff00;
if ((g_session.result & 0xFF00) != 0) {
return 0xFF00;
}
return g_session.result;
}
int IPLContestGetErrorCode(int conntype) {
return -(g_session.errCode - conntype);
}
@@ -296,15 +319,18 @@ int IPLGetNATSupportCode(int conntype) {
code = 11190;
}
switch (conntype / 10) {
case 2:
case 2: {
code += 1;
break;
case 3:
}
case 3: {
code += 2;
break;
case 4:
}
case 4: {
code += 3;
break;
}
}
OSReport("Wii Support Code:%d\n", code);
return code;
@@ -320,8 +346,9 @@ void IPLContestShutdown() {
void* IPLContestNHTTPAlloc(u32 size, int align) {
void* block;
if (align < 4)
if (align < 4) {
align = 4;
}
OSLockMutex(&g_session.mutex);
block = MEMAllocFromExpHeapEx(g_session.heap, size, align);
@@ -393,41 +420,49 @@ void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
g_session.httpResponse = httpRes;
if (param_1 == 0) {
switch (NHTTPGetResultCode(httpRes)) {
case 200:
case 200: {
g_session.httpTestState = HTTP_TEST_RESPONSE_RECEIVED;
return;
case 407:
}
case 407: {
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52500;
g_session.result |= 4;
return;
default:
}
default: {
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200;
g_session.result |= 4;
return;
}
}
}
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
switch (param_1) {
case 0x4:
case 0x4: {
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52100;
break;
case 0xc:
}
case 0xC: {
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52400;
break;
case 0xd:
}
case 0xD: {
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52400;
break;
default:
}
default: {
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52200;
break;
}
}
g_session.result |= 4;
OSReport("[error] NHTTPReqCallback errorcode:%d\n", NHTTPGetError());
return;
}
void sNHTTPCleanupCallback() {
g_session.state = 3;
}

View File

@@ -3,48 +3,56 @@
#include "scene/nakamuratest/iplContest.h"
#include "scene/setting/iplSetting.h"
#include <revolution/nhttp/d_nhttp.h>
#include <revolution/net.h>
#include <revolution/nhttp.h>
#include <revolution/nup.h>
#include <revolution/os.h>
#include <revolution/scutil.h>
#include <revolution/soex.h>
#include <revolution/wad.h>
#include "system/iplSystem.h"
#include "titledb.h"
namespace ipl {
namespace scene {
EGG::Heap* NakamuraTest::spHeap;
BOOL NakamuraTest::sNHTTPFinished;
NakamuraTest::NakamuraTest(EGG::Heap* heap) : scene::FaderSceneBase(heap), mNetSetup() {
pNetSetupHeapBuf = NULL;
pNUPHeapBuf = 0;
unk_0x2b88 = 0;
mState = 0x00;
mpNetSetupHeapBuf = NULL;
mpNUPHeapBuf = 0;
unk_0x2B88 = 0;
mState = 0;
pAppHeapBuf = System::getMem2App()->alloc(0x299999, 4);
pAppHeap = EGG::ExpHeap::create(pAppHeapBuf, 0x299999, 2);
spHeap = pAppHeap;
mpAppHeapBuf = System::getMem2App()->alloc(0x299999, 4);
mpAppHeap = EGG::ExpHeap::create(mpAppHeapBuf, 0x299999, 2);
spHeap = mpAppHeap;
}
NakamuraTest::~NakamuraTest() {
pAppHeap->destroy();
System::getMem2App()->free(pAppHeapBuf);
mpAppHeap->destroy();
System::getMem2App()->free(mpAppHeapBuf);
}
void NakamuraTest::prepare() {
}
void NakamuraTest::create() {
OSReport("Nakamuratest scene created.\n");
pNetSetupHeapBuf = NULL;
pNUPHeapBuf = NULL;
pNUPHeap = NULL;
mState = 0x01;
mpNetSetupHeapBuf = NULL;
mpNUPHeapBuf = NULL;
mNUPHeap = NULL;
mState = 1;
mNetSetupLastErr = 0;
mConnTestResult = 0;
mFoundUpdate = false;
mAmtCompleted = 0;
mAmtTotal = 0;
pNUPInstance = NULL;
mpNUPInstance = NULL;
}
void NakamuraTest::destroy() {
OSReport("Nakamuratest scene destroyed.\n");
}
@@ -52,114 +60,103 @@ namespace ipl {
void NakamuraTest::calcCommon() {
}
// TODO: Put these in iplContest
extern "C" {
int WADGetInstalledVersion(ESTitleId titleID, u16* version);
// int NHTTPStartup(void* (*)(u32, int), void (*)(void*), int);
// int NHTTPCleanupAsync(void (*)());
int NETGetStartupErrorCode(int);
void* NUP_Init(MEMAllocator* allocator);
int NUP_Start(void* instance, const char* nus, const char* isoCountryCode, void* productAreaString, int);
int NUP_GetStatus(void* instance, u64*);
int NUP_Finish(void* instance);
const char* SCUTILGetISOCountryCodeA2();
}
FaderSceneCommand NakamuraTest::calcNormal() {
FaderSceneCommand cmd = FADER_SCN_CONTINUE;
System::getMasterController();
switch (mState) {
case 0x00:
case 0: {
break;
case 0x01:
}
case 1: {
if (System::isReceiveScheduleStopped() == FALSE) {
System::stopReceiveSchedule();
OSReport("[Receive Scheduler] Wait..\n");
} else {
pNetSetupHeapBuf = pAppHeap->alloc(0x10000, 4);
mpNetSetupHeapBuf = mpAppHeap->alloc(0x10000, 4);
mNetSetupLastErr = 0;
Setting* settingScene = (Setting*)System::getSceneManager()->getScene(SCENE_SETTING);
u32 profileId = settingScene->getProfileID();
if (mNetSetup.setup(pNetSetupHeapBuf, profileId)) {
mState = 0x02;
u32 profileId = ((Setting*)System::getScene(SCENE_SETTING))->getProfileID();
if (mNetSetup.setup(mpNetSetupHeapBuf, profileId)) {
mState = 2;
OSReport("NetSetup Start\n");
} else {
mState = 0x11;
mState = 17;
mNetSetupLastErr = mNetSetup.getlasterror();
if (pNetSetupHeapBuf != NULL) {
pAppHeap->free(pNetSetupHeapBuf);
pNetSetupHeapBuf = NULL;
if (mpNetSetupHeapBuf != NULL) {
mpAppHeap->free(mpNetSetupHeapBuf);
mpNetSetupHeapBuf = NULL;
}
OSReport("[error] NetSetup failed\n");
}
}
break;
case 0x02:
}
case 2: {
switch (mNetSetup.getstate()) {
case NetSetup::NET_SETUP_SUCCESS:
mState = 0x03;
case NetSetup::NET_SETUP_SUCCESS: {
mState = 3;
OSReport("NetSetup Completed\n");
OSReport("Starting Connecting Test\n");
break;
case NetSetup::NET_SETUP_UNK_4:
mState = 0x11;
}
case NetSetup::NET_SETUP_UNK_4: {
mState = 17;
mNetSetup.cleanup();
mNetSetupLastErr = mNetSetup.getlasterror();
if (pNetSetupHeapBuf != NULL) {
pAppHeap->free(pNetSetupHeapBuf);
pNetSetupHeapBuf = NULL;
if (mpNetSetupHeapBuf != NULL) {
mpAppHeap->free(mpNetSetupHeapBuf);
mpNetSetupHeapBuf = NULL;
}
OSReport("[error] %d\n", this->mNetSetupLastErr);
OSReport("[error] %d\n", mNetSetupLastErr);
break;
case NetSetup::NET_SETUP_ERROR:
mState = 0x11;
}
case NetSetup::NET_SETUP_ERROR: {
mState = 17;
mNetSetup.cleanup();
mNetSetupLastErr = mNetSetup.getlasterror();
if (pNetSetupHeapBuf != NULL) {
pAppHeap->free(pNetSetupHeapBuf);
pNetSetupHeapBuf = NULL;
if (mpNetSetupHeapBuf != NULL) {
mpAppHeap->free(mpNetSetupHeapBuf);
mpNetSetupHeapBuf = NULL;
}
OSReport("[error] %d\n", this->mNetSetupLastErr);
OSReport("[error] %d\n", mNetSetupLastErr);
break;
default:
}
default: {
break;
}
}
break;
}
case 3: {
mpNUPHeapBuf = mpAppHeap->alloc(0x10000, 4);
case 0x03:
pNUPHeapBuf = pAppHeap->alloc(0x10000, 4);
IPLContestInitialize(pNUPHeapBuf, mNetSetup.getproxy());
pConnTestThreadStack = pAppHeap->alloc(0x4000, 4);
OSCreateThread(&mConnTestThread, conntestthread, NULL, (u8*)pConnTestThreadStack + 0x4000, 0x4000, 0x12, 1);
IPLContestInitialize(mpNUPHeapBuf, mNetSetup.getproxy());
mpConnTestThreadStack = mpAppHeap->alloc(0x4000, 4);
OSCreateThread(&mConnTestThread, conntestthread, NULL, (u8*)mpConnTestThreadStack + 0x4000, 0x4000, 0x12, 1);
OSResumeThread(&mConnTestThread);
mState = 0x04;
mState = 4;
break;
case 0x04:
}
case 4: {
if (OSIsThreadTerminated(&mConnTestThread)) {
if (pConnTestThreadStack != NULL) {
pAppHeap->free(pConnTestThreadStack);
pConnTestThreadStack = NULL;
if (mpConnTestThreadStack != NULL) {
mpAppHeap->free(mpConnTestThreadStack);
mpConnTestThreadStack = NULL;
}
mState = 0x05;
mState = 5;
System::resetNWC24Regist();
}
break;
case 0x05:
mState = 0x06;
}
case 5: {
mState = 6;
if (IPLContestGetResult() == 0 && System::processNWC24Regist() == 0) {
mState = 0x05;
mState = 5;
}
break;
case 0x06:
}
case 6: {
mConnTestResult = IPLContestGetResult();
if (System::getNWC24RegistErr() != 0) {
OSReport("WiiID ErrorOccur\n");
@@ -182,151 +179,171 @@ namespace ipl {
mNetSetupLastErr = IPLContestGetErrorCode(mNetSetup.getconntype());
}
} else {
Setting* settingsScene = (Setting*)System::getScene(SCENE_SETTING);
settingsScene->setConnectTestResult(1, mNetSetupLastErr, mFoundUpdate, IPLGetNATSupportCode(mNetSetup.getconntype()));
((Setting*)System::getScene(SCENE_SETTING))
->setConnectTestResult(1, mNetSetupLastErr, mFoundUpdate, IPLGetNATSupportCode(mNetSetup.getconntype()));
}
mState = 0x07;
mState = 7;
break;
case 0x07:
}
case 7: {
IPLContestShutdown();
if (pNUPHeapBuf != NULL) {
pAppHeap->free(pNUPHeapBuf);
pNUPHeapBuf = NULL;
if (mpNUPHeapBuf != NULL) {
mpAppHeap->free(mpNUPHeapBuf);
mpNUPHeapBuf = NULL;
}
if (mNetSetupLastErr != 0) {
mState = 0x11;
mState = 17;
mNetSetup.cleanup();
if (pNetSetupHeapBuf != NULL) {
pAppHeap->free(pNetSetupHeapBuf);
pNetSetupHeapBuf = NULL;
if (mpNetSetupHeapBuf != NULL) {
mpAppHeap->free(mpNetSetupHeapBuf);
mpNetSetupHeapBuf = NULL;
}
} else {
mState = 0x08;
}
break;
case 0x08: {
Setting* settingsScene = (Setting*)System::getScene(SCENE_SETTING);
if (settingsScene->getUpdateTiming() == 4) {
mState = 0x09;
} else if (settingsScene->getUpdateTiming() == 10) {
mState = 0x0e;
mState = 8;
}
break;
}
case 0x09: {
case 8: {
Setting* settingsScene = (Setting*)System::getScene(SCENE_SETTING);
if (settingsScene->getUpdateTiming() == 4) {
mState = 9;
} else if (settingsScene->getUpdateTiming() == 10) {
mState = 14;
}
break;
}
case 9: {
u16 menuVersion;
System::getNandManager()->closeContentsAll();
WADGetInstalledVersion(0x0000000100000002ULL, &menuVersion);
WADGetInstalledVersion(SYSMENU_TITLE_ID, &menuVersion);
mCurrVersion = menuVersion;
NHTTPStartup(nhttpalloc, nhttpfree, 0x13);
pNUPHeapBuf = pAppHeap->alloc(0x270000, 4);
pNUPHeap = MEMCreateExpHeapEx(pNUPHeapBuf, 0x270000, 0);
MEMInitAllocatorForExpHeap(&mNUPAllocator, pNUPHeap, 4);
pNUPInstance = NUP_Init(&mNUPAllocator);
if (pNUPInstance != (void*)0x0) {
mpNUPHeapBuf = mpAppHeap->alloc(0x270000, 4);
mNUPHeap = MEMCreateExpHeapEx(mpNUPHeapBuf, 0x270000, 0);
MEMInitAllocatorForExpHeap(&mNUPAllocator, mNUPHeap, 4);
mpNUPInstance = NUP_Init(&mNUPAllocator);
if (mpNUPInstance != NULL) {
char productAreaString[8];
char nus[] = "nus.shop.wii.com";
SCGetProductAreaString(productAreaString, 4);
OSReport("NUP region code : %s\n", productAreaString);
const char* isoCountryCode = SCUTILGetISOCountryCodeA2();
OSReport("NUP country code : %s\n", isoCountryCode);
int iVar8 = NUP_Start(pNUPInstance, nus, isoCountryCode, productAreaString, 0);
int iVar8 = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
OSReport("NUP_Start()\n");
if (iVar8 < 0) {
switch (iVar8) {
case -5000:
case -5000: {
OSReport("FAIL ALLOC\n");
case -5001:
}
case -5001: {
OSReport("FAIL INTERNAL\n");
case -5002:
}
case -5002: {
OSReport("INVALID_FLAG\n");
case -5003:
}
case -5003: {
OSReport("NOT READY\n");
case -5011:
}
case -5011: {
OSReport("BAD HEAP\n");
case -5012:
}
case -5012: {
OSReport("BAD SIZE\n");
mNetSetupLastErr = 32004;
break;
case -5005:
}
case -5005: {
mNetSetupLastErr = 32001;
break;
}
case -5009:
case -5008:
case -5007:
case -5006:
case -5004:
case -5004: {
mNetSetupLastErr = 32002;
break;
case -5010:
}
case -5010: {
mNetSetupLastErr = 32003;
break;
default:
}
default: {
mNetSetupLastErr = 32004;
break;
}
}
mState = 0x0c;
mState = 12;
break;
}
}
mState = 0x0a;
mState = 10;
break;
}
case 0x0a: {
case 10: {
u16 menuVersion;
u64 nupStatus[3];
int nupErrno = NUP_GetStatus(pNUPInstance, nupStatus);
int nupErrno = NUP_GetStatus(mpNUPInstance, nupStatus);
if (nupStatus[1] != 0) {
mAmtCompleted = nupStatus[2];
mAmtTotal = nupStatus[1];
}
if (nupErrno == 0) {
mFoundUpdate = true;
mState = 0x0c;
mState = 12;
} else if (nupErrno < 0) {
OSReport("NUP failed errorcode :%d\n", nupErrno);
WADGetInstalledVersion(0x0000000100000002ULL, &menuVersion);
WADGetInstalledVersion(SYSMENU_TITLE_ID, &menuVersion);
if (mCurrVersion != menuVersion) {
mFoundUpdate = true;
} else {
mFoundUpdate = false;
}
switch (nupErrno) {
case -5000:
case -5000: {
OSReport("FAIL ALLOC\n");
case -5001:
}
case -5001: {
OSReport("FAIL INTERNAL\n");
case -5002:
}
case -5002: {
OSReport("INVALID_FLAG\n");
case -5003:
}
case -5003: {
OSReport("NOT READY\n");
case -5011:
}
case -5011: {
OSReport("BAD HEAP\n");
case -5012:
}
case -5012: {
OSReport("BAD SIZE\n");
mNetSetupLastErr = 32004;
break;
case -5005:
}
case -5005: {
mNetSetupLastErr = 32001;
break;
}
case -5009:
case -5008:
case -5007:
case -5006:
case -5004:
case -5004: {
mNetSetupLastErr = 32002;
break;
case -5010:
}
case -5010: {
mNetSetupLastErr = 32003;
break;
default:
}
default: {
if (-1001 >= nupErrno && nupErrno >= -1007) {
mNetSetupLastErr = 32005;
} else if (-6000 >= nupErrno && nupErrno > -7000) {
@@ -338,62 +355,62 @@ namespace ipl {
} else {
mNetSetupLastErr = 32004;
}
}
}
mState = 0x0c;
mState = 12;
}
break;
}
case 0x0c: {
NUP_Finish(pNUPInstance);
if (pNUPHeap != NULL) {
MEMDestroyExpHeap(pNUPHeap);
pNUPHeap = NULL;
case 12: {
NUP_Finish(mpNUPInstance);
if (mNUPHeap != NULL) {
MEMDestroyExpHeap(mNUPHeap);
mNUPHeap = NULL;
}
if (pNUPHeapBuf != NULL) {
pAppHeap->free(pNUPHeapBuf);
pNUPHeapBuf = NULL;
if (mpNUPHeapBuf != NULL) {
mpAppHeap->free(mpNUPHeapBuf);
mpNUPHeapBuf = NULL;
}
sNHTTPFinished = false;
NHTTPCleanupAsync(nhttpcleanupcallback);
mState = 0x0d;
mState = 13;
u16 menuVersion;
WADGetInstalledVersion(0x0000000100000002ULL, &menuVersion);
WADGetInstalledVersion(SYSMENU_TITLE_ID, &menuVersion);
OSReport("systemmenu ver. before:%d after:%d\n", mCurrVersion, menuVersion);
mFoundUpdate = true;
break;
}
case 0x0d:
case 13: {
if (sNHTTPFinished)
mState = 0x0b;
mState = 11;
break;
case 0x0b:
mState = 0x0f;
}
case 11: {
mState = 15;
break;
case 0x0e:
mState = 0x0f;
}
case 14: {
mState = 15;
OSReport("Network update has been skipped.\n");
break;
case 0x0f:
}
case 15: {
OSReport("Disconnecting from network.\n");
mNetSetup.cleanup();
OSReport("Finished\n");
if (pNetSetupHeapBuf != NULL) {
pAppHeap->free(pNetSetupHeapBuf);
pNetSetupHeapBuf = NULL;
if (mpNetSetupHeapBuf != NULL) {
mpAppHeap->free(mpNetSetupHeapBuf);
mpNetSetupHeapBuf = NULL;
}
if (mNetSetupLastErr == 0) {
mState = 0x10;
mState = 16;
} else {
mState = 0x11;
mState = 17;
}
break;
case 0x10:
}
case 16: {
if (mAmtTotal == 0) {
Setting* settingScene = (Setting*)System::getScene(SCENE_SETTING);
settingScene->setConnectTestResult(3, mNetSetupLastErr, mFoundUpdate, 0);
@@ -404,14 +421,11 @@ namespace ipl {
cmd = FADER_SCN_NEXT;
}
break;
case 0x11:
}
case 17: {
int val;
int len = 4;
// local_50 = 4;
int level = 0xfffe;
int optname = 0x1003;
if (SOGetInterfaceOpt(NULL, level, optname, &val, &len) == 0 && val == -111) {
if (SOGetInterfaceOpt(NULL, SO_SOL_CONFIG, SO_CONFIG_ERROR, &val, &len) == 0 && val == -111) {
int iVar7 = NETGetStartupErrorCode(-111);
mNetSetupLastErr = (-iVar7 / 100) * 100;
mNetSetupLastErr = mNetSetup.getconntype();
@@ -420,9 +434,9 @@ namespace ipl {
settingScene->setConnectTestResult(2, mNetSetupLastErr, mFoundUpdate, 0);
cmd = FADER_SCN_NEXT;
break;
}
}
return cmd;
// WADGetInstalledVersion;
}
FaderSceneCommand NakamuraTest::calcFadeout() {
@@ -433,7 +447,7 @@ namespace ipl {
if (System::getSceneManager()->onDefaultDrawLayer() != TRUE) {
return;
}
utility::Graphics::setOrtho(0);
utility::Graphics::setOrtho();
}
void* NakamuraTest::conntestthread(void*) {
@@ -442,14 +456,15 @@ namespace ipl {
IPLContestStart();
while (true) {
switch (IPLContestProcess()) {
case 4:
case 4: {
return NULL;
}
case 0:
case 1:
case 2:
case 3:
case 3: {
break;
}
}
OSSleepTicks(OSMicrosecondsToTicks(1));
}
@@ -460,9 +475,11 @@ namespace ipl {
align = 4;
return spHeap->alloc(size, align);
}
void NakamuraTest::nhttpfree(void* buf) {
return spHeap->free(buf);
}
void NakamuraTest::nhttpcleanupcallback() {
sNHTTPFinished = TRUE;
}
@@ -470,6 +487,5 @@ namespace ipl {
BOOL NakamuraTest::isResetAcceptable() const {
return FALSE;
}
} // namespace scene
} // namespace ipl

View File

@@ -14,25 +14,25 @@ namespace ipl {
void* NetSetup::iSOStartupEXThread(void* param_1) {
s32 cfgSetResult;
int soStartupRes;
undefined* puVar3;
SOInAddr soAddr;
OSReport("NCDSetIpConfig()\n");
cfgSetResult = NCDSetIpConfig(sSOStartupInfo.ipcfg);
if (cfgSetResult != 0) {
switch (cfgSetResult) {
case -3:
case -3: {
sSOStartupInfo.state = NET_SETUP_ERROR;
sSOStartupInfo.lastErr = 50300;
break;
}
case -1:
case -2:
case -4:
default:
default: {
sSOStartupInfo.state = NET_SETUP_ERROR;
sSOStartupInfo.lastErr = 50100;
break;
}
}
return NULL;
}
@@ -41,18 +41,19 @@ namespace ipl {
cfgSetResult = NCDSetIfConfig(sSOStartupInfo.ifcfg);
if (cfgSetResult != 0) {
switch (cfgSetResult) {
case -3:
case -3: {
sSOStartupInfo.state = NET_SETUP_ERROR;
sSOStartupInfo.lastErr = 50300;
break;
}
case -1:
case -2:
case -4:
default:
default: {
sSOStartupInfo.state = NET_SETUP_ERROR;
sSOStartupInfo.lastErr = 50100;
break;
}
}
return NULL;
}
@@ -132,6 +133,7 @@ namespace ipl {
} else {
mConnType = mProfileId + 40;
}
mState = NET_SETUP_REQUESTED_STARTUP;
return TRUE;
}
@@ -143,14 +145,18 @@ namespace ipl {
SOLibraryConfig soLibCfg;
switch (mState) {
case NET_SETUP_REQUESTED_STARTUP:
case NET_SETUP_REQUESTED_STARTUP: {
memset(&soLibCfg, 0, 8);
soLibCfg.alloc = allocfunc;
soLibCfg.free = freefunc;
SOInit(&soLibCfg);
pThreadStack = (void*)allocfunc(0x4000, 0x20);
stackEnd = (void*)((int)pThreadStack + 0x4000);
if (OSCreateThread(&mThread, iSOStartupEXThread, (void*)mConnType, stackEnd, 0x4000, 0x11, 1) == 0) {
mpThreadStack = (void*)allocfunc(0x4000, 0x20);
stackEnd = (void*)((int)mpThreadStack + 0x4000);
if (OSCreateThread(&mThread, iSOStartupEXThread, (void*)mConnType, stackEnd, 0x4000, 17, 1) == 0) {
mLastErr = -(-50100 + -mConnType);
mState = NET_SETUP_ERROR;
OSReport("OSCreateThread failed\n");
@@ -159,10 +165,10 @@ namespace ipl {
mState = NET_SETUP_RUNNING;
}
break;
case NET_SETUP_RUNNING:
}
case NET_SETUP_RUNNING: {
if (OSIsThreadTerminated(&mThread)) {
threadStack = pThreadStack;
threadStack = mpThreadStack;
mState = sSOStartupInfo.state;
mLastErr = sSOStartupInfo.lastErr;
if (threadStack != NULL) {
@@ -171,20 +177,21 @@ namespace ipl {
MEMFreeToExpHeap(sHeap, threadStack);
OSUnlockMutex(&sAllocLock);
}
pThreadStack = NULL;
mpThreadStack = NULL;
}
}
break;
case NET_SETUP_SUCCESS:
}
case NET_SETUP_SUCCESS: {
NCDGetLinkStatus();
break;
}
case NET_SETUP_NOT_STARTED:
case NET_SETUP_UNK_4:
case NET_SETUP_ERROR:
default:
default: {
break;
}
}
return mState;
}
@@ -192,7 +199,7 @@ namespace ipl {
void NetSetup::cleanup() {
SOCleanup();
SOFinish();
memset(&mNcdIfCfg, 0, 0x15e);
memset(&mNcdIfCfg, 0, sizeof(mNcdIfCfg));
mNcdIfCfg.selectedMedia = 0;
NCDSetIfConfig(&mNcdIfCfg);
MEMDestroyExpHeap(sHeap);
@@ -202,13 +209,14 @@ namespace ipl {
void* ptr = NULL;
if (size > 0) {
OSLockMutex(&sAllocLock);
ptr = MEMAllocFromExpHeapEx(sHeap, size, 0x20);
ptr = MEMAllocFromExpHeapEx(sHeap, size, 32);
OSUnlockMutex(&sAllocLock);
}
return ptr;
}
void NetSetup::freefunc(u32, void* buf, s32) {
if (buf != (void*)0x0) {
if (buf != NULL) {
OSLockMutex(&sAllocLock);
MEMFreeToExpHeap(sHeap, buf);
OSUnlockMutex(&sAllocLock);

View File

@@ -10,37 +10,9 @@
namespace ipl {
namespace scene {
enum SavedataBaseAnimIdx {
ANIM_SWITCH = 0x00, // 0x00
ANIM_DATA_IN = 0x01, // 0x01
ANIM_DATA_OUT = 0x02, // 0x02
ANIM_SELECT_IN = 0x03, // 0x03
ANIM_SELECT_WII_IN = 0x04, // 0x04
ANIM_SELECT_WII_OUT = 0x05, // 0x05
ANIM_SELECT_WII_FLASH = 0x06, // 0x06
ANIM_SELECT_SD_IN = 0x07, // 0x07
ANIM_SELECT_SD_OUT = 0x08, // 0x08
ANIM_SELECT_SD_FLASH = 0x09, // 0x09
ANIM_ARROWS_MOVE_L = 0x0a, // 0x0a
ANIM_ARROWS_MOVE_R = 0x0b, // 0x0b
ANIM_ARROW_R_SELECT = 0x0c, // 0x0c
ANIM_ARROW_L_SELECT = 0x0d, // 0x0d
ANIM_ARROW_R_FOCUS_ON = 0x0e, // 0x0e
ANIM_ARROW_L_FOCUS_ON = 0x0f, // 0x0f
ANIM_ARROW_R_FOCUS_OFF = 0x10, // 0x10
ANIM_ARROW_L_FOCUS_OFF = 0x11, // 0x11
ANIM_ARROW_R_LOOP = 0x12, // 0x12
ANIM_ARROW_R_END = 0x13, // 0x13
ANIM_ARROW_L_END = 0x14, // 0x14
ANIM_ARROW_R_LOST = 0x15, // 0x15
ANIM_ARROW_L_LOST = 0x16, // 0x16
ANIM_ERROR_TEXT_IN = 0x17, // 0x17
ANIM_ERROR_TEXT_OUT = 0x18, // 0x18
};
SavedataBase::SavedataBase(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName)
: AnmController(heap), ::gui::EventHandler(), mState(SAVEDATA_IDLE) {
pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName);
SavedataBase::SavedataBase(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName)
: AnmController(heap), ::gui::EventHandler(), mState(STATE_IDLE) {
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
add_animation("it_ObjCubeEdit_a_WiiSwitch.brlan", "G_Switch");
add_animation("it_ObjCubeEdit_a_DataIn.brlan", "G_DataAll");
@@ -72,7 +44,7 @@ namespace ipl {
get_animation(ANIM_SELECT_WII_OUT)->animator->setAnmType(ANIM_TYPE_BACKWARD);
get_animation(ANIM_SELECT_SD_OUT)->animator->setAnmType(ANIM_TYPE_BACKWARD);
do_animation(ANIM_SWITCH, ANIM_TYPE_FORWARD, true);
pLytObj->finishBinding();
mpLayout->finishBinding();
set_textbox("T_SelectWii_00", MESG_SAVEDATA_EDIT_WII);
set_textbox("T_SelectWii_01", MESG_SAVEDATA_EDIT_WII);
@@ -86,14 +58,14 @@ namespace ipl {
set_visible("N_Capa_00", false);
set_visible("T_Capa_00", false);
pPaneManager = new (heap) ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true);
pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt());
pPaneManager->setAllComponentTriggerTarget(false);
mpGui = new (heap) gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_ArwR"), true);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_ArwL"), true);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_SelectWii_00"), true);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_SelectSd_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_ArwR"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_ArwL"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_SelectWii_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_SelectSd_00"), true);
add_anmpane("B_ArwR", get_animation(ANIM_ARROW_R_FOCUS_ON), get_animation(ANIM_ARROW_R_FOCUS_OFF));
add_anmpane("B_ArwL", get_animation(ANIM_ARROW_L_FOCUS_ON), get_animation(ANIM_ARROW_L_FOCUS_OFF));
@@ -102,102 +74,121 @@ namespace ipl {
}
SavedataBase::~SavedataBase() {
delete pLytObj;
delete pPaneManager;
delete mpLayout;
delete mpGui;
}
void SavedataBase::calc() {
AnmPane* anmPane;
pLytObj->calc();
pPaneManager->calc();
mpLayout->calc();
mpGui->calc();
anmPane = NULL;
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL)
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) {
anmPane->calc();
}
switch (mState) {
case SAVEDATA_IDLE:
case STATE_IDLE: {
break;
case SAVEDATA_FADEIN1ST:
}
case STATE_FADEIN1ST: {
on_fadein1st();
break;
case SAVEDATA_FADEIN2ND:
}
case STATE_FADEIN2ND: {
on_fadein2nd();
break;
case SAVEDATA_FADEOUT:
}
case STATE_FADEOUT: {
on_fadeout();
break;
case SAVEDATA_CHANGE_SD_TO_WII:
}
case STATE_CHANGE_SD_TO_WII: {
on_change_sd_to_wii();
break;
case SAVEDATA_CHANGE_WII_TO_SD:
}
case STATE_CHANGE_WII_TO_SD: {
on_change_wii_to_sd();
break;
case SAVEDATA_SCROLL_R:
}
case STATE_SCROLL_R: {
on_scroll_r();
break;
case SAVEDATA_SCROLL_L:
}
case STATE_SCROLL_L: {
on_scroll_l();
break;
case SAVEDATA_TEXT_FADEIN:
}
case STATE_TEXT_FADEIN: {
on_text_fadein();
break;
case SAVEDATA_TEXT_FADEOUT:
}
case STATE_TEXT_FADEOUT: {
on_text_fadeout();
break;
}
default: {
break;
}
}
}
void SavedataBase::draw() {
pLytObj->draw();
mpLayout->draw();
}
void SavedataBase::update() {
pPaneManager->update();
mpGui->update();
}
void SavedataBase::anmFadein() {
do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true);
mState = SAVEDATA_FADEIN1ST;
mState = STATE_FADEIN1ST;
}
void SavedataBase::anmFadeout(bool isErr) {
do_animation(ANIM_DATA_OUT, ANIM_TYPE_FORWARD, true);
if (isErr) {
do_animation(ANIM_ERROR_TEXT_OUT, ANIM_TYPE_FORWARD, true);
}
mState = SAVEDATA_FADEOUT;
mState = STATE_FADEOUT;
}
void SavedataBase::anmChangeWiitoSD() {
do_animation(ANIM_SELECT_SD_FLASH, ANIM_TYPE_FORWARD, true);
mState = SAVEDATA_CHANGE_WII_TO_SD;
mState = STATE_CHANGE_WII_TO_SD;
}
void SavedataBase::anmChangeSDtoWii() {
do_animation(ANIM_SELECT_WII_FLASH, ANIM_TYPE_FORWARD, true);
mState = SAVEDATA_CHANGE_SD_TO_WII;
mState = STATE_CHANGE_SD_TO_WII;
}
void SavedataBase::anmScrollR(bool playButtonAnm) {
do_animation(ANIM_ARROWS_MOVE_L, ANIM_TYPE_FORWARD, true);
if (playButtonAnm)
do_animation(ANIM_ARROW_R_SELECT, ANIM_TYPE_FORWARD, true);
mState = SAVEDATA_SCROLL_R;
mState = STATE_SCROLL_R;
}
void SavedataBase::anmScrollL(bool playButtonAnm) {
do_animation(ANIM_ARROWS_MOVE_R, ANIM_TYPE_FORWARD, true);
if (playButtonAnm)
if (playButtonAnm) {
do_animation(ANIM_ARROW_L_SELECT, ANIM_TYPE_FORWARD, true);
mState = SAVEDATA_SCROLL_L;
}
mState = STATE_SCROLL_L;
}
void SavedataBase::anmTextFadein(u32 msgId) {
set_textbox("T_Error_00", msgId);
do_animation(ANIM_ERROR_TEXT_IN, ANIM_TYPE_FORWARD, true);
mState = SAVEDATA_TEXT_FADEIN;
mState = STATE_TEXT_FADEIN;
}
void SavedataBase::anmTextFadeout() {
do_animation(ANIM_ERROR_TEXT_OUT, ANIM_TYPE_FORWARD, true);
mState = SAVEDATA_TEXT_FADEOUT;
mState = STATE_TEXT_FADEOUT;
}
void SavedataBase::anmArwAppear(bool arwR, bool arwL) {
@@ -225,55 +216,61 @@ namespace ipl {
gui::PaneComponent* paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId);
const char* paneName = paneComponent->getPane()->GetName();
controller::Interface* con = (controller::Interface*)data;
AnmPane* anmPane;
switch (event) {
case ON_POINT:
case ON_POINT: {
anmPane = get_anmpane(paneName);
if (anmPane != NULL) {
Memory* sceneMemory = (Memory*)System::getScene(SCENE_MEMORY);
sceneMemory->onPoint(anmPane);
}
break;
case ON_LEFT:
}
case ON_LEFT: {
anmPane = get_anmpane(paneName);
if (anmPane != NULL) {
Memory* sceneMemory = (Memory*)System::getScene(SCENE_MEMORY);
sceneMemory->onLeft(anmPane);
}
break;
case ON_TRIG:
if (!((controller::Interface*)data)->downTrg(controller::BTN_INTERACT))
}
case ON_TRIG: {
if (!con->downTrg(controller::BTN_INTERACT)) {
break;
}
anmPane = get_anmpane(paneName);
if (anmPane != NULL) {
Memory* sceneMemory = (Memory*)System::getScene(SCENE_MEMORY);
sceneMemory->onTrig(anmPane);
}
break;
}
}
}
WAIT_FOR_ANIM_STATE(SavedataBase::on_fadein1st, ANIM_DATA_IN, {
do_animation(ANIM_SELECT_IN, ANIM_TYPE_FORWARD, true);
mState = SAVEDATA_FADEIN2ND;
mState = STATE_FADEIN2ND;
});
WAIT_FOR_ANIM_STATE(SavedataBase::on_fadein2nd, ANIM_SELECT_IN, mState = SAVEDATA_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_fadeout, ANIM_DATA_OUT, mState = SAVEDATA_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_change_wii_to_sd, ANIM_SELECT_SD_FLASH, mState = SAVEDATA_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_change_sd_to_wii, ANIM_SELECT_WII_FLASH, mState = SAVEDATA_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_fadein2nd, ANIM_SELECT_IN, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_fadeout, ANIM_DATA_OUT, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_change_wii_to_sd, ANIM_SELECT_SD_FLASH, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_change_sd_to_wii, ANIM_SELECT_WII_FLASH, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_scroll_r, ANIM_ARROWS_MOVE_L, {
get_animation(ANIM_ARROWS_MOVE_L)->animator->init();
pLytObj->calc();
mpLayout->calc();
mState = SAVEDATA_IDLE;
mState = STATE_IDLE;
});
WAIT_FOR_ANIM_STATE(SavedataBase::on_scroll_l, ANIM_ARROWS_MOVE_R, {
get_animation(ANIM_ARROWS_MOVE_L)->animator->init();
pLytObj->calc();
mpLayout->calc();
mState = SAVEDATA_IDLE;
mState = STATE_IDLE;
});
WAIT_FOR_ANIM_STATE(SavedataBase::on_text_fadein, ANIM_ERROR_TEXT_IN, mState = SAVEDATA_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_text_fadeout, ANIM_ERROR_TEXT_OUT, mState = SAVEDATA_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_text_fadein, ANIM_ERROR_TEXT_IN, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBase::on_text_fadeout, ANIM_ERROR_TEXT_OUT, mState = STATE_IDLE);
} // namespace scene
} // namespace ipl

View File

@@ -4,62 +4,55 @@
namespace ipl {
namespace scene {
enum SavedataBoxAnimIdx {
ANIM_DATA_IN = 0x0, // 0x0
ANIM_DATA_OUT = 0x1, // 0x1
ANIM_DATA_FOCUS_IN = 0x2, // 0x2
ANIM_DATA_FOCUS_OUT = 0x3, // 0x3
};
SavedataBox::SavedataBox(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName)
: AnmController(heap), ::gui::EventHandler(), mState(BOX_STATE_IDLE), pBannerFileInfo(NULL), pTextBalloon(NULL),
mTextBalloonInitialized(false) {
pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName);
SavedataBox::SavedataBox(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName)
: AnmController(heap), ::gui::EventHandler(), mState(STATE_IDLE), mpBannerFileInfo(NULL), mpBalloon(NULL), mbInitBalloon(false) {
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
add_animation("it_ObjCubeEdit_b_SaveDataIn.brlan", "G_Data");
add_animation("it_ObjCubeEdit_b_SaveDataOut.brlan", "G_Data");
add_animation("it_ObjCubeEdit_b_SaveDataFoucusIn.brlan", "G_Data");
add_animation("it_ObjCubeEdit_b_SaveDataFoucusOut.brlan", "G_Data");
pLytObj->finishBinding();
mpLayout->finishBinding();
set_visible("N_Data_00", false);
set_visible("DataBanner_00", false);
pPaneManager = new ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true);
pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt());
pPaneManager->setAllComponentTriggerTarget(false);
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Data_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Data_00"), true);
add_anmpane("B_Data_00", get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
}
SavedataBox::~SavedataBox() {
delete pLytObj;
delete pPaneManager;
delete mpLayout;
delete mpGui;
}
void SavedataBox::calc() {
Memory* sceneMemory;
Memory* memory;
GXTexObj corruptIconTex;
AnmPane* anmPane;
pLytObj->calc();
pPaneManager->calc();
mpLayout->calc();
mpGui->calc();
anmPane = NULL;
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != 0)
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL) {
anmPane->calc();
}
if (mState != BOX_STATE_FADEOUT && pBannerFileInfo != NULL) {
if (mState != STATE_FADEOUT && mpBannerFileInfo != NULL) {
set_visible("DataBanner_00", true);
if (!pBannerFileInfo->isCorrupt()) {
set_texture("DataBanner_00", *pBannerFileInfo->loadIconTexture());
pBannerFileInfo->update();
if (!mpBannerFileInfo->isCorrupt()) {
set_texture("DataBanner_00", *mpBannerFileInfo->loadIconTexture());
mpBannerFileInfo->update();
} else {
sceneMemory = (Memory*)System::getScene(SCENE_MEMORY);
sceneMemory->getCorruptIconTexture(&corruptIconTex);
memory = (Memory*)System::getScene(SCENE_MEMORY);
memory->getCorruptIconTexture(&corruptIconTex);
set_texture("DataBanner_00", corruptIconTex);
}
} else {
@@ -67,124 +60,139 @@ namespace ipl {
}
switch (mState) {
case BOX_STATE_IDLE:
case STATE_IDLE: {
break;
case BOX_STATE_FADEIN:
}
case STATE_FADEIN: {
on_fadein();
break;
case BOX_STATE_FADEOUT:
}
case STATE_FADEOUT: {
on_fadeout();
break;
}
}
}
void SavedataBox::draw() {
pLytObj->draw();
mpLayout->draw();
}
void SavedataBox::update() {
pPaneManager->update();
mpGui->update();
}
void SavedataBox::anmFadein() {
set_visible("N_Data_00", true);
do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true);
mState = BOX_STATE_FADEIN;
mState = STATE_FADEIN;
}
void SavedataBox::anmFadeout() {
if (pTextBalloon != NULL)
pTextBalloon->terminate();
if (mpBalloon != NULL)
mpBalloon->terminate();
do_animation(ANIM_DATA_OUT, ANIM_TYPE_FORWARD, true);
mState = BOX_STATE_FADEOUT;
mState = STATE_FADEOUT;
}
void SavedataBox::onEvent(u32 compId, u32 event, void* data) {
const char* paneName;
gui::PaneComponent* paneComponent;
AnmPane* anmPane;
Memory* sceneMemory;
paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId);
paneName = paneComponent->getPane()->GetName();
controller::Interface* con = (controller::Interface*)data;
AnmPane* anmPane;
Memory* memory;
switch (event) {
case ON_POINT:
case ON_POINT: {
anmPane = get_anmpane(paneName);
if (anmPane == NULL)
if (anmPane == NULL) {
break;
}
anmPane->incHoverCount();
sceneMemory = (Memory*)System::getScene(SCENE_MEMORY);
sceneMemory->onPoint(anmPane);
if (pTextBalloon == NULL || pBannerFileInfo == NULL)
((Memory*)System::getScene(SCENE_MEMORY))->onPoint(anmPane);
if (mpBalloon == NULL || mpBannerFileInfo == NULL) {
break;
if (!pBannerFileInfo->isCorrupt()) {
pTextBalloon->init(pBannerFileInfo->getSaveName());
} else {
pTextBalloon->init(L"???");
}
mTextBalloonInitialized = true;
pTextBalloon->fadein();
break;
case ON_MOVE:
anmPane = get_anmpane(paneName);
if (anmPane == NULL)
break;
if (pTextBalloon == NULL || pBannerFileInfo == NULL)
break;
if (mTextBalloonInitialized)
break;
if (!pBannerFileInfo->isCorrupt()) {
pTextBalloon->init(pBannerFileInfo->getSaveName());
if (!mpBannerFileInfo->isCorrupt()) {
mpBalloon->init(mpBannerFileInfo->getSaveName());
} else {
pTextBalloon->init(L"???");
mpBalloon->init(L"???");
}
mTextBalloonInitialized = true;
pTextBalloon->fadein();
break;
case ON_LEFT:
mbInitBalloon = true;
mpBalloon->fadein();
break;
}
case ON_MOVE: {
anmPane = get_anmpane(paneName);
if (anmPane == NULL)
if (anmPane == NULL) {
break;
}
if (mpBalloon == NULL || mpBannerFileInfo == NULL) {
break;
}
if (mbInitBalloon) {
break;
}
if (!mpBannerFileInfo->isCorrupt()) {
mpBalloon->init(mpBannerFileInfo->getSaveName());
} else {
mpBalloon->init(L"???");
}
mbInitBalloon = true;
mpBalloon->fadein();
break;
}
case ON_LEFT: {
anmPane = get_anmpane(paneName);
if (anmPane == NULL) {
break;
}
anmPane->decHoverCount();
sceneMemory = (Memory*)System::getScene(SCENE_MEMORY);
sceneMemory->onLeft(anmPane);
mTextBalloonInitialized = false;
((Memory*)System::getScene(SCENE_MEMORY))->onLeft(anmPane);
mbInitBalloon = false;
if (pTextBalloon == NULL || pBannerFileInfo == NULL)
if (mpBalloon == NULL || mpBannerFileInfo == NULL) {
break;
pTextBalloon->fadeout();
}
mpBalloon->fadeout();
break;
case ON_TRIG:
if (!((controller::Interface*)data)->downTrg(controller::BTN_INTERACT))
}
case ON_TRIG: {
if (!con->downTrg(controller::BTN_INTERACT)) {
break;
}
anmPane = get_anmpane(paneName);
if (anmPane == NULL)
if (anmPane == NULL) {
break;
if (pBannerFileInfo == NULL)
}
if (mpBannerFileInfo == NULL) {
break;
sceneMemory = (Memory*)System::getScene(SCENE_MEMORY);
sceneMemory->onTrig(this);
}
((Memory*)System::getScene(SCENE_MEMORY))->onTrig(this);
break;
}
}
}
void SavedataBox::clearEvent() {
clear_anmpane("B_Data_00");
if (pTextBalloon != NULL) {
pTextBalloon->terminate();
mTextBalloonInitialized = false;
if (mpBalloon != NULL) {
mpBalloon->terminate();
mbInitBalloon = false;
}
}
WAIT_FOR_ANIM_STATE(SavedataBox::on_fadein, ANIM_DATA_IN, mState = BOX_STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBox::on_fadeout, ANIM_DATA_OUT, mState = BOX_STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBox::on_fadein, ANIM_DATA_IN, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataBox::on_fadeout, ANIM_DATA_OUT, mState = STATE_IDLE);
} // namespace scene
} // namespace ipl

View File

@@ -13,38 +13,16 @@
namespace ipl {
namespace scene {
typedef struct {
wchar_t digits[10];
} SCNumber;
static const SCNumber scNumber = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'};
// TODO: Figure out what this might've been/why it isn't inlining
void dummyFunctionToKeepAConstructorStuffFromInlining(nw4r::math::VEC3& vec) {
// stripped out function generated a weak
void forceWeakFunc(nw4r::math::VEC3& vec) {
math::VEC3 end(vec);
}
enum SavedataEditAnimIdx {
ANIM_MASK_IN = 0x0, // 0x0
ANIM_MASK_OUT = 0x1, // 0x1
ANIM_COPY_IN = 0x2, // 0x2
ANIM_COPY_OUT = 0x3, // 0x3
ANIM_COPY_FLASH = 0x4, // 0x4
ANIM_DEL_IN = 0x5, // 0x5
ANIM_DEL_OUT = 0x6, // 0x6
ANIM_DEL_FLASH = 0x7, // 0x7
ANIM_SELECT_OUT = 0x8, // 0x8
ANIM_TEXT_FADEIN = 0x9, // 0x9
ANIM_TEXT_FADEOUT = 0xa, // 0xa
ANIM_WAIT = 0xb, // 0xb
ANIM_MOVE_IN = 0xc, // 0xc
ANIM_MOVE_OUT = 0xd, // 0xd
ANIM_MOVE_FLASH = 0xe, // 0xe
};
SavedataEdit::SavedataEdit(EGG::Heap* heap, nand::LayoutFile* lytFile, const char* lytFolder, const char* lytFileName)
: AnmController(heap), ::gui::EventHandler(), mState(EDIT_STATE_IDLE), mLinearInterp(), pSavedataBox(NULL), mMsgId(0) {
pLytObj = new (heap) layout::Object(heap, lytFile, lytFolder, lytFileName);
SavedataEdit::SavedataEdit(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* layoutDir, const char* layoutFileName)
: AnmController(heap), ::gui::EventHandler(), mState(STATE_IDLE), mLinearInterp(), mpSavedataBox(NULL), mMsgId(0) {
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
// New filenames for 4.0 (10th December 2008)
add_animation("081210_sys4_mn_DataDetail_a_SeenIn.brlan", "G_Mask");
add_animation("081210_sys4_mn_DataDetail_a_SeenOut.brlan", "G_Mask");
add_animation("081210_sys4_mn_DataDetail_a_CopyFoucusIn.brlan", "G_Copy");
@@ -61,7 +39,7 @@ namespace ipl {
add_animation("081210_sys4_mn_DataDetail_a_MoveFoucusOut.brlan", "G_Move");
add_animation("081210_sys4_mn_DataDetail_a_MoveFlash.brlan", "G_MoveFlash");
pLytObj->finishBinding();
mpLayout->finishBinding();
set_textbox("T_Move_00", MESG_SAVEDATA_EDIT_MOVE);
set_textbox("T_Copy_00", MESG_SAVEDATA_EDIT_COPY);
set_textbox("T_Del_00", MESG_SAVEDATA_EDIT_DEL);
@@ -81,13 +59,13 @@ namespace ipl {
set_visible("T_Move_off", false);
set_visible("T_Move_off_00", false);
pPaneManager = new ipl::gui::PaneManager(this, pLytObj->getDrawInfo(), NULL, NULL, true);
pPaneManager->createLayoutScene(*pLytObj->getNW4RLyt());
pPaneManager->setAllComponentTriggerTarget(false);
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Move_00"), true);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Copy_00"), true);
pPaneManager->setTriggerTarget(pLytObj->FindPaneByName("B_Del_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Move_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Copy_00"), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName("B_Del_00"), true);
add_anmpane("B_Move_00", get_animation(ANIM_MOVE_IN), get_animation(ANIM_MOVE_OUT));
add_anmpane("B_Copy_00", get_animation(ANIM_COPY_IN), get_animation(ANIM_COPY_OUT));
@@ -95,53 +73,53 @@ namespace ipl {
}
SavedataEdit::~SavedataEdit() {
delete pLytObj;
delete pPaneManager;
delete mpLayout;
delete mpGui;
}
void SavedataEdit::calc() {
AnmPane* anmPane;
pLytObj->calc();
pPaneManager->calc();
mpLayout->calc();
mpGui->calc();
anmPane = NULL;
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL)
anmPane->calc();
switch (mState) {
case EDIT_STATE_IDLE:
case STATE_IDLE:
break;
case EDIT_STATE_FADEIN:
case STATE_FADEIN:
on_fadein();
break;
case EDIT_STATE_FADEOUT:
case STATE_FADEOUT:
on_fadeout();
break;
case EDIT_STATE_HIDE_BTN0_DIALOG:
case STATE_HIDE_BTN0_DIALOG:
on_hide_btn0_dialog();
break;
case EDIT_STATE_SHOW_BTN2_DIALOG1ST:
case STATE_SHOW_BTN2_DIALOG1ST:
on_show_btn2_dialog1st();
break;
case EDIT_STATE_SHOW_BTN2_DIALOG2ND:
case STATE_SHOW_BTN2_DIALOG2ND:
on_show_btn2_dialog2nd();
break;
case EDIT_STATE_SELECT_FADEIN:
case STATE_SELECT_FADEIN:
on_select_fadein();
break;
case EDIT_STATE_SELECT_FADEOUT1ST:
case STATE_SELECT_FADEOUT1ST:
on_select_fadeout1st();
break;
case EDIT_STATE_SELECT_FADEOUT2ND:
case STATE_SELECT_FADEOUT2ND:
on_select_fadeout2nd();
break;
case EDIT_STATE_TEXT_FADEIN:
case STATE_TEXT_FADEIN:
on_text_fadein();
break;
case EDIT_STATE_TEXT_FADEOUT:
case STATE_TEXT_FADEOUT:
on_text_fadeout();
break;
case EDIT_STATE_TRIG_DEL:
case STATE_TRIG_DEL:
on_trig_del();
break;
}
@@ -149,15 +127,15 @@ namespace ipl {
}
void SavedataEdit::draw() {
pLytObj->draw();
mpLayout->draw();
}
void SavedataEdit::update() {
pPaneManager->update();
mpGui->update();
}
void SavedataEdit::anmFadein(SavedataBox* box) {
pSavedataBox = box;
mpSavedataBox = box;
set_visible("Mask_00", true);
set_visible("N_Window", true);
set_visible("Banner_00", true);
@@ -199,13 +177,17 @@ namespace ipl {
set_texture("Banner_00", corruptIconTex);
}
u32 blockCount = box->getBanner()->getBlockCount();
SCNumber scNumberData = scNumber;
const wchar_t scNumber[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'};
wchar_t blockTextDigits[5] = L"";
wchar_t blockText[5] = L"";
blockTextDigits[0] = scNumberData.digits[blockCount / 1000];
blockTextDigits[1] = scNumberData.digits[blockCount / 100 % 10];
blockTextDigits[2] = scNumberData.digits[blockCount / 10 % 10];
blockTextDigits[3] = scNumberData.digits[blockCount % 10];
blockTextDigits[0] = scNumber[blockCount / 1000];
blockTextDigits[1] = scNumber[blockCount / 100 % 10];
blockTextDigits[2] = scNumber[blockCount / 10 % 10];
blockTextDigits[3] = scNumber[blockCount % 10];
int zeroOffset;
for (zeroOffset = 0; zeroOffset < 3; zeroOffset++)
if (blockTextDigits[zeroOffset] != L'0')
@@ -225,25 +207,25 @@ namespace ipl {
clear_anmpane(anmPane->getName());
do_animation(ANIM_MASK_IN, ANIM_TYPE_FORWARD, true);
mState = EDIT_STATE_FADEIN;
mState = STATE_FADEIN;
}
void SavedataEdit::anmFadeout() {
pSavedataBox = NULL;
mpSavedataBox = NULL;
change_button_text(MESG_CMN_BACK_ALT);
do_animation(ANIM_MASK_OUT, ANIM_TYPE_FORWARD, true);
mState = EDIT_STATE_FADEOUT;
mState = STATE_FADEOUT;
}
void SavedataEdit::anmHideBtn0Dialog() {
System::getDialog()->terminate();
mState = EDIT_STATE_HIDE_BTN0_DIALOG;
mState = STATE_HIDE_BTN0_DIALOG;
}
void SavedataEdit::anmShowBtn0Dialog(u32 msgId, bool dontWait, bool showLoading) {
System::getDialog()->callBtn0(msgId, dontWait ? 0 : 180, showLoading);
}
void SavedataEdit::anmShowS2Btn2Dialog(u32 msgId) {
set_textbox("T_Message_00", msgId);
mState = EDIT_STATE_SHOW_BTN2_DIALOG1ST;
mState = STATE_SHOW_BTN2_DIALOG1ST;
}
void SavedataEdit::anmSelectFadein() {
@@ -256,17 +238,17 @@ namespace ipl {
while (anmPane = (AnmPane*)nw4r::ut::List_GetNext(&mPaneList, anmPane), anmPane != NULL)
clear_anmpane(anmPane->getName());
mState = EDIT_STATE_SELECT_FADEIN;
mState = STATE_SELECT_FADEIN;
}
void SavedataEdit::anmSelectFadeout(u32 msgId) {
set_textbox("T_Message_00", msgId);
mState = EDIT_STATE_SELECT_FADEOUT1ST;
mState = STATE_SELECT_FADEOUT1ST;
}
void SavedataEdit::anmTextFadein(u32 msgId) {
mMsgId = msgId;
do_animation(ANIM_TEXT_FADEIN, ANIM_TYPE_FORWARD, true);
mState = EDIT_STATE_TEXT_FADEIN;
mState = STATE_TEXT_FADEIN;
}
void SavedataEdit::anmTextFadeout() {
do_animation(ANIM_TEXT_FADEOUT, ANIM_TYPE_FORWARD, true);
@@ -275,7 +257,7 @@ namespace ipl {
sceneSettingButton->reserve(SettingButton::CMD_SET_TEXT, MESG_CMN_BACK_ALT);
sceneSettingButton->reserve(SettingButton::CMD_SHOW_BTN, 0);
mState = EDIT_STATE_TEXT_FADEOUT;
mState = STATE_TEXT_FADEOUT;
}
void SavedataEdit::anmStartWaitAnm() {
@@ -301,8 +283,9 @@ namespace ipl {
gui::PaneComponent* paneComponent = (gui::PaneComponent*)mpManager->getComponent(compId);
const char* paneName = paneComponent->getPane()->GetName();
if (mState == EDIT_STATE_TRIG_DEL)
if (mState == STATE_TRIG_DEL) {
return;
}
AnmPane* anmPane;
switch (event) {
@@ -335,10 +318,10 @@ namespace ipl {
do_animation(ANIM_MOVE_FLASH, ANIM_TYPE_FORWARD, true);
Memory* sceneMemory = (Memory*)System::getScene(SCENE_MEMORY);
sceneMemory->onTrigMove();
} else if (strcmp(anmPane->getName(), "B_Del_00") == 0 && mState != EDIT_STATE_TRIG_DEL) {
} else if (strcmp(anmPane->getName(), "B_Del_00") == 0 && mState != STATE_TRIG_DEL) {
snd::getSystem()->startSE("WIPL_SE_DECIDE");
do_animation(ANIM_DEL_FLASH, ANIM_TYPE_FORWARD, true);
mState = EDIT_STATE_TRIG_DEL;
mState = STATE_TRIG_DEL;
}
}
break;
@@ -353,68 +336,73 @@ namespace ipl {
switch (msgId) {
case MESG_CMN_BACK_ALT_3:
case MESG_CMN_BACK_ALT:
case MESG_CMN_BACK_ALT: {
sceneSettingButton->setSoundType(SettingButton::CANCEL);
break;
case MESG_CMN_OK:
}
case MESG_CMN_OK: {
sceneSettingButton->setSoundType(SettingButton::DECIDE);
break;
}
}
}
void SavedataEdit::on_fadein() {
mLinearInterp.calc();
set_translate("N_Window", mLinearInterp.get());
if (is_animation(ANIM_MASK_IN))
if (is_animation(ANIM_MASK_IN)) {
return;
if (mLinearInterp.isPlaying())
}
if (mLinearInterp.isPlaying()) {
return;
mState = EDIT_STATE_IDLE;
}
mState = STATE_IDLE;
}
WAIT_FOR_ANIM_STATE(SavedataEdit::on_fadeout, ANIM_MASK_OUT, mState = EDIT_STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataEdit::on_fadeout, ANIM_MASK_OUT, mState = STATE_IDLE);
void SavedataEdit::on_hide_btn0_dialog() {
if (System::getDialog()->getLastResult() != DialogWindow::RESULT_PROGRESS &&
System::getDialog()->getLastResult() != DialogWindow::RESULT_TERMINATED)
System::getDialog()->getLastResult() != DialogWindow::RESULT_TERMINATED) {
return;
}
mState = EDIT_STATE_IDLE;
mState = STATE_IDLE;
}
WAIT_FOR_ANIM_STATE(SavedataEdit::on_show_btn2_dialog1st, ANIM_COPY_FLASH, {
do_animation(ANIM_SELECT_OUT, ANIM_TYPE_FORWARD, true);
SettingButton* sceneSettingButton = (SettingButton*)System::getScene(SCENE_SETTING_BUTTON);
sceneSettingButton->hideBtn();
mState = EDIT_STATE_SHOW_BTN2_DIALOG2ND;
mState = STATE_SHOW_BTN2_DIALOG2ND;
});
WAIT_FOR_ANIM_STATE(SavedataEdit::on_show_btn2_dialog2nd, ANIM_SELECT_OUT, {
System::getDialog()->callS2Btn2(MESG_CMN_NO, MESG_CMN_YES, true);
mState = EDIT_STATE_IDLE;
mState = STATE_IDLE;
});
WAIT_FOR_ANIM_STATE(SavedataEdit::on_select_fadein, ANIM_SELECT_OUT, mState = EDIT_STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataEdit::on_select_fadein, ANIM_SELECT_OUT, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataEdit::on_select_fadeout1st, ANIM_COPY_FLASH, {
do_animation(ANIM_SELECT_OUT, ANIM_TYPE_FORWARD, true);
change_button_text(MESG_CMN_OK);
mState = EDIT_STATE_SELECT_FADEOUT2ND;
mState = STATE_SELECT_FADEOUT2ND;
});
WAIT_FOR_ANIM_STATE(SavedataEdit::on_select_fadeout2nd, ANIM_SELECT_OUT, mState = EDIT_STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataEdit::on_select_fadeout2nd, ANIM_SELECT_OUT, mState = STATE_IDLE);
void SavedataEdit::on_text_fadein() {
if (get_animation(ANIM_TEXT_FADEIN)->animator->getCurrentFrame() >= 20.0f) {
set_textbox("T_Message_00", mMsgId);
}
if (is_animation(ANIM_TEXT_FADEIN))
if (is_animation(ANIM_TEXT_FADEIN)) {
return;
}
stop_animation(ANIM_TEXT_FADEIN);
mState = EDIT_STATE_IDLE;
mState = STATE_IDLE;
}
WAIT_FOR_ANIM_STATE(SavedataEdit::on_text_fadeout, ANIM_TEXT_FADEOUT, mState = EDIT_STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataEdit::on_text_fadeout, ANIM_TEXT_FADEOUT, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(SavedataEdit::on_trig_del, ANIM_DEL_FLASH, {
mState = EDIT_STATE_IDLE;
mState = STATE_IDLE;
Memory* sceneMemory = (Memory*)System::getScene(SCENE_MEMORY);
sceneMemory->onTrigDel();
});

View File

@@ -16,15 +16,15 @@ namespace ipl {
mAnim_AltBackward = 0;
// Init name
wmemset(mSaveName, 0, SAVE_NAME_LENGTH + 1);
wmemset(mSaveSubName, 0, SAVE_NAME_LENGTH + 1);
wmemset(mSaveName, 0, WII_SAVE_BANNER_LENGTH + 1);
wmemset(mSaveSubName, 0, WII_SAVE_BANNER_LENGTH + 1);
// Init banner
memset(mpBannerData, 0, SAVE_BANNER_TEX_SIZE);
memset(mpBannerData, 0, WII_SAVE_BANNER_BNR_TEXSIZE);
// Init icons
for (int i = 0; i < SAVE_ICON_COUNT; i++) {
memset(mpIconData[i], 0, SAVE_ICON_TEX_SIZE);
for (int i = 0; i < WII_SAVE_BANNER_ICON_COUNT; i++) {
memset(mpIconData[i], 0, WII_SAVE_BANNER_ICON_TEXSIZE);
}
// Init data
@@ -45,17 +45,17 @@ namespace ipl {
resolve_icon();
// Setup name
memcpy(mSaveName, mData.name, SAVE_NAME_LENGTH * sizeof(wchar_t));
memcpy(mSaveSubName, mData.subName, SAVE_NAME_LENGTH * sizeof(wchar_t));
memcpy(mSaveName, mData.name, WII_SAVE_BANNER_LENGTH * sizeof(wchar_t));
memcpy(mSaveSubName, mData.subName, WII_SAVE_BANNER_LENGTH * sizeof(wchar_t));
// Setup banner
memcpy(mpBannerData, mData.bannerData, SAVE_BANNER_TEX_SIZE);
DCStoreRange(mpBannerData, SAVE_BANNER_TEX_SIZE);
memcpy(mpBannerData, mData.bannerData, WII_SAVE_BANNER_BNR_TEXSIZE);
DCStoreRange(mpBannerData, WII_SAVE_BANNER_BNR_TEXSIZE);
// Setup icons
for (int i = 0; i < SAVE_ICON_COUNT; i++) {
memcpy(mpIconData[i], (&mData.iconData0)[i], SAVE_ICON_TEX_SIZE);
DCStoreRange(mpIconData[i], SAVE_ICON_TEX_SIZE);
for (int i = 0; i < WII_SAVE_BANNER_ICON_COUNT; i++) {
memcpy(mpIconData[i], (&mData.iconData)[i], WII_SAVE_BANNER_ICON_TEXSIZE);
DCStoreRange(mpIconData[i], WII_SAVE_BANNER_ICON_TEXSIZE);
}
}
@@ -66,7 +66,7 @@ namespace ipl {
// If tick reached to last frame
if (mAnim_FrameTick >= mAnim_MaxFrameTicks) {
// For alternate, play backwards
if (mAnim_AltFlag == FLAG_ALTERNATE_ANIMATION) {
if (mAnim_AltFlag == WII_SAVE_BANNER_FLAG_ALTERNATE) {
mAnim_FrameTick = (mAnim_MaxFrameTicks - mAnim_AltBackward) - 1;
mAnim_Incrementer = -1;
}
@@ -80,7 +80,7 @@ namespace ipl {
// If tick reached to first frame
if (mAnim_FrameTick < 0) {
// For alternate, play forwards
if (mAnim_AltFlag == FLAG_ALTERNATE_ANIMATION) {
if (mAnim_AltFlag == WII_SAVE_BANNER_FLAG_ALTERNATE) {
mAnim_FrameTick = mAnim_AltForward;
}
// For loop, reset to first frame
@@ -99,10 +99,11 @@ namespace ipl {
if (mAnim_FrameTick <= speed) {
break;
}
} while (i < SAVE_ICON_COUNT);
} while (i < WII_SAVE_BANNER_ICON_COUNT);
// Init current frame texture
GXInitTexObj(&mCurIconTex, mpIconData[i - 1], SAVE_ICON_TEX_WIDTH, SAVE_ICON_TEX_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObj(&mCurIconTex, mpIconData[i - 1], WII_SAVE_BANNER_ICON_WIDTH, WII_SAVE_BANNER_ICON_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP,
GX_FALSE);
}
GXTexObj* WiiBannerFileInfo::loadIconTexture() {
@@ -115,10 +116,11 @@ namespace ipl {
if (mAnim_FrameTick <= speed) {
break;
}
} while (i < SAVE_ICON_COUNT);
} while (i < WII_SAVE_BANNER_ICON_COUNT);
// Load current icon frame texture
GXInitTexObj(&mCurIconTex, mpIconData[i - 1], SAVE_ICON_TEX_WIDTH, SAVE_ICON_TEX_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObj(&mCurIconTex, mpIconData[i - 1], WII_SAVE_BANNER_ICON_WIDTH, WII_SAVE_BANNER_ICON_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP,
GX_FALSE);
GXLoadTexObj(&mCurIconTex, GX_TEXMAP0);
return &mCurIconTex;
@@ -126,7 +128,8 @@ namespace ipl {
GXTexObj* WiiBannerFileInfo::loadBannerTexture() {
// Load current banner texture
GXInitTexObj(&mCurBannerTex, mpBannerData, SAVE_BANNER_TEX_WIDTH, SAVE_BANNER_TEX_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_FALSE);
GXInitTexObj(&mCurBannerTex, mpBannerData, WII_SAVE_BANNER_BNR_WIDTH, WII_SAVE_BANNER_BNR_HEIGHT, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP,
GX_FALSE);
GXLoadTexObj(&mCurBannerTex, GX_TEXMAP0);
return &mCurBannerTex;
@@ -142,7 +145,7 @@ namespace ipl {
// Set max frame ticks
int i = 0;
for (i = 0; i < SAVE_ICON_COUNT; i++) {
for (i = 0; i < WII_SAVE_BANNER_ICON_COUNT; i++) {
if (get_iconspeed(i) == 0)
break; // A frame with the speed of 0 indicates the end.
mAnim_MaxFrameTicks += (get_iconspeed_ticks(i));
@@ -159,9 +162,9 @@ namespace ipl {
mFrameCount++;
}
i++;
} while (i < SAVE_ICON_COUNT);
} while (i < WII_SAVE_BANNER_ICON_COUNT);
mAnim_AltFlag = (mFlags & FLAG_ALTERNATE_ANIMATION);
mAnim_AltFlag = (mFlags & WII_SAVE_BANNER_FLAG_ALTERNATE);
mAnim_Incrementer = 1;
}
}
@@ -174,7 +177,7 @@ namespace ipl {
(01010101 01111111)
3, 3, 3, 1, 1, 1, 1, 1
*/
if (frame < 0 || frame > SAVE_ICON_COUNT) {
if (frame < 0 || frame > WII_SAVE_BANNER_ICON_COUNT) {
return 0;
}
return (mFrameSpeed >> (frame * 2)) & 0b00000011;

View File

@@ -14,6 +14,23 @@
namespace ipl {
namespace ncd {
// If you change one thing in this function, checkFlag will not match.
// Probably some stripped out function, but... I don't get MWCC
#ifndef NON_MATCHING
void NCDSetting::matchHack() {
u16 myNewMode;
if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode == 2 ||
(strlen((const char*)mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.wep104.key) > 20)) {
myNewMode = 2;
}
if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode != myNewMode) {
mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode = myNewMode;
}
}
#endif
NCDConfig NCDSetting::mConfig;
NCDConfig NCDSetting::mSaveConfig;
u8 NCDSetting::mMac[0x20];
@@ -32,36 +49,20 @@ namespace ipl {
mID = setID;
}
// If you change one thing in this function, checkFlag will not match.
// Probably some stripped out function, but... I don't get MWCC
#ifndef NON_MATCHING
void NCDSetting::matchHack() {
u16 sVar2;
if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode == 2 ||
(strlen((const char*)mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.wep104.key) > 20)) {
sVar2 = 2;
}
if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode != sVar2) {
mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode = sVar2;
}
}
#endif
int NCDSetting::checkFlag(int id) {
int ret = 0;
int flags = mConfig.profiles[id].flags;
if (flags & NCD_DHCP_FLAG) {
return 1;
}
if (mConfig.profiles[id].netif.wireless.config.manual.ssidLength == 0 && mConfig.profiles[id].netif.wireless.configMethod == 0 &&
mConfig.profiles[id].netif.wireless.config.manual.privacy.mode == 0) {
return 0;
}
int bVar1 = mConfig.profiles[id].netif.wireless.configMethod;
switch (bVar1) {
switch (mConfig.profiles[id].netif.wireless.configMethod) {
case 0: {
ret = 2;
break;
@@ -88,7 +89,7 @@ namespace ipl {
bool NCDSetting::checkAllFlag() {
for (int i = 0; i < 3; i++) {
if (checkFlag(i) & 0xff) {
if (checkFlag(i) & 0xFF) {
return true;
}
}
@@ -114,8 +115,8 @@ namespace ipl {
void NCDSetting::checkDHCP_() {
if (checkDNSFlag()) {
memset(&mConfig.profiles[mID].ip.dns1, 0, 4);
memset(&mConfig.profiles[mID].ip.dns2, 0, 4);
memset(&mConfig.profiles[mID].ip.dns1, 0, sizeof(mConfig.profiles[mID].ip.dns1));
memset(&mConfig.profiles[mID].ip.dns2, 0, sizeof(mConfig.profiles[mID].ip.dns2));
} else {
// im sorry for this
int i = 0;
@@ -142,9 +143,9 @@ namespace ipl {
}
}
if (checkDHCPFlag()) {
memset(&mConfig.profiles[mID].ip.addr, 0, 4);
memset(&mConfig.profiles[mID].ip.netmask, 0, 4);
memset(&mConfig.profiles[mID].ip.gateway, 0, 4);
memset(&mConfig.profiles[mID].ip.addr, 0, sizeof(mConfig.profiles[mID].ip.addr));
memset(&mConfig.profiles[mID].ip.netmask, 0, sizeof(mConfig.profiles[mID].ip.netmask));
memset(&mConfig.profiles[mID].ip.gateway, 0, sizeof(mConfig.profiles[mID].ip.gateway));
}
return;
}
@@ -162,7 +163,7 @@ namespace ipl {
return (u8)(configMethod + (u8)-1) > 1;
}
bool NCDSetting::convert16toASCII(char hexHi, char hexLo, unsigned char* byte) {
bool NCDSetting::convert16toASCII(char hexHi, char hexLo, u8* byte) {
bool inRange = true;
if (hexHi >= '0' && hexHi <= '9') {
@@ -206,7 +207,7 @@ namespace ipl {
} else if (keyLen == 64) {
for (int i = 0; i < 64; i++) {
char c = key[i];
if ((((c < '0') || ('9' < c)) && ((c < 'A' || ('F' < c)))) && ((c < 'a' || ('f' < c)))) {
if ((c < '0' || '9' < c) && (c < 'A' || 'F' < c) && (c < 'a' || 'f' < c)) {
return -1;
}
}
@@ -250,10 +251,12 @@ namespace ipl {
int i;
len = strlen(proxy);
if (len >= 256)
if (len >= 256) {
return false;
if (proxy[0] == '.')
}
if (proxy[0] == '.') {
return false;
}
for (i = 0; i < len; i++) {
c = proxy[i];
@@ -315,22 +318,24 @@ namespace ipl {
void NCDSetting::adjustSelectMedia_(int exclude) {
u8 flag = checkFlag(exclude);
switch (flag) {
case 1:
case 1: {
mConfig.selectedMedia = 2;
break;
}
case 2:
case 3:
case 4:
case 5:
case 5: {
mConfig.selectedMedia = 1;
break;
}
}
}
void NCDSetting::adjustEnableFlag_(int exclude) {
for (int i = 0; i < 3; i++) {
if (exclude != i) {
mConfig.profiles[i].flags &= 0x7f;
mConfig.profiles[i].flags &= 0x7F;
}
}
}
@@ -342,7 +347,7 @@ namespace ipl {
if (mID == i) {
mConfig.profiles[mID].flags |= 0x80;
} else {
mConfig.profiles[i].flags &= 0x7f;
mConfig.profiles[i].flags &= 0x7F;
}
}
}
@@ -351,7 +356,7 @@ namespace ipl {
NCDWriteConfig(&mConfig);
}
void NCDSetting::setDHCPFlag(unsigned char newFlag) {
void NCDSetting::setDHCPFlag(u8 newFlag) {
if (newFlag != 0) {
mConfig.profiles[mID].flags = mConfig.profiles[mID].flags | 2;
return;
@@ -359,7 +364,7 @@ namespace ipl {
mConfig.profiles[mID].flags = mConfig.profiles[mID].flags & ~2;
}
void NCDSetting::setDNSFlag(unsigned char newFlag) {
void NCDSetting::setDNSFlag(u8 newFlag) {
if (newFlag != 0) {
mConfig.profiles[mID].flags = mConfig.profiles[mID].flags | 4;
return;
@@ -367,7 +372,7 @@ namespace ipl {
mConfig.profiles[mID].flags = mConfig.profiles[mID].flags & ~4;
}
void NCDSetting::setProxyFlag(unsigned char newFlag) {
void NCDSetting::setProxyFlag(u8 newFlag) {
mConfig.profiles[mID].proxy.http.mode = newFlag;
mConfig.profiles[mID].proxy.ssl.mode = newFlag;
if (newFlag != 0) {
@@ -377,7 +382,7 @@ namespace ipl {
mConfig.profiles[mID].flags = mConfig.profiles[mID].flags & ~0x10;
}
void NCDSetting::setBasicFlag(unsigned char newFlag) {
void NCDSetting::setBasicFlag(u8 newFlag) {
mConfig.profiles[mID].proxy.http.authType = newFlag;
mConfig.profiles[mID].proxy.ssl.authType = newFlag;
}
@@ -390,7 +395,7 @@ namespace ipl {
}
void NCDSetting::setWireless(u8 configMethod) {
memset(&mConfig.profiles[mID], 0, 0x91c);
memset(&mConfig.profiles[mID], 0, sizeof(NCDProfile));
mConfig.version = 0;
mConfig.linkTimeout = 0;
@@ -415,35 +420,41 @@ namespace ipl {
}
void NCDSetting::setPrivacyMode(u16 newMode) {
u16 sVar2;
u16 myNewMode;
switch (newMode) {
case 0:
sVar2 = 0;
case 0: {
myNewMode = 0;
break;
case 1:
}
case 1: {
if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode == 2 ||
(strlen((const char*)mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.wep104.key) > 20)) {
sVar2 = 2;
myNewMode = 2;
} else {
sVar2 = 1;
myNewMode = 1;
}
break;
case 2:
sVar2 = 4;
}
case 2: {
myNewMode = 4;
break;
case 3:
sVar2 = 6;
}
case 3: {
myNewMode = 6;
break;
case 4:
sVar2 = 5;
}
case 4: {
myNewMode = 5;
break;
default:
sVar2 = 0;
}
default: {
myNewMode = 0;
break;
}
}
if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode != sVar2) {
mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode = sVar2;
if (mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode != myNewMode) {
mConfig.profiles[mID].netif.wireless.config.rakuraku.privacy.mode = myNewMode;
}
}
@@ -451,39 +462,48 @@ namespace ipl {
u16 uVar1;
switch (mode) {
case 0:
case 0: {
uVar1 = 0;
break;
case 1:
}
case 1: {
uVar1 = 1;
break;
case 2:
}
case 2: {
uVar1 = 2;
break;
case 4:
}
case 4: {
uVar1 = 4;
break;
case 5:
}
case 5: {
uVar1 = 5;
break;
case 6:
}
case 6: {
uVar1 = 6;
break;
case 7:
}
case 7: {
uVar1 = 4;
break;
case 8:
}
case 8: {
uVar1 = 1;
break;
default:
}
default: {
uVar1 = 0;
break;
}
}
memset(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104, 0, 0x44);
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = uVar1;
}
void NCDSetting::setPrivacy(unsigned char* newKey, int len) {
void NCDSetting::setPrivacy(u8* newKey, int len) {
int i;
u8 mode;
mode = mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep40.reserved[0];
@@ -494,60 +514,65 @@ namespace ipl {
} else {
switch (mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode) {
case 1:
case 2:
case 2: {
for (i = 0; i < 4; i++) {
if (len == 5) {
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = 1;
memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep40.key[i], newKey, 5);
memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep40.key[i], newKey,
sizeof(mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep40.key[i]));
} else if (len == 0xd) {
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = 2;
memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104.key[i], newKey, 13);
memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104.key[i], newKey,
sizeof(mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104.key[i]));
}
}
break;
case 4:
}
case 4: {
memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.aes.key, newKey, len);
mConfig.profiles[mID].netif.wireless.config.manual.privacy.aes.keyLen = len;
break;
}
case 5:
case 6:
case 6: {
memcpy(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.tkip.key, newKey, len);
mConfig.profiles[mID].netif.wireless.config.manual.privacy.tkip.keyLen = len;
break;
}
}
}
}
void NCDSetting::setIP(NCDIpProfile* ip) {
memcpy(&mConfig.profiles[mID].ip.addr, ip->addr, 4);
memcpy(&mConfig.profiles[mID].ip.netmask, ip->netmask, 4);
memcpy(&mConfig.profiles[mID].ip.gateway, ip->gateway, 4);
memcpy(&mConfig.profiles[mID].ip.addr, ip->addr, sizeof(mConfig.profiles[mID].ip.addr));
memcpy(&mConfig.profiles[mID].ip.netmask, ip->netmask, sizeof(mConfig.profiles[mID].ip.netmask));
memcpy(&mConfig.profiles[mID].ip.gateway, ip->gateway, sizeof(mConfig.profiles[mID].ip.gateway));
}
void NCDSetting::setDNS(NCDIpProfile* ip) {
memcpy(&mConfig.profiles[mID].ip.dns1, ip->dns1, 4);
memcpy(&mConfig.profiles[mID].ip.dns2, ip->dns2, 4);
memcpy(&mConfig.profiles[mID].ip.dns1, ip->dns1, sizeof(mConfig.profiles[mID].ip.dns1));
memcpy(&mConfig.profiles[mID].ip.dns2, ip->dns2, sizeof(mConfig.profiles[mID].ip.dns2));
}
void NCDSetting::setMTU(long mtu) {
void NCDSetting::setMTU(s32 mtu) {
mConfig.profiles[mID].adjust.maxTransferUnit = mtu;
mConfig.profiles[mID].adjust.tcpRetransTimeout = 0;
mConfig.profiles[mID].adjust.dhcpRetransCount = 0;
}
void NCDSetting::setProxy(NCDProxyServerProfile* proxyServerProfile) {
memcpy(&mConfig.profiles[mID].proxy.http.server, proxyServerProfile->server, 256);
memcpy(&mConfig.profiles[mID].proxy.ssl.server, proxyServerProfile->server, 256);
memcpy(&mConfig.profiles[mID].proxy.http.server, proxyServerProfile->server, sizeof(mConfig.profiles[mID].proxy.http.server));
memcpy(&mConfig.profiles[mID].proxy.ssl.server, proxyServerProfile->server, sizeof(mConfig.profiles[mID].proxy.ssl.server));
mConfig.profiles[mID].proxy.http.port = proxyServerProfile->port;
mConfig.profiles[mID].proxy.ssl.port = proxyServerProfile->port;
}
void NCDSetting::setBasic(NCDProxyServerProfile* proxyServerProfile) {
memcpy(mConfig.profiles[mID].proxy.http.username, proxyServerProfile->username, 33);
memcpy(mConfig.profiles[mID].proxy.ssl.username, proxyServerProfile->username, 33);
memcpy(mConfig.profiles[mID].proxy.http.password, proxyServerProfile->password, 33);
memcpy(mConfig.profiles[mID].proxy.ssl.password, proxyServerProfile->password, 33);
memcpy(mConfig.profiles[mID].proxy.http.username, proxyServerProfile->username, sizeof(mConfig.profiles[mID].proxy.http.username));
memcpy(mConfig.profiles[mID].proxy.ssl.username, proxyServerProfile->username, sizeof(mConfig.profiles[mID].proxy.ssl.username));
memcpy(mConfig.profiles[mID].proxy.http.password, proxyServerProfile->password, sizeof(mConfig.profiles[mID].proxy.http.password));
memcpy(mConfig.profiles[mID].proxy.ssl.password, proxyServerProfile->password, sizeof(mConfig.profiles[mID].proxy.ssl.password));
}
void NCDSetting::clearData() {
@@ -576,11 +601,11 @@ namespace ipl {
}
void NCDSetting::backupData() {
memcpy(&mSaveConfig, &mConfig, 0x1b5c);
memcpy(&mSaveConfig, &mConfig, sizeof(mSaveConfig));
}
void NCDSetting::resetData() {
memcpy(&mConfig, &mSaveConfig, 0x1b5c);
memcpy(&mConfig, &mSaveConfig, sizeof(mConfig));
}
void NCDSetting::setUseProfileID() {
@@ -593,7 +618,7 @@ namespace ipl {
mConfig.selectedMedia = 1;
}
} else {
mConfig.profiles[i].flags &= 0x7f;
mConfig.profiles[i].flags &= 0x7F;
}
}
NCDWriteConfig(&mConfig);
@@ -608,7 +633,7 @@ namespace ipl {
}
u16 NCDSetting::getID() {
return mID & 0xff;
return mID & 0xFF;
}
NCDApConfig* NCDSetting::getSSID() {
@@ -616,12 +641,12 @@ namespace ipl {
}
u16 NCDSetting::getUseProfileID() {
if (!(checkAllFlag() & 0xff)) {
if (!(checkAllFlag() & 0xFF)) {
return 3;
} else {
for (int i = 0; i < 3; i++) {
if (mConfig.profiles[i].flags & 0x80 && mConfig.profiles[i].flags & 0x20) {
return i & 0xff;
return i & 0xFF;
}
}
}
@@ -633,28 +658,35 @@ namespace ipl {
if (mConfig.profiles[mID].netif.wireless.configMethod == 0 || mConfig.profiles[mID].netif.wireless.configMethod == 3) {
u16 mode = mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode;
switch (mode) {
case 0:
case 0: {
ret = 0;
break;
case 1:
}
case 1: {
ret = 1;
break;
case 2:
}
case 2: {
ret = 1;
break;
case 4:
}
case 4: {
ret = 2;
break;
case 5:
}
case 5: {
ret = 4;
break;
case 6:
}
case 6: {
ret = 3;
break;
case 3:
default:
ret = 0;
break;
}
case 3: {
default:
ret = 0;
break;
}
}
}
return ret;
@@ -740,7 +772,7 @@ namespace ipl {
NCDErr err = NETGetWirelessMacAddress(macAddress);
switch (err) {
case 0:
case NCD_RESULT_SUCCESS: {
sprintf(mac.str, "%02x-%02x-%02x-%02x-%02x-%02x", macAddress[0], macAddress[1], macAddress[2], macAddress[3], macAddress[4],
macAddress[5]);
OSReport("MAC: %s\n", &mac);
@@ -753,15 +785,16 @@ namespace ipl {
mMacNum = mac.num % 100000000;
OSReport("%lld %d\n", mMacNum, mac.num, mMacNum);
return;
case -8:
case -4:
OSPanic(__FILE__, 0x436, "try again!!");
}
case NCD_RESULT_INPROGRESS:
case NCD_RESULT_4: {
OSHalt("try again!!", 1078);
return;
default:
OSPanic(__FILE__, 0x43b, "Unrecoverable Error!!");
}
default: {
OSHalt("Unrecoverable Error!!", 1083);
return;
}
}
}
@@ -804,7 +837,7 @@ namespace ipl {
mConfig.nwc24Permission = 0;
if (wcFlags && SCGetEULA()) {
mConfig.nwc24Permission |= 4;
if (!(parental::Parental::checkFlags() & 0xFF) || ((parental::Parental::checkFlags() & 0xFF) && !(contentRestrictions))) {
if (!(parental::Parental::checkFlags() & 0xFF) || ((parental::Parental::checkFlags() & 0xFF) && !contentRestrictions)) {
mConfig.nwc24Permission |= 3;
}
}

View File

@@ -197,18 +197,18 @@ namespace ipl {
void Parental::setRestrictions(u32 restrictions) {
m_sc.netContentRestrict = 0;
m_sc.netContentRestrict |= (restrictions >> 3) & 0x01;
m_sc.netContentRestrict |= -((restrictions >> 1) & 1) & 0x02;
m_sc.netContentRestrict |= -((restrictions >> 0) & 1) & 0x04;
m_sc.wwwRestrict = (restrictions >> 2) & 1;
m_sc.netContentRestrict |= -((restrictions >> 1) & 1) & 0b010;
m_sc.netContentRestrict |= (restrictions >> 3) & 0b001;
m_sc.netContentRestrict |= -((restrictions >> 0) & 1) & 0b100;
// m_sc.netContentRestrict = newNetContentRestrict;
// m_sc.netContentRestrict = ((((((restrictions >> 1) & 1) * -1) & 2 & ~1) | ((restrictions >> 3) & 1)) & ~4) | (-(restrictions & 1) & 4);
}
void Parental::adjustOgn(u8 country) {
m_sc.info.rating = 20;
switch (country) { // irregular
switch (country) {
case SC_COUNTRY_DE: {
m_sc.info.org = SC_PARENTAL_ORG_USK;
break;

View File

@@ -4,7 +4,6 @@
namespace ipl {
namespace snd {
void System::shutup(BOOL shutUpDMA) {
// if (ipl::snd::is)
}
} // namespace snd
} // namespace ipl

View File

@@ -120,7 +120,7 @@ namespace ipl {
if (System::isSafeMode()) {
}
switch (sdVfWorker->get_sd_state()) {
case SDVFWorker::SD_STATE_UNAVAILABLE: {
case SDVFWorker::SD_STATE_INITIAL: {
break;
}
case SDVFWorker::SD_STATE_EJECTED: {
@@ -230,7 +230,7 @@ namespace ipl {
void CdbBackup::stt_check_sd_err() {
SDVFWorker* sdVfWorker = System::getCdbManager()->getSDWorker();
switch (sdVfWorker->get_sd_state()) {
case SDVFWorker::SD_STATE_AVAILABLE: {
case SDVFWorker::SD_STATE_READY: {
if (sdVfWorker->is_sd_write_protected()) {
System::getDialog()->callBtn1(MESG_CDBBACKUP_SD_LOCKED, MESG_CMN_OK);
mState = STATE_WAIT_RET;

View File

@@ -232,20 +232,16 @@ namespace ipl {
}
ESTitleId Manager::hasChannel(ESTitleId titleId, int* outPage, int* outIndex) const {
u64 typeMask;
if (ES_TITLE_TYPE(titleId) != 0) {
typeMask = 0xFFFFFFFFFFFFFFFF;
} else {
typeMask = 0x00000000FFFFFFFF;
}
ESTitleId titleCodeRegion = ES_TITLE_TYPE(titleId) != 0 ? 0xFFFFFFFFFFFFFFFF : 0x00000000FFFFFFFF;
ESTitleId titleCode = TITLE_NO_REGION(titleCodeRegion);
for (int page = 0; page < MAX_CHANNEL_PAGE; page++) {
for (int index = 0; index < MAX_CHANNEL_INDEX; index++) {
if (mChannels[page][index].loadedBnr) {
if (mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_CHANNEL) {
ESTitleId tId = ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode);
if (titleId == (tId & typeMask) ||
TITLE_NO_REGION(tId & typeMask) == TITLE_NO_REGION(titleId & typeMask) && TITLE_REGION(titleId) == TITLE_REGION_ALL) {
if (titleId == (tId & titleCodeRegion) ||
(tId & titleCode) == (titleId & titleCode) && TITLE_REGION(titleId) == TITLE_REGION_ALL) {
if (outPage) {
*outPage = page;
}
@@ -367,7 +363,7 @@ namespace ipl {
if (!mChannels[page][index].loadedBnr || mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_DISK) {
return NULL;
} else {
u32 rsoIndex = getChannel(page, index).loadedBnr ? mChannels[page][index].metaHdr->blockHdr.iconRSOIdx : 0;
u32 rsoIndex = getMetaHdr_IconRSOIdx(page, index);
if (rsoIndex == 0) {
return NULL;
@@ -382,7 +378,7 @@ namespace ipl {
if (!mChannels[page][index].loadedBnr || mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_DISK) {
return NULL;
} else {
u32 rsoIndex = mChannels[page][index].loadedBnr ? mChannels[page][index].metaHdr->blockHdr.bannerRSOIdx : 0;
u32 rsoIndex = getMetaHdr_BannerRSOIdx(page, index);
if (rsoIndex == 0) {
return NULL;
@@ -397,7 +393,7 @@ namespace ipl {
if (!mChannels[page][index].loadedBnr || mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_DISK) {
return NULL;
} else {
u32 rsoIndex = mChannels[page][index].loadedBnr ? mChannels[page][index].metaHdr->blockHdr.iconCSIdx : 0;
u32 rsoIndex = getMetaHdr_IconCSIdx(page, index);
if (rsoIndex == 0) {
return NULL;
@@ -412,7 +408,7 @@ namespace ipl {
if (!mChannels[page][index].loadedBnr || mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_DISK) {
return NULL;
} else {
u32 rsoIndex = mChannels[page][index].loadedBnr ? mChannels[page][index].metaHdr->blockHdr.bannerCSIdx : 0;
u32 rsoIndex = getMetaHdr_BannerCSIdx(page, index);
if (rsoIndex == 0) {
return NULL;
@@ -471,6 +467,8 @@ namespace ipl {
return NULL;
}
u32 lang;
// Get title name via language
if (mChannels[page][index].metaHdr->names[System::getLanguage()][nameIndex][0] != 0) {
return mChannels[page][index].metaHdr->names[System::getLanguage()][nameIndex];
@@ -481,7 +479,7 @@ namespace ipl {
u32* lookup = (u32*)scLangLookup[System::getRegion()];
for (int i = 0; i < ARRAY_LENGTH(scLangLookup[0]); i++) {
u32 lang = lookup[i];
lang = lookup[i];
if (mChannels[page][index].metaHdr->names[lang][nameIndex][0] != 0) {
return mChannels[page][index].metaHdr->names[lang][nameIndex];
}
@@ -701,9 +699,10 @@ namespace ipl {
channel->bnrFile = NULL;
} else {
// Search for meta header
channel->headerOffset = System::getChannelManager()->searchMetaHeader(channel->bnrFile->getBuffer() + META_PAD);
if (channel->headerOffset < 0 || !System::getChannelManager()->checkHeaderBase(
(u8*)(channel->headerOffset + channel->bnrFile->getBuffer() + META_PAD), &channel->headerSize)) {
channel->headerOffset = System::getChannelManager()->searchMetaHeader(channel->bnrFile->getBuffer() + META_RESERVED_PADDING);
if (channel->headerOffset < 0 ||
!System::getChannelManager()->checkHeaderBase(
(u8*)(channel->headerOffset + (u32)channel->bnrFile->getBuffer() + META_RESERVED_PADDING), &channel->headerSize)) {
memset(channel, 0, sizeof(SEntry));
delete channel->bnrFile;
channel->bnrFile = NULL;
@@ -717,7 +716,7 @@ namespace ipl {
memset(channel, 0, sizeof(SEntry));
} else {
// Alright, prepare the ARC!
channel->arcData = (u8*)(channel->bnrFile->getBuffer() + channel->headerSize + channel->headerOffset);
channel->arcData = (u8*)(channel->headerSize + channel->headerOffset + (u32)channel->bnrFile->getBuffer());
ARCInitHandle(channel->arcData, &channel->arc);
channel->loadedBnr = true;
}
@@ -726,21 +725,22 @@ namespace ipl {
channel->state = CHAN_STATE_LOADED;
}
#pragma push
#pragma ppc_iro_level 0
void Manager::loadMetaHeaderAsync(int page, int index) {
if (mTmpChannel.state != CHAN_STATE_UNLOADED) {
if (mChannels[page][index].state != CHAN_STATE_UNLOADED) {
return;
}
SInfo info = System::getSaveData()->getChanInfo(page, index);
mChannels[page][index].info = info;
if (info.primaryType == channel::PRIMARY_TYPE_NONE) {
if (mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_NONE) {
// Invalid!!!!
memset(&mChannels[page][index], 0, sizeof(SEntry));
mNumFinished++;
mChannels[page][index].state = CHAN_STATE_LOADED;
} else if (info.primaryType == channel::PRIMARY_TYPE_DISK) {
} else if (mChannels[page][index].info.primaryType == channel::PRIMARY_TYPE_DISK) {
// Load disk banner
mChannels[page][index].loadedBnr = true;
if (mChannels[page][index].info.sceneID == SCENE_ID_DISK_CHANNEL) {
@@ -755,17 +755,17 @@ namespace ipl {
} else {
// Load channel banner
ESTitleId titleId = ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode);
s32 ret = utility::ESMisc::GetValidTicketIndex(System::getMem2Sys(), titleId);
if (ret == -1) {
ret = 0;
s32 ticketIdx = utility::ESMisc::GetValidTicketIndex(System::getMem2Sys(), titleId);
if (ticketIdx == -1) {
ticketIdx = 0;
mChannels[page][index].missingTicket = TRUE;
}
mChannels[page][index].ticketIdx = ret;
mChannels[page][index].ticketIdx = ticketIdx;
// Get tmd
ESTmdView* tmdView = NULL;
ret = utility::ESMisc::GetTmdView(System::getMem2Sys(), titleId, &tmdView);
s32 ret = utility::ESMisc::GetTmdView(System::getMem2Sys(), titleId, &tmdView);
if (ret != ES_ERR_OK) {
IPLErrorLogAndDisplay(MESG_ERR_FILE, "ES", ret, 1468);
}
@@ -787,6 +787,7 @@ namespace ipl {
mChannels[page][index].state = CHAN_STATE_LOADED_META;
}
}
#pragma pop
void Manager::cbReadMetaHeader(void* work) {
SEntry* channel = (SEntry*)work;
@@ -800,9 +801,10 @@ namespace ipl {
channel->bnrFile = NULL;
} else {
// Search for meta header
channel->headerOffset = System::getChannelManager()->searchMetaHeader(channel->bnrFile->getBuffer() + META_PAD);
if (channel->headerOffset < 0 || !System::getChannelManager()->checkHeaderBase(
(u8*)(channel->headerOffset + channel->bnrFile->getBuffer() + META_PAD), &channel->headerSize)) {
channel->headerOffset = System::getChannelManager()->searchMetaHeader(channel->bnrFile->getBuffer() + META_RESERVED_PADDING);
if (channel->headerOffset < 0 ||
!System::getChannelManager()->checkHeaderBase(
(u8*)(channel->headerOffset + (u32)channel->bnrFile->getBuffer() + META_RESERVED_PADDING), &channel->headerSize)) {
memset(channel, 0, sizeof(SEntry));
delete channel->bnrFile;
channel->bnrFile = NULL;
@@ -816,7 +818,7 @@ namespace ipl {
memset(channel, 0, sizeof(SEntry));
} else {
// Alright, prepare the ARC!
channel->arcData = (u8*)(channel->bnrFile->getBuffer() + channel->headerSize + channel->headerOffset);
channel->arcData = (u8*)(channel->headerSize + channel->headerOffset + (u32)channel->bnrFile->getBuffer());
ARCInitHandle(channel->arcData, &channel->arc);
channel->loadedBnr = true;
@@ -902,7 +904,7 @@ namespace ipl {
const char* magic = "IMET";
int next = 0;
for (int i = 0; i < ((META_PAD * 2) + 0x20); i++, buffer++) {
for (int i = 0; i < ((META_RESERVED_PADDING * 2) + 0x20); i++, buffer++) {
// Found one character?
if (*buffer == magic[next]) {
// Look for the next one
@@ -950,7 +952,7 @@ namespace ipl {
}
// Reset padding
memset(buffer, 0, META_PAD);
memset(buffer, 0, META_RESERVED_PADDING);
// Do not include sum in buffer
memset(buffer + (size - NET_MD5_DIGEST_SIZE), 0, NET_MD5_DIGEST_SIZE);
@@ -1178,16 +1180,16 @@ namespace ipl {
SEntry* Manager::fn_8133A4E0(ESTitleId titleId) {
for (int page = 0; page < MAX_CHANNEL_PAGE; page++) {
for (int index = 0; index < MAX_CHANNEL_INDEX; index++) {
if (mChannels[page][index].loadedBnr) {
if (ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode) == titleId) {
return &mChannels[page][index];
}
ESTitleId cmp = ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode);
if (mChannels[page][index].loadedBnr && cmp == titleId) {
return &mChannels[page][index];
}
}
}
if (mTmpChannel.loadedBnr) {
if (ES_TITLE_ID(mTmpChannel.info.titleType, mTmpChannel.info.titleCode) == titleId) {
ESTitleId cmp = ES_TITLE_ID(mTmpChannel.info.titleType, mTmpChannel.info.titleCode);
if (cmp == titleId) {
return &mTmpChannel;
}
}

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