Compare commits
89 Commits
cleanup/cd
...
agent/w092
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b8fb8edd4 | ||
|
|
138cdffaea | ||
|
|
27dcd0f954 | ||
|
|
83f17d7e3f | ||
|
|
56cbf0253b | ||
|
|
734b1517f9 | ||
|
|
23a6eac51c | ||
|
|
294ba4491d | ||
|
|
610fc8ccbf | ||
|
|
eb8f78788d | ||
|
|
889823ed67 | ||
|
|
7dea4122fc | ||
|
|
1802d45758 | ||
|
|
130cc9e88e | ||
|
|
a801d1c5d6 | ||
|
|
8ab07fbb20 | ||
|
|
f68fcc0f9b | ||
|
|
5ad481ae40 | ||
|
|
713951c551 | ||
|
|
b47507aa3f | ||
|
|
01a73b600f | ||
|
|
83b577cf62 | ||
|
|
f67990d237 | ||
|
|
ad85ad1537 | ||
|
|
f32665703f | ||
|
|
e062e1c669 | ||
|
|
76a60f8c1a | ||
|
|
63579601e2 | ||
|
|
e46bac9a1b | ||
|
|
1f224c53c1 | ||
|
|
30e2147479 | ||
|
|
6ffcbf8f46 | ||
|
|
47add32987 | ||
|
|
e0ea552982 | ||
|
|
c7949ac4f0 | ||
|
|
e697514b7b | ||
|
|
32c3f7f2cd | ||
|
|
1618565c1d | ||
|
|
6040414eec | ||
|
|
08acc800f1 | ||
|
|
0703b62968 | ||
|
|
86c3cacc2d | ||
|
|
f7e6fc5387 | ||
|
|
dfbb774ce4 | ||
|
|
9b69048f06 | ||
|
|
602b10ed43 | ||
|
|
f0a91338f4 | ||
|
|
ff568a273c | ||
|
|
9f6ef656fd | ||
|
|
9d2f607b3f | ||
|
|
c836ab8bae | ||
|
|
b889c52efc | ||
|
|
282c29b2c7 | ||
|
|
27e37fd7ee | ||
|
|
00051c32c6 | ||
|
|
80fecf3aa3 | ||
|
|
37724c57d6 | ||
|
|
1a32db7bdc | ||
|
|
2aab31c1f9 | ||
|
|
24c84f5bfc | ||
|
|
73de5786da | ||
|
|
3abcd34252 | ||
|
|
5c20a11fa8 | ||
|
|
f85a98a6e3 | ||
|
|
137ee3242a | ||
|
|
2368a9a774 | ||
|
|
90399bb6cf | ||
|
|
fc831357ea | ||
|
|
e2191ae933 | ||
|
|
7d77c095c0 | ||
|
|
db8ff7e141 | ||
|
|
2cb6c2dfae | ||
|
|
6f96235605 | ||
|
|
367b042e63 | ||
|
|
feb7ba400d | ||
|
|
20f4af8beb | ||
|
|
dca6cd9aef | ||
|
|
a0700bf908 | ||
|
|
de058b4298 | ||
|
|
c5468cbe50 | ||
|
|
62591733eb | ||
|
|
e2488b073a | ||
|
|
9a8de22195 | ||
|
|
a6bf0e5f4f | ||
|
|
d434f5b897 | ||
|
|
0adc759b42 | ||
|
|
9c55b47c1d | ||
|
|
081329daa8 | ||
|
|
a348c9777a |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.37% | 87.69% | 61.81% | 91.27% |
|
||||
| 99.37% | 87.79% | 62.05% | 92.06% |
|
||||
|
||||
units 916/1027 complete, functions 12211/12563 matched.
|
||||
units 918/1027 complete, functions 12216/12563 matched.
|
||||
|
||||
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
|
||||
<!-- progress:end -->
|
||||
|
||||
@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
|
||||
.rodata start:0x81610608 end:0x81610918
|
||||
.data start:0x81654B38 end:0x81654F98
|
||||
.sdata2 start:0x81694B18 end:0x81694B60
|
||||
.sdata start:0x81696DD0 end:0x81696E40
|
||||
.sdata start:0x81696DD0 end:0x81696E30
|
||||
|
||||
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
|
||||
.text start:0x813E4BBC end:0x813E947C
|
||||
.rodata start:0x81610918 end:0x81610948
|
||||
.data start:0x81654F98 end:0x81655638
|
||||
.sdata2 start:0x81694B60 end:0x81694B88
|
||||
.sdata start:0x81696E40 end:0x81696EF0
|
||||
.sdata start:0x81696E30 end:0x81696EF0
|
||||
|
||||
src/scene/sdButton/iplSDButton.cpp:
|
||||
.text start:0x813E947C end:0x813EA88C
|
||||
|
||||
@@ -1385,19 +1385,19 @@ getDiskBannerData__Q33ipl7channel7ManagerFib = .text:0x81339FB0; // type:functio
|
||||
titleIDtoPageIndex__Q33ipl7channel7ManagerCFUxPiPi = .text:0x8133A2BC; // type:function size:0xA0
|
||||
getLockedMsgFromBuf__Q33ipl7channel7ManagerCFPCQ33ipl7channel22SChanMgrDiskInMessages = .text:0x8133A35C; // type:function size:0xA8
|
||||
nand_error_handling__Q33ipl7channel7ManagerFi = .text:0x8133A404; // type:function size:0xDC
|
||||
fn_8133A4E0__Q33ipl7channel7ManagerFUx = .text:0x8133A4E0; // type:function size:0x9C
|
||||
fn_8133A57C__Q33ipl7channel7ManagerFUx = .text:0x8133A57C; // type:function size:0x3C
|
||||
fn_8133A5B8__Q33ipl7channel7ManagerFUx = .text:0x8133A5B8; // type:function size:0x38
|
||||
fn_8133A5F0__Q33ipl7channel7ManagerFUx = .text:0x8133A5F0; // type:function size:0x44
|
||||
fn_8133A634__Q33ipl7channel7ManagerFUx = .text:0x8133A634; // type:function size:0x44
|
||||
fn_8133A678__Q33ipl7channel7ManagerFUx = .text:0x8133A678; // type:function size:0x40
|
||||
fn_8133A6B8__Q33ipl7channel7ManagerFUx = .text:0x8133A6B8; // type:function size:0x84
|
||||
fn_8133A73C__Q33ipl7channel7ManagerFUx = .text:0x8133A73C; // type:function size:0x68
|
||||
fn_8133A7A4__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A7A4; // type:function size:0xB8
|
||||
fn_8133A85C__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A85C; // type:function size:0xC8
|
||||
fn_8133A924__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A924; // type:function size:0xCC
|
||||
fn_8133A9F0__Q33ipl7channel7ManagerFv = .text:0x8133A9F0; // type:function size:0x60
|
||||
fn_8133AA50__Q33ipl7channel7ManagerFUx = .text:0x8133AA50; // type:function size:0x30
|
||||
findEntryByTitleId__Q33ipl7channel7ManagerFUx = .text:0x8133A4E0; // type:function size:0x9C
|
||||
getBannerCSIdx__Q33ipl7channel7ManagerFUx = .text:0x8133A57C; // type:function size:0x3C
|
||||
getSoundSize__Q33ipl7channel7ManagerFUx = .text:0x8133A5B8; // type:function size:0x38
|
||||
needsNetSetting__Q33ipl7channel7ManagerFUx = .text:0x8133A5F0; // type:function size:0x44
|
||||
usesAltSound__Q33ipl7channel7ManagerFUx = .text:0x8133A634; // type:function size:0x44
|
||||
isMissingTicket__Q33ipl7channel7ManagerFUx = .text:0x8133A678; // type:function size:0x40
|
||||
isNewsChannelV6Plus__Q33ipl7channel7ManagerFUx = .text:0x8133A6B8; // type:function size:0x84
|
||||
isOperaChannel__Q33ipl7channel7ManagerFUx = .text:0x8133A73C; // type:function size:0x68
|
||||
readBannerMetaAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A7A4; // type:function size:0xB8
|
||||
readSoundMetaAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A85C; // type:function size:0xC8
|
||||
readBannerCSAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A924; // type:function size:0xCC
|
||||
clearTmpChannel__Q33ipl7channel7ManagerFv = .text:0x8133A9F0; // type:function size:0x60
|
||||
unloadBanner__Q33ipl7channel7ManagerFUx = .text:0x8133AA50; // type:function size:0x30
|
||||
__ct__Q33ipl7channel20ChannelScriptManagerFv = .text:0x8133AA80; // type:function size:0x10
|
||||
create__Q33ipl7channel20ChannelScriptManagerFPQ23EGG7ExpHeap = .text:0x8133AA90; // type:function size:0x90
|
||||
init__Q33ipl7channel20ChannelScriptManagerFPQ33ipl4nand4FilePQ33ipl7channel9RsoThread = .text:0x8133AB20; // type:function size:0x3D4
|
||||
@@ -1761,7 +1761,7 @@ update_sd_app_location_async__Q23ipl12NandSDWorkerFPUl = .text:0x81348E30; // ty
|
||||
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
|
||||
check_sd_app_titles_async__Q23ipl12NandSDWorkerFPvPvPv = .text:0x81348EA8; // type:function size:0x2C
|
||||
get_nand_save_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348ED4; // type:function size:0x18
|
||||
get_nand_app_size_async__Q23ipl12NandSDWorkerFUx = .text:0x81348EEC; // type:function size:0x18
|
||||
delete_nand_save_async__Q23ipl12NandSDWorkerFUx = .text:0x81348F04; // type:function size:0x18
|
||||
@@ -1823,7 +1823,7 @@ do_read_sd_app_location__Q23ipl12NandSDWorkerFv = .text:0x8134BC60; // type:func
|
||||
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_usage__Q23ipl12NandSDWorkerFv = .text:0x8134C670; // type:function size:0x1C8
|
||||
do_unk_8134C838__Q23ipl12NandSDWorkerFv = .text:0x8134C838; // type:function size:0x2D0
|
||||
do_check_sd_app_titles__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
|
||||
get_sd_save_size__Q23ipl12NandSDWorkerFUl = .text:0x8134CF5C; // type:function size:0x140
|
||||
@@ -2095,7 +2095,7 @@ stt_wait_fns_msg__Q23ipl9CdbBackupFv = .text:0x8135B004; // type:function size:0
|
||||
stt_clean_up_back__Q23ipl9CdbBackupFv = .text:0x8135B030; // type:function size:0x60
|
||||
stt_wait_terminate__Q23ipl9CdbBackupFv = .text:0x8135B090; // type:function size:0x60
|
||||
error_handling__Q23ipl9CdbBackupFv = .text:0x8135B0F0; // type:function size:0xD0
|
||||
fn_8135B1C0__Q23ipl9CdbBackupFv = .text:0x8135B1C0; // type:function size:0x28
|
||||
getProgressPercent__Q23ipl9CdbBackupFv = .text:0x8135B1C0; // type:function size:0x28
|
||||
cdb_backup_delete_search_cb___3iplFPvP10_CDBRecord = .text:0x8135B1E8; // type:function size:0x8C
|
||||
cdb_backup_delete_task___3iplFPv = .text:0x8135B274; // type:function size:0xDC
|
||||
cdb_backup_move_search_cb___3iplFPvP10_CDBRecord = .text:0x8135B350; // type:function size:0xBC
|
||||
@@ -5126,8 +5126,8 @@ __ct__Q33ipl5scene10AOSSThreadFPQ23EGG4Heap = .text:0x813FCA0C; // type:function
|
||||
destroy__Q33ipl5scene10AOSSThreadFi = .text:0x813FCAA0; // type:function size:0x84
|
||||
__dt__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB24; // type:function size:0x70
|
||||
start__Q33ipl5scene10AOSSThreadFv = .text:0x813FCB94; // type:function size:0xF8
|
||||
AOSSThread_813FCC8C__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
|
||||
AOSSThread_813FCCE4__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
|
||||
aossAlloc__Q33ipl5scene10AOSSThreadFv = .text:0x813FCC8C; // type:function size:0x58
|
||||
aossFree__Q33ipl5scene10AOSSThreadFv = .text:0x813FCCE4; // type:function size:0x50
|
||||
Run__Q33ipl5scene10AOSSThreadFv = .text:0x813FCD34; // type:function size:0xEC
|
||||
cancel__Q33ipl5scene10AOSSThreadFv = .text:0x813FCE20; // type:function size:0x50
|
||||
finish__Q33ipl5scene10AOSSThreadFP13NCDAossConfigPi = .text:0x813FCE70; // type:function size:0x2FC
|
||||
@@ -5267,10 +5267,10 @@ start_focusout_anm__Q33ipl5scene13SettingSelectFi = .text:0x814093D0; // type:fu
|
||||
start_selected_anm__Q33ipl5scene13SettingSelectFi = .text:0x81409480; // type:function size:0x274
|
||||
is_stopped_all_anm__Q33ipl5scene13SettingSelectCFv = .text:0x814096F4; // type:function size:0x74
|
||||
onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409768; // type:function size:0xFC
|
||||
fn_81409864__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
|
||||
fn_814098F4__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
|
||||
fn_81409988__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
|
||||
fn_814099EC__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
|
||||
calc_exit_sequence__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
|
||||
prepare_exit_abort__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
|
||||
start_exit_fade__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
|
||||
finish_exit_reboot__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
|
||||
__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409B84; // type:function size:0x58 scope:weak
|
||||
@20@__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409BDC; // type:function size:0x8 scope:weak
|
||||
@84@onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409BE4; // type:function size:0x8 scope:weak
|
||||
@@ -5576,7 +5576,7 @@ __sinit_\tiPcKeyboard_cpp = .text:0x81416F34; // type:function size:0x1B0
|
||||
@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x814170FC; // type:function size:0x8
|
||||
@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x81417104; // type:function size:0x8
|
||||
@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x8141710C; // type:function size:0x8
|
||||
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5 = .text:0x81417114; // type:function size:0x8
|
||||
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv = .text:0x81417114; // type:function size:0x8
|
||||
create__Q49textinput8keyboard13cellphonetype4BaseFP12MEMAllocator = .text:0x8141711C; // type:function size:0xAC
|
||||
init__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x814171C8; // type:function size:0xA8
|
||||
calc__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x81417270; // type:function size:0x4
|
||||
@@ -13271,7 +13271,7 @@ __nupSetAuditState__FUc = .text:0x815F0444; // type:function size:0x7C scope:loc
|
||||
__nupBase64Encode__FPUcPUcUl = .text:0x815F04C0; // type:function size:0xFC scope:local
|
||||
__nupGetAuditData__FP14NUPContextInfoPPc = .text:0x815F05BC; // type:function size:0x3D0 scope:local
|
||||
__nupGetTmdView__FUxPP9ESTmdView = .text:0x815F098C; // type:function size:0xB4 scope:local
|
||||
__nupGetBootVersion__FP14ESTitleVersion = .text:0x815F0A40; // type:function size:0x28C scope:local
|
||||
__nupGetBootVersion__14NUPContextInfoFP14ESTitleVersion = .text:0x815F0A40; // type:function size:0x28C scope:local
|
||||
__nupGetTicket__FP12NUPTitleInfoPc = .text:0x815F0CCC; // type:function size:0x164 scope:local
|
||||
__nupGetTmd__FP12NUPTitleInfoPc = .text:0x815F0E30; // type:function size:0x1E4 scope:local
|
||||
__nupGetTitleSize__FP12NUPTitleInfo = .text:0x815F1014; // type:function size:0x22C scope:local
|
||||
@@ -13986,8 +13986,8 @@ lbl_81616AE4 = .rodata:0x81616AE4; // type:object size:0x30
|
||||
lbl_81616B14 = .rodata:0x81616B14; // type:object size:0x74
|
||||
lbl_81616B88 = .rodata:0x81616B88; // type:object size:0x40
|
||||
lbl_81616BC8 = .rodata:0x81616BC8; // type:object size:0x10 data:4byte
|
||||
lbl_81616BD8 = .rodata:0x81616BD8; // type:object size:0xC
|
||||
lbl_81616BE4 = .rodata:0x81616BE4; // type:object size:0xC
|
||||
scCountryMap_EU = .rodata:0x81616BD8; // type:object size:0xC
|
||||
scCountryMap_NonEU = .rodata:0x81616BE4; // type:object size:0xC
|
||||
lbl_81616BF0 = .rodata:0x81616BF0; // type:object size:0x88
|
||||
CHANSVmConstStringObjectUndefined = .rodata:0x81616C78; // type:object size:0x10
|
||||
lbl_81616C88 = .rodata:0x81616C88; // type:object size:0x10
|
||||
@@ -14110,7 +14110,7 @@ hairColorTable$1737 = .rodata:0x8161DDDC; // type:object size:0xB4 scope:local
|
||||
eyeColorTable$1742 = .rodata:0x8161DE90; // type:object size:0x1E scope:local
|
||||
scDefaultData = .rodata:0x8161DEB0; // type:object size:0x1BC scope:local
|
||||
scDayMax$1845 = .rodata:0x8161E070; // type:object size:0xD scope:local
|
||||
lbl_8161E080 = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
|
||||
scJpegAanScale = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
|
||||
TMCJPEGDEC_SampleH_N = .rodata:0x8161E180; // type:object size:0x18 data:byte
|
||||
TMCJPEGDEC_SampleV_N = .rodata:0x8161E198; // type:object size:0x18 data:byte
|
||||
TMCJPEGDEC_Zigzag_data = .rodata:0x8161E1B0; // type:object size:0x40 data:byte
|
||||
@@ -14736,7 +14736,7 @@ lbl_81639189 = .data:0x81639189; // type:object size:0x39 data:string
|
||||
jumptable_816391C4 = .data:0x816391C4; // type:object size:0x30 scope:local
|
||||
__vt__Q33ipl8savedata7Manager = .data:0x816391F4; // type:object size:0xC
|
||||
__vt__Q33ipl7channel9RsoThread = .data:0x81639200; // type:object size:0x2C
|
||||
lbl_81639230 = .data:0x81639230; // type:object size:0x41 data:string
|
||||
scRsoFatalMsg = .data:0x81639230; // type:object size:0x41 data:string
|
||||
jumptable_81639278 = .data:0x81639278; // type:object size:0x44 scope:local
|
||||
lbl_816392BC = .data:0x816392BC; // type:object size:0xB data:string
|
||||
lbl_816392C7 = .data:0x816392C7; // type:object size:0x11 data:string
|
||||
@@ -14994,8 +14994,8 @@ __vt__Q37ext_ead3www14SurfaceManager = .data:0x81643AA0; // type:object size:0xC
|
||||
@1183 = .data:0x81643AB8; // type:object size:0x21 scope:local data:string
|
||||
__vt__Q37ext_ead3www9ut_thread = .data:0x81643ADC; // type:object size:0x28
|
||||
lbl_81643B08 = .data:0x81643B08; // type:object size:0x38
|
||||
lbl_81643B40 = .data:0x81643B40; // type:object size:0x1E data:string
|
||||
lbl_81643B5E = .data:0x81643B5E; // type:object size:0x24 data:string
|
||||
scWwwTexBufFmt = .data:0x81643B40; // type:object size:0x1E data:string
|
||||
scWwwNoBrowserWin = .data:0x81643B5E; // type:object size:0x24 data:string
|
||||
lbl_81643B82 = .data:0x81643B82; // type:object size:0x1B data:string
|
||||
lbl_81643B9D = .data:0x81643B9D; // type:object size:0x2B data:string
|
||||
lbl_81643BC8 = .data:0x81643BC8; // type:object size:0x12 data:string
|
||||
@@ -15655,15 +15655,15 @@ lbl_8164C424 = .data:0x8164C424; // type:object size:0xB data:string
|
||||
lbl_8164C42F = .data:0x8164C42F; // type:object size:0xD data:string
|
||||
lbl_8164C43C = .data:0x8164C43C; // type:object size:0xD data:string
|
||||
lbl_8164C449 = .data:0x8164C449; // type:object size:0xD data:string
|
||||
lbl_8164C458 = .data:0x8164C458; // type:object size:0xC data:4byte
|
||||
scPaneName_T_CalMonth = .data:0x8164C458; // type:object size:0xC data:4byte
|
||||
lbl_8164C464 = .data:0x8164C464; // type:object size:0x9 data:string
|
||||
lbl_8164C46D = .data:0x8164C46D; // type:object size:0x9 data:string
|
||||
lbl_8164C476 = .data:0x8164C476; // type:object size:0x9 data:string
|
||||
lbl_8164C480 = .data:0x8164C480; // type:object size:0xC
|
||||
scPaneName_N_Cal = .data:0x8164C480; // type:object size:0xC
|
||||
lbl_8164C48C = .data:0x8164C48C; // type:object size:0xB data:string
|
||||
lbl_8164C497 = .data:0x8164C497; // type:object size:0xB data:string
|
||||
lbl_8164C4A2 = .data:0x8164C4A2; // type:object size:0xB data:string
|
||||
lbl_8164C4B0 = .data:0x8164C4B0; // type:object size:0xC
|
||||
scPaneName_N_CalPos = .data:0x8164C4B0; // type:object size:0xC
|
||||
lbl_8164C4BC = .data:0x8164C4BC; // type:object size:0x43
|
||||
lbl_8164C4FF = .data:0x8164C4FF; // type:object size:0xF data:string
|
||||
lbl_8164C50E = .data:0x8164C50E; // type:object size:0x14 data:string
|
||||
@@ -15673,11 +15673,11 @@ lbl_8164C54E = .data:0x8164C54E; // type:object size:0x18
|
||||
lbl_8164C566 = .data:0x8164C566; // type:object size:0xC
|
||||
lbl_8164C572 = .data:0x8164C572; // type:object size:0xA
|
||||
__vt__Q33ipl5scene8Calendar = .data:0x8164C57C; // type:object size:0xA4
|
||||
lbl_8164C620 = .data:0x8164C620; // type:object size:0xB data:string
|
||||
lbl_8164C62C = .data:0x8164C62C; // type:object size:0x14 data:4byte
|
||||
lbl_8164C640 = .data:0x8164C640; // type:object size:0x12 data:string
|
||||
lbl_8164C652 = .data:0x8164C652; // type:object size:0xB data:string
|
||||
lbl_8164C65D = .data:0x8164C65D; // type:object size:0x13 data:string
|
||||
scN_CalDay_r = .data:0x8164C620; // type:object size:0xB data:string
|
||||
scDateAnimPaneNames = .data:0x8164C62C; // type:object size:0x14 data:4byte
|
||||
scMyIplTopFBrlan = .data:0x8164C640; // type:object size:0x12 data:string
|
||||
scN_CalDay_t = .data:0x8164C652; // type:object size:0xB data:string
|
||||
scSEDateFocus = .data:0x8164C65D; // type:object size:0x13 data:string
|
||||
__vt__Q33ipl5scene4Date = .data:0x8164C670; // type:object size:0x18
|
||||
@12712 = .data:0x8164C688; // type:object size:0xC scope:local data:string
|
||||
...data.0 = .data:0x8164C688; // type:label scope:local
|
||||
@@ -15796,20 +15796,20 @@ __vt__Q33ipl5scene11ChannelEdit = .data:0x8164CC1C; // type:object size:0x4C
|
||||
@17390 = .data:0x8164D00C; // type:object size:0x30 scope:local
|
||||
__vt__Q33ipl5scene11ChanAppBase = .data:0x8164D03C; // type:object size:0x28
|
||||
__vt__Q33ipl5scene13AnmController = .data:0x8164D0F8; // type:object size:0xC scope:weak
|
||||
lbl_8164D108 = .data:0x8164D108; // type:object size:0x25 data:string
|
||||
lbl_8164D12D = .data:0x8164D12D; // type:object size:0x26 data:string
|
||||
lbl_8164D153 = .data:0x8164D153; // type:object size:0x2B data:string
|
||||
lbl_8164D17E = .data:0x8164D17E; // type:object size:0x2C data:string
|
||||
lbl_8164D1AA = .data:0x8164D1AA; // type:object size:0xB data:string
|
||||
lbl_8164D1B5 = .data:0x8164D1B5; // type:object size:0xA data:string
|
||||
lbl_8164D1BF = .data:0x8164D1BF; // type:object size:0xA data:string
|
||||
lbl_8164D1C9 = .data:0x8164D1C9; // type:object size:0xA data:string
|
||||
lbl_8164D1D3 = .data:0x8164D1D3; // type:object size:0xC data:string
|
||||
lbl_8164D1DF = .data:0x8164D1DF; // type:object size:0xA data:string
|
||||
lbl_8164D1E9 = .data:0x8164D1E9; // type:object size:0xB data:string
|
||||
lbl_8164D1F4 = .data:0x8164D1F4; // type:object size:0xA data:string
|
||||
lbl_8164D1FE = .data:0x8164D1FE; // type:object size:0x11 data:string
|
||||
lbl_8164D20F = .data:0x8164D20F; // type:object size:0x11 data:string
|
||||
scBrlan_SaveDataIn = .data:0x8164D108; // type:object size:0x25 data:string
|
||||
scBrlan_SaveDataOut = .data:0x8164D12D; // type:object size:0x26 data:string
|
||||
scBrlan_SaveDataFocusIn = .data:0x8164D153; // type:object size:0x2B data:string
|
||||
scBrlan_SaveDataFocusOut = .data:0x8164D17E; // type:object size:0x2C data:string
|
||||
scPaneName_N_Data16x9 = .data:0x8164D1AA; // type:object size:0xB data:string
|
||||
scPaneName_N_Data4x3 = .data:0x8164D1B5; // type:object size:0xA data:string
|
||||
scPaneName_B_Data_01 = .data:0x8164D1BF; // type:object size:0xA data:string
|
||||
scPaneName_B_Data_00 = .data:0x8164D1C9; // type:object size:0xA data:string
|
||||
scPaneName_N_Atari16x9 = .data:0x8164D1D3; // type:object size:0xC data:string
|
||||
scPaneName_N_Data_01 = .data:0x8164D1DF; // type:object size:0xA data:string
|
||||
scPaneName_N_Atari4x3 = .data:0x8164D1E9; // type:object size:0xB data:string
|
||||
scPaneName_N_Data_00 = .data:0x8164D1F4; // type:object size:0xA data:string
|
||||
scPaneName_DataBaseCover_00 = .data:0x8164D1FE; // type:object size:0x11 data:string
|
||||
scPaneName_DataBaseCover_01 = .data:0x8164D20F; // type:object size:0x11 data:string
|
||||
__vt__Q33ipl5scene10ChanAppBox = .data:0x8164D220; // type:object size:0x28
|
||||
@18429 = .data:0x8164D2E8; // type:object size:0x20 scope:local data:string
|
||||
@18431 = .data:0x8164D308; // type:object size:0x21 scope:local data:string
|
||||
@@ -15940,19 +15940,19 @@ lbl_8164DCDF = .data:0x8164DCDF; // type:object size:0x35
|
||||
jumptable_8164DD14 = .data:0x8164DD14; // type:object size:0x6C scope:local
|
||||
lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
|
||||
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
|
||||
lbl_8164DE64 = .data:0x8164DE64; // type:object size:0x9 data:string
|
||||
lbl_8164DE6D = .data:0x8164DE6D; // type:object size:0x11 data:string
|
||||
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
|
||||
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
|
||||
jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local
|
||||
lbl_8164DE9C = .data:0x8164DE9C; // type:object size:0xB data:string
|
||||
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
|
||||
lbl_8164DEA7 = .data:0x8164DEA7; // type:object size:0x10 data:string
|
||||
lbl_8164DEB7 = .data:0x8164DEB7; // type:object size:0x114
|
||||
lbl_8164DFCB = .data:0x8164DFCB; // type:object size:0x16 data:string
|
||||
lbl_8164DFE1 = .data:0x8164DFE1; // type:object size:0x10 data:string
|
||||
lbl_8164DFF1 = .data:0x8164DFF1; // type:object size:0xF data:string
|
||||
lbl_8164E000 = .data:0x8164E000; // type:object size:0x14 data:string
|
||||
scSE_WIPL_SE_CH_TARGETTING = .data:0x8164DFCB; // type:object size:0x16 data:string
|
||||
scSE_WIPL_SE_CH_HOLD = .data:0x8164DFE1; // type:object size:0x10 data:string
|
||||
scSE_WIPL_SE_CH_SET = .data:0x8164DFF1; // type:object size:0xF data:string
|
||||
scSE_WIPL_SE_CH_NOT_MOVE = .data:0x8164E000; // type:object size:0x14 data:string
|
||||
lbl_8164E014 = .data:0x8164E014; // type:object size:0x10 data:string
|
||||
lbl_8164E024 = .data:0x8164E024; // type:object size:0x14 data:string
|
||||
lbl_8164E038 = .data:0x8164E038; // type:object size:0xF data:string
|
||||
scSE_WIPL_SE_GRAY_BUTTON = .data:0x8164E024; // type:object size:0x14 data:string
|
||||
scSE_WIPL_SE_DECIDE = .data:0x8164E038; // type:object size:0xF data:string
|
||||
__vt__Q33ipl4math29HermiteIntp<Q33ipl4math4VEC3> = .data:0x8164E048; // type:object size:0x20
|
||||
__vt__Q33ipl5scene27CsChanSelSDMenuEventHandler = .data:0x8164E068; // type:object size:0x1C
|
||||
__vt__Q33ipl5scene27CsChanSelButtonEventHandler = .data:0x8164E084; // type:object size:0x1C
|
||||
@@ -15983,46 +15983,46 @@ lbl_8164E6F3 = .data:0x8164E6F3; // type:object size:0x12 data:string
|
||||
lbl_8164E705 = .data:0x8164E705; // type:object size:0x19 data:string
|
||||
lbl_8164E71E = .data:0x8164E71E; // type:object size:0x26 data:string
|
||||
lbl_8164E744 = .data:0x8164E744; // type:object size:0x1F data:string
|
||||
lbl_8164E768 = .data:0x8164E768; // type:object size:0xC data:string
|
||||
lbl_8164E774 = .data:0x8164E774; // type:object size:0xC data:string
|
||||
lbl_8164E780 = .data:0x8164E780; // type:object size:0xD data:string
|
||||
lbl_8164E78D = .data:0x8164E78D; // type:object size:0xD data:string
|
||||
lbl_8164E79A = .data:0x8164E79A; // type:object size:0xC data:string
|
||||
lbl_8164E7A6 = .data:0x8164E7A6; // type:object size:0xC data:string
|
||||
lbl_8164E7B2 = .data:0x8164E7B2; // type:object size:0xE data:string
|
||||
lbl_8164E7C0 = .data:0x8164E7C0; // type:object size:0xE data:string
|
||||
scGroup_G_FocusBtnA = .data:0x8164E768; // type:object size:0xC data:string
|
||||
scGroup_G_FocusBtnB = .data:0x8164E774; // type:object size:0xC data:string
|
||||
scGroup_G_SelectBtnA = .data:0x8164E780; // type:object size:0xD data:string
|
||||
scGroup_G_SelectBtnB = .data:0x8164E78D; // type:object size:0xD data:string
|
||||
scGroup_G_OnOffBtnA = .data:0x8164E79A; // type:object size:0xC data:string
|
||||
scGroup_G_OnOffBtnB = .data:0x8164E7A6; // type:object size:0xC data:string
|
||||
scGroup_G_ChangeTextA = .data:0x8164E7B2; // type:object size:0xE data:string
|
||||
scGroup_G_ChangeTextB = .data:0x8164E7C0; // type:object size:0xE data:string
|
||||
scAnimGroups__Q23ipl5scene = .data:0x8164E7D0; // type:object size:0x24
|
||||
lbl_8164E7F4 = .data:0x8164E7F4; // type:object size:0x1F data:string
|
||||
lbl_8164E813 = .data:0x8164E813; // type:object size:0x1D data:string
|
||||
lbl_8164E830 = .data:0x8164E830; // type:object size:0x1E data:string
|
||||
lbl_8164E84E = .data:0x8164E84E; // type:object size:0x18 data:string
|
||||
lbl_8164E866 = .data:0x8164E866; // type:object size:0x17 data:string
|
||||
lbl_8164E87D = .data:0x8164E87D; // type:object size:0x1F data:string
|
||||
lbl_8164E89C = .data:0x8164E89C; // type:object size:0x1E data:string
|
||||
lbl_8164E8BA = .data:0x8164E8BA; // type:object size:0x1A data:string
|
||||
lbl_8164E8D4 = .data:0x8164E8D4; // type:object size:0x1C data:string
|
||||
lbl_8164E8F0 = .data:0x8164E8F0; // type:object size:0x1B data:string
|
||||
scBrlan_my_ChTop_a_FocusBtnA_off = .data:0x8164E7F4; // type:object size:0x1F data:string
|
||||
scBrlan_my_ChTop_a_FocusBtn_on = .data:0x8164E813; // type:object size:0x1D data:string
|
||||
scBrlan_my_ChTop_a_SelectBtn_Ac = .data:0x8164E830; // type:object size:0x1E data:string
|
||||
scBrlan_my_ChTop_a_OffBtn = .data:0x8164E84E; // type:object size:0x18 data:string
|
||||
scBrlan_my_ChTop_a_OnBtn = .data:0x8164E866; // type:object size:0x17 data:string
|
||||
scBrlan_my_ChTop_a_ChangeTextOut = .data:0x8164E87D; // type:object size:0x1F data:string
|
||||
scBrlan_my_ChTop_a_ChangeTextIn = .data:0x8164E89C; // type:object size:0x1E data:string
|
||||
scBrlan_my_ChTop_a_ChangeIn = .data:0x8164E8BA; // type:object size:0x1A data:string
|
||||
scBrlan_my_ChTop_a_ChangeRoop = .data:0x8164E8D4; // type:object size:0x1C data:string
|
||||
scBrlan_my_ChTop_a_ChangeOut = .data:0x8164E8F0; // type:object size:0x1B data:string
|
||||
scAnimNames__Q23ipl5scene = .data:0x8164E90C; // type:object size:0x28
|
||||
lbl_8164E934 = .data:0x8164E934; // type:object size:0xD data:string
|
||||
lbl_8164E941 = .data:0x8164E941; // type:object size:0x13 data:string
|
||||
lbl_8164E954 = .data:0x8164E954; // type:object size:0x12 data:string
|
||||
scBrlan_banner = .data:0x8164E934; // type:object size:0xD data:string
|
||||
scBrlan_banner_Start = .data:0x8164E941; // type:object size:0x13 data:string
|
||||
scBrlan_banner_Loop = .data:0x8164E954; // type:object size:0x12 data:string
|
||||
scBannerAnims__Q23ipl5scene = .data:0x8164E968; // type:object size:0xC
|
||||
lbl_8164E974 = .data:0x8164E974; // type:object size:0xB data:string
|
||||
lbl_8164E97F = .data:0x8164E97F; // type:object size:0x9 data:string
|
||||
scGroup_G_Comment0 = .data:0x8164E974; // type:object size:0xB data:string
|
||||
scGroup_G_DiskIn = .data:0x8164E97F; // type:object size:0x9 data:string
|
||||
scDiskGroups__Q23ipl5scene = .data:0x8164E988; // type:object size:0x14 data:4byte
|
||||
lbl_8164E99C = .data:0x8164E99C; // type:object size:0x18 data:string
|
||||
lbl_8164E9B4 = .data:0x8164E9B4; // type:object size:0x1C data:string
|
||||
lbl_8164E9D0 = .data:0x8164E9D0; // type:object size:0x1B data:string
|
||||
lbl_8164E9EB = .data:0x8164E9EB; // type:object size:0x1A data:string
|
||||
lbl_8164EA05 = .data:0x8164EA05; // type:object size:0x1B data:string
|
||||
lbl_8164EA20 = .data:0x8164EA20; // type:object size:0x19 data:string
|
||||
lbl_8164EA39 = .data:0x8164EA39; // type:object size:0x1C data:string
|
||||
lbl_8164EA55 = .data:0x8164EA55; // type:object size:0x1A data:string
|
||||
lbl_8164EA6F = .data:0x8164EA6F; // type:object size:0x1E data:string
|
||||
lbl_8164EA8D = .data:0x8164EA8D; // type:object size:0x1E data:string
|
||||
scBrlan_my_DiskCh_a_Start = .data:0x8164E99C; // type:object size:0x18 data:string
|
||||
scBrlan_my_DiskCh_a_DiskStart = .data:0x8164E9B4; // type:object size:0x1C data:string
|
||||
scBrlan_my_DiskCh_a_DiskLoop = .data:0x8164E9D0; // type:object size:0x1B data:string
|
||||
scBrlan_my_DiskCh_a_DiskEnd = .data:0x8164E9EB; // type:object size:0x1A data:string
|
||||
scBrlan_my_DiskCh_a_DiskLost = .data:0x8164EA05; // type:object size:0x1B data:string
|
||||
scBrlan_my_DiskCh_a_DiskIn = .data:0x8164EA20; // type:object size:0x19 data:string
|
||||
scBrlan_my_DiskCh_a_DiskEject = .data:0x8164EA39; // type:object size:0x1C data:string
|
||||
scBrlan_my_DiskCh_a_Unknown = .data:0x8164EA55; // type:object size:0x1A data:string
|
||||
scBrlan_my_DiskCh_a_UnknownLoop = .data:0x8164EA6F; // type:object size:0x1E data:string
|
||||
scBrlan_my_DiskCh_a_UnknwnEject = .data:0x8164EA8D; // type:object size:0x1E data:string
|
||||
scDiskAnimNames__Q23ipl5scene = .data:0x8164EAAC; // type:object size:0x28 data:4byte
|
||||
lbl_8164EAD4 = .data:0x8164EAD4; // type:object size:0x12 data:string
|
||||
lbl_8164EAE6 = .data:0x8164EAE6; // type:object size:0x1A data:string
|
||||
scBrlyt_my_DiskCh_a = .data:0x8164EAD4; // type:object size:0x12 data:string
|
||||
scBrlan_my_GCTop_a_BackLoop = .data:0x8164EAE6; // type:object size:0x1A data:string
|
||||
scWidePanes__Q23ipl5scene = .data:0x8164EB00; // type:object size:0x30
|
||||
lbl_8164EB30 = .data:0x8164EB30; // type:object size:0xC data:string
|
||||
lbl_8164EB3C = .data:0x8164EB3C; // type:object size:0xCC
|
||||
@@ -18149,7 +18149,7 @@ lbl_8166A6B1 = .data:0x8166A6B1; // type:object size:0xD data:string
|
||||
lbl_8166A6BE = .data:0x8166A6BE; // type:object size:0xD data:string
|
||||
lbl_8166A6CB = .data:0x8166A6CB; // type:object size:0xC data:string
|
||||
lbl_8166A6D7 = .data:0x8166A6D7; // type:object size:0xC data:string
|
||||
lbl_8166A6E3 = .data:0x8166A6E3; // type:object size:0x41 data:string
|
||||
scCsFatalMsg = .data:0x8166A6E3; // type:object size:0x41 data:string
|
||||
lbl_8166A728 = .data:0x8166A728; // type:object size:0xB data:string
|
||||
lbl_8166A733 = .data:0x8166A733; // type:object size:0x9 data:string
|
||||
lbl_8166A73C = .data:0x8166A73C; // type:object size:0xB data:string
|
||||
@@ -18664,7 +18664,7 @@ __vt__Q34nw4r3lyt7Picture = .data:0x816717F4; // type:object size:0x6C
|
||||
@5574 = .data:0x816718E8; // type:object size:0x41 scope:local data:string
|
||||
__vt__Q34nw4r3lyt7TextBox = .data:0x8167192C; // type:object size:0x74
|
||||
flipInfos$7849 = .data:0x816719A0; // type:object size:0x3C scope:local
|
||||
lbl_816719DC = .data:0x816719DC; // type:object size:0x41 data:string
|
||||
scLytFatalMsg = .data:0x816719DC; // type:object size:0x41 data:string
|
||||
__vt__Q34nw4r3lyt6Window = .data:0x81671A20; // type:object size:0x7C
|
||||
__vt__Q34nw4r3lyt8Bounding = .data:0x81671AA0; // type:object size:0x64
|
||||
kColSels$4880 = .data:0x81671B08; // type:object size:0x20 scope:local data:4byte
|
||||
@@ -19181,13 +19181,13 @@ base64_array = .data:0x816874A0; // type:object size:0x80 scope:local
|
||||
@2185 = .data:0x816876A0; // type:object size:0x21 scope:local data:string
|
||||
@654 = .data:0x816876C8; // type:object size:0x48 scope:local data:string
|
||||
ShutdownFunctionInfo = .data:0x81687710; // type:object size:0x10 scope:local
|
||||
lbl_81687720 = .data:0x81687720; // type:object size:0x49 data:string
|
||||
scWpadVersionStr = .data:0x81687720; // type:object size:0x49 data:string
|
||||
lbl_8168776C = .data:0x8168776C; // type:object size:0x1C data:string
|
||||
lbl_81687788 = .data:0x81687788; // type:object size:0x1B data:string
|
||||
lbl_816877A4 = .data:0x816877A4; // type:object size:0x2F data:string
|
||||
lbl_816877D4 = .data:0x816877D4; // type:object size:0x27 data:string
|
||||
ShutdownFunctionInfo = .data:0x81687800; // type:object size:0x10 scope:local
|
||||
lbl_81687810 = .data:0x81687810; // type:object size:0x58
|
||||
scWpadManageStrs = .data:0x81687810; // type:object size:0x58
|
||||
lbl_81687868 = .data:0x81687868; // type:object size:0xC data:string
|
||||
lbl_81687874 = .data:0x81687874; // type:object size:0x37 data:string
|
||||
lbl_816878AC = .data:0x816878AC; // type:object size:0xB4
|
||||
@@ -20016,7 +20016,7 @@ lbl_81691040 = .data:0x81691040; // type:object size:0x2D0
|
||||
lbl_81691310 = .data:0x81691310; // type:object size:0x3B data:string
|
||||
lbl_8169134C = .data:0x8169134C; // type:object size:0x3DC
|
||||
st_uhs_msc_blk_func = .data:0x81691728; // type:object size:0x20
|
||||
lbl_81691748 = .data:0x81691748; // type:object size:0x50
|
||||
__sdPathData = .data:0x81691748; // type:object size:0x50
|
||||
lbl_81691798 = .data:0x81691798; // type:object size:0x16 data:string
|
||||
lbl_816917B0 = .data:0x816917B0; // type:object size:0xD data:string
|
||||
lbl_816917C0 = .data:0x816917C0; // type:object size:0x15 data:string
|
||||
@@ -20050,8 +20050,8 @@ lbl_816932D0 = .data:0x816932D0; // type:object size:0x48 data:string
|
||||
lbl_81693318 = .data:0x81693318; // type:object size:0xA data:string
|
||||
lbl_81693324 = .data:0x81693324; // type:object size:0x15 data:string
|
||||
@466 = .data:0x81693340; // type:object size:0xD scope:local data:string
|
||||
lbl_81693350 = .data:0x81693350; // type:object size:0xD0
|
||||
lbl_81693420 = .data:0x81693420; // type:object size:0x16 data:string
|
||||
scCntCacheStrs = .data:0x81693350; // type:object size:0xD0
|
||||
scCntCacheTitleDataFmt = .data:0x81693420; // type:object size:0x16 data:string
|
||||
__vt__Q23EGG9Allocator = .data:0x81693438; // type:object size:0x14
|
||||
__vt__Q23EGG9ArcPlayer = .data:0x81693450; // type:object size:0x54
|
||||
__vt__Q23EGG20SimpleAudioMgrWithFx = .data:0x816934A8; // type:object size:0x78
|
||||
@@ -20107,12 +20107,12 @@ gDBCommTable = .data:0x816943C8; // type:object size:0x28
|
||||
lbl_81694410 = .sdata2:0x81694410; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694418 = .sdata2:0x81694418; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694420 = .sdata2:0x81694420; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694424 = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694428 = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
|
||||
lbl_8169442C = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694430 = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694434 = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694438 = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
|
||||
scOrthoLeft = .sdata2:0x81694424; // type:object size:0x4 align:4 data:float
|
||||
scOrthoRight = .sdata2:0x81694428; // type:object size:0x4 align:4 data:float
|
||||
scOrthoBottom = .sdata2:0x8169442C; // type:object size:0x4 align:4 data:float
|
||||
scOrthoTop = .sdata2:0x81694430; // type:object size:0x4 align:4 data:float
|
||||
scWideOrthoLeft = .sdata2:0x81694434; // type:object size:0x4 align:4 data:float
|
||||
scWideOrthoRight = .sdata2:0x81694438; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694440 = .sdata2:0x81694440; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694444 = .sdata2:0x81694444; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694448 = .sdata2:0x81694448; // type:object size:0x8 align:8 data:double
|
||||
@@ -20192,7 +20192,7 @@ lbl_816944EB = .sdata2:0x816944EB; // type:object size:0x1 data:byte
|
||||
@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
|
||||
scRsoZeroF = .sdata2:0x81694598; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945A0 = .sdata2:0x816945A0; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945A4 = .sdata2:0x816945A4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945A8 = .sdata2:0x816945A8; // type:object size:0x4 align:4 data:float
|
||||
@@ -20201,10 +20201,10 @@ lbl_816945B0 = .sdata2:0x816945B0; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945B4 = .sdata2:0x816945B4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945B8 = .sdata2:0x816945B8; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945C0 = .sdata2:0x816945C0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945C8 = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945D0 = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945D8 = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945E0 = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
|
||||
scTvrcMsPerSec = .sdata2:0x816945C8; // type:object size:0x4 align:4 data:float
|
||||
scTvrcNsecPerSec = .sdata2:0x816945D0; // type:object size:0x8 align:8 data:double
|
||||
scTvrcOne = .sdata2:0x816945D8; // type:object size:0x8 align:8 data:double
|
||||
scTvrcFloatMagic = .sdata2:0x816945E0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816945E8 = .sdata2:0x816945E8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945EC = .sdata2:0x816945EC; // type:object size:0x4 align:4 data:float
|
||||
lbl_816945F0 = .sdata2:0x816945F0; // type:object size:0x4 align:4 data:float
|
||||
@@ -20370,9 +20370,9 @@ lbl_816948E8 = .sdata2:0x816948E8; // type:object size:0x8 align:4 data:float
|
||||
@16092 = .sdata2:0x816948F4; // type:object size:0x4 scope:local align:4 data:float
|
||||
@16094 = .sdata2:0x816948F8; // type:object size:0x4 scope:local align:4 data:float
|
||||
@16095 = .sdata2:0x816948FC; // type:object size:0x4 scope:local align:4 data:float
|
||||
lbl_81694900 = .sdata2:0x81694900; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694904 = .sdata2:0x81694904; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694908 = .sdata2:0x81694908; // type:object size:0x8 align:8 data:double
|
||||
scHalfF = .sdata2:0x81694900; // type:object size:0x4 align:4 data:float
|
||||
scTwoF = .sdata2:0x81694904; // type:object size:0x4 align:4 data:float
|
||||
scF2IBias = .sdata2:0x81694908; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694910 = .sdata2:0x81694910; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694914 = .sdata2:0x81694914; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694918 = .sdata2:0x81694918; // type:object size:0x4 align:4 data:float
|
||||
@@ -20710,12 +20710,12 @@ lbl_81694ECC = .sdata2:0x81694ECC; // type:object size:0x4 align:4 data:float
|
||||
@880 = .sdata2:0x81694ED4; // type:object size:0x4 scope:local align:4 data:float
|
||||
@885 = .sdata2:0x81694ED8; // type:object size:0x4 scope:local align:4 data:float
|
||||
@888 = .sdata2:0x81694EE0; // type:object size:0x8 scope:local align:8 data:double
|
||||
lbl_81694EE8 = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694EEC = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
|
||||
lbl_81694EED = .sdata2:0x81694EED; // type:object size:0x1 data:byte
|
||||
lbl_81694EEE = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
|
||||
lbl_81694EEF = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
|
||||
lbl_81694EF0 = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
|
||||
scGuiZeroF = .sdata2:0x81694EE8; // type:object size:0x4 align:4 data:float
|
||||
scGuiLineColorR = .sdata2:0x81694EEC; // type:object size:0x1 data:byte
|
||||
scGuiLineColorG = .sdata2:0x81694EED; // type:object size:0x1 data:byte
|
||||
scGuiLineColorB = .sdata2:0x81694EEE; // type:object size:0x1 data:byte
|
||||
scGuiLineColorA = .sdata2:0x81694EEF; // type:object size:0x1 data:byte
|
||||
scGuiHalfF = .sdata2:0x81694EF0; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694EF8 = .sdata2:0x81694EF8; // type:object size:0x8 data:4byte
|
||||
lbl_81694F00 = .sdata2:0x81694F00; // type:object size:0x4 data:4byte
|
||||
lbl_81694F08 = .sdata2:0x81694F08; // type:object size:0x8 align:8 data:double
|
||||
@@ -20741,7 +20741,7 @@ lbl_81694FA0 = .sdata2:0x81694FA0; // type:object size:0x7 data:string
|
||||
lbl_81694FA7 = .sdata2:0x81694FA7; // type:object size:0x5 data:string
|
||||
lbl_81694FAC = .sdata2:0x81694FAC; // type:object size:0xC align:4
|
||||
lbl_81694FB8 = .sdata2:0x81694FB8; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694FC0 = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
|
||||
scCsZeroF = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
|
||||
@10105 = .sdata2:0x81694FC8; // type:object size:0x4 scope:local align:4 data:float
|
||||
@9941 = .sdata2:0x81694FD0; // type:object size:0x8 scope:local data:4byte
|
||||
@10304 = .sdata2:0x81694FD8; // type:object size:0x8 scope:local align:8 data:double
|
||||
@@ -20769,12 +20769,12 @@ NET_AES_BLOCK_MODE_CBC = .sdata2:0x81695040; // type:object size:0x8
|
||||
@524 = .sdata2:0x81695050; // type:object size:0x2 scope:local data:byte
|
||||
@1077 = .sdata2:0x81695054; // type:object size:0x2 scope:local data:byte
|
||||
@1128 = .sdata2:0x81695058; // type:object size:0x2 scope:local data:byte
|
||||
lbl_81695060 = .sdata2:0x81695060; // type:object size:0x1 data:byte
|
||||
lbl_81695061 = .sdata2:0x81695061; // type:object size:0x1 data:byte
|
||||
lbl_81695062 = .sdata2:0x81695062; // type:object size:0x1 data:byte
|
||||
lbl_81695064 = .sdata2:0x81695064; // type:object size:0x1 data:byte
|
||||
lbl_81695065 = .sdata2:0x81695065; // type:object size:0x1 data:byte
|
||||
lbl_81695066 = .sdata2:0x81695066; // type:object size:0x1 data:byte
|
||||
scRsnOui0 = .sdata2:0x81695060; // type:object size:0x1 data:byte
|
||||
scRsnOui1 = .sdata2:0x81695061; // type:object size:0x1 data:byte
|
||||
scRsnOui2 = .sdata2:0x81695062; // type:object size:0x1 data:byte
|
||||
scWpaOui0 = .sdata2:0x81695064; // type:object size:0x1 data:byte
|
||||
scWpaOui1 = .sdata2:0x81695065; // type:object size:0x1 data:byte
|
||||
scWpaOui2 = .sdata2:0x81695066; // type:object size:0x1 data:byte
|
||||
scFilePermissions = .sdata2:0x81695068; // type:object size:0x2 scope:local
|
||||
cWhite = .sdata2:0x81695070; // type:object size:0x4 scope:local data:byte
|
||||
@2829 = .sdata2:0x81695074; // type:object size:0x4 scope:local align:4 data:float
|
||||
@@ -21025,10 +21025,10 @@ lbl_8169553B = .sdata2:0x8169553B; // type:object size:0x1 data:byte
|
||||
lbl_8169553C = .sdata2:0x8169553C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81695540 = .sdata2:0x81695540; // type:object size:0x8 align:8 data:double
|
||||
lbl_81695548 = .sdata2:0x81695548; // type:object size:0x8 align:8 data:double
|
||||
lbl_81695550 = .sdata2:0x81695550; // type:object size:0x1 data:byte
|
||||
lbl_81695551 = .sdata2:0x81695551; // type:object size:0x1 data:byte
|
||||
lbl_81695552 = .sdata2:0x81695552; // type:object size:0x1 data:byte
|
||||
lbl_81695553 = .sdata2:0x81695553; // type:object size:0x5 data:byte
|
||||
scLytFatalColorR = .sdata2:0x81695550; // type:object size:0x1 data:byte
|
||||
scLytFatalColorG = .sdata2:0x81695551; // type:object size:0x1 data:byte
|
||||
scLytFatalColorB = .sdata2:0x81695552; // type:object size:0x1 data:byte
|
||||
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x5 data:byte
|
||||
@6184 = .sdata2:0x81695558; // type:object size:0x4 scope:local align:4 data:float
|
||||
@6185 = .sdata2:0x8169555C; // type:object size:0x4 scope:local align:4 data:float
|
||||
@6186 = .sdata2:0x81695560; // type:object size:0x4 scope:local align:4 data:float
|
||||
@@ -21548,10 +21548,10 @@ lbl_81696220 = .sdata:0x81696220; // type:object size:0x2 data:string
|
||||
lbl_81696222 = .sdata:0x81696222; // type:object size:0x2
|
||||
lbl_81696224 = .sdata:0x81696224; // type:object size:0x6 data:wstring
|
||||
lbl_8169622A = .sdata:0x8169622A; // type:object size:0x2
|
||||
lbl_8169622C = .sdata:0x8169622C; // type:object size:0x1 data:byte
|
||||
lbl_8169622D = .sdata:0x8169622D; // type:object size:0x1 data:byte
|
||||
lbl_8169622E = .sdata:0x8169622E; // type:object size:0x1 data:byte
|
||||
lbl_8169622F = .sdata:0x8169622F; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorR = .sdata:0x8169622C; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorG = .sdata:0x8169622D; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorB = .sdata:0x8169622E; // type:object size:0x1 data:byte
|
||||
scRsoFatalColorA = .sdata:0x8169622F; // type:object size:0x1 data:byte
|
||||
lbl_81696230 = .sdata:0x81696230; // type:object size:0x5 data:string
|
||||
TVRC_FILE_HEADER__7LibTVRC = .sdata:0x81696238; // type:object size:0x4 data:4byte
|
||||
__tienHoseiNsec__7LibTVRC = .sdata:0x8169623C; // type:object size:0x4 data:4byte
|
||||
@@ -21589,7 +21589,7 @@ lbl_816962DB = .sdata:0x816962DB; // type:object size:0x8 data:string
|
||||
lbl_816962E3 = .sdata:0x816962E3; // type:object size:0x1
|
||||
lbl_816962E4 = .sdata:0x816962E4; // type:object size:0x8 data:string
|
||||
lbl_816962F0 = .sdata:0x816962F0; // type:object size:0x8 data:string
|
||||
lbl_816962F8 = .sdata:0x816962F8; // type:object size:0x8 data:string
|
||||
scWwwErrorQ = .sdata:0x816962F8; // type:object size:0x8 data:string
|
||||
globalNames__Q23www9trasition = .sdata:0x81696300; // type:object size:0x8 scope:local
|
||||
@1425 = .sdata:0x81696308; // type:object size:0x1 scope:local
|
||||
gEnableDpd = .sdata:0x81696310; // type:object size:0x4 data:4byte
|
||||
@@ -21753,7 +21753,7 @@ lbl_816966E1 = .sdata:0x816966E1; // type:object size:0x6 data:string
|
||||
lbl_816966E7 = .sdata:0x816966E7; // type:object size:0x7 data:string
|
||||
lbl_816966EE = .sdata:0x816966EE; // type:object size:0x7 data:string
|
||||
lbl_816966F5 = .sdata:0x816966F5; // type:object size:0x4 data:string
|
||||
lbl_816966F9 = .sdata:0x816966F9; // type:object size:0x7 data:string
|
||||
scPaneName_B_Stop = .sdata:0x816966F9; // type:object size:0x7 data:string
|
||||
lbl_81696700 = .sdata:0x81696700; // type:object size:0x6 data:string
|
||||
lbl_81696706 = .sdata:0x81696706; // type:object size:0x5 data:string
|
||||
lbl_8169670B = .sdata:0x8169670B; // type:object size:0x6 data:string
|
||||
@@ -21781,15 +21781,15 @@ lbl_81696797 = .sdata:0x81696797; // type:object size:0x8 data:string
|
||||
lbl_8169679F = .sdata:0x8169679F; // type:object size:0x8 data:string
|
||||
lbl_816967A7 = .sdata:0x816967A7; // type:object size:0x7 data:string
|
||||
lbl_816967AE = .sdata:0x816967AE; // type:object size:0x7 data:string
|
||||
lbl_816967B5 = .sdata:0x816967B5; // type:object size:0x7 data:string
|
||||
scPaneName_T_Stop = .sdata:0x816967B5; // type:object size:0x7 data:string
|
||||
lbl_816967C0 = .sdata:0x816967C0; // type:object size:0x4 data:string
|
||||
lbl_816967C4 = .sdata:0x816967C4; // type:object size:0x6 data:string
|
||||
lbl_816967CA = .sdata:0x816967CA; // type:object size:0x7 data:string
|
||||
lbl_816967D8 = .sdata:0x816967D8; // type:object size:0x6 data:string
|
||||
lbl_816967DE = .sdata:0x816967DE; // type:object size:0x6 data:string
|
||||
lbl_816967E4 = .sdata:0x816967E4; // type:object size:0x7 data:string
|
||||
lbl_816967EB = .sdata:0x816967EB; // type:object size:0x7 data:string
|
||||
lbl_816967F2 = .sdata:0x816967F2; // type:object size:0x6 data:string
|
||||
scW_Cal = .sdata:0x816967D8; // type:object size:0x6 data:string
|
||||
scT_Cal = .sdata:0x816967DE; // type:object size:0x6 data:string
|
||||
scCal_Ac = .sdata:0x816967E4; // type:object size:0x7 data:string
|
||||
scInfo_a = .sdata:0x816967EB; // type:object size:0x7 data:string
|
||||
scB_Cal = .sdata:0x816967F2; // type:object size:0x6 data:string
|
||||
@16087 = .sdata:0x816967F8; // type:object size:0x4 scope:local data:string
|
||||
@16350 = .sdata:0x816967FC; // type:object size:0x7 scope:local data:string
|
||||
@16351 = .sdata:0x81696803; // type:object size:0x7 scope:local data:string
|
||||
@@ -21802,8 +21802,8 @@ lbl_8169682A = .sdata:0x8169682A; // type:object size:0x7 data:string
|
||||
lbl_81696831 = .sdata:0x81696831; // type:object size:0x7 data:string
|
||||
lbl_81696838 = .sdata:0x81696838; // type:object size:0x7 data:string
|
||||
lbl_8169683F = .sdata:0x8169683F; // type:object size:0x7 data:string
|
||||
lbl_81696848 = .sdata:0x81696848; // type:object size:0x7 data:string
|
||||
lbl_81696850 = .sdata:0x81696850; // type:object size:0x8 data:wstring
|
||||
scGroup_G_Data = .sdata:0x81696848; // type:object size:0x7 data:string
|
||||
scUnknownWstr = .sdata:0x81696850; // type:object size:0x8 data:wstring
|
||||
s_all_pane_name__Q33ipl5scene10ChanAppBox = .sdata:0x81696858; // type:object size:0x6 data:string
|
||||
lbl_81696860 = .sdata:0x81696860; // type:object size:0x7 data:string
|
||||
lbl_81696867 = .sdata:0x81696867; // type:object size:0x7 data:string
|
||||
@@ -21881,32 +21881,32 @@ lbl_816969F7 = .sdata:0x816969F7; // type:object size:0x4 data:string
|
||||
lbl_816969FB = .sdata:0x816969FB; // type:object size:0x4 data:string
|
||||
lbl_816969FF = .sdata:0x816969FF; // type:object size:0x4 data:string
|
||||
lbl_81696A03 = .sdata:0x81696A03; // type:object size:0x7 data:string
|
||||
lbl_81696A10 = .sdata:0x81696A10; // type:object size:0x7 data:string
|
||||
lbl_81696A17 = .sdata:0x81696A17; // type:object size:0x7 data:string
|
||||
lbl_81696A20 = .sdata:0x81696A20; // type:object size:0x8 data:4byte
|
||||
lbl_81696A28 = .sdata:0x81696A28; // type:object size:0x7 data:string
|
||||
lbl_81696A30 = .sdata:0x81696A30; // type:object size:0x4 data:4byte
|
||||
lbl_81696A34 = .sdata:0x81696A34; // type:object size:0x6 data:string
|
||||
lbl_81696A3A = .sdata:0x81696A3A; // type:object size:0x5 data:string
|
||||
scPaneName_B_BtnA = .sdata:0x81696A10; // type:object size:0x7 data:string
|
||||
scPaneName_B_BtnB = .sdata:0x81696A17; // type:object size:0x7 data:string
|
||||
scPaneNames_B_Btn = .sdata:0x81696A20; // type:object size:0x8 data:4byte
|
||||
scGroup_Change = .sdata:0x81696A28; // type:object size:0x7 data:string
|
||||
scGroupNames_Change = .sdata:0x81696A30; // type:object size:0x4 data:4byte
|
||||
scGroup_G_Wii = .sdata:0x81696A34; // type:object size:0x6 data:string
|
||||
scGroup_G_GC = .sdata:0x81696A3A; // type:object size:0x5 data:string
|
||||
scLayoutNames__Q23ipl5scene = .sdata:0x81696A40; // type:object size:0x4 data:4byte
|
||||
lbl_81696A44 = .sdata:0x81696A44; // type:object size:0x7 data:string
|
||||
scGroup_G_Back = .sdata:0x81696A44; // type:object size:0x7 data:string
|
||||
scGCAnimGroups__Q23ipl5scene = .sdata:0x81696A4C; // type:object size:0x4 data:4byte
|
||||
scGCAnimNames__Q23ipl5scene = .sdata:0x81696A50; // type:object size:0x4 data:4byte
|
||||
lbl_81696A54 = .sdata:0x81696A54; // type:object size:0x6 data:string
|
||||
lbl_81696A5A = .sdata:0x81696A5A; // type:object size:0x6 data:string
|
||||
lbl_81696A60 = .sdata:0x81696A60; // type:object size:0x6 data:string
|
||||
lbl_81696A66 = .sdata:0x81696A66; // type:object size:0x6 data:string
|
||||
lbl_81696A6C = .sdata:0x81696A6C; // type:object size:0x6 data:string
|
||||
lbl_81696A72 = .sdata:0x81696A72; // type:object size:0x6 data:string
|
||||
lbl_81696A78 = .sdata:0x81696A78; // type:object size:0x6 data:string
|
||||
lbl_81696A7E = .sdata:0x81696A7E; // type:object size:0x6 data:string
|
||||
lbl_81696A84 = .sdata:0x81696A84; // type:object size:0x6 data:string
|
||||
lbl_81696A8A = .sdata:0x81696A8A; // type:object size:0x6 data:string
|
||||
lbl_81696A90 = .sdata:0x81696A90; // type:object size:0x6 data:string
|
||||
lbl_81696A96 = .sdata:0x81696A96; // type:object size:0x6 data:string
|
||||
lbl_81696A9C = .sdata:0x81696A9C; // type:object size:0x7 data:string
|
||||
lbl_81696AA3 = .sdata:0x81696AA3; // type:object size:0x7 data:string
|
||||
lbl_81696AAC__Q23ipl5scene = .sdata:0x81696AAC; // type:object size:0x8 data:4byte
|
||||
scPaneName_Fre_a = .sdata:0x81696A54; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_d = .sdata:0x81696A5A; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_i = .sdata:0x81696A60; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_l = .sdata:0x81696A66; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_e = .sdata:0x81696A6C; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_f = .sdata:0x81696A72; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_g = .sdata:0x81696A78; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_h = .sdata:0x81696A7E; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_b = .sdata:0x81696A84; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_c = .sdata:0x81696A8A; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_j = .sdata:0x81696A90; // type:object size:0x6 data:string
|
||||
scPaneName_Fre_k = .sdata:0x81696A96; // type:object size:0x6 data:string
|
||||
scPaneName_T_BtnA = .sdata:0x81696A9C; // type:object size:0x7 data:string
|
||||
scPaneName_T_BtnB = .sdata:0x81696AA3; // type:object size:0x7 data:string
|
||||
scPaneNames_T_Btn__Q23ipl5scene = .sdata:0x81696AAC; // type:object size:0x8 data:4byte
|
||||
lbl_81696AB4 = .sdata:0x81696AB4; // type:object size:0x4
|
||||
lbl_81696AB8 = .sdata:0x81696AB8; // type:object size:0x4
|
||||
lbl_81696ABC = .sdata:0x81696ABC; // type:object size:0x4 data:string
|
||||
@@ -22466,10 +22466,10 @@ lbl_81697824 = .sdata:0x81697824; // type:object size:0x8 data:string
|
||||
lbl_8169782C = .sdata:0x8169782C; // type:object size:0x8 data:string
|
||||
lbl_81697834 = .sdata:0x81697834; // type:object size:0x8 data:string
|
||||
lbl_8169783C = .sdata:0x8169783C; // type:object size:0x8 data:string
|
||||
lbl_81697844 = .sdata:0x81697844; // type:object size:0x1 data:byte
|
||||
lbl_81697845 = .sdata:0x81697845; // type:object size:0x1 data:byte
|
||||
lbl_81697846 = .sdata:0x81697846; // type:object size:0x1 data:byte
|
||||
lbl_81697847 = .sdata:0x81697847; // type:object size:0x1 data:byte
|
||||
scCsFatalColorR = .sdata:0x81697844; // type:object size:0x1 data:byte
|
||||
scCsFatalColorG = .sdata:0x81697845; // type:object size:0x1 data:byte
|
||||
scCsFatalColorB = .sdata:0x81697846; // type:object size:0x1 data:byte
|
||||
scCsFatalColorA = .sdata:0x81697847; // type:object size:0x1 data:byte
|
||||
lbl_81697848 = .sdata:0x81697848; // type:object size:0x8 data:string
|
||||
lbl_81697850 = .sdata:0x81697850; // type:object size:0x6 data:string
|
||||
lbl_81697858 = .sdata:0x81697858; // type:object size:0x6 data:string
|
||||
@@ -22538,7 +22538,7 @@ lbl_816979C8 = .sdata:0x816979C8; // type:object size:0x5 data:string
|
||||
lbl_816979D0 = .sdata:0x816979D0; // type:object size:0x5 data:string
|
||||
lbl_816979D8 = .sdata:0x816979D8; // type:object size:0x4 data:string
|
||||
lbl_816979E0 = .sdata:0x816979E0; // type:object size:0x8 data:string
|
||||
lbl_816979E8 = .sdata:0x816979E8; // type:object size:0x1 data:byte
|
||||
CDBFSPathSeparator = .sdata:0x816979E8; // type:object size:0x1 data:byte
|
||||
@1433 = .sdata:0x816979F0; // type:object size:0x4 scope:local data:string
|
||||
@1435 = .sdata:0x816979F4; // type:object size:0x1 scope:local
|
||||
@1440 = .sdata:0x816979F8; // type:object size:0x6 scope:local data:string
|
||||
@@ -22700,9 +22700,9 @@ __SSLVersion = .sdata:0x81697CE0; // type:object size:0x4 data:4byte
|
||||
qErr$1631 = .sdata:0x81697D58; // type:object size:0x4 scope:local data:4byte
|
||||
l_dev_nandflash_init_info = .sdata:0x81697D60; // type:object size:0x8 scope:local
|
||||
l_dev_sd_direct_init_info = .sdata:0x81697D68; // type:object size:0x8 scope:local
|
||||
lbl_81697D70 = .sdata:0x81697D70; // type:object size:0x1 data:byte
|
||||
lbl_81697D71 = .sdata:0x81697D71; // type:object size:0x1 data:byte
|
||||
lbl_81697D72 = .sdata:0x81697D72; // type:object size:0x1 data:byte
|
||||
scWpaFindOui0 = .sdata:0x81697D70; // type:object size:0x1 data:byte
|
||||
scWpaFindOui1 = .sdata:0x81697D71; // type:object size:0x1 data:byte
|
||||
scWpaFindOui2 = .sdata:0x81697D72; // type:object size:0x1 data:byte
|
||||
__RFLVersion = .sdata:0x81697D78; // type:object size:0x4 data:4byte
|
||||
sRFLLastErrCode = .sdata:0x81697D7C; // type:object size:0x4 scope:local data:4byte
|
||||
scResFileFullPathName = .sdata:0x81697D80; // type:object size:0x4 scope:local data:4byte
|
||||
@@ -23109,7 +23109,7 @@ lbl_816983EC = .sdata:0x816983EC; // type:object size:0x6 data:string
|
||||
__KBDVersion = .sdata:0x816985C8; // type:object size:0x4 data:4byte
|
||||
__KPRVersion = .sdata:0x816985D0; // type:object size:0x4 data:4byte
|
||||
__CNTCACHEVersion = .sdata:0x816985D8; // type:object size:0x4 data:4byte
|
||||
lbl_816985DC = .sdata:0x816985DC; // type:object size:0x3 data:string
|
||||
scCntCacheSpaceNl = .sdata:0x816985DC; // type:object size:0x3 data:string
|
||||
@428 = .sdata:0x816985E0; // type:object size:0x4 scope:local data:string
|
||||
@429 = .sdata:0x816985E4; // type:object size:0x3 scope:local data:string
|
||||
@442 = .sdata:0x816985E7; // type:object size:0x8 scope:local data:string
|
||||
@@ -23191,7 +23191,7 @@ _repeatBitLength__7LibTVRC = .sbss:0x81698768; // type:object size:0x4 data:4byt
|
||||
_repeatBitArray__7LibTVRC = .sbss:0x8169876C; // type:object size:0x4 data:4byte
|
||||
_tickT__7LibTVRC = .sbss:0x81698770; // type:object size:0x4 data:4byte
|
||||
m_handle__Q23ipl11TVRCManager = .sbss:0x81698778; // type:object size:0x4 data:4byte
|
||||
lbl_8169877C__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
|
||||
sTvrcStartDelay__3ipl = .sbss:0x8169877C; // type:object size:0x4 data:4byte
|
||||
suIDCounter__Q23gui11PaneManager = .sbss:0x81698780; // type:object size:0x4 data:4byte
|
||||
_bgmBlk__Q23ipl3snd = .sbss:0x81698788; // type:object size:0x4
|
||||
_mainBGMHandle__Q23ipl3snd = .sbss:0x8169878C; // type:object size:0x4 data:4byte
|
||||
@@ -23331,7 +23331,7 @@ opera_callbacks__Q23www10wiisetting = .sbss:0x816989A0; // type:object size:0x4
|
||||
sStatus__Q23www9arcreader = .sbss:0x816989A8; // type:object size:0x4 scope:local data:4byte
|
||||
lbl_816989B0 = .sbss:0x816989B0; // type:object size:0x4 data:4byte
|
||||
sBatteryFlag__Q210homebutton10Controller = .sbss:0x816989B8; // type:object size:0x4
|
||||
lbl_816989BC__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
|
||||
sAlarmCreated__Q210homebutton10Controller = .sbss:0x816989BC; // type:object size:0x4
|
||||
suIDCounter__Q310homebutton3gui11PaneManager = .sbss:0x816989C0; // type:object size:0x4 data:4byte
|
||||
spInstance__Q210homebutton9RemoteSpk = .sbss:0x816989C8; // type:object size:0x4 data:4byte
|
||||
InvalidShutdown = .sbss:0x816989D0; // type:object size:0x4 data:4byte
|
||||
|
||||
@@ -918,7 +918,7 @@ config.libs = [
|
||||
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
|
||||
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
|
||||
Object(NonMatching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiUtil.cpp", extra_cflags=["-O4,p"]),
|
||||
@@ -929,7 +929,7 @@ config.libs = [
|
||||
Object(Matching, "keyboard/tiTextInputBase.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiManager.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiInputForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(NonMatching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiLetterForm.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/MyTiBg.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
|
||||
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
|
||||
|
||||
@@ -75,7 +75,7 @@ namespace homebutton {
|
||||
|
||||
private:
|
||||
static bool sBatteryFlag[WPAD_MAX_CONTROLLERS];
|
||||
static bool lbl_816989BC[WPAD_MAX_CONTROLLERS];
|
||||
static bool sAlarmCreated[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
static OSAlarm sAlarm[WPAD_MAX_CONTROLLERS];
|
||||
static OSAlarm sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
@@ -35,8 +35,8 @@ namespace ext_ead {
|
||||
|
||||
class SurfaceManager {
|
||||
public:
|
||||
static void CreateManager(int rectW0, int rectH0, int rectW1, int rectH1, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* param_10);
|
||||
static void CreateManager(int surfaceW, int surfaceH, int browserW, int browserH, void* mem1Buf, u32 mem1BufSize, void* mem2Buf, u32 mem2BufSize,
|
||||
void* libBuf, const char* arcPath);
|
||||
static void DisposeManager();
|
||||
|
||||
static void RegisterArcFile(void* fileBuf);
|
||||
|
||||
@@ -133,7 +133,11 @@ namespace textinput {
|
||||
friend class Base;
|
||||
public:
|
||||
RowInfoManager(u16 maxLength) : mpInfo(NULL), mMaxLength(maxLength), mpAllocator(NULL) {}
|
||||
#ifdef TIINPUTFORM_IMPLEMENTATION
|
||||
void init() __attribute__((never_inline));
|
||||
#else
|
||||
void init();
|
||||
#endif
|
||||
~RowInfoManager();
|
||||
#endif
|
||||
private:
|
||||
@@ -145,7 +149,7 @@ namespace textinput {
|
||||
#ifdef TISIGNWINDOW_IMPLEMENTATION
|
||||
bool isAtokActive() const;
|
||||
#endif
|
||||
#ifdef MYTILETTERFORM_IMPLEMENTATION
|
||||
#if defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void create(MEMAllocator* allocator);
|
||||
virtual void init();
|
||||
virtual void onCommand(INPUT_COMMAND command, void* data);
|
||||
@@ -384,7 +388,7 @@ namespace textinput {
|
||||
virtual void setRootPaneScaleFor16x9();
|
||||
virtual void setRootPaneScaleFor4x3();
|
||||
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void onSE(sound::SE seId);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <nw4r/ut/CharWriter.h>
|
||||
#include <nw4r/ut/Rect.h>
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace textinput {
|
||||
} CursorPos;
|
||||
|
||||
typedef struct DrawInfo {
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
nw4r::ut::Rect rect;
|
||||
wchar_t character;
|
||||
#else
|
||||
@@ -94,7 +94,7 @@ namespace textinput {
|
||||
virtual u32 getEndPos() const;
|
||||
|
||||
// todo
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual void setDrawModifyScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void setDrawCacheScopeLine(s32 startLine, s32 endLine);
|
||||
virtual void modifyCursorCache(s32 line, u32 position, f32 x, f32 y, f32 width, f32 height);
|
||||
@@ -103,12 +103,12 @@ namespace textinput {
|
||||
virtual void setDrawCacheScopeLine();
|
||||
virtual void modifyCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual bool isEnableCursorCache() const;
|
||||
#else
|
||||
virtual void isEnableCursorCache();
|
||||
#endif
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION)
|
||||
#if defined(TIINPUTFORM_IMPLEMENTATION) || defined(TIMANAGER_IMPLEMENTATION) || defined(TITEXTDRAWER_IMPLEMENTATION) || defined(MYTILETTERFORM_IMPLEMENTATION) || defined(MYTIINPUTFORM_IMPLEMENTATION)
|
||||
virtual u32 getDrawModifyStartLine() const;
|
||||
virtual u32 getDrawModifyEndLine() const;
|
||||
#else
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
@@ -81,11 +81,11 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(unkVal0 *
|
||||
(mStartTangent *
|
||||
(var_f27 +
|
||||
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -101,7 +101,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
@@ -109,8 +109,8 @@ namespace ipl {
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
|
||||
template <>
|
||||
@@ -119,7 +119,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
|
||||
f32 speed = 1.0f);
|
||||
|
||||
f32 get() const {
|
||||
@@ -132,10 +132,10 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(unkVal0 *
|
||||
(mStartTangent *
|
||||
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -144,8 +144,8 @@ namespace ipl {
|
||||
protected:
|
||||
f32 mStart;
|
||||
f32 mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
|
||||
#pragma dont_instantiate HermiteIntp<float>
|
||||
@@ -155,12 +155,12 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
|
||||
unkVal0 = param_5;
|
||||
unkVal1 = param_6;
|
||||
mStartTangent = startTangent;
|
||||
mEndTangent = endTangent;
|
||||
}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
@@ -176,9 +176,9 @@ namespace ipl {
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = unkVal0 * (frame + (cubic -
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
unkVal1 * (cubic - inverseDuration * frameSquared);
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
@@ -196,7 +196,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
|
||||
r = r + temp_f3;
|
||||
|
||||
@@ -213,15 +213,15 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
#endif
|
||||
|
||||
protected:
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -236,7 +236,7 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
VEC3 get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
@@ -249,9 +249,9 @@ namespace ipl {
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = unkVal0 * (frame + (cubic -
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
unkVal1 * (cubic - inverseDuration * frameSquared);
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
@@ -260,8 +260,8 @@ namespace ipl {
|
||||
protected:
|
||||
VEC3 mStart;
|
||||
VEC3 mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
@@ -167,12 +167,12 @@ namespace ipl {
|
||||
|
||||
bool is_stopped_all_anm() const;
|
||||
|
||||
void fn_81409864();
|
||||
void calc_exit_sequence();
|
||||
|
||||
void fn_814098F4();
|
||||
void fn_unk_inline();
|
||||
void fn_81409988();
|
||||
void fn_814099EC();
|
||||
void prepare_exit_abort();
|
||||
void wait_decide_se();
|
||||
void start_exit_fade();
|
||||
void finish_exit_reboot();
|
||||
|
||||
int mState; // 0x60
|
||||
int mPrevState; // 0x64
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace ipl {
|
||||
void stt_wait_fns_msg();
|
||||
void stt_wait_terminate();
|
||||
|
||||
int fn_8135B1C0();
|
||||
int getProgressPercent();
|
||||
|
||||
void error_handling();
|
||||
|
||||
|
||||
@@ -336,19 +336,19 @@ namespace ipl {
|
||||
|
||||
BOOL nand_error_handling(int code);
|
||||
|
||||
SEntry* fn_8133A4E0(ESTitleId titleId);
|
||||
u32 fn_8133A57C(ESTitleId titleId);
|
||||
u32 fn_8133A5B8(ESTitleId titleId);
|
||||
BOOL fn_8133A5F0(ESTitleId titleId);
|
||||
BOOL fn_8133A634(ESTitleId titleId);
|
||||
BOOL fn_8133A678(ESTitleId titleId);
|
||||
BOOL fn_8133A6B8(ESTitleId titleId);
|
||||
BOOL fn_8133A73C(ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* fn_8133A85C(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* fn_8133A924(EGG::Heap* heap, ESTitleId titleId);
|
||||
void fn_8133A9F0();
|
||||
void fn_8133AA50(ESTitleId titleId);
|
||||
SEntry* findEntryByTitleId(ESTitleId titleId);
|
||||
u32 getBannerCSIdx(ESTitleId titleId);
|
||||
u32 getSoundSize(ESTitleId titleId);
|
||||
BOOL needsNetSetting(ESTitleId titleId);
|
||||
BOOL usesAltSound(ESTitleId titleId);
|
||||
BOOL isMissingTicket(ESTitleId titleId);
|
||||
BOOL isNewsChannelV6Plus(ESTitleId titleId);
|
||||
BOOL isOperaChannel(ESTitleId titleId);
|
||||
nand::MetaFile* readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::MetaFile* readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
nand::SharedFile* readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId);
|
||||
void clearTmpChannel();
|
||||
void unloadBanner(ESTitleId titleId);
|
||||
|
||||
BOOL isReady() { return mState == FINISH; }
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
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* ptrA, void* ptrB, void* ptrC);
|
||||
void check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC);
|
||||
|
||||
void list_nand_apps_usage_async(void* ptrA, void* ptr);
|
||||
|
||||
@@ -514,7 +514,7 @@ namespace ipl {
|
||||
void do_check_for_sd_app_to_nand();
|
||||
void check_backup_fits();
|
||||
void do_list_nand_apps_usage();
|
||||
void do_unk_8134C838();
|
||||
void do_check_sd_app_titles();
|
||||
|
||||
void do_move_nand_app_to_sd();
|
||||
void do_move_sd_app_to_nand();
|
||||
|
||||
@@ -301,9 +301,9 @@ namespace nw4r {
|
||||
}
|
||||
|
||||
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
|
||||
u32 uVar1 = sException.FPCSR_COPY;
|
||||
uVar1 &= (((uVar1 & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((uVar1 & 0x20000000) != 0) {
|
||||
u32 fpcsr = sException.FPCSR_COPY;
|
||||
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
|
||||
if ((fpcsr & 0x20000000) != 0) {
|
||||
Exception_Printf_(" FPE: Invalid operation\n");
|
||||
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
|
||||
Exception_Printf_(" SNaN\n");
|
||||
@@ -333,16 +333,16 @@ namespace nw4r {
|
||||
Exception_Printf_(" Invalid integer convert\n");
|
||||
}
|
||||
}
|
||||
if ((uVar1 & 0x10000000) != 0) {
|
||||
if ((fpcsr & 0x10000000) != 0) {
|
||||
Exception_Printf_(" FPE: Overflow\n");
|
||||
}
|
||||
if ((uVar1 & 0x8000000) != 0) {
|
||||
if ((fpcsr & 0x8000000) != 0) {
|
||||
Exception_Printf_(" FPE: Underflow\n");
|
||||
}
|
||||
if ((uVar1 & 0x4000000) != 0) {
|
||||
if ((fpcsr & 0x4000000) != 0) {
|
||||
Exception_Printf_(" FPE: Zero division\n");
|
||||
}
|
||||
if ((uVar1 & 0x2000000) != 0) {
|
||||
if ((fpcsr & 0x2000000) != 0) {
|
||||
Exception_Printf_(" FPE: Inexact result\n");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <nw4r/db/assert.h>
|
||||
|
||||
extern "C" const u8 lbl_81695550 = 255;
|
||||
extern "C" const u8 lbl_81695551 = 255;
|
||||
extern "C" const u8 lbl_81695552 = 255;
|
||||
extern "C" const u8 lbl_81695553 = 0;
|
||||
extern "C" char lbl_816719DC[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" const u8 scLytFatalColorR = 255;
|
||||
extern "C" const u8 scLytFatalColorG = 255;
|
||||
extern "C" const u8 scLytFatalColorB = 255;
|
||||
extern "C" const u8 scLytFatalColorA = 0;
|
||||
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
#undef NW4R_ASSERT
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
|
||||
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
|
||||
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
|
||||
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
|
||||
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
extern void* memset(void* dest, s32 val, u32 count);
|
||||
|
||||
extern const u32 lbl_8161E080[64] = {
|
||||
extern const u32 scJpegAanScale[64] = {
|
||||
0x00000100, 0x000000B9, 0x000000C4, 0x000000DA, 0x00000100, 0x00000146, 0x000001D9, 0x000003A0, 0x000000B9, 0x00000085, 0x0000008D,
|
||||
0x0000009D, 0x000000B9, 0x000000EB, 0x00000155, 0x0000029D, 0x000000C4, 0x0000008D, 0x00000096, 0x000000A7, 0x000000C4, 0x000000F9,
|
||||
0x0000016A, 0x000002C6, 0x000000DA, 0x0000009D, 0x000000A7, 0x000000B9, 0x000000DA, 0x00000115, 0x00000192, 0x00000315, 0x00000100,
|
||||
@@ -1424,7 +1424,7 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
s32 r;
|
||||
|
||||
d = tblCopy;
|
||||
*(CopyBlock64*)d = *(CopyBlock64*)lbl_8161E080;
|
||||
*(CopyBlock64*)d = *(CopyBlock64*)scJpegAanScale;
|
||||
|
||||
scaleInfo = (QuantizationTables*)&work->scaleFlag;
|
||||
|
||||
|
||||
@@ -457,7 +457,7 @@ void bta_dm_signal_strength(tBTA_DM_MSG *p_data);
|
||||
|
||||
void bta_dm_acl_change(tBTA_DM_MSG *p_data);
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int, UINT8 app_id, BD_ADDR peer_addr);
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr);
|
||||
|
||||
void bta_dm_keep_acl(tBTA_DM_MSG *p_data);
|
||||
void bta_dm_immediate_disable(void);
|
||||
|
||||
@@ -151,7 +151,7 @@ UINT8 L2CA_SetTraceLevel(UINT8 new_level);
|
||||
UINT8 L2CA_SetDesireRole(UINT8 new_role);
|
||||
BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority);
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 enable);
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *, signed);
|
||||
UINT8 L2CA_Flush(UINT16 cid);
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <revolution/types.h>
|
||||
|
||||
s32 uhf_ker_create_sem(u32 param_1, int param_2);
|
||||
s32 uhf_ker_create_sem(u32 initCount, int flags);
|
||||
s32 uhf_ker_delete_sem(int sem);
|
||||
|
||||
s32 uhf_ker_get_sem(int sem);
|
||||
|
||||
@@ -62,9 +62,9 @@ typedef struct CXUncompContextHuffman {
|
||||
CXHuffmanDecodeTableEntry decodeTableData[0x200]; // 0x20
|
||||
} CXUncompContextHuffman;
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
|
||||
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data);
|
||||
|
||||
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
|
||||
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);
|
||||
|
||||
@@ -40,7 +40,7 @@ ISD_Error ISD_ProbeCard(u32 slot);
|
||||
ISD_Error ISD_MountCard(u32 slot, SDDev** dev);
|
||||
ISD_Error ISD_UnmountCard(SDDev* dev);
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) NO_INLINE;
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) NO_INLINE;
|
||||
|
||||
ISD_Error ISD_ReadBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
ISD_Error ISD_WriteBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
|
||||
|
||||
@@ -33,8 +33,8 @@ typedef struct USBKBDCmdLEDAsync {
|
||||
|
||||
USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback detachCb);
|
||||
|
||||
USBKBDErr USBKBDSetLED(u32, u8, USBKBDCmdLED* cmd);
|
||||
USBKBDErr USBKBDSetLEDAsync(u32, u8, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd);
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
|
||||
|
||||
USBKBDErr USBKBDRegisterEventCallback(USBKBDEventCallback cb);
|
||||
|
||||
|
||||
@@ -1376,7 +1376,7 @@ static void bta_dm_link_quality_cback(tBTM_LINK_QUALITY_RESULTS *p_result)
|
||||
}
|
||||
}
|
||||
|
||||
BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
|
||||
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr)
|
||||
{
|
||||
BOOLEAN status = FALSE;
|
||||
int i;
|
||||
@@ -1399,8 +1399,8 @@ BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
|
||||
}
|
||||
|
||||
static BOOLEAN bta_dm_l2cap_server_compress_cback(
|
||||
BD_ADDR peer_addr, int param_2, int param_3, int param_4,
|
||||
int param_5, int param_6, int param_7, UINT8 **p_mem_pool,
|
||||
BD_ADDR peer_addr, int pe_type, int mem_level, int wbits,
|
||||
int direction, int config, int enable, UINT8 **p_mem_pool,
|
||||
UINT32 *mem_pool_size)
|
||||
{
|
||||
BOOLEAN status = FALSE;
|
||||
|
||||
@@ -22,7 +22,7 @@ void bte_hcisu_send(HC_BT_HDR *p_msg, UINT16 event)
|
||||
GKI_freebuf(p_msg);
|
||||
}
|
||||
|
||||
void bte_hcisu_task(int param_1)
|
||||
void bte_hcisu_task(int unused)
|
||||
{
|
||||
if (p_hcisu_if)
|
||||
{
|
||||
|
||||
@@ -152,11 +152,11 @@ void BTA_CleanUp(tBTA_APP_INFO_CBACK *p_cb)
|
||||
GKI_shutdown();
|
||||
}
|
||||
|
||||
void bta_usb_close_evt(INT8 param_1)
|
||||
void bta_usb_close_evt(INT8 status)
|
||||
{
|
||||
if (_bte_app_info)
|
||||
{
|
||||
if (param_1 >= 0)
|
||||
if (status >= 0)
|
||||
(*_bte_app_info)(0);
|
||||
else
|
||||
(*_bte_app_info)(1);
|
||||
|
||||
@@ -113,20 +113,20 @@ static UINT16 const hcisu_msg_evt_table[] =
|
||||
MSG_HC_TO_STACK_HCI_EVT,
|
||||
};
|
||||
|
||||
void hcisu_h2_usb_cback(UINT8 param_1, INT8 param_2)
|
||||
void hcisu_h2_usb_cback(UINT8 event, INT8 status)
|
||||
{
|
||||
switch (param_1)
|
||||
switch (event)
|
||||
{
|
||||
case 0:
|
||||
break;
|
||||
|
||||
case 4:
|
||||
bta_usb_close_evt(param_2);
|
||||
bta_usb_close_evt(status);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
|
||||
{
|
||||
UINT16 bytes_read = 0;
|
||||
UINT8 byte;
|
||||
@@ -138,7 +138,7 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
if (p_cb->at_0x1e != 2)
|
||||
return 0;
|
||||
|
||||
r27 = param_1 + 1;
|
||||
r27 = pipe + 1;
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
@@ -148,36 +148,36 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
++bytes_read;
|
||||
msg_received = FALSE;
|
||||
|
||||
switch (p_cb->at_0x1a[param_1])
|
||||
switch (p_cb->at_0x1a[pipe])
|
||||
{
|
||||
case 0:
|
||||
if (r27 == 1)
|
||||
{
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_2);
|
||||
p_cb->at_0x14[param_1] = 4;
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_2);
|
||||
p_cb->at_0x14[pipe] = 4;
|
||||
}
|
||||
else if (r27 == 2)
|
||||
{
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_3);
|
||||
p_cb->at_0x14[param_1] = 2;
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_3);
|
||||
p_cb->at_0x14[pipe] = 2;
|
||||
}
|
||||
else if (r27 == 3)
|
||||
{
|
||||
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_1);
|
||||
p_cb->at_0x14[param_1] = 3;
|
||||
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_1);
|
||||
p_cb->at_0x14[pipe] = 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (p_cb->at_0x00[param_1])
|
||||
if (p_cb->at_0x00[pipe])
|
||||
{
|
||||
p_cb->at_0x00[param_1]->len = 0;
|
||||
p_cb->at_0x00[param_1]->event =
|
||||
hcisu_msg_evt_table[p_cb->at_0x14[param_1] - 1];
|
||||
p_cb->at_0x00[param_1]->offset = 0;
|
||||
p_cb->at_0x1a[param_1] = 1;
|
||||
p_cb->at_0x00[pipe]->len = 0;
|
||||
p_cb->at_0x00[pipe]->event =
|
||||
hcisu_msg_evt_table[p_cb->at_0x14[pipe] - 1];
|
||||
p_cb->at_0x00[pipe]->offset = 0;
|
||||
p_cb->at_0x1a[pipe] = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -185,54 +185,54 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
"HCIS: Unable to allocate buffer for incoming HCI "
|
||||
"message.");
|
||||
|
||||
p_cb->at_0x1a[param_1] = 2;
|
||||
p_cb->at_0x1a[pipe] = 2;
|
||||
}
|
||||
|
||||
p_cb->at_0x0c[param_1] =
|
||||
hcisu_preamble_table[p_cb->at_0x14[param_1] - 1];
|
||||
p_cb->at_0x0c[pipe] =
|
||||
hcisu_preamble_table[p_cb->at_0x14[pipe] - 1];
|
||||
|
||||
/* fallthrough */
|
||||
|
||||
case 1:
|
||||
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len++) = byte;
|
||||
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len++) = byte;
|
||||
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
{
|
||||
msg_len = byte;
|
||||
|
||||
if (p_cb->at_0x14[param_1] == 2)
|
||||
if (p_cb->at_0x14[pipe] == 2)
|
||||
{
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
|
||||
|
||||
if ((p_cb->at_0x00[param_1] =
|
||||
if ((p_cb->at_0x00[pipe] =
|
||||
(HC_BT_HDR *)l2cap_link_chk_pkt_start(
|
||||
(BT_HDR *)p_cb->at_0x00[param_1]))
|
||||
(BT_HDR *)p_cb->at_0x00[pipe]))
|
||||
== 0)
|
||||
{
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
|
||||
if (msg_len == 0)
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
else
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
|
||||
if (sizeof(HC_BT_HDR)
|
||||
+ hcisu_preamble_table[p_cb->at_0x14[param_1] - 1]
|
||||
+ hcisu_preamble_table[p_cb->at_0x14[pipe] - 1]
|
||||
+ msg_len
|
||||
> GKI_get_buf_size(p_cb->at_0x00[param_1]))
|
||||
> GKI_get_buf_size(p_cb->at_0x00[pipe]))
|
||||
{
|
||||
GKI_freebuf(p_cb->at_0x00[param_1]);
|
||||
p_cb->at_0x00[param_1] = NULL;
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
GKI_freebuf(p_cb->at_0x00[pipe]);
|
||||
p_cb->at_0x00[pipe] = NULL;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
|
||||
BT_TRACE(HCI, ERROR,
|
||||
"HCIS: Invalid length for incoming HCI message.");
|
||||
@@ -242,85 +242,85 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
|
||||
|
||||
if (msg_len != 0)
|
||||
{
|
||||
p_cb->at_0x1a[param_1] = 3;
|
||||
p_cb->at_0x1a[pipe] = 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_received = TRUE;
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
p_cb->at_0x17[param_1] = byte;
|
||||
p_cb->at_0x17[pipe] = byte;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 2:
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
{
|
||||
msg_len = byte;
|
||||
|
||||
if (p_cb->at_0x14[param_1] == 2)
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
|
||||
if (p_cb->at_0x14[pipe] == 2)
|
||||
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
|
||||
|
||||
p_cb->at_0x0c[param_1] = msg_len;
|
||||
p_cb->at_0x1a[param_1] = 4;
|
||||
p_cb->at_0x0c[pipe] = msg_len;
|
||||
p_cb->at_0x1a[pipe] = 4;
|
||||
}
|
||||
else
|
||||
{
|
||||
p_cb->at_0x17[param_1] = byte;
|
||||
p_cb->at_0x17[pipe] = byte;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 3:
|
||||
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len++) = byte;
|
||||
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len++) = byte;
|
||||
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
len = UUSB_Read(param_1 + 1,
|
||||
(UINT8 *)(p_cb->at_0x00[param_1] + 1)
|
||||
+ p_cb->at_0x00[param_1]->len,
|
||||
p_cb->at_0x0c[param_1]);
|
||||
len = UUSB_Read(pipe + 1,
|
||||
(UINT8 *)(p_cb->at_0x00[pipe] + 1)
|
||||
+ p_cb->at_0x00[pipe]->len,
|
||||
p_cb->at_0x0c[pipe]);
|
||||
|
||||
p_cb->at_0x00[param_1]->len += len;
|
||||
p_cb->at_0x0c[param_1] -= len;
|
||||
p_cb->at_0x00[pipe]->len += len;
|
||||
p_cb->at_0x0c[pipe] -= len;
|
||||
bytes_read += len;
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
{
|
||||
if (p_cb->at_0x14[param_1] == 2
|
||||
if (p_cb->at_0x14[pipe] == 2
|
||||
&& l2cap_link_chk_pkt_end() == 0)
|
||||
{
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_received = TRUE;
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case 4:
|
||||
--p_cb->at_0x0c[param_1];
|
||||
--p_cb->at_0x0c[pipe];
|
||||
|
||||
if (p_cb->at_0x0c[param_1] == 0)
|
||||
p_cb->at_0x1a[param_1] = 0;
|
||||
if (p_cb->at_0x0c[pipe] == 0)
|
||||
p_cb->at_0x1a[pipe] = 0;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (msg_received)
|
||||
{
|
||||
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[param_1]);
|
||||
p_cb->at_0x00[param_1] = NULL;
|
||||
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[pipe]);
|
||||
p_cb->at_0x00[pipe] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -403,7 +403,7 @@ void hcisu_h2_send_msg(tHCISU_H2_CB *p_cb, HC_BT_HDR *p_msg)
|
||||
hcisu_h2_send_msg_now(p_cb, p_msg);
|
||||
}
|
||||
|
||||
void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
|
||||
void hcisu_h2_init(UINT8 taskId, UINT8 mbox, UINT16 bufSize)
|
||||
{
|
||||
hcisu_h2_cb.at_0x1e = 0;
|
||||
|
||||
@@ -411,9 +411,9 @@ void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
|
||||
hcisu_h2_cb.at_0x1a[1] = 0;
|
||||
hcisu_h2_cb.at_0x1a[2] = 0;
|
||||
|
||||
hcisu_h2_cb.at_0x1f = param_1;
|
||||
hcisu_h2_cb.at_0x20 = param_2;
|
||||
hcisu_h2_cb.at_0x12 = param_3;
|
||||
hcisu_h2_cb.at_0x1f = taskId;
|
||||
hcisu_h2_cb.at_0x20 = mbox;
|
||||
hcisu_h2_cb.at_0x12 = bufSize;
|
||||
}
|
||||
|
||||
BOOLEAN hcisu_h2_open(tHCI_CFG *_p_cfg)
|
||||
|
||||
@@ -478,7 +478,7 @@ BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority)
|
||||
}
|
||||
|
||||
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
UINT8 wbits, UINT8 direction, UINT8 param_6,
|
||||
UINT8 wbits, UINT8 direction, UINT8 config,
|
||||
UINT8 enable)
|
||||
{
|
||||
tL2C_LCB *p_lcb;
|
||||
@@ -506,7 +506,7 @@ void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
|
||||
}
|
||||
}
|
||||
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *param_1, int param_2)
|
||||
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *p_callback, int unused)
|
||||
{
|
||||
#if 0
|
||||
/* ... */
|
||||
|
||||
@@ -565,7 +565,7 @@ void UUSB_Open(tUUSB *uusb, tUUSB_CBACK *cback)
|
||||
(void)uusb;
|
||||
}
|
||||
|
||||
UINT16 UUSB_Read(UINT8 param_1, void *param_2, UINT16 param_3)
|
||||
UINT16 UUSB_Read(UINT8 pipe, void *buf, UINT16 len)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -580,7 +580,7 @@ int UUSB_WriteBuf(/* ... */)
|
||||
return 0;
|
||||
}
|
||||
|
||||
UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
|
||||
{
|
||||
short sp18 = 0;
|
||||
IOSError ret = 0;
|
||||
@@ -591,7 +591,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
if (usb.state != 2)
|
||||
return 0;
|
||||
|
||||
switch (param_1)
|
||||
switch (pipe)
|
||||
{
|
||||
case 0:
|
||||
p_buf = GKI_getpoolbuf(usb.cmd_buffer_pool);
|
||||
@@ -656,7 +656,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
memcpy(p_buffer, p_data, len);
|
||||
|
||||
if (len > 190)
|
||||
UUSBDBG(" woah ! thats pretty Big ! :%d", param_3);
|
||||
UUSBDBG(" woah ! thats pretty Big ! :%d", len);
|
||||
|
||||
if (usb.at_0x38 < 5 && usb.bulk_buffer_q.count == 0)
|
||||
{
|
||||
@@ -696,7 +696,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
|
||||
break;
|
||||
}
|
||||
|
||||
(void)param_4;
|
||||
(void)unused;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
char lbl_81693350[0xd0] = {
|
||||
char scCntCacheStrs[0xd0] = {
|
||||
0x3c, 0x3c, 0x20, 0x52, 0x56, 0x4c, 0x5f, 0x53, 0x44, 0x4b, 0x20, 0x2d, 0x20, 0x43, 0x4e, 0x54,
|
||||
0x43, 0x41, 0x43, 0x48, 0x45, 0x20, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x62,
|
||||
0x75, 0x69, 0x6c, 0x64, 0x3a, 0x20, 0x41, 0x70, 0x72, 0x20, 0x32, 0x30, 0x20, 0x32, 0x30, 0x31,
|
||||
@@ -22,12 +22,12 @@ char lbl_81693350[0xd0] = {
|
||||
0x74, 0x20, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00,
|
||||
0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00
|
||||
};
|
||||
char lbl_81693420[0x16] = {
|
||||
char scCntCacheTitleDataFmt[0x16] = {
|
||||
0x2f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2f, 0x25, 0x30, 0x38, 0x78, 0x2f, 0x25, 0x30, 0x38, 0x78,
|
||||
0x2f, 0x64, 0x61, 0x74, 0x61, 0x00,
|
||||
};
|
||||
const char* __CNTCACHEVersion = lbl_81693350;
|
||||
char lbl_816985DC[3] = {0x20, 0x0a, 0x00};
|
||||
const char* __CNTCACHEVersion = scCntCacheStrs;
|
||||
char scCntCacheSpaceNl[3] = {0x20, 0x0a, 0x00};
|
||||
|
||||
extern void _savegpr_23();
|
||||
extern void _restgpr_23();
|
||||
@@ -72,9 +72,9 @@ asm void CNTCACHEClear() {
|
||||
mr r11, r12
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_23
|
||||
lis r30, lbl_81693350@ha
|
||||
lis r30, scCntCacheStrs@ha
|
||||
lis r3, _CNTCACHEMutex@ha
|
||||
addi r30, r30, lbl_81693350@l
|
||||
addi r30, r30, scCntCacheStrs@l
|
||||
li r29, 0
|
||||
addi r3, r3, _CNTCACHEMutex@l
|
||||
bl OSLockMutex
|
||||
@@ -146,7 +146,7 @@ L_184:
|
||||
stb r31, 0(r4)
|
||||
subf r23, r24, r4
|
||||
mr r3, r24
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
cmpwi r3, 0
|
||||
mr r29, r3
|
||||
@@ -246,7 +246,7 @@ asm void _CNTCACHEDeleteTitle() {
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
stw r0, 0x24(r1)
|
||||
stw r31, 0x1c(r1)
|
||||
stw r30, 0x18(r1)
|
||||
@@ -284,7 +284,7 @@ L_350:
|
||||
bl ES_DeleteTitleContent
|
||||
L_364:
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
L_370:
|
||||
cmpwi r3, 0
|
||||
@@ -305,10 +305,10 @@ asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
|
||||
subfic r11, r11, -0x2100
|
||||
stwux r1, r1, r11
|
||||
mflr r0
|
||||
lis r5, lbl_81693420@ha
|
||||
lis r5, scCntCacheTitleDataFmt@ha
|
||||
stw r0, 4(r12)
|
||||
li r0, 1
|
||||
addi r5, r5, lbl_81693420@l
|
||||
addi r5, r5, scCntCacheTitleDataFmt@l
|
||||
stw r31, -4(r12)
|
||||
stw r30, -8(r12)
|
||||
mr r30, r3
|
||||
@@ -403,7 +403,7 @@ asm void _CNTCACHEDeleteContent() {
|
||||
stw r0, 4(r12)
|
||||
bl _savegpr_26
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
li r31, 0
|
||||
li r4, 0
|
||||
@@ -441,10 +441,10 @@ asm void _CNTCACHEDeleteContent() {
|
||||
rlwinm. r0, r3, 0, 0x1b, 0x1b
|
||||
beq L_6f0
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
li r26, 1
|
||||
lis r27, lbl_81693420@ha
|
||||
lis r27, scCntCacheTitleDataFmt@ha
|
||||
b L_6e8
|
||||
L_5b0:
|
||||
stw r31, errno(r0)
|
||||
@@ -488,7 +488,7 @@ L_5e8:
|
||||
li r0, -1
|
||||
stw r26, 0x20(r1)
|
||||
addi r3, r1, 0x40
|
||||
addi r5, r27, lbl_81693420@l
|
||||
addi r5, r27, scCntCacheTitleDataFmt@l
|
||||
stw r26, 0x24(r1)
|
||||
and r6, r30, r0
|
||||
and r7, r29, r0
|
||||
@@ -529,7 +529,7 @@ L_6d4:
|
||||
bdnz L_5e8
|
||||
L_6dc:
|
||||
li r3, 0
|
||||
la r4, lbl_816985DC
|
||||
la r4, scCntCacheSpaceNl
|
||||
bl strtok
|
||||
L_6e8:
|
||||
cmpwi r3, 0
|
||||
|
||||
@@ -221,11 +221,11 @@ CXSecureResult CXSecureUncompressLZ(const void* src, u32 length, void* dst) {
|
||||
return CX_SECURE_ERR_OK;
|
||||
}
|
||||
|
||||
BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
|
||||
const u8* a = param_1;
|
||||
BOOL CXiVerifyHuffmanTable_(const void* table, u8 bitSize) {
|
||||
const u8* a = table;
|
||||
const u8* b = a + 1;
|
||||
u32 c = *a;
|
||||
const u8* d = (u8*)param_1 + ((c + 1) << 1);
|
||||
const u8* d = (u8*)table + ((c + 1) << 1);
|
||||
|
||||
u8 e[sizeof(u8) * 0x40];
|
||||
u32 i;
|
||||
@@ -233,7 +233,7 @@ BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
|
||||
e[i] = 0;
|
||||
}
|
||||
|
||||
if (param_2 == 4 && c >= 16) {
|
||||
if (bitSize == 4 && c >= 16) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
static inline int CXiReadHeader(u8*, int*, const u8*, int, int);
|
||||
static inline CXHuffmanDecodeTableEntry* GetNextNode(CXHuffmanDecodeTableEntry*, int);
|
||||
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
|
||||
context->unk_0x00 = param_2;
|
||||
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
|
||||
context->unk_0x00 = data;
|
||||
context->unk_0x04 = 0;
|
||||
context->unk_0x0e = 0;
|
||||
context->unk_0x0C = 0;
|
||||
@@ -13,8 +13,8 @@ void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
|
||||
context->size = 0;
|
||||
}
|
||||
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2) {
|
||||
context->unk_0x00 = param_2;
|
||||
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
|
||||
context->unk_0x00 = data;
|
||||
context->unk_0x04 = 0;
|
||||
context->unk_0x11 = 0;
|
||||
context->unk_0x12 = 0;
|
||||
@@ -125,7 +125,7 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
|
||||
return CX_STREAMING_ERR_OK;
|
||||
}
|
||||
|
||||
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int param_5) {
|
||||
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int maxOutLen) {
|
||||
int bytesParsed = 0;
|
||||
|
||||
while (*pHdrLen) {
|
||||
@@ -150,8 +150,8 @@ static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize,
|
||||
}
|
||||
}
|
||||
|
||||
if (param_5 > 0 && param_5 < *pOutLen) {
|
||||
*pOutLen = param_5;
|
||||
if (maxOutLen > 0 && maxOutLen < *pOutLen) {
|
||||
*pOutLen = maxOutLen;
|
||||
}
|
||||
|
||||
return bytesParsed;
|
||||
|
||||
@@ -291,7 +291,7 @@ s32 pfd_st_removal_callback(s32 status, void* data) {
|
||||
return 0;
|
||||
}
|
||||
g_pfd_sddrv_info.media_inserted = 0;
|
||||
if (pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
|
||||
if (g_pfd_sddrv_info.media_inserted == 0 && pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
|
||||
g_event = 1;
|
||||
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_inter_callback, &g_event);
|
||||
if (result != 0) {
|
||||
|
||||
@@ -654,7 +654,7 @@ pf_s32 PFENT_MakeRootDir(PF_VOLUME* p_vol) {
|
||||
return 7;
|
||||
}
|
||||
{
|
||||
static pf_u8 default_volume_label[16] = "NO NAME ";
|
||||
static pf_u8 default_volume_label[12] = "NO NAME ";
|
||||
PFDRV_LoadVolumeLabelFromBuf(p_vol, default_volume_label);
|
||||
}
|
||||
return 0;
|
||||
|
||||
@@ -1180,20 +1180,24 @@ s32 PFFAT_GetClusterSpecified(PFFAT_FFD* file, u32 chainIndex,
|
||||
s32 PFFAT_GetClusterAllocated(PFFAT_FFD* file, u32 chainIndex,
|
||||
u32 numClusters, u32* cluster)
|
||||
{
|
||||
u32* start;
|
||||
PF_VOLUME* vol;
|
||||
PFFAT_HINT* hint;
|
||||
u32 fatType;
|
||||
u32 locateStart;
|
||||
u32 locateEnd;
|
||||
s32 error;
|
||||
|
||||
fatType = file->p_vol->bpb.fat_type;
|
||||
start = file->p_start_cluster;
|
||||
vol = file->p_vol;
|
||||
fatType = vol->bpb.fat_type;
|
||||
hint = file->p_hint;
|
||||
if (*file->p_start_cluster == 1) {
|
||||
if (*start == 1) {
|
||||
if (fatType <= FAT_16) {
|
||||
*cluster = -1;
|
||||
return 0;
|
||||
}
|
||||
*file->p_start_cluster = file->p_vol->bpb.root_dir_cluster;
|
||||
*start = vol->bpb.root_dir_cluster;
|
||||
}
|
||||
*cluster = -1;
|
||||
error = find_cluster_in_chain(file, chainIndex, 2, numClusters, 1, cluster);
|
||||
|
||||
@@ -122,6 +122,7 @@ struct NUPContextInfo {
|
||||
OSThread thread;
|
||||
OSMutex mutex;
|
||||
u64 threadStack[0x400];
|
||||
s32 __nupGetBootVersion(ESTitleVersion* title);
|
||||
};
|
||||
|
||||
static const char* __nupStatusMessage[6] = {
|
||||
@@ -487,7 +488,7 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
u8* end = input + length;
|
||||
u32 value = 0;
|
||||
u32 count = 0;
|
||||
static char fillByte = '=';
|
||||
static char pad = '=';
|
||||
|
||||
while (input != end) {
|
||||
count++;
|
||||
@@ -496,39 +497,30 @@ static void __nupBase64Encode(u8* output, u8* input, unsigned long length) {
|
||||
if (count < 3) {
|
||||
continue;
|
||||
}
|
||||
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[0] = encodedFirst;
|
||||
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
|
||||
output[1] = encodedSecond;
|
||||
u8 encodedFourth = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value & 0x3f];
|
||||
output[2] = encodedThird;
|
||||
output[3] = encodedFourth;
|
||||
output[0] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
count = 0;
|
||||
output[1] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
output[2] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
|
||||
output[3] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value & 0x3f];
|
||||
output += 4;
|
||||
}
|
||||
|
||||
if (count == 2) {
|
||||
value <<= 8;
|
||||
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[0] = encodedFirst;
|
||||
u8 encodedThird = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
|
||||
output[1] = encodedSecond;
|
||||
output[2] = encodedThird;
|
||||
output[3] = fillByte;
|
||||
output[0] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[1] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
output[2] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 6 & 0x3f];
|
||||
output[3] = pad;
|
||||
return;
|
||||
}
|
||||
if (count != 1) {
|
||||
return;
|
||||
}
|
||||
value <<= 16;
|
||||
u8 encodedSecond = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
u8 encodedFirst = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[0] = encodedFirst;
|
||||
output[1] = encodedSecond;
|
||||
output[2] = fillByte;
|
||||
output[3] = fillByte;
|
||||
output[0] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 18 & 0x3f];
|
||||
output[1] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"[value >> 12 & 0x3f];
|
||||
output[2] = pad;
|
||||
output[3] = pad;
|
||||
}
|
||||
|
||||
static s32 __nupGetAuditData(NUPContextInfo* context, char** auditData) {
|
||||
@@ -725,7 +717,7 @@ static inline s32 __nupSetBootTitleVersion(ESTitleVersion* title) {
|
||||
return result;
|
||||
}
|
||||
|
||||
static s32 __nupGetBootVersion(NUPContextInfo* context, ESTitleVersion* title) {
|
||||
s32 NUPContextInfo::__nupGetBootVersion(ESTitleVersion* title) {
|
||||
s32 result;
|
||||
ESTmdView* tmdView = 0;
|
||||
|
||||
@@ -736,12 +728,12 @@ static s32 __nupGetBootVersion(NUPContextInfo* context, ESTitleVersion* title) {
|
||||
result = __nupSetBootTitleVersion(title);
|
||||
} else {
|
||||
u32 i;
|
||||
for (i = 0; i < context->ownedTitleCount; i++) {
|
||||
if (context->ownedTitleIds[i] == title->titleId) {
|
||||
for (i = 0; i < ownedTitleCount; i++) {
|
||||
if (ownedTitleIds[i] == title->titleId) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i < context->ownedTitleCount) {
|
||||
if (i < ownedTitleCount) {
|
||||
title->hasTicket = 1;
|
||||
}
|
||||
|
||||
@@ -1174,8 +1166,12 @@ static inline s32 __nupGetBoot2Version(u16* version) {
|
||||
s32 result = ES_GetBoot2Version(&bootVersion);
|
||||
if (result == 0) {
|
||||
u16 checkedVersion = bootVersion;
|
||||
*version = checkedVersion;
|
||||
if (checkedVersion != bootVersion) { result = -0x1389; }
|
||||
if (checkedVersion != bootVersion) {
|
||||
result = -0x1389;
|
||||
}
|
||||
if (checkedVersion != bootVersion) {
|
||||
*version = checkedVersion;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -1194,7 +1190,7 @@ static inline s32 __nupGetOwnedTitles(NUPContextInfo* context) {
|
||||
}
|
||||
|
||||
static inline s32 __nupCheckTitleVersion(NUPContextInfo* context, NUPTitleInfo* title) {
|
||||
s32 result = __nupGetBootVersion(context, (ESTitleVersion*)title);
|
||||
s32 result = context->__nupGetBootVersion((ESTitleVersion*)title);
|
||||
if (result == 0) {
|
||||
if (title->hasTicket && title->hasTmd && title->hasContent &&
|
||||
title->installedVersion >= title->serverVersion) {
|
||||
@@ -1225,11 +1221,11 @@ static inline void __nupSetStatus(NUPContextInfo* context, s32 status) {
|
||||
extern "C" void* __nupOp(void* argument) {
|
||||
u8* response = 0;
|
||||
ESTmdView* tmdView = 0;
|
||||
u32 currentDeviceId;
|
||||
u32 needsAudit;
|
||||
char* auditData = 0;
|
||||
u32 needsAudit;
|
||||
u32 currentDeviceId;
|
||||
s32 result;
|
||||
u16 serverBootVersion = 0;
|
||||
u16 serverBootVersion;
|
||||
u16 bootTitleVersion;
|
||||
u16 systemMenuVersion;
|
||||
ESTitleId currentTitleId;
|
||||
|
||||
@@ -83,8 +83,8 @@ static u8* __nupNhttpBufFull(u8** buffer, unsigned long* length, unsigned long r
|
||||
}
|
||||
done:
|
||||
if (state->error != 0) {
|
||||
next = NULL;
|
||||
*length = 0;
|
||||
next = NULL;
|
||||
}
|
||||
return next;
|
||||
}
|
||||
@@ -101,12 +101,13 @@ static void __nupNhttpReqDone(int result, void* response, HttpState* state) {
|
||||
}
|
||||
|
||||
static int __nupNhttpOp(char* url, NHTTPReqMethod method, char* headers, u8* body, unsigned long bodyLength, unsigned long limit, ProgressCallback progress, void* progressContext, FlushCallback flush, void* flushContext) {
|
||||
unsigned long transferred, expected;
|
||||
int length;
|
||||
char* responseHeaders = NULL;
|
||||
u8* responseBody = NULL;
|
||||
HttpState state;
|
||||
int status;
|
||||
u8* responseBody = NULL;
|
||||
char* responseHeaders = NULL;
|
||||
int length;
|
||||
unsigned long expected;
|
||||
unsigned long transferred;
|
||||
HttpState state;
|
||||
state.error = 0;
|
||||
state.limit = limit;
|
||||
state.received = 0;
|
||||
@@ -130,16 +131,15 @@ static int __nupNhttpOp(char* url, NHTTPReqMethod method, char* headers, u8* bod
|
||||
if (headerCopy == NULL) { result = -5000; goto cleanup; }
|
||||
memcpy(headerCopy, headers, size);
|
||||
char* field = headerCopy;
|
||||
while (*field != 0) {
|
||||
char* colon = strchr(field, ':');
|
||||
if (colon == NULL) break;
|
||||
char* end = strstr(colon, "\r\n");
|
||||
if (end == NULL) break;
|
||||
char* colon;
|
||||
char* end;
|
||||
char* value;
|
||||
while (*field != 0 && (colon = strchr(field, ':')) != NULL && (end = strstr(colon, "\r\n")) != NULL) {
|
||||
*colon = 0;
|
||||
*end = 0;
|
||||
while (*field && isspace(*field)) field++;
|
||||
do { colon++; } while (*colon && isspace(*colon));
|
||||
if (NHTTPAddHeaderField(request, field, colon) != 0) { result = -7000 - NHTTPGetError(); goto cleanup; }
|
||||
value = colon + 1; while (*value && isspace(*value)) value++;
|
||||
if (NHTTPAddHeaderField(request, field, value) != 0) { result = -7000 - NHTTPGetError(); goto cleanup; }
|
||||
field = end + 2;
|
||||
}
|
||||
}
|
||||
@@ -153,40 +153,44 @@ static int __nupNhttpOp(char* url, NHTTPReqMethod method, char* headers, u8* bod
|
||||
if (method == NHTTP_POST && body != NULL && bodyLength != 0 && NHTTPAddPostDataRaw(request, body, bodyLength) != 0) { result = -7000 - NHTTPGetError(); goto cleanup; }
|
||||
requestId = NHTTPSendRequestAsync(request);
|
||||
if (requestId < 0) {
|
||||
int error = NHTTPGetError();
|
||||
result = -7000 - NHTTPGetError();
|
||||
NHTTPDeleteRequest(request);
|
||||
result = -7000 - error;
|
||||
goto cleanup;
|
||||
}
|
||||
state.lastActivity = OSGetTime();
|
||||
for (;;) {
|
||||
if (NHTTPGetProgress(&expected, &transferred) != 0 && state.done != 0) {
|
||||
if (state.result != 0) { result = -7000 - state.result; goto cleanup; }
|
||||
if (state.response != NULL) {
|
||||
length = NHTTPGetBodyAll(state.response, &responseBody);
|
||||
if (length < 0) { result = -5007; goto cleanup; }
|
||||
__nupNhttpBufFull(&responseBody, (unsigned long*)&length, 0, NULL, NULL, &state);
|
||||
}
|
||||
result = state.error;
|
||||
if (result != 0 || state.response == NULL) goto cleanup;
|
||||
length = NHTTPGetHeaderAll(state.response, &responseHeaders);
|
||||
if (length < 0) { result = -5007; goto cleanup; }
|
||||
char* protocol = strstr(responseHeaders, "HTTP/");
|
||||
if (protocol != NULL && sscanf(protocol, "HTTP/%*d.%*d %d", &status) == 1) {
|
||||
if (status != 200 && status != 202) result = -5000 - status;
|
||||
goto cleanup;
|
||||
while (NHTTPGetProgress(&expected, &transferred) == 0 || state.done == 0) {
|
||||
if (OSGetTime() - state.lastActivity >= OSMillisecondsToTicks((OSTime)90000)) {
|
||||
if (requestId >= 0) {
|
||||
NHTTPCancelRequestAsync(requestId);
|
||||
NCDSleep(OSMillisecondsToTicks(100));
|
||||
}
|
||||
result = -5009;
|
||||
goto cleanup;
|
||||
}
|
||||
NCDSleep(OSMillisecondsToTicks(100));
|
||||
}
|
||||
if (state.result != 0) { result = -7000 - state.result; goto cleanup; }
|
||||
if (state.response != NULL) {
|
||||
length = NHTTPGetBodyAll(state.response, &responseBody);
|
||||
if (length < 0) { result = -5007; goto cleanup; }
|
||||
__nupNhttpBufFull(&responseBody, (unsigned long*)&length, 0, NULL, NULL, &state);
|
||||
}
|
||||
if (state.error != 0) {
|
||||
result = state.error;
|
||||
goto cleanup;
|
||||
}
|
||||
if (state.response == NULL) goto cleanup;
|
||||
length = NHTTPGetHeaderAll(state.response, &responseHeaders);
|
||||
if (length < 0) { result = -5007; goto cleanup; }
|
||||
{
|
||||
char* protocol = strstr(responseHeaders, "HTTP/");
|
||||
if (protocol == NULL || sscanf(protocol, "HTTP/%*d.%*d %d", &status) != 1) {
|
||||
result = -5007;
|
||||
goto cleanup;
|
||||
}
|
||||
if (OSGetTime() - state.lastActivity >= OSMillisecondsToTicks(90000)) break;
|
||||
NCDSleep(OSMillisecondsToTicks(100));
|
||||
if (status != 200 && status != 202) result = -5000 - status;
|
||||
goto cleanup;
|
||||
}
|
||||
if (requestId >= 0) {
|
||||
NHTTPCancelRequestAsync(requestId);
|
||||
NCDSleep(OSMillisecondsToTicks(100));
|
||||
}
|
||||
result = -5009;
|
||||
cleanup:
|
||||
if (state.response != NULL || result == -5009) NHTTPDestroyResponse(state.response);
|
||||
if (headerCopy != NULL) nup::__nupFree(headerCopy);
|
||||
@@ -200,7 +204,7 @@ static long __nupHttpStringFlush(u8* data, unsigned long length, unsigned long r
|
||||
total = length + text->length;
|
||||
long result = 0;
|
||||
if (total > text->capacity) {
|
||||
if (requested >= total) {} else {
|
||||
if (requested < total) {
|
||||
requested = text->growth + total;
|
||||
text->growth <<= 1;
|
||||
if (text->growth < text->maximumGrowth) {} else text->growth = text->maximumGrowth;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#define SD_SLOT_PATH_LENGTH 32
|
||||
|
||||
char lbl_81691748[] = " +++ SD RESET Failed: %d +++\n\0"
|
||||
char __sdPathData[] = " +++ SD RESET Failed: %d +++\n\0"
|
||||
"/dev/sdio/slot0\0/dev/sdio/slot1\0/dev/sdio/slotw";
|
||||
|
||||
typedef void (*SDCallbackFunc)(s32, void*);
|
||||
@@ -55,17 +55,17 @@ enum {
|
||||
|
||||
static IOSFd sduOpenFD(u32 slot);
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg);
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg);
|
||||
|
||||
static ISD_Error sduDatabuswidth(SDDev* dev, u32 buswidth);
|
||||
static ISD_Error sduGetSCR(SDDev* dev, u32* data) NO_INLINE;
|
||||
static ISD_Error sduGetOCR(SDDev* dev, u32* data);
|
||||
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
|
||||
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4);
|
||||
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
|
||||
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize);
|
||||
|
||||
IOSError __sdCb(s32 result, void* arg) {
|
||||
__sdCbArg* data = (__sdCbArg*)arg;
|
||||
@@ -73,7 +73,7 @@ IOSError __sdCb(s32 result, void* arg) {
|
||||
switch (data->unk_0x0C) {
|
||||
case 4: {
|
||||
if (result != 0) {
|
||||
OSReport(lbl_81691748, result);
|
||||
OSReport(__sdPathData, result);
|
||||
data->dev->SDDevRca = 0;
|
||||
} else {
|
||||
if (data->dev != NULL) {
|
||||
@@ -106,33 +106,33 @@ IOSError __sdCb(s32 result, void* arg) {
|
||||
return result;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) {
|
||||
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) {
|
||||
IOSError ret;
|
||||
|
||||
if (__sdHeapId[0] < 0) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
__sdReg[0] = param_2;
|
||||
__sdReg[3] = param_4;
|
||||
__sdReg[0] = reg;
|
||||
__sdReg[3] = size;
|
||||
__sdReg[4] = 0;
|
||||
|
||||
if (param_3 != NULL) {
|
||||
if (outValue != NULL) {
|
||||
ret = IOS_Ioctl(dev->SDDevFd, SD_IOCTL_2, __sdReg, 0x18, __sdCmdBuffer, 4);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
*param_3 = *__sdCmdBuffer;
|
||||
*outValue = *__sdCmdBuffer;
|
||||
return ret;
|
||||
}
|
||||
|
||||
return SD_ERROR_FATAL;
|
||||
}
|
||||
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* status) {
|
||||
IOSError ret = SD_ERROR_FATAL;
|
||||
|
||||
if (__sdHeapId[0] >= 0 && param_2 != NULL) {
|
||||
if (__sdHeapId[0] >= 0 && status != NULL) {
|
||||
OSLockMutex(&__reqMutex);
|
||||
|
||||
if (__sdReq != 0) {
|
||||
@@ -145,7 +145,7 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
} else {
|
||||
*param_2 = *__sdCmdBuffer;
|
||||
*status = *__sdCmdBuffer;
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -154,13 +154,13 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
IOSError ret;
|
||||
u32 readCount, writeCount;
|
||||
u32* sdCmd;
|
||||
|
||||
if (param_9 != 0) {
|
||||
if (dma != 0) {
|
||||
readCount = 2;
|
||||
writeCount = 1;
|
||||
} else {
|
||||
@@ -216,7 +216,7 @@ static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
|
||||
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
|
||||
void* cb, void* cbArg) {
|
||||
ISD_Error ret;
|
||||
u32* sdCmd;
|
||||
@@ -232,7 +232,7 @@ static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
|
||||
sdCmd[6] = buffer;
|
||||
sdCmd[4] = blockCount;
|
||||
sdCmd[5] = sectorSize;
|
||||
sdCmd[7] = param_9;
|
||||
sdCmd[7] = dma;
|
||||
|
||||
if (resp != NULL) {
|
||||
if (cb != NULL) {
|
||||
@@ -365,7 +365,7 @@ ISD_Error ISD_WriteMultiBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSi
|
||||
return ISD_WriteMultiBlockAsync(dev, offset, cmdResp, cmdRespSize, 0, 0);
|
||||
}
|
||||
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ret;
|
||||
u32 status;
|
||||
|
||||
@@ -435,12 +435,12 @@ ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRe
|
||||
|
||||
DCInvalidateRange(cmdResp, cmdRespSize << 9);
|
||||
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (param_5 == 0) {
|
||||
if (callback == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -449,7 +449,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
|
||||
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
|
||||
ISD_Error ret;
|
||||
u32 status;
|
||||
|
||||
@@ -519,12 +519,12 @@ ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdR
|
||||
|
||||
DCFlushRange(cmdResp, cmdRespSize << 9);
|
||||
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
|
||||
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
|
||||
if (ret != IPC_RESULT_OK) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
|
||||
if (param_5 == 0) {
|
||||
if (callback == 0) {
|
||||
__sdReq = 0;
|
||||
}
|
||||
}
|
||||
@@ -570,7 +570,7 @@ ISD_Error ISD_UnmountCard(SDDev* dev) {
|
||||
|
||||
ISD_Error ISD_InitCard() {
|
||||
static u8* lo;
|
||||
char* paths = lbl_81691748;
|
||||
char* paths = __sdPathData;
|
||||
ISD_Error ret = SD_ERROR_SUCCESS;
|
||||
BOOL enabled;
|
||||
|
||||
@@ -782,7 +782,7 @@ static ISD_Error sduGetOCR(SDDev* dev, u32* data) {
|
||||
}
|
||||
|
||||
#ifdef __MWERKS__
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* param_2, register u32* param_3, register u32* param_4) {
|
||||
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* outSize, register u32* outSize2, register u32* outSectorSize) {
|
||||
nofralloc
|
||||
|
||||
stwu r1, -0x30(r1)
|
||||
@@ -859,13 +859,13 @@ ISD_GetCardSize_store:
|
||||
stw r5, 0x18(r28)
|
||||
stw r0, 0x1c(r28)
|
||||
stw r3, 0x20(r28)
|
||||
beq ISD_GetCardSize_no_param2
|
||||
beq ISD_GetCardSize_no_outSize
|
||||
stw r3, 0(r29)
|
||||
ISD_GetCardSize_no_param2:
|
||||
ISD_GetCardSize_no_outSize:
|
||||
cmpwi r30, 0
|
||||
beq ISD_GetCardSize_no_param3
|
||||
beq ISD_GetCardSize_no_outSize2
|
||||
stw r3, 0(r30)
|
||||
ISD_GetCardSize_no_param3:
|
||||
ISD_GetCardSize_no_outSize2:
|
||||
cmpwi r31, 0
|
||||
beq ISD_GetCardSize_success_return
|
||||
li r0, 0x200
|
||||
@@ -884,7 +884,7 @@ ISD_GetCardSize_return:
|
||||
blr
|
||||
}
|
||||
#else
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4) {
|
||||
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize) {
|
||||
ISD_Error ret;
|
||||
u32 out0;
|
||||
u32 out1;
|
||||
@@ -915,14 +915,14 @@ ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4)
|
||||
dev->SDSectorNum = out1;
|
||||
dev->SDDevSize = out2;
|
||||
|
||||
if (param_2 != NULL) {
|
||||
*param_2 = out2;
|
||||
if (outSize != NULL) {
|
||||
*outSize = out2;
|
||||
}
|
||||
if (param_3 != NULL) {
|
||||
*param_3 = out2;
|
||||
if (outSize2 != NULL) {
|
||||
*outSize2 = out2;
|
||||
}
|
||||
if (param_4 != NULL) {
|
||||
*param_4 = 512;
|
||||
if (outSectorSize != NULL) {
|
||||
*outSectorSize = 512;
|
||||
}
|
||||
|
||||
return SD_ERROR_SUCCESS;
|
||||
|
||||
@@ -34,13 +34,13 @@ static void uhf_ker_sem_inline_1() {
|
||||
}
|
||||
}
|
||||
|
||||
s32 uhf_ker_create_sem(u32 param_1, int param_2) {
|
||||
s32 uhf_ker_create_sem(u32 initCount, int flags) {
|
||||
int i, k;
|
||||
|
||||
if (param_1 != 0 && param_1 != 1) {
|
||||
if (initCount != 0 && initCount != 1) {
|
||||
return -5;
|
||||
}
|
||||
if (param_2 != 0) {
|
||||
if (flags != 0) {
|
||||
return -5;
|
||||
}
|
||||
|
||||
@@ -60,13 +60,13 @@ s32 uhf_ker_create_sem(u32 param_1, int param_2) {
|
||||
OSInitSemaphore(&st_uhf_ker_sem[i], 1);
|
||||
sem = &st_uhf_ker_sem[i];
|
||||
|
||||
for (k = (int)(1 - param_1); k > 0; k--) {
|
||||
for (k = (int)(1 - initCount); k > 0; k--) {
|
||||
OSWaitSemaphore((OSSemaphore*)sem);
|
||||
}
|
||||
|
||||
st_uhs_ker_sem_mng.entries[i].sem = sem;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x04 = param_1;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x08 = param_2;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x04 = initCount;
|
||||
st_uhs_ker_sem_mng.entries[i].unk_0x08 = flags;
|
||||
st_uhs_ker_sem_mng.unk_0x90++;
|
||||
|
||||
uhf_ker_sem_inline_1();
|
||||
|
||||
@@ -96,13 +96,13 @@ USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback d
|
||||
return USB_KBD_ERR_OK;
|
||||
}
|
||||
|
||||
USBKBDErr USBKBDSetLED(u32 param_1, u8 param_2, USBKBDCmdLED* cmd) {
|
||||
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd) {
|
||||
if (usbKbdFd < 0) {
|
||||
return USB_KBD_ERR_NOT_INIT;
|
||||
}
|
||||
|
||||
cmd->unk_0x04 = param_2;
|
||||
cmd->unk_0x00 = param_1;
|
||||
cmd->unk_0x04 = ledBits;
|
||||
cmd->unk_0x00 = device;
|
||||
|
||||
return IOS_Write(usbKbdFd, cmd, sizeof(USBKBDCmdLED)) != IPC_RESULT_OK ? USB_KBD_ERR_FATAL : USB_KBD_ERR_OK;
|
||||
}
|
||||
@@ -114,12 +114,12 @@ static IOSError usbKbdSetLEDHandler(IOSError error, void* arg) {
|
||||
return IPC_RESULT_OK;
|
||||
}
|
||||
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 param_1, u8 param_2, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg) {
|
||||
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg) {
|
||||
if (usbKbdFd < 0) {
|
||||
return USB_KBD_ERR_NOT_INIT;
|
||||
}
|
||||
cmd->base.unk_0x00 = param_1;
|
||||
cmd->base.unk_0x04 = param_2;
|
||||
cmd->base.unk_0x00 = device;
|
||||
cmd->base.unk_0x04 = ledBits;
|
||||
cmd->cb = cb;
|
||||
cmd->cbArg = cbArg;
|
||||
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
#define DPD_CONFIG2_SIZE 2
|
||||
#define SPK_CONFIG_SIZE 7
|
||||
|
||||
char lbl_81687720[] = "<< RVL_SDK - WPAD \trelease build: Apr 20 2010 11:20:55 (0x4199_60831) >>";
|
||||
const char* __WPADVersion = lbl_81687720;
|
||||
char scWpadVersionStr[] = "<< RVL_SDK - WPAD \trelease build: Apr 20 2010 11:20:55 (0x4199_60831) >>";
|
||||
const char* __WPADVersion = scWpadVersionStr;
|
||||
|
||||
WPADStorage _wpd;
|
||||
WPADCB* _wpdcb[WPAD_MAX_CONTROLLERS];
|
||||
@@ -617,7 +617,7 @@ static void __reconnect(BOOL exec) {
|
||||
WUDShutdown(exec);
|
||||
}
|
||||
#ifdef __MWERKS__
|
||||
char lbl_81687810[0x58] = "Reconnect Start!!\n\0\0\0\0\0\0"
|
||||
char scWpadManageStrs[0x58] = "Reconnect Start!!\n\0\0\0\0\0\0"
|
||||
"Check the update of WiFi using channel\n\0"
|
||||
"WiFi uses channel = %d\n";
|
||||
extern void _savegpr_19();
|
||||
@@ -629,8 +629,8 @@ static asm void WPADiManageHandler(OSAlarm* pAlarm, OSContext* pContext) {
|
||||
stw r0, 0x164(r1)
|
||||
addi r11, r1, 0x160
|
||||
bl _savegpr_19
|
||||
lis r28, lbl_81687720@ha
|
||||
addi r28, r28, lbl_81687720@l
|
||||
lis r28, scWpadVersionStr@ha
|
||||
addi r28, r28, scWpadVersionStr@l
|
||||
bl WUDGetStatus
|
||||
cmpwi r3, 0x3
|
||||
beq WPADiManageHandler_8AC8
|
||||
|
||||
@@ -8,10 +8,10 @@ extern u32 CDBGetInitialCode();
|
||||
extern void CDBLock();
|
||||
extern CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flags);
|
||||
extern void CDBUnlock();
|
||||
extern void CDBDatabaseFree();
|
||||
extern void CDBRecordCreateAtOnce();
|
||||
extern void CDBRecordInitDescriptor();
|
||||
extern void CDBRecordIsExistFile();
|
||||
extern CDBErr CDBDatabaseFree(CDBDatabase* database);
|
||||
extern CDBErr CDBRecordCreateAtOnce(CDBRecord* record, CDBDatabase* database, const char* desc, char* fileType, CDBDate epoch, int gameCode, u16 makerCode, void* buffer, u32 size);
|
||||
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
|
||||
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
|
||||
extern void CDBRecordOpenReadOnly();
|
||||
extern void CDBRecordKeyArrayInit();
|
||||
extern void CDBRecordKeyArraySetReverse();
|
||||
@@ -95,7 +95,7 @@ extern CDBErr CDBDatabaseCreateRecordAtOnce();
|
||||
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
|
||||
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
|
||||
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_();
|
||||
extern CDBErr CDBDatabaseCreateRecordImAtOnce_();
|
||||
extern CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize);
|
||||
extern CDBErr CDBDatabaseFindByKey();
|
||||
typedef struct {
|
||||
CDBDate beginDate;
|
||||
@@ -117,9 +117,9 @@ extern CDBErr CDBDatabaseSearchMinuteLayer();
|
||||
extern CDBErr CDBDatabaseSearchHourLayer();
|
||||
extern CDBErr CDBDatabaseSearchDayLayer();
|
||||
extern CDBErr CDBDatabaseSearchMonthLayer();
|
||||
extern CDBErr CDBDatabaseSearchYearLayer();
|
||||
extern CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions* conditions, CDBRecordLocation recordLocation);
|
||||
extern CDBErr CDBDatabaseSearch();
|
||||
extern CDBErr CDBDatabaseSearch_();
|
||||
extern CDBErr CDBDatabaseSearch_(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCodeStr, char* gameCodeStr, char* type, CDBRecordLocation recordLocation, BOOL openRecord, CDBSearchRecordCB searchRecordCB, void* searchRecordArg, u64* wiiId);
|
||||
typedef struct {
|
||||
u32 used;
|
||||
u8 state[0xC00C];
|
||||
@@ -157,59 +157,27 @@ CDBErr CDBDatabaseOpen(CDBDatabase* database) {
|
||||
return result;
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseClose(CDBDatabase* database) {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
stw r30, 0x8(r1)
|
||||
mr r30, r3
|
||||
bl CDBLock
|
||||
lwz r31, 0x8(r30)
|
||||
cmpwi r31, 0x0
|
||||
beq L_8148746C
|
||||
addis r3, r31, 0x1
|
||||
lwz r0, -0x3ff0(r3)
|
||||
cmpwi r0, 0x0
|
||||
bne L_8148749C
|
||||
L_8148746C:
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_81487494
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B528@ha
|
||||
addi r3, r3, lbl_8166B528@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_81487494:
|
||||
li r31, 0x1b
|
||||
b L_814874C4
|
||||
L_8148749C:
|
||||
mr r3, r30
|
||||
bl CDBDatabaseFree
|
||||
cmpwi r3, 0x0
|
||||
beq L_814874B4
|
||||
mr r31, r3
|
||||
b L_814874C4
|
||||
L_814874B4:
|
||||
addis r3, r31, 0x1
|
||||
li r0, 0x0
|
||||
stw r0, -0x3ff0(r3)
|
||||
li r31, 0x0
|
||||
L_814874C4:
|
||||
bl CDBUnlock
|
||||
mr r3, r31
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 0x8(r1)
|
||||
lwz r0, 0x14(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
#endif
|
||||
CDBErr CDBDatabaseClose(CDBDatabase* database) {
|
||||
CDBErr result;
|
||||
CDBErr status;
|
||||
CDBDatabaseState* instance;
|
||||
|
||||
CDBLock();
|
||||
instance = database->instance;
|
||||
if (instance == NULL || instance->flags == 0) {
|
||||
CDBReportError(lbl_8166B528);
|
||||
result = CDB_ERROR_27;
|
||||
} else {
|
||||
status = CDBDatabaseFree(database);
|
||||
if (status != CDB_ERROR_OK) {
|
||||
result = status;
|
||||
} else {
|
||||
instance->flags = 0;
|
||||
result = CDB_ERROR_OK;
|
||||
}
|
||||
}
|
||||
CDBUnlock();
|
||||
return result;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabasePrivateCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, char* makerCodeStr, char* gameCodeStr) {
|
||||
@@ -428,169 +396,50 @@ asm CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_() {
|
||||
#endif
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseCreateRecordImAtOnce_() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x40(r1)
|
||||
mflr r0
|
||||
stw r0, 0x44(r1)
|
||||
addi r11, r1, 0x40
|
||||
bl _savegpr_24
|
||||
lwz r11, 0x8(r3)
|
||||
mr r24, r3
|
||||
lwz r30, 0x48(r1)
|
||||
mr r25, r4
|
||||
cmpwi r11, 0x0
|
||||
lwz r31, 0x4c(r1)
|
||||
mr r26, r5
|
||||
mr r27, r6
|
||||
mr r28, r9
|
||||
mr r29, r10
|
||||
bne L_81487974
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148796C
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B550@ha
|
||||
addi r3, r3, lbl_8166B550@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_8148796C:
|
||||
li r3, 0x1b
|
||||
b L_81487A3C
|
||||
L_81487974:
|
||||
addis r3, r11, 0x1
|
||||
lwz r3, -0x3ff0(r3)
|
||||
rlwinm. r0, r3, 0, 30, 30
|
||||
bne L_814879EC
|
||||
cmpwi r3, 0x0
|
||||
bne L_814879BC
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_814879B4
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B550@ha
|
||||
addi r3, r3, lbl_8166B550@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_814879B4:
|
||||
li r3, 0x1b
|
||||
b L_81487A3C
|
||||
L_814879BC:
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_814879E4
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B57C@ha
|
||||
addi r3, r3, lbl_8166B57C@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_814879E4:
|
||||
li r3, 0x1a
|
||||
b L_81487A3C
|
||||
L_814879EC:
|
||||
lis r4, 0x8000
|
||||
mr r3, r7
|
||||
lwz r0, 0xf8(r4)
|
||||
mr r4, r8
|
||||
li r5, 0x0
|
||||
srwi r6, r0, 2
|
||||
bl __div2i
|
||||
stw r4, 0x10(r1)
|
||||
addi r3, r1, 0x10
|
||||
bl CDBClampCDBDate
|
||||
stw r31, 0x8(r1)
|
||||
mr r3, r25
|
||||
mr r4, r24
|
||||
mr r5, r26
|
||||
lwz r7, 0x10(r1)
|
||||
mr r6, r27
|
||||
mr r8, r28
|
||||
mr r9, r29
|
||||
mr r10, r30
|
||||
bl CDBRecordCreateAtOnce
|
||||
L_81487A3C:
|
||||
addi r11, r1, 0x40
|
||||
bl _restgpr_24
|
||||
lwz r0, 0x44(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x40
|
||||
blr
|
||||
#endif
|
||||
CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize) {
|
||||
CDBDatabaseState* instance;
|
||||
int flags;
|
||||
CDBDate date;
|
||||
|
||||
instance = database->instance;
|
||||
if (instance == NULL) {
|
||||
CDBReportError(lbl_8166B550);
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
|
||||
flags = instance->flags;
|
||||
if ((flags & 2) == 0) {
|
||||
if (flags == 0) {
|
||||
CDBReportError(lbl_8166B550);
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
CDBReportError(lbl_8166B57C);
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
|
||||
date = time / (OS_BUS_CLOCK / 4);
|
||||
CDBClampCDBDate(&date);
|
||||
return CDBRecordCreateAtOnce(record, database, typeStr, (char*)fileTypeStr, date, gameCode, makerCode, recordData, recordDataSize);
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseFindByKey() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
stw r0, 0x24(r1)
|
||||
stw r31, 0x1c(r1)
|
||||
mr r31, r5
|
||||
stw r30, 0x18(r1)
|
||||
mr r30, r4
|
||||
stw r29, 0x14(r1)
|
||||
mr r29, r3
|
||||
bl CDBLock
|
||||
mr r3, r31
|
||||
bl CDBRecordKeyIsValid
|
||||
cmpwi r3, 0x0
|
||||
bne L_81487ABC
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_81487AB4
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B5A8@ha
|
||||
addi r3, r3, lbl_8166B5A8@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_81487AB4:
|
||||
li r31, 0x5
|
||||
b L_81487B14
|
||||
L_81487ABC:
|
||||
mr r3, r30
|
||||
mr r4, r29
|
||||
mr r5, r31
|
||||
bl CDBRecordInitDescriptor
|
||||
mr r3, r30
|
||||
bl CDBRecordIsExistFile
|
||||
cmpwi r3, 0x0
|
||||
bne L_81487B10
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_81487B08
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B5B8@ha
|
||||
mr r4, r31
|
||||
addi r3, r3, lbl_8166B5B8@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_81487B08:
|
||||
li r31, 0x23
|
||||
b L_81487B14
|
||||
L_81487B10:
|
||||
li r31, 0x0
|
||||
L_81487B14:
|
||||
bl CDBUnlock
|
||||
mr r3, r31
|
||||
lwz r31, 0x1c(r1)
|
||||
lwz r30, 0x18(r1)
|
||||
lwz r29, 0x14(r1)
|
||||
lwz r0, 0x24(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
#endif
|
||||
CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordKey* recordKey) {
|
||||
CDBErr result;
|
||||
|
||||
CDBLock();
|
||||
if (!CDBRecordKeyIsValid(recordKey)) {
|
||||
CDBReportError(lbl_8166B5A8);
|
||||
result = CDB_ERROR_5;
|
||||
} else {
|
||||
CDBRecordInitDescriptor(record, database, recordKey);
|
||||
if (!CDBRecordIsExistFile(record)) {
|
||||
CDBReportError(lbl_8166B5B8, recordKey->keyString);
|
||||
result = CDB_ERROR_CANNOT_OPEN_FILE;
|
||||
} else {
|
||||
result = CDB_ERROR_OK;
|
||||
}
|
||||
}
|
||||
CDBUnlock();
|
||||
return result;
|
||||
}
|
||||
|
||||
CDBErr CDBDatabaseSearchConditionsIsMatch(CDBSearchConditions* conditions, char* key) {
|
||||
@@ -2256,7 +2105,7 @@ asm CDBErr CDBDatabaseSearchMonthLayer() {
|
||||
#endif
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseSearchYearLayer() {
|
||||
asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions* conditions, CDBRecordLocation recordLocation) {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x90(r1)
|
||||
@@ -2512,74 +2361,38 @@ asm CDBErr CDBDatabaseSearchYearLayer() {
|
||||
CDBErr CDBDatabaseSearch(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCode, char* gameCode, int unk7, CDBRecordLocation recordLocation, int unk9, CDBSearchRecordCB searchRecordCB, void* searchRecordArg) {
|
||||
CDBErr result;
|
||||
CDBLock();
|
||||
result = CDBDatabaseSearch_(database, beginDate, endDate, searchDirection, makerCode, gameCode, unk7, recordLocation, unk9, searchRecordCB, searchRecordArg, NULL);
|
||||
result = CDBDatabaseSearch_(database, beginDate, endDate, searchDirection, makerCode, gameCode, (char*)unk7, recordLocation, unk9, searchRecordCB, searchRecordArg, NULL);
|
||||
CDBUnlock();
|
||||
return result;
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseSearch_() {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x60(r1)
|
||||
mflr r0
|
||||
stw r0, 0x64(r1)
|
||||
addi r11, r1, 0x60
|
||||
bl _savegpr_24
|
||||
cmplw r4, r5
|
||||
lwz r28, 0x68(r1)
|
||||
lwz r29, 0x6c(r1)
|
||||
mr r24, r3
|
||||
lwz r30, 0x70(r1)
|
||||
mr r25, r8
|
||||
lwz r31, 0x74(r1)
|
||||
mr r26, r9
|
||||
mr r27, r10
|
||||
bge L_81489764
|
||||
stw r4, 0x8(r1)
|
||||
stw r5, 0xc(r1)
|
||||
b L_8148976C
|
||||
L_81489764:
|
||||
stw r5, 0x8(r1)
|
||||
stw r4, 0xc(r1)
|
||||
L_8148976C:
|
||||
stw r6, 0x1c(r1)
|
||||
mr r3, r7
|
||||
addi r4, r1, 0x10
|
||||
bl CDBConvMCStrToMCValue
|
||||
mr r3, r25
|
||||
addi r4, r1, 0x14
|
||||
bl CDBConvGCStrToGCValue
|
||||
li r0, 0x1
|
||||
cmpwi r31, 0x0
|
||||
stw r26, 0x18(r1)
|
||||
stw r29, 0x20(r1)
|
||||
stw r30, 0x24(r1)
|
||||
stw r0, 0x28(r1)
|
||||
stw r28, 0x2c(r1)
|
||||
bne L_814897B8
|
||||
li r0, 0x0
|
||||
stw r0, 0x34(r1)
|
||||
stw r0, 0x30(r1)
|
||||
b L_814897C8
|
||||
L_814897B8:
|
||||
lwz r0, 0x0(r31)
|
||||
lwz r3, 0x4(r31)
|
||||
stw r3, 0x34(r1)
|
||||
stw r0, 0x30(r1)
|
||||
L_814897C8:
|
||||
mr r3, r24
|
||||
mr r5, r27
|
||||
addi r4, r1, 0x8
|
||||
bl CDBDatabaseSearchYearLayer
|
||||
addi r11, r1, 0x60
|
||||
bl _restgpr_24
|
||||
lwz r0, 0x64(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x60
|
||||
blr
|
||||
#endif
|
||||
CDBErr CDBDatabaseSearch_(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCodeStr, char* gameCodeStr, char* type, CDBRecordLocation recordLocation, BOOL openRecord, CDBSearchRecordCB searchRecordCB, void* searchRecordArg, u64* wiiId) {
|
||||
CDBSearchConditions conditions;
|
||||
|
||||
if (beginDate < endDate) {
|
||||
conditions.beginDate = beginDate;
|
||||
conditions.endDate = endDate;
|
||||
} else {
|
||||
conditions.beginDate = endDate;
|
||||
conditions.endDate = beginDate;
|
||||
}
|
||||
conditions.direction = searchDirection;
|
||||
CDBConvMCStrToMCValue(makerCodeStr, &conditions.makerCode);
|
||||
CDBConvGCStrToGCValue(gameCodeStr, &conditions.gameCode);
|
||||
conditions.type = type;
|
||||
conditions.callback = searchRecordCB;
|
||||
conditions.callbackArg = searchRecordArg;
|
||||
conditions.keepSearching = TRUE;
|
||||
conditions.openRecord = openRecord;
|
||||
if (wiiId == NULL) {
|
||||
conditions.wiiId = 0;
|
||||
} else {
|
||||
conditions.wiiId = *wiiId;
|
||||
}
|
||||
return CDBDatabaseSearchYearLayer(database, &conditions, recordLocation);
|
||||
}
|
||||
|
||||
|
||||
void CDBDatabaseInstanceInit(CDBDatabaseState* instance, u32 flags, CDBDatabase* database) {
|
||||
instance->used = 1;
|
||||
instance->flags = flags;
|
||||
@@ -2771,160 +2584,81 @@ CDBErr CDBDatabaseCleanUpEmptyDirectoriesMonth(char* year, CDBLocation location,
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
asm CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocation recordLocation) {
|
||||
#ifdef __MWERKS__
|
||||
nofralloc
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
cmpwi r3, 0x0
|
||||
stw r0, 0x24(r1)
|
||||
stw r31, 0x1c(r1)
|
||||
mr r31, r3
|
||||
stw r30, 0x18(r1)
|
||||
stw r29, 0x14(r1)
|
||||
mr r29, r4
|
||||
lwz r5, CDBDatabaseWorkBuf(r0)
|
||||
addi r30, r5, 0x430c
|
||||
bne L_8148A13C
|
||||
li r3, 0x1
|
||||
b L_8148A2FC
|
||||
L_8148A13C:
|
||||
bl CDBLock
|
||||
lwz r3, 0x8(r31)
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A158
|
||||
addis r3, r3, 0x1
|
||||
lwz r31, -0x3ff0(r3)
|
||||
b L_8148A15C
|
||||
L_8148A158:
|
||||
li r31, 0x0
|
||||
L_8148A15C:
|
||||
bl CDBUnlock
|
||||
cmpwi r31, 0x0
|
||||
bne L_8148A198
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A190
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B5D0@ha
|
||||
addi r3, r3, lbl_8166B5D0@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_8148A190:
|
||||
li r3, 0x1b
|
||||
b L_8148A2FC
|
||||
L_8148A198:
|
||||
cmpwi r31, 0x1
|
||||
bne L_8148A1D0
|
||||
li r3, 0x2
|
||||
bl CDBIsPrintDebugMessage
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A1C8
|
||||
li r3, 0x2
|
||||
bl CDBReport_
|
||||
lis r3, lbl_8166B618@ha
|
||||
addi r3, r3, lbl_8166B618@l
|
||||
crclr 4*cr1+eq
|
||||
bl OSReport
|
||||
L_8148A1C8:
|
||||
li r3, 0x1a
|
||||
b L_8148A2FC
|
||||
L_8148A1D0:
|
||||
clrlwi. r0, r29, 31
|
||||
beq L_8148A24C
|
||||
mr r3, r30
|
||||
li r4, 0x1
|
||||
bl CDBFSFindFirstRoot
|
||||
b L_8148A234
|
||||
L_8148A1E8:
|
||||
mr r3, r30
|
||||
bl CDBFindDataIsDirectory
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A22C
|
||||
mr r3, r30
|
||||
bl CDBFindDataGetName
|
||||
bl CDBFSIsYearDirName
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A22C
|
||||
mr r3, r30
|
||||
bl CDBFindDataGetName
|
||||
li r4, 0x1
|
||||
li r5, 0x0
|
||||
bl CDBDatabaseCleanUpEmptyDirectoriesMonth
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A22C
|
||||
b L_8148A2FC
|
||||
L_8148A22C:
|
||||
mr r3, r30
|
||||
bl CDBFSFindNext
|
||||
L_8148A234:
|
||||
mr r3, r30
|
||||
bl CDBFindDataIsEnd
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A1E8
|
||||
mr r3, r30
|
||||
bl CDBFSFindClose
|
||||
L_8148A24C:
|
||||
bl CDBVFSync
|
||||
li r31, 0x0
|
||||
bl CDBFSSDIsMounted
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A270
|
||||
bl CDBFSSDIsEjected
|
||||
cmpwi r3, 0x0
|
||||
bne L_8148A270
|
||||
li r31, 0x1
|
||||
L_8148A270:
|
||||
cmpwi r31, 0x0
|
||||
beq L_8148A2F4
|
||||
rlwinm. r0, r29, 0, 30, 30
|
||||
beq L_8148A2F4
|
||||
mr r3, r30
|
||||
li r4, 0x2
|
||||
bl CDBFSFindFirstRoot
|
||||
b L_8148A2DC
|
||||
L_8148A290:
|
||||
mr r3, r30
|
||||
bl CDBFindDataIsDirectory
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A2D4
|
||||
mr r3, r30
|
||||
bl CDBFindDataGetName
|
||||
bl CDBFSIsYearDirName
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A2D4
|
||||
mr r3, r30
|
||||
bl CDBFindDataGetName
|
||||
li r4, 0x2
|
||||
li r5, 0x0
|
||||
bl CDBDatabaseCleanUpEmptyDirectoriesMonth
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A2D4
|
||||
b L_8148A2FC
|
||||
L_8148A2D4:
|
||||
mr r3, r30
|
||||
bl CDBFSFindNext
|
||||
L_8148A2DC:
|
||||
mr r3, r30
|
||||
bl CDBFindDataIsEnd
|
||||
cmpwi r3, 0x0
|
||||
beq L_8148A290
|
||||
mr r3, r30
|
||||
bl CDBFSFindClose
|
||||
L_8148A2F4:
|
||||
bl CDBVFSync
|
||||
li r3, 0x0
|
||||
L_8148A2FC:
|
||||
lwz r0, 0x24(r1)
|
||||
lwz r31, 0x1c(r1)
|
||||
lwz r30, 0x18(r1)
|
||||
lwz r29, 0x14(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
#endif
|
||||
CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocation recordLocation) {
|
||||
CDBDatabase* db;
|
||||
CDBFindData* find;
|
||||
int flags;
|
||||
CDBDatabaseState* instance;
|
||||
CDBErr result;
|
||||
BOOL sdAvailable;
|
||||
|
||||
db = database;
|
||||
find = &CDBDatabaseWorkBuf->year;
|
||||
if (db == NULL) {
|
||||
return CDB_ERROR_1;
|
||||
}
|
||||
|
||||
CDBLock();
|
||||
instance = db->instance;
|
||||
if (instance != NULL) {
|
||||
flags = instance->flags;
|
||||
} else {
|
||||
flags = 0;
|
||||
}
|
||||
CDBUnlock();
|
||||
|
||||
if (flags == 0) {
|
||||
CDBReportError(lbl_8166B5D0);
|
||||
return CDB_ERROR_27;
|
||||
}
|
||||
if (flags == 1) {
|
||||
CDBReportError(lbl_8166B618);
|
||||
return CDB_ERROR_26;
|
||||
}
|
||||
|
||||
if ((recordLocation & 1) != 0) {
|
||||
CDBFSFindFirstRoot(find, 1);
|
||||
while (CDBFindDataIsEnd(find) == 0) {
|
||||
if (CDBFindDataIsDirectory(find) != 0) {
|
||||
if (CDBFSIsYearDirName(CDBFindDataGetName(find)) != 0) {
|
||||
result = CDBDatabaseCleanUpEmptyDirectoriesMonth(CDBFindDataGetName(find), 1, NULL);
|
||||
if (result != CDB_ERROR_OK) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
CDBFSFindNext(find);
|
||||
}
|
||||
CDBFSFindClose(find);
|
||||
}
|
||||
|
||||
CDBVFSync();
|
||||
sdAvailable = 0;
|
||||
if (CDBFSSDIsMounted() != 0) {
|
||||
if (CDBFSSDIsEjected() == 0) {
|
||||
sdAvailable = 1;
|
||||
}
|
||||
}
|
||||
if (sdAvailable != 0) {
|
||||
if ((recordLocation & 2) != 0) {
|
||||
CDBFSFindFirstRoot(find, 2);
|
||||
while (CDBFindDataIsEnd(find) == 0) {
|
||||
if (CDBFindDataIsDirectory(find) != 0) {
|
||||
if (CDBFSIsYearDirName(CDBFindDataGetName(find)) != 0) {
|
||||
result = CDBDatabaseCleanUpEmptyDirectoriesMonth(CDBFindDataGetName(find), 2, NULL);
|
||||
if (result != CDB_ERROR_OK) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
CDBFSFindNext(find);
|
||||
}
|
||||
CDBFSFindClose(find);
|
||||
}
|
||||
}
|
||||
|
||||
CDBVFSync();
|
||||
return CDB_ERROR_OK;
|
||||
}
|
||||
|
||||
#pragma section data_type ".data"
|
||||
|
||||
@@ -6,13 +6,10 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
extern const char lbl_816979E8[8] = "/\0\0\0\0\0\0\0";
|
||||
#pragma pop
|
||||
char CDBFSPathSeparator = '/';
|
||||
|
||||
void CDBFSConcatenatePath(char* path, const char* concatPath) {
|
||||
strcat(path, lbl_816979E8);
|
||||
strcat(path, &CDBFSPathSeparator);
|
||||
strcat(path, concatPath);
|
||||
}
|
||||
|
||||
|
||||
@@ -19,17 +19,20 @@ typedef struct HMACContext {
|
||||
u8 key[64];
|
||||
} HMACContext;
|
||||
|
||||
char hmac_file_name[] = "hmac.c";
|
||||
char hmac_newline[] = "\n";
|
||||
|
||||
void NETHMACInit(HMACContext* context, const DigestInterface* interface, const void* key, u32 length) {
|
||||
u8 innerKey[64];
|
||||
u32 i;
|
||||
u32 keyLength;
|
||||
void* work = context->digestContext;
|
||||
u8* work = context->digestContext;
|
||||
const char* function = "NETHMACInit";
|
||||
context->interface = *interface;
|
||||
if (context->interface.contextSize > 96 || context->interface.blockSize > 64) {
|
||||
OSReport("%s(%d):[warning in %s]", "hmac.c", 100, function);
|
||||
OSReport("%s(%d):[warning in %s]", hmac_file_name, 100, function);
|
||||
OSReport("specified interface needs too large workmemory.");
|
||||
OSReport("\n");
|
||||
OSReport(hmac_newline);
|
||||
return;
|
||||
}
|
||||
if (length <= context->interface.blockSize) {
|
||||
@@ -44,8 +47,8 @@ void NETHMACInit(HMACContext* context, const DigestInterface* interface, const v
|
||||
keyLength = context->keyLength;
|
||||
for (i=0; i<keyLength; ++i) innerKey[i] = context->key[i] ^ 0x36;
|
||||
memset(innerKey + keyLength, 0x36, context->interface.blockSize - keyLength);
|
||||
context->interface.init(context->digestContext);
|
||||
context->interface.update(context->digestContext, innerKey, context->interface.blockSize);
|
||||
context->interface.init(work);
|
||||
context->interface.update(work, innerKey, context->interface.blockSize);
|
||||
}
|
||||
|
||||
void NETHMACUpdate(HMACContext* context, const void* data, u32 length) {
|
||||
@@ -57,13 +60,13 @@ void NETHMACGetDigest(HMACContext* context, void* digest) {
|
||||
u8 outerKey[64];
|
||||
u32 i;
|
||||
u32 keyLength;
|
||||
void* work = context->digestContext;
|
||||
context->interface.getDigest(work, innerDigest);
|
||||
u8* work = context->digestContext;
|
||||
context->interface.getDigest(context->digestContext, innerDigest);
|
||||
keyLength = context->keyLength;
|
||||
for (i=0; i<keyLength; ++i) outerKey[i] = context->key[i] ^ 0x5c;
|
||||
memset(outerKey + keyLength, 0x5c, context->interface.blockSize - keyLength);
|
||||
context->interface.init(context->digestContext);
|
||||
context->interface.update(context->digestContext, outerKey, context->interface.blockSize);
|
||||
context->interface.init(work);
|
||||
context->interface.update(work, outerKey, context->interface.blockSize);
|
||||
context->interface.update(work, innerDigest, context->interface.digestSize);
|
||||
context->interface.getDigest(work, digest);
|
||||
}
|
||||
|
||||
@@ -69,7 +69,16 @@ void NETMD5GetDigest(NETMD5Context* context, void* digest) {
|
||||
}
|
||||
|
||||
#define ROTATE(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
|
||||
#define STEP(a, b, c, d, f, word, n) ((a) += (f), (a) = (b) + ROTATE(__lwbrx(0, (int)(word)) + (*constant + (a)), n))
|
||||
#define STEP(a, b, c, d, f, word, n) \
|
||||
do { \
|
||||
u32* _p = (word); \
|
||||
u32 _k = *constant; \
|
||||
u32 _xw = __lwbrx(_p, 0); \
|
||||
u32 _wc = __lwbrx(_p, 0) + _k; \
|
||||
(a) += (f); \
|
||||
(a) = (b) + ((_wc + (a)) << (n) | (_xw + (_k + (a))) >> (32 - (n))); \
|
||||
++constant; \
|
||||
} while (0)
|
||||
|
||||
static void ProcessBlock(NETMD5Context* context) {
|
||||
static u32 constants[64] = {0xD76AA478, 0xE8C7B756, 0x242070DB, 0xC1BDCEEE, 0xF57C0FAF, 0x4787C62A, 0xA8304613, 0xFD469501, 0x698098D8, 0x8B44F7AF, 0xFFFF5BB1, 0x895CD7BE, 0x6B901122, 0xFD987193, 0xA679438E, 0x49B40821, 0xF61E2562, 0xC040B340, 0x265E5A51, 0xE9B6C7AA, 0xD62F105D, 0x02441453, 0xD8A1E681, 0xE7D3FBC8, 0x21E1CDE6, 0xC33707D6, 0xF4D50D87, 0x455A14ED, 0xA9E3E905, 0xFCEFA3F8, 0x676F02D9, 0x8D2A4C8A, 0xFFFA3942, 0x8771F681, 0x6D9D6122, 0xFDE5380C, 0xA4BEEA44, 0x4BDECFA9, 0xF6BB4B60, 0xBEBFBC70, 0x289B7EC6, 0xEAA127FA, 0xD4EF3085, 0x04881D05, 0xD9D4D039, 0xE6DB99E5, 0x1FA27CF8, 0xC4AC5665, 0xF4292244, 0x432AFF97, 0xAB9423A7, 0xFC93A039, 0x655B59C3, 0x8F0CCC92, 0xFFEFF47D, 0x85845DD1, 0x6FA87E4F, 0xFE2CE6E0, 0xA3014314, 0x4E0811A1, 0xF7537E82, 0xBD3AF235, 0x2AD7D2BB, 0xEB86D391};
|
||||
@@ -83,30 +92,30 @@ static void ProcessBlock(NETMD5Context* context) {
|
||||
block = context->buffer32;
|
||||
word = block;
|
||||
constant = constants;
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,(b & c) | (~b & d),word++,7);
|
||||
STEP(d,a,b,c,(a & b) | (~a & c),word++,12);
|
||||
STEP(c,d,a,b,(d & a) | (~d & b),word++,17);
|
||||
STEP(b,c,d,a,(c & d) | (~c & a),word++,22);
|
||||
}
|
||||
index = indices;
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,(b & c) | (~b & d),word,7); ++word; ++constant;
|
||||
STEP(d,a,b,c,(a & b) | (~a & c),word,12); ++word; ++constant;
|
||||
STEP(c,d,a,b,(d & a) | (~d & b),word,17); ++word; ++constant;
|
||||
STEP(b,c,d,a,(c & d) | (~c & a),word,22); ++word; ++constant;
|
||||
STEP(a,b,c,d,(b & d) | (c & ~d),block + *index++,5);
|
||||
STEP(d,a,b,c,(a & c) | (b & ~c),block + *index++,9);
|
||||
STEP(c,d,a,b,(d & b) | (a & ~b),block + *index++,14);
|
||||
STEP(b,c,d,a,(c & a) | (d & ~a),block + *index++,20);
|
||||
}
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,(b & d) | (c & ~d),block + *index,5); ++index; ++constant;
|
||||
STEP(d,a,b,c,(a & c) | (b & ~c),block + *index,9); ++index; ++constant;
|
||||
STEP(c,d,a,b,(d & b) | (a & ~b),block + *index,14); ++index; ++constant;
|
||||
STEP(b,c,d,a,(c & a) | (d & ~a),block + *index,20); ++index; ++constant;
|
||||
STEP(a,b,c,d,d ^ b ^ c,block + *index++,4);
|
||||
STEP(d,a,b,c,c ^ a ^ b,block + *index++,11);
|
||||
STEP(c,d,a,b,b ^ d ^ a,block + *index++,16);
|
||||
STEP(b,c,d,a,a ^ c ^ d,block + *index++,23);
|
||||
}
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,d ^ b ^ c,block + *index,4); ++index; ++constant;
|
||||
STEP(d,a,b,c,c ^ a ^ b,block + *index,11); ++index; ++constant;
|
||||
STEP(c,d,a,b,b ^ d ^ a,block + *index,16); ++index; ++constant;
|
||||
STEP(b,c,d,a,a ^ c ^ d,block + *index,23); ++index; ++constant;
|
||||
}
|
||||
for (round = 0; round < 4; ++round) {
|
||||
STEP(a,b,c,d,c ^ (b | ~d),block + *index,6); ++index; ++constant;
|
||||
STEP(d,a,b,c,b ^ (a | ~c),block + *index,10); ++index; ++constant;
|
||||
STEP(c,d,a,b,a ^ (d | ~b),block + *index,15); ++index; ++constant;
|
||||
STEP(b,c,d,a,d ^ (c | ~a),block + *index,21); ++index; ++constant;
|
||||
STEP(a,b,c,d,c ^ (b | ~d),block + *index++,6);
|
||||
STEP(d,a,b,c,b ^ (a | ~c),block + *index++,10);
|
||||
STEP(c,d,a,b,a ^ (d | ~b),block + *index++,15);
|
||||
STEP(b,c,d,a,d ^ (c | ~a),block + *index++,21);
|
||||
}
|
||||
context->a += a;
|
||||
context->b += b;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <private/nhttp.h>
|
||||
|
||||
const char NHTTPi_strMultipartBound[] = STR_POSTBOUND;
|
||||
const char NHTTPi_strMultipartBound[24] = STR_POSTBOUND;
|
||||
|
||||
void* NHTTPi_alloc(u32 size, int align);
|
||||
void NHTTPi_free(void* ptr);
|
||||
|
||||
@@ -371,9 +371,9 @@ static BOOL NHTTPi_RecvProxyConnectHeader(NHTTPThreadContext* context)
|
||||
response->httpStatus = NHTTPi_strToInt(header + 9, 3);
|
||||
if (NHTTPi_strnicmp(header, "HTTP/", 5) == 0 && header[8] == ' '
|
||||
&& response->httpStatus == 200) accepted = TRUE;
|
||||
ended = FALSE;
|
||||
cursor = header;
|
||||
index = 0;
|
||||
ended = FALSE;
|
||||
while (index < used)
|
||||
{
|
||||
if (index > 1 && cursor[-1] == '\r' && *cursor == '\r') ended = TRUE;
|
||||
|
||||
@@ -13,8 +13,8 @@ int SOiIsBufferAddrCheck(void);
|
||||
void* SOiAlloc(u32, s32);
|
||||
void SOiFree(u32, void*, s32);
|
||||
|
||||
static int soSocketRegistered;
|
||||
const char* __SOCKETVersion="<< RVL_SDK - SOCKET \trelease build: Dec 12 2008 03:06:17 (0x4199_60831) >>";
|
||||
static int soSocketRegistered[2];
|
||||
const char* __SOCKETVersion ="<< RVL_SDK - SOCKET \trelease build: Dec 12 2008 03:06:17 (0x4199_60831) >>";
|
||||
|
||||
typedef struct SocketRequest { int socket; int type; int protocol; } SocketRequest;
|
||||
typedef struct AddressRequest { int socket; int hasAddress; SOSockAddr address; } AddressRequest;
|
||||
@@ -35,9 +35,12 @@ typedef struct RecvRequest {
|
||||
union { struct { int socket; int flags; } command; u8 commandBlock[32]; };
|
||||
SOSockAddr address;
|
||||
} RecvRequest;
|
||||
typedef struct SendCmd {
|
||||
int socket; int flags; int hasAddress; SOSockAddr address;
|
||||
} SendCmd;
|
||||
typedef struct SendRequest {
|
||||
IOSIoVector vectors[4];
|
||||
struct { int socket; int flags; int hasAddress; SOSockAddr address; } command;
|
||||
SendCmd command;
|
||||
} SendRequest;
|
||||
|
||||
static int RecvFrom(const char*, int, void*, int, int, SOSockAddr*);
|
||||
@@ -47,7 +50,7 @@ int SOSocket(int family, int type, int protocol) {
|
||||
s32 rm;
|
||||
SocketRequest* request;
|
||||
int result;
|
||||
if(!soSocketRegistered) { OSRegisterVersion(__SOCKETVersion); soSocketRegistered=1; }
|
||||
if(!soSocketRegistered[0]) { OSRegisterVersion(__SOCKETVersion); soSocketRegistered[0]=1; }
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(family==23) result=-5;
|
||||
else {
|
||||
@@ -87,7 +90,7 @@ int SOBind(int socket, void* address) {
|
||||
int result;
|
||||
AddressRequest* request;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(!addr || addr->len>8 || addr->len<8) result=-28;
|
||||
if(!address || addr->len>8 || addr->len<8) result=-28;
|
||||
else {
|
||||
request=SOiAlloc(12,64);
|
||||
if(!request) result=-49;
|
||||
@@ -109,7 +112,7 @@ int SOConnect(int socket, void* address) {
|
||||
int result;
|
||||
AddressRequest* request;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(!addr || addr->len>8 || addr->len<8) result=-28;
|
||||
if(!address || addr->len>8 || addr->len<8) result=-28;
|
||||
else {
|
||||
request=SOiAlloc(12,64);
|
||||
if(!request) result=-49;
|
||||
@@ -125,26 +128,24 @@ int SOConnect(int socket, void* address) {
|
||||
return result;
|
||||
}
|
||||
|
||||
int SOGetSockName(int socket, void* address) {
|
||||
int SOGetSockName(int socket, SOSockAddr* address) {
|
||||
int size;
|
||||
int result;
|
||||
s32 rm;
|
||||
SOSockAddr* addr;
|
||||
SOSockAddr* reply;
|
||||
NameRequest* request;
|
||||
addr=address;
|
||||
SOSockAddr* reply;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
if(!addr || addr->len>8 || addr->len<8) result=-28;
|
||||
if(!address || address->len>8 || address->len<8) result=-28;
|
||||
else {
|
||||
size=(addr->len+63)&~31;
|
||||
size=(address->len+63)&~31;
|
||||
request=SOiAlloc(12,size);
|
||||
if(!request) result=-49;
|
||||
else {
|
||||
request->socket=socket;
|
||||
reply=&request->address;
|
||||
memcpy(reply,addr,addr->len);
|
||||
result=IOS_Ioctl(rm,7,request,4,reply,addr->len);
|
||||
if(result>=0) memcpy(addr,reply,reply->len);
|
||||
memcpy(reply,address,address->len);
|
||||
result=IOS_Ioctl(rm,7,request,4,reply,address->len);
|
||||
if(result>=0) memcpy(address,reply,reply->len);
|
||||
SOiFree(12,request,size);
|
||||
}
|
||||
}
|
||||
@@ -199,7 +200,7 @@ int SOShutdown(int socket, int how) {
|
||||
|
||||
int SOPoll(SOPollFD* fds, unsigned int count, s64 timeout) {
|
||||
s32 rm;
|
||||
s32 result,bytes,size;
|
||||
s32 size,bytes,result;
|
||||
PollRequest* request;
|
||||
SOPollFD* reply;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
@@ -256,11 +257,11 @@ char* SOInetNtoA(SOInAddr address) {
|
||||
|
||||
int SOInetPtoN(int family, const char* text, void* address) {
|
||||
s32 rm;
|
||||
int temporary,result,size,bytes;
|
||||
int size,temporary,result,bytes;
|
||||
InetRequest* request;
|
||||
if((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
|
||||
bytes=0;
|
||||
if(family==2) bytes=4;
|
||||
switch(family) { case 2: bytes=4; break; default: break; }
|
||||
if(!bytes) result=-5;
|
||||
else if(!text) result=-28;
|
||||
else {
|
||||
@@ -305,10 +306,10 @@ static inline int DirectBuffer(const void* data, int length) {
|
||||
static int RecvFrom(const char* name, int socket, void* data, int length, int flags, SOSockAddr* address) {
|
||||
s32 rm;
|
||||
int result,size;
|
||||
BOOL direct;
|
||||
RecvRequest* request;
|
||||
void* buffer;
|
||||
SOSockAddr* reply;
|
||||
BOOL direct;
|
||||
if(length>32768) length=32768;
|
||||
if((result=SOiPrepare(name,&rm))==0) {
|
||||
if(address && (address->len>8 || address->len<8)) result=-28;
|
||||
@@ -316,7 +317,7 @@ static int RecvFrom(const char* name, int socket, void* data, int length, int fl
|
||||
else {
|
||||
direct=TRUE;
|
||||
if(length && !DirectBuffer(data,length)) direct=FALSE;
|
||||
size=((address ? address->len : 0)+95)&~31;
|
||||
size=((address==0 ? 0 : address->len)+95)&~31;
|
||||
request=SOiAlloc(12,size);
|
||||
if(!direct) buffer=SOiAlloc(13,(length+31)&~31);
|
||||
else buffer=data;
|
||||
@@ -330,13 +331,12 @@ static int RecvFrom(const char* name, int socket, void* data, int length, int fl
|
||||
request->vectors[2].base=NULL; request->vectors[2].length=0;
|
||||
result=IOS_Ioctlv(rm,12,1,2,request->vectors);
|
||||
} else {
|
||||
memcpy(reply,address,address->len);
|
||||
memcpy(reply,(SOSockAddr*)address,address->len);
|
||||
request->vectors[2].base=(u8*)reply; request->vectors[2].length=address->len;
|
||||
result=IOS_Ioctlv(rm,12,1,2,request->vectors);
|
||||
if(result>=0) {
|
||||
u32 bytes=address->len;
|
||||
if(bytes>reply->len) bytes=reply->len;
|
||||
memcpy(address,reply,bytes);
|
||||
memcpy(address,reply,bytes>reply->len?reply->len:bytes);
|
||||
}
|
||||
}
|
||||
if(result>=0 && !direct) memcpy(data,buffer,length);
|
||||
@@ -362,19 +362,20 @@ static int SendTo(const char* name, int socket, const void* data, int length, in
|
||||
direct=TRUE;
|
||||
if(length && !DirectBuffer(data,length)) direct=FALSE;
|
||||
request=SOiAlloc(12,96);
|
||||
if(!direct) buffer=SOiAlloc(14,(length+31)&~31);
|
||||
if(direct==0) buffer=SOiAlloc(14,(length+31)&~31);
|
||||
else buffer=(void*)data;
|
||||
if(!request || !buffer) result=-49;
|
||||
else {
|
||||
request->command.socket=socket; request->command.flags=flags;
|
||||
if(!address) request->command.hasAddress=0;
|
||||
SendCmd* cmd=&request->command;
|
||||
cmd->socket=socket; cmd->flags=flags;
|
||||
if(!address) cmd->hasAddress=0;
|
||||
else {
|
||||
request->command.hasAddress=1;
|
||||
memcpy(&request->command.address,address,address->len);
|
||||
cmd->hasAddress=1;
|
||||
memcpy(&cmd->address,address,address->len);
|
||||
}
|
||||
if(!direct) memcpy(buffer,data,length);
|
||||
request->vectors[0].base=buffer; request->vectors[0].length=length;
|
||||
request->vectors[1].base=(u8*)&request->command; request->vectors[1].length=40;
|
||||
request->vectors[1].base=(u8*)cmd; request->vectors[1].length=40;
|
||||
result=IOS_Ioctlv(rm,13,2,0,request->vectors);
|
||||
}
|
||||
if(!direct) SOiFree(14,buffer,(length+31)&~31);
|
||||
|
||||
@@ -94,8 +94,12 @@ int SOGetAddrInfo(const char* nodeName, const char* servName, const SOAddrInfo*
|
||||
char* node;
|
||||
char* service;
|
||||
SOAddrInfo* requestHints;
|
||||
int nodeSize,servSize;
|
||||
if((result=SOiPrepare(NULL,&rm))==0) {
|
||||
size=(((NameSize(nodeName)+31)&~31)+((servName ? strlen(nodeName)+32 : 31)&~31)+95)&~31;
|
||||
servSize = servName==0 ? 0 : strlen(nodeName)+1;
|
||||
nodeSize = nodeName==0 ? 0 : strlen(nodeName)+1;
|
||||
size=((nodeSize+31)&~31)+((servSize+31)&~31)+95;
|
||||
size&=~31;
|
||||
request=SOiAlloc(12,size);
|
||||
if(!request) result=-49;
|
||||
else {
|
||||
@@ -103,14 +107,14 @@ int SOGetAddrInfo(const char* nodeName, const char* servName, const SOAddrInfo*
|
||||
if(!reply) { SOiFree(12,request,size); result=-49; }
|
||||
else {
|
||||
node=(char*)request->storage;
|
||||
service=node+((NameSize(nodeName)+31)&~31);
|
||||
requestHints=(SOAddrInfo*)(service+((servName ? strlen(nodeName)+32 : 31)&~31));
|
||||
service=node+(((nodeName==0 ? 0 : strlen(nodeName)+1)+31)&~31);
|
||||
requestHints=(SOAddrInfo*)(service+(((servName==0 ? 0 : strlen(nodeName)+1)+31)&~31));
|
||||
if(nodeName) strcpy(node,nodeName);
|
||||
request->vectors[0].base=nodeName ? (u8*)node : NULL;
|
||||
request->vectors[0].length=nodeName ? strlen(nodeName) : 0;
|
||||
request->vectors[0].length=nodeName==0 ? 0 : strlen(nodeName);
|
||||
if(servName) strcpy(service,servName);
|
||||
request->vectors[1].base=servName ? (u8*)service : NULL;
|
||||
request->vectors[1].length=servName ? strlen(servName) : 0;
|
||||
request->vectors[1].length=servName==0 ? 0 : strlen(servName);
|
||||
if(hints) memcpy(requestHints,hints,32);
|
||||
else memset(requestHints,0,32);
|
||||
if(requestHints->family==0) requestHints->family=2;
|
||||
@@ -121,7 +125,7 @@ int SOGetAddrInfo(const char* nodeName, const char* servName, const SOAddrInfo*
|
||||
request->vectors[3].base=(u8*)reply; request->vectors[3].length=0x834;
|
||||
result=IOS_Ioctlv(rm,24,3,1,request->vectors);
|
||||
if(result>=0) {
|
||||
SOAddrInfo* entry=reply->entries;
|
||||
SOAddrInfo* entry=(SOAddrInfo*)reply;
|
||||
u8* address=reply->addresses;
|
||||
*resultInfo=entry;
|
||||
while(entry) {
|
||||
|
||||
@@ -111,8 +111,8 @@ int SOGetInterfaceOpt(void* interface, int level, int option, void* value, int*
|
||||
else {
|
||||
command=&request->command;
|
||||
command->level=level; command->option=option;
|
||||
returnedLength=&request->length;
|
||||
reply=request->value;
|
||||
returnedLength=(int*)((u8*)command+0x20);
|
||||
reply=(u8*)returnedLength+0x20;
|
||||
*returnedLength=OptionLength(length);
|
||||
request->vectors[0].base=(u8*)command;
|
||||
request->vectors[0].length=8;
|
||||
@@ -152,7 +152,7 @@ int SOSetInterfaceOpt(void* interface, int level, int option, const void* value,
|
||||
else {
|
||||
command=&request->command;
|
||||
command->level=level; command->option=option;
|
||||
reply=request->value;
|
||||
reply=(u8*)command+0x20;
|
||||
if(value) memcpy(reply,value,length);
|
||||
else memset(reply,0,length);
|
||||
request->vectors[0].base=(u8*)command; request->vectors[0].length=8;
|
||||
|
||||
@@ -10,20 +10,20 @@
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata2"
|
||||
const u8 lbl_81695060 = 0;
|
||||
const u8 lbl_81695061 = 0x0F;
|
||||
const u8 lbl_81695062 = 0xAC;
|
||||
const u8 scRsnOui0 = 0;
|
||||
const u8 scRsnOui1 = 0x0F;
|
||||
const u8 scRsnOui2 = 0xAC;
|
||||
const u8 lbl_81695063 = 0;
|
||||
const u8 lbl_81695064 = 0;
|
||||
const u8 lbl_81695065 = 0x50;
|
||||
const u8 lbl_81695066 = 0xF2;
|
||||
const u8 scWpaOui0 = 0;
|
||||
const u8 scWpaOui1 = 0x50;
|
||||
const u8 scWpaOui2 = 0xF2;
|
||||
const u8 lbl_81695067 = 0;
|
||||
#pragma pop
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
const u8 lbl_81697D70 = 0;
|
||||
const u8 lbl_81697D71 = 0x50;
|
||||
const u8 lbl_81697D72 = 0xF2;
|
||||
const u8 scWpaFindOui0 = 0;
|
||||
const u8 scWpaFindOui1 = 0x50;
|
||||
const u8 scWpaFindOui2 = 0xF2;
|
||||
const u8 lbl_81697D73 = 0;
|
||||
const u8 lbl_81697D74 = 0;
|
||||
const u8 lbl_81697D75 = 0;
|
||||
@@ -31,15 +31,15 @@ const u8 lbl_81697D76 = 0;
|
||||
const u8 lbl_81697D77 = 0;
|
||||
#pragma pop
|
||||
|
||||
#define lbl_81695060 (*((volatile const u8*)&lbl_81695060))
|
||||
#define lbl_81695061 (*((volatile const u8*)&lbl_81695061))
|
||||
#define lbl_81695062 (*((volatile const u8*)&lbl_81695062))
|
||||
#define lbl_81695064 (*((volatile const u8*)&lbl_81695064))
|
||||
#define lbl_81695065 (*((volatile const u8*)&lbl_81695065))
|
||||
#define lbl_81695066 (*((volatile const u8*)&lbl_81695066))
|
||||
#define lbl_81697D70 (*((volatile const u8*)&lbl_81697D70))
|
||||
#define lbl_81697D71 (*((volatile const u8*)&lbl_81697D71))
|
||||
#define lbl_81697D72 (*((volatile const u8*)&lbl_81697D72))
|
||||
#define scRsnOui0 (*((volatile const u8*)&scRsnOui0))
|
||||
#define scRsnOui1 (*((volatile const u8*)&scRsnOui1))
|
||||
#define scRsnOui2 (*((volatile const u8*)&scRsnOui2))
|
||||
#define scWpaOui0 (*((volatile const u8*)&scWpaOui0))
|
||||
#define scWpaOui1 (*((volatile const u8*)&scWpaOui1))
|
||||
#define scWpaOui2 (*((volatile const u8*)&scWpaOui2))
|
||||
#define scWpaFindOui0 (*((volatile const u8*)&scWpaFindOui0))
|
||||
#define scWpaFindOui1 (*((volatile const u8*)&scWpaFindOui1))
|
||||
#define scWpaFindOui2 (*((volatile const u8*)&scWpaFindOui2))
|
||||
extern void _savegpr_21();
|
||||
extern void _restgpr_21();
|
||||
|
||||
@@ -175,9 +175,9 @@ s32 WDGetPrivacyMode(WDBssDesc* bssDesc) {
|
||||
if (WDFindInformationElement((WDInfoElement**)&ieData, &ieLength, bssDesc, 0x30)) {
|
||||
u8 data[WD_VENDOR_LENGTH];
|
||||
|
||||
data[0] = lbl_81695060;
|
||||
data[1] = lbl_81695061;
|
||||
data[2] = lbl_81695062;
|
||||
data[0] = scRsnOui0;
|
||||
data[1] = scRsnOui1;
|
||||
data[2] = scRsnOui2;
|
||||
memcpy(readIE, ieData, sizeof(WDVendorInfoElement) + 2);
|
||||
if (memcmp(&readIE[2], data, WD_VENDOR_LENGTH) == 0) {
|
||||
if ((s32)readIE[5] == 3) {
|
||||
@@ -218,15 +218,15 @@ privacy_second: {
|
||||
u8 data[WD_VENDOR_LENGTH];
|
||||
u8 findData[WD_VENDOR_LENGTH];
|
||||
|
||||
findData[0] = lbl_81697D70;
|
||||
findData[1] = lbl_81697D71;
|
||||
findData[2] = lbl_81697D72;
|
||||
findData[0] = scWpaFindOui0;
|
||||
findData[1] = scWpaFindOui1;
|
||||
findData[2] = scWpaFindOui2;
|
||||
if (!WDiFindVendorSpecificIE(&ieData, &ieLength, bssDesc, 0xDD, findData, 1)) {
|
||||
goto privacy_fallback;
|
||||
}
|
||||
data[0] = lbl_81695064;
|
||||
data[1] = lbl_81695065;
|
||||
data[2] = lbl_81695066;
|
||||
data[0] = scWpaOui0;
|
||||
data[1] = scWpaOui1;
|
||||
data[2] = scWpaOui2;
|
||||
|
||||
{
|
||||
memcpy(readIE, ieData, sizeof(WDVendorInfoElement));
|
||||
|
||||
@@ -20,14 +20,14 @@ void VoiceCallback(void* _voice) {
|
||||
}
|
||||
|
||||
inline u8* getCurrAddr(VoiceInfo* voice) {
|
||||
AXPB* iVar4 = &voice->getAXVPB()->pb;
|
||||
AXPB* pb = &voice->getAXVPB()->pb;
|
||||
nw4r::ut::AutoInterruptLock lock;
|
||||
if (iVar4 == NULL) {
|
||||
if (pb == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
u16 addrHi = iVar4->addr.currentAddressHi;
|
||||
u16 addrLo = iVar4->addr.currentAddressLo;
|
||||
u16 addrHi = pb->addr.currentAddressHi;
|
||||
u16 addrLo = pb->addr.currentAddressLo;
|
||||
return (u8*)((addrHi << 16) + addrLo);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <revolution/gx/GXStruct.h>
|
||||
#include <revolution/os/OSError.h>
|
||||
|
||||
extern "C" const char lbl_8166A6E3[];
|
||||
extern "C" const u8 lbl_81697844;
|
||||
extern "C" const u8 lbl_81697845;
|
||||
extern "C" const u8 lbl_81697846;
|
||||
extern "C" const u8 lbl_81697847;
|
||||
extern "C" const char scCsFatalMsg[];
|
||||
extern "C" const u8 scCsFatalColorR;
|
||||
extern "C" const u8 scCsFatalColorG;
|
||||
extern "C" const u8 scCsFatalColorB;
|
||||
extern "C" const u8 scCsFatalColorA;
|
||||
|
||||
#define NW4R_DB_ASSERT_H
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {lbl_81697844, lbl_81697845, lbl_81697846, lbl_81697847}; \
|
||||
GXColor front = {scCsFatalColorR, scCsFatalColorG, scCsFatalColorB, scCsFatalColorA}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, lbl_8166A6E3); \
|
||||
OSFatal((GXColor)front, (GXColor)back, scCsFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ extern "C" const u8 lbl_81697847;
|
||||
|
||||
#include "math/iplMathTypes.h"
|
||||
|
||||
extern "C" const f32 lbl_81694FC0 = 0.0f;
|
||||
extern "C" const f32 scCsZeroF = 0.0f;
|
||||
|
||||
extern "C" nw4r::ut::Color GetTextColor__Q34nw4r3lyt7TextBoxCFUl(const nw4r::lyt::TextBox*, u32);
|
||||
|
||||
@@ -130,7 +130,7 @@ namespace ipl {
|
||||
nw4r::math::VEC2 scale;
|
||||
scale.x = pane->GetScale().x;
|
||||
scale.y = pane->GetScale().y;
|
||||
result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, lbl_81694FC0) == TRUE;
|
||||
result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, scCsZeroF) == TRUE;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
@@ -514,7 +514,7 @@ namespace ipl {
|
||||
nw4r::math::VEC3 get_vec_(CHANSVm* vm) {
|
||||
u32 argc = CHANSVmGetArgc(vm);
|
||||
CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0);
|
||||
nw4r::math::VEC3 out(lbl_81694FC0, lbl_81694FC0, lbl_81694FC0);
|
||||
nw4r::math::VEC3 out(scCsZeroF, scCsZeroF, scCsZeroF);
|
||||
if (argc == 1 && util::is_valid_class(arg, "VEC3")) {
|
||||
f32* src = static_cast<f32*>(*arg->value.ptr_v);
|
||||
out.x = src[0];
|
||||
@@ -540,7 +540,7 @@ namespace ipl {
|
||||
nw4r::lyt::Size get_size_(CHANSVm* vm) {
|
||||
u32 argc = CHANSVmGetArgc(vm);
|
||||
CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0);
|
||||
nw4r::lyt::Size out(lbl_81694FC0, lbl_81694FC0);
|
||||
nw4r::lyt::Size out(scCsZeroF, scCsZeroF);
|
||||
if (argc == 1 && util::is_valid_class(arg, "Size")) {
|
||||
f32* src = static_cast<f32*>(*arg->value.ptr_v);
|
||||
out.width = src[0];
|
||||
@@ -622,15 +622,15 @@ namespace ipl {
|
||||
namespace pane {
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8166A6E3[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" const char scCsFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
#pragma pop
|
||||
|
||||
#pragma push
|
||||
#pragma section data_type ".sdata"
|
||||
extern "C" __declspec(section ".sdata") const u8 lbl_81697844 = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 lbl_81697845 = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 lbl_81697846 = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 lbl_81697847 = 0;
|
||||
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorR = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorG = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorB = 0xff;
|
||||
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorA = 0;
|
||||
#pragma pop
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ extern "C" void __dt__Q34nw4r3snd11SoundHandleFv(nw4r::snd::SoundHandle*, int);
|
||||
|
||||
namespace homebutton {
|
||||
bool Controller::sBatteryFlag[WPAD_MAX_CONTROLLERS];
|
||||
bool Controller::lbl_816989BC[WPAD_MAX_CONTROLLERS];
|
||||
bool Controller::sAlarmCreated[WPAD_MAX_CONTROLLERS];
|
||||
|
||||
OSAlarm Controller::sAlarm[WPAD_MAX_CONTROLLERS];
|
||||
OSAlarm Controller::sAlarmSoundOff[WPAD_MAX_CONTROLLERS];
|
||||
@@ -83,10 +83,10 @@ namespace homebutton {
|
||||
if (chan < WPAD_MAX_CONTROLLERS) {
|
||||
sBatteryFlag[chan] = false;
|
||||
OSReport("Create %d\n", chan);
|
||||
if (!lbl_816989BC[chan]) {
|
||||
if (!sAlarmCreated[chan]) {
|
||||
OSCreateAlarm(&sAlarm[chan]);
|
||||
OSCreateAlarm(&sAlarmSoundOff[chan]);
|
||||
lbl_816989BC[chan] = true;
|
||||
sAlarmCreated[chan] = true;
|
||||
}
|
||||
sThis[chan] = this;
|
||||
}
|
||||
|
||||
@@ -12,11 +12,11 @@ namespace ext_ead {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" char lbl_816962F8[] = "ERROR?\n";
|
||||
extern "C" char lbl_81643B40[] = " TextureBuffer_ %d:%d ptr:%p\n";
|
||||
extern "C" char lbl_81643B5E[] = "INFO: cannot create browser window\n";
|
||||
extern "C" char scWwwErrorQ[] = "ERROR?\n";
|
||||
extern "C" char scWwwTexBufFmt[] = " TextureBuffer_ %d:%d ptr:%p\n";
|
||||
extern "C" char scWwwNoBrowserWin[] = "INFO: cannot create browser window\n";
|
||||
|
||||
#define OSReport(...) OSReport(lbl_816962F8)
|
||||
#define OSReport(...) OSReport(scWwwErrorQ)
|
||||
#include "iplwww/www_window.h"
|
||||
#undef OSReport
|
||||
|
||||
@@ -76,12 +76,12 @@ namespace ext_ead {
|
||||
memset(mTexBufArr[i][j], 0, texBufSize);
|
||||
DCStoreRange(mTexBufArr[i][j], texBufSize);
|
||||
|
||||
print::IPLWWWReport(print::WWW_DEBUG, lbl_81643B40, j, i, mTexBufArr[i][j]);
|
||||
print::IPLWWWReport(print::WWW_DEBUG, scWwwTexBufFmt, j, i, mTexBufArr[i][j]);
|
||||
}
|
||||
}
|
||||
|
||||
if (WWWCreateBrowserWindow(mpBrowserThread->GetHandle(), &mpWwwWindow, 0)) {
|
||||
print::IPLWWWReport(print::WWW_WARNING, lbl_81643B5E);
|
||||
print::IPLWWWReport(print::WWW_WARNING, scWwwNoBrowserWin);
|
||||
return NULL;
|
||||
} else {
|
||||
WWWRect rect = {0, 0, 0, 0};
|
||||
|
||||
@@ -20,6 +20,16 @@ protected:
|
||||
namespace extend {
|
||||
namespace memo {
|
||||
|
||||
class EventHandler : public inputform::EventHandler {
|
||||
public:
|
||||
EventHandler(InputForm* form) : inputform::EventHandler(form), mpMemoForm(form) {}
|
||||
virtual ~EventHandler() {}
|
||||
virtual void onTiEvent(gui::PaneComponent*, u32, Input*);
|
||||
private:
|
||||
InputForm* mpMemoForm;
|
||||
};
|
||||
|
||||
|
||||
class AnmPane : public nw4rmanager::AnmPane {
|
||||
protected:
|
||||
AnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer)
|
||||
@@ -28,8 +38,8 @@ public:
|
||||
virtual ~AnmPane();
|
||||
virtual void init();
|
||||
virtual void changeAnimation(u32 id);
|
||||
virtual u32 getState();
|
||||
virtual u32 getKeyType() const;
|
||||
virtual u32 getState();
|
||||
protected:
|
||||
u32 meState;
|
||||
u32 meKeyType;
|
||||
@@ -49,13 +59,6 @@ public:
|
||||
virtual void onAnmEvent(AnmPaneEvent event);
|
||||
};
|
||||
|
||||
class SimpleAnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
SimpleAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer) {}
|
||||
virtual ~SimpleAnmPane() {}
|
||||
virtual void init();
|
||||
virtual void changeAnimation(u32 id);
|
||||
};
|
||||
|
||||
class ScrollButton {
|
||||
public:
|
||||
@@ -74,15 +77,16 @@ private:
|
||||
bool mbRightPressed;
|
||||
};
|
||||
|
||||
class EventHandler : public inputform::EventHandler {
|
||||
|
||||
class SimpleAnmPane : public nw4rmanager::AnmPane {
|
||||
public:
|
||||
EventHandler(InputForm* form) : inputform::EventHandler(form), mpMemoForm(form) {}
|
||||
virtual ~EventHandler() {}
|
||||
virtual void onTiEvent(gui::PaneComponent*, u32, Input*);
|
||||
private:
|
||||
InputForm* mpMemoForm;
|
||||
SimpleAnmPane(nw4r::lyt::Pane* pane, nw4rmanager::AnmObserver* observer) : nw4rmanager::AnmPane(pane, observer) {}
|
||||
virtual ~SimpleAnmPane() {}
|
||||
virtual void init();
|
||||
virtual void changeAnimation(u32 id);
|
||||
};
|
||||
|
||||
|
||||
static const char* scPaneName[] = {
|
||||
"N_Header", "N_Body", "B_Body", "N_Footer", "Nigaoe",
|
||||
"T_Nigaoe", "B_Nigaoe", "T_Letter", "T_TouchLetter"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
namespace textinput {
|
||||
namespace gui {
|
||||
extern "C" void drawLine___Q29textinput3guiFfffffUcR8_GXColor();
|
||||
extern "C" const f32 lbl_81694EE8;
|
||||
extern "C" const f32 scGuiZeroF;
|
||||
|
||||
void drawLine_(f32 x0, f32 y0, f32 x1, f32 y1, f32 z, u8 width, GXColor& color) {
|
||||
GXClearVtxDesc();
|
||||
@@ -31,7 +31,7 @@ namespace textinput {
|
||||
GXSetBlendMode(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_NOOP);
|
||||
|
||||
Mtx mtx;
|
||||
MTXTrans(mtx, lbl_81694EE8, lbl_81694EE8, lbl_81694EE8);
|
||||
MTXTrans(mtx, scGuiZeroF, scGuiZeroF, scGuiZeroF);
|
||||
GXLoadPosMtxImm(mtx, 0);
|
||||
|
||||
GXSetLineWidth(width, GX_TO_ZERO);
|
||||
@@ -334,7 +334,7 @@ namespace textinput {
|
||||
MTXInverse(mpPane->GetGlobalMtx(), globalMtx);
|
||||
|
||||
nw4r::math::VEC3 pos;
|
||||
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, lbl_81694EE8), pos);
|
||||
MTXMultVec(globalMtx, nw4r::math::VEC3(x, y, scGuiZeroF), pos);
|
||||
|
||||
nw4r::ut::Rect rect = mpPane->GetPaneRect(*drawInfo);
|
||||
|
||||
@@ -348,12 +348,12 @@ namespace textinput {
|
||||
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata2"
|
||||
extern "C" const f32 lbl_81694EE8 = 0.0f;
|
||||
extern "C" const u8 lbl_81694EEC = 0xFF;
|
||||
extern "C" const u8 lbl_81694EED = 0x00;
|
||||
extern "C" const u8 lbl_81694EEE = 0x00;
|
||||
extern "C" const u8 lbl_81694EEF = 0xFF;
|
||||
extern "C" const f32 lbl_81694EF0 = 0.5f;
|
||||
extern "C" const f32 scGuiZeroF = 0.0f;
|
||||
extern "C" const u8 scGuiLineColorR = 0xFF;
|
||||
extern "C" const u8 scGuiLineColorG = 0x00;
|
||||
extern "C" const u8 scGuiLineColorB = 0x00;
|
||||
extern "C" const u8 scGuiLineColorA = 0xFF;
|
||||
extern "C" const f32 scGuiHalfF = 0.5f;
|
||||
#pragma pop
|
||||
|
||||
extern "C" asm void draw__Q39textinput3gui13PaneComponentFv() {
|
||||
@@ -376,15 +376,15 @@ namespace textinput {
|
||||
beq pane_component_draw_done
|
||||
lwz r5, 0x9c(r31)
|
||||
mr r3, r31
|
||||
lbz r7, lbl_81694EEC
|
||||
lbz r7, scGuiLineColorR
|
||||
li r4, 0
|
||||
lfs f1, 0x4c(r5)
|
||||
lfs f0, 0x50(r5)
|
||||
lfs f31, 0x90(r5)
|
||||
lfs f30, 0xa0(r5)
|
||||
lbz r6, lbl_81694EED
|
||||
lbz r5, lbl_81694EEE
|
||||
lbz r0, lbl_81694EEF
|
||||
lbz r6, scGuiLineColorG
|
||||
lbz r5, scGuiLineColorB
|
||||
lbz r0, scGuiLineColorA
|
||||
stb r7, 8(r1)
|
||||
stb r6, 9(r1)
|
||||
stb r5, 0xa(r1)
|
||||
@@ -402,13 +402,13 @@ namespace textinput {
|
||||
stb r3, 8(r1)
|
||||
stb r0, 0xa(r1)
|
||||
pane_component_draw_lines:
|
||||
lfs f1, lbl_81694EF0
|
||||
lfs f1, scGuiHalfF
|
||||
addi r4, r1, 8
|
||||
lfs f0, 0x14(r1)
|
||||
li r3, 8
|
||||
lfs f2, 0x10(r1)
|
||||
fmuls f0, f0, f1
|
||||
lfs f5, lbl_81694EE8
|
||||
lfs f5, scGuiZeroF
|
||||
fmuls f3, f2, f1
|
||||
fsubs f2, f30, f0
|
||||
fsubs f1, f31, f3
|
||||
@@ -417,24 +417,24 @@ namespace textinput {
|
||||
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
|
||||
lfs f1, 0x10(r1)
|
||||
addi r4, r1, 8
|
||||
lfs f2, lbl_81694EF0
|
||||
lfs f2, scGuiHalfF
|
||||
li r3, 8
|
||||
lfs f0, 0x14(r1)
|
||||
fmuls f1, f1, f2
|
||||
lfs f5, lbl_81694EE8
|
||||
lfs f5, scGuiZeroF
|
||||
fmuls f0, f0, f2
|
||||
fadds f1, f31, f1
|
||||
fsubs f2, f30, f0
|
||||
fadds f4, f30, f0
|
||||
fmr f3, f1
|
||||
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
|
||||
lfs f1, lbl_81694EF0
|
||||
lfs f1, scGuiHalfF
|
||||
addi r4, r1, 8
|
||||
lfs f0, 0x14(r1)
|
||||
li r3, 8
|
||||
lfs f2, 0x10(r1)
|
||||
fmuls f0, f0, f1
|
||||
lfs f5, lbl_81694EE8
|
||||
lfs f5, scGuiZeroF
|
||||
fmuls f3, f2, f1
|
||||
fadds f2, f30, f0
|
||||
fadds f1, f31, f3
|
||||
@@ -443,11 +443,11 @@ namespace textinput {
|
||||
bl drawLine___Q29textinput3guiFfffffUcR8_GXColor
|
||||
lfs f1, 0x10(r1)
|
||||
addi r4, r1, 8
|
||||
lfs f2, lbl_81694EF0
|
||||
lfs f2, scGuiHalfF
|
||||
li r3, 8
|
||||
lfs f0, 0x14(r1)
|
||||
fmuls f1, f1, f2
|
||||
lfs f5, lbl_81694EE8
|
||||
lfs f5, scGuiZeroF
|
||||
fmuls f0, f0, f2
|
||||
fsubs f1, f31, f1
|
||||
fadds f2, f30, f0
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
#include "keyboard/tiHKBManager.h"
|
||||
#include "keyboard/tiLayoutGather.h"
|
||||
|
||||
extern const u8 lbl_81616BD8[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
extern const u8 lbl_81616BE4[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
extern "C" void SetCountry__Q39textinput5input10HKBManagerFUc();
|
||||
extern "C" textinput::input::HKBManager sInstance__Q39textinput5input10HKBManager;
|
||||
extern "C" void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw();
|
||||
@@ -528,20 +526,6 @@ extern const u8 controlKeys[];
|
||||
return false;
|
||||
}
|
||||
|
||||
const u8 controlKeys[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
|
||||
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
|
||||
0x00, 0x04, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
|
||||
0x2b, 0x2c, 0x19, 0x1a, 0x1b, 0x13, 0x15, 0x17, 0x14, 0x16, 0x18, 0x00,
|
||||
0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0f, 0x0e,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x0b,
|
||||
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
bool HWKeyboard::updateTappingShift_(input::HKBManager& hkbManager) {
|
||||
hkbManager.GetModifierState();
|
||||
input::HKBManager::KeySet currentKeySet;
|
||||
@@ -635,20 +619,38 @@ const u8 controlKeys[] = {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
|
||||
|
||||
const u8 controlKeys[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
|
||||
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
|
||||
0x00, 0x04, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
|
||||
0x2b, 0x2c, 0x19, 0x1a, 0x1b, 0x13, 0x15, 0x17, 0x14, 0x16, 0x18, 0x00,
|
||||
0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0f, 0x0e,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x0b,
|
||||
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
|
||||
extern "C" asm void setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language() {
|
||||
nofralloc
|
||||
cmpwi r4, 2
|
||||
bne setLanguage_L1
|
||||
lis r4, lbl_81616BD8@ha
|
||||
lis r4, scCountryMap_EU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, lbl_81616BD8@l
|
||||
addi r4, r4, scCountryMap_EU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
setLanguage_L1:
|
||||
lis r4, lbl_81616BE4@ha
|
||||
lis r4, scCountryMap_NonEU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, lbl_81616BE4@l
|
||||
addi r4, r4, scCountryMap_NonEU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
|
||||
@@ -2419,178 +2419,42 @@ void Base::onPressRight() {
|
||||
meScrollFlag = SF_ScrollOn;
|
||||
}
|
||||
|
||||
extern "C" asm void calc__Q39textinput9inputform4BaseFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x40(r1)
|
||||
mflr r0
|
||||
stw r0, 0x44(r1)
|
||||
stfd f31, 0x30(r1)
|
||||
psq_st f31, 0x38(r1), 0, 0
|
||||
stw r31, 0x2c(r1)
|
||||
stw r30, 0x28(r1)
|
||||
mr r30, r3
|
||||
lwz r12, 0x18c(r3)
|
||||
lwz r12, 0x14(r12)
|
||||
mtctr r12
|
||||
addi r3, r3, 0x18c
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
beq calc_L1
|
||||
lwz r12, 0x18c(r30)
|
||||
addi r3, r30, 0x18c
|
||||
lwz r12, 0x10(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
frsp f0, f1
|
||||
stfs f1, 0x188(r30)
|
||||
stfs f0, 0x100(r30)
|
||||
calc_L1:
|
||||
lwz r12, 0x18c(r30)
|
||||
addi r3, r30, 0x18c
|
||||
lwz r12, 0x14(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne calc_L2
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0x16c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
calc_L2:
|
||||
lwz r3, 0x164(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x78(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne calc_L3
|
||||
lfs f1, lbl_81694D38(r0)
|
||||
lfs f0, 0x1ac(r30)
|
||||
fadds f0, f1, f0
|
||||
stfs f0, 0x1ac(r30)
|
||||
calc_L3:
|
||||
lwz r12, 0x18c(r30)
|
||||
addi r3, r30, 0x18c
|
||||
lwz r12, 0xc(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lfs f1, sfColorPhase(r0)
|
||||
lfs f0, lbl_81694D40(r0)
|
||||
fmuls f1, f0, f1
|
||||
bl SinFIdx__Q24nw4r4mathFf
|
||||
lfs f0, lbl_81694D48(r0)
|
||||
li r0, 0x5a
|
||||
li r3, 2
|
||||
li r31, 0xfd
|
||||
fmuls f2, f0, f1
|
||||
lfs f0, lbl_81694D44(r0)
|
||||
stb r3, 0x1c0(r30)
|
||||
fmr f31, f1
|
||||
lwz r3, 0x164(r30)
|
||||
fadds f0, f0, f2
|
||||
stb r0, 0x1c1(r30)
|
||||
fctiwz f0, f0
|
||||
stb r31, 0x1c2(r30)
|
||||
stfd f0, 8(r1)
|
||||
lwz r0, 0xc(r1)
|
||||
stb r0, 0x1c3(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x78(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
beq calc_L4
|
||||
lfs f1, lbl_81694D50(r0)
|
||||
li r0, 0x8c
|
||||
li r3, 0x34
|
||||
lfs f0, lbl_81694D4C(r0)
|
||||
fmuls f1, f1, f31
|
||||
stb r0, 0x1c1(r30)
|
||||
stb r3, 0x1c0(r30)
|
||||
fadds f0, f0, f1
|
||||
stb r31, 0x1c2(r30)
|
||||
fctiwz f0, f0
|
||||
stfd f0, 8(r1)
|
||||
lwz r0, 0xc(r1)
|
||||
stb r0, 0x1c3(r30)
|
||||
b calc_L7
|
||||
calc_L4:
|
||||
lfs f1, 0x1ac(r30)
|
||||
lfs f5, lbl_81694D4C(r0)
|
||||
fcmpo cr0, f1, f5
|
||||
cror eq, lt, eq
|
||||
bne calc_L7
|
||||
lfs f2, lbl_81694D28(r0)
|
||||
lfs f3, lbl_81694D54(r0)
|
||||
fmr f4, f2
|
||||
lfs f6, lbl_81694D58(r0)
|
||||
fmr f7, f2
|
||||
bl hermiteInterporation__Q29textinput4utilFfffffff
|
||||
fctiwz f0, f1
|
||||
lfs f2, lbl_81694D28(r0)
|
||||
lfs f1, 0x1ac(r30)
|
||||
fmr f4, f2
|
||||
lfs f3, lbl_81694D5C(r0)
|
||||
stfd f0, 8(r1)
|
||||
fmr f7, f2
|
||||
lfs f5, lbl_81694D4C(r0)
|
||||
lwz r0, 0xc(r1)
|
||||
lfs f6, lbl_81694D60(r0)
|
||||
stb r0, 0x1c0(r30)
|
||||
bl hermiteInterporation__Q29textinput4utilFfffffff
|
||||
fctiwz f0, f1
|
||||
lfs f2, lbl_81694D28(r0)
|
||||
lfs f3, lbl_81694D64(r0)
|
||||
fmr f4, f2
|
||||
lfs f1, 0x1ac(r30)
|
||||
stfd f0, 0x10(r1)
|
||||
fmr f6, f3
|
||||
lfs f5, lbl_81694D4C(r0)
|
||||
lwz r0, 0x14(r1)
|
||||
fmr f7, f2
|
||||
stb r0, 0x1c1(r30)
|
||||
bl hermiteInterporation__Q29textinput4utilFfffffff
|
||||
fctiwz f1, f1
|
||||
lfs f2, sfColorPhase(r0)
|
||||
lfs f0, lbl_81694D40(r0)
|
||||
stfd f1, 0x18(r1)
|
||||
fmuls f1, f0, f2
|
||||
lwz r0, 0x1c(r1)
|
||||
stb r0, 0x1c2(r30)
|
||||
bl SinFIdx__Q24nw4r4mathFf
|
||||
lfs f2, lbl_81694D28(r0)
|
||||
fmr f31, f1
|
||||
lfs f3, lbl_81694D4C(r0)
|
||||
fmr f4, f2
|
||||
lfs f1, 0x1ac(r30)
|
||||
fmr f5, f3
|
||||
lfs f6, lbl_81694D44(r0)
|
||||
fmr f7, f2
|
||||
bl hermiteInterporation__Q29textinput4utilFfffffff
|
||||
lfs f0, lbl_81694D68(r0)
|
||||
fmuls f0, f0, f31
|
||||
fadds f0, f1, f0
|
||||
fctiwz f0, f0
|
||||
stfd f0, 0x20(r1)
|
||||
lwz r0, 0x24(r1)
|
||||
stb r0, 0x1c3(r30)
|
||||
calc_L7:
|
||||
lwz r3, 0x214(r30)
|
||||
lfs f1, sfColorPhase(r0)
|
||||
lfs f0, lbl_81694D58(r0)
|
||||
addi r0, r3, 8
|
||||
stw r0, 0x214(r30)
|
||||
fadds f0, f1, f0
|
||||
stfs f0, sfColorPhase(r0)
|
||||
psq_l f31, 0x38(r1), 0, 0
|
||||
lfd f31, 0x30(r1)
|
||||
lwz r31, 0x2c(r1)
|
||||
lwz r30, 0x28(r1)
|
||||
lwz r0, 0x44(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x40
|
||||
blr
|
||||
inline f32 nextColorPhase(f32 phase) { phase += 2.0f; return phase; }
|
||||
inline f32 colorSine(f32 phase) { return nw4r::math::SinFIdx(phase * 0.7111111f); }
|
||||
void Base::calc() {
|
||||
if (mScrollAnm.isActive()) {
|
||||
f32 scroll = mScrollAnm.getValue();
|
||||
mfScrollY = scroll;
|
||||
mfDrawScrollY = mfScrollY;
|
||||
}
|
||||
if (!mScrollAnm.isActive()) autoScroll();
|
||||
if (!mpString->isOnSustain()) mfSustainTimer = 1.0f + mfSustainTimer;
|
||||
mScrollAnm.calc();
|
||||
f32 wave = colorSine(sfColorPhase);
|
||||
mSelectedColor.r = 2;
|
||||
mSelectedColor.g = 90;
|
||||
mSelectedColor.b = 253;
|
||||
mSelectedColor.a = static_cast<u8>(150.0f + 30.0f * wave);
|
||||
if (mpString->isOnSustain()) {
|
||||
mSelectedColor.r = 52;
|
||||
mSelectedColor.g = 140;
|
||||
mSelectedColor.b = 253;
|
||||
mSelectedColor.a = static_cast<u8>(50.0f + 10.0f * wave);
|
||||
} else if (mfSustainTimer <= 50.0f) {
|
||||
mSelectedColor.r = static_cast<u8>(util::hermiteInterporation(mfSustainTimer, 0.0f, 52.0f, 0.0f, 50.0f, 2.0f, 0.0f));
|
||||
mSelectedColor.g = static_cast<u8>(util::hermiteInterporation(mfSustainTimer, 0.0f, 140.0f, 0.0f, 50.0f, 90.0f, 0.0f));
|
||||
u8 blue = static_cast<u8>(util::hermiteInterporation(mfSustainTimer, 0.0f, 253.0f, 0.0f, 50.0f, 253.0f, 0.0f));
|
||||
f32 phase = sfColorPhase;
|
||||
f32 angle = phase * 0.7111111f;
|
||||
mSelectedColor.b = blue;
|
||||
wave = nw4r::math::SinFIdx(angle);
|
||||
f32 alpha = util::hermiteInterporation(mfSustainTimer, 0.0f, 50.0f, 0.0f, 50.0f, 150.0f, 0.0f);
|
||||
mSelectedColor.a = static_cast<u8>(alpha + 20.0f * wave);
|
||||
}
|
||||
u32 cursorTimer = muCursorTimer + 8;
|
||||
f32 phase = sfColorPhase;
|
||||
muCursorTimer = cursorTimer;
|
||||
sfColorPhase = nextColorPhase(phase);
|
||||
}
|
||||
|
||||
Base::RowInfoManager::~RowInfoManager() {
|
||||
@@ -2824,49 +2688,29 @@ void tistring::Decolated::clear() {
|
||||
}
|
||||
|
||||
namespace inputform {
|
||||
extern "C" asm void init__Q49textinput9inputform4Base14RowInfoManagerFv() {
|
||||
nofralloc
|
||||
li r8, 0
|
||||
li r4, 0
|
||||
b init_RowInfo_L1
|
||||
init_RowInfo_L2:
|
||||
lwz r7, 0(r3)
|
||||
subi r5, r8, 1
|
||||
clrlslwi r6, r8, 16, 3
|
||||
addi r0, r8, 1
|
||||
sthux r5, r6, r7
|
||||
addi r8, r8, 1
|
||||
sth r0, 2(r6)
|
||||
sth r4, 4(r6)
|
||||
sth r4, 6(r6)
|
||||
init_RowInfo_L1:
|
||||
lhz r5, 4(r3)
|
||||
clrlwi r0, r8, 16
|
||||
cmplw r0, r5
|
||||
blt init_RowInfo_L2
|
||||
lhz r0, 4(r3)
|
||||
subi r5, r5, 1
|
||||
lwz r7, 0(r3)
|
||||
li r4, 0
|
||||
slwi r6, r0, 3
|
||||
clrlslwi r0, r5, 16, 3
|
||||
sthux r5, r6, r7
|
||||
sth r4, 2(r6)
|
||||
lwz r6, 0(r3)
|
||||
lhz r5, 4(r3)
|
||||
add r4, r6, r0
|
||||
sth r5, 2(r4)
|
||||
lhz r0, 4(r3)
|
||||
sth r0, 0(r6)
|
||||
lhz r5, 4(r3)
|
||||
lwz r4, 0(r3)
|
||||
addi r5, r5, 1
|
||||
clrlslwi r0, r5, 16, 3
|
||||
sthux r5, r4, r0
|
||||
lhz r3, 4(r3)
|
||||
addi r0, r3, 1
|
||||
sth r0, 2(r4)
|
||||
blr
|
||||
inline u16 initializeRowLinks(Base::Info_* const& rows, const u16& capacity) {
|
||||
for (u16 index = 0; index < capacity; ++index) {
|
||||
Base::Info_* row = &rows[index];
|
||||
row->Back = index - 1;
|
||||
row->Next = index + 1;
|
||||
row->StrCount = 0;
|
||||
row->DispRowCount = 0;
|
||||
}
|
||||
return capacity;
|
||||
}
|
||||
void Base::RowInfoManager::init() {
|
||||
u16 capacity = initializeRowLinks(mpInfo, mMaxLength);
|
||||
Info_* freeHead = &mpInfo[mMaxLength];
|
||||
u16 last = capacity - 1;
|
||||
freeHead->Back = last;
|
||||
freeHead->Next = 0;
|
||||
Info_* rows = mpInfo;
|
||||
rows[last].Next = mMaxLength;
|
||||
rows[0].Back = mMaxLength;
|
||||
u16 activeIndex = mMaxLength + 1;
|
||||
Info_* activeHead = &mpInfo[activeIndex];
|
||||
activeHead->Back = activeIndex;
|
||||
activeHead->Next = mMaxLength + 1;
|
||||
}
|
||||
nw4r::math::VEC2 LayoutByNW4R::getScale() const {
|
||||
return mpLayout->GetRootPane()->FindPaneByName(static_cast<const char*>(mpLayoutData), true)->GetScale();
|
||||
@@ -3205,8 +3049,8 @@ bool Base::onCursor(CursorPos* cursor) {
|
||||
glyph.rect.bottom = 0.0f;
|
||||
glyph.character = *predicted;
|
||||
calcRect(glyph);
|
||||
f32 width = glyph.rect.right - glyph.rect.left;
|
||||
f32 fieldWidth = mRect.right - mRect.left;
|
||||
f32 width = glyph.rect.GetWidth();
|
||||
f32 fieldWidth = mRect.GetWidth();
|
||||
f32 cursorX = GetCursorX();
|
||||
if (cursorX + width >= fieldWidth) doLineFeed();
|
||||
Print(*predicted);
|
||||
@@ -3249,9 +3093,7 @@ bool Base::onCursor(CursorPos* cursor) {
|
||||
marker.character = 0xE057;
|
||||
calcRect(space);
|
||||
calcRect(marker);
|
||||
f32 markerWidth = marker.rect.right - marker.rect.left;
|
||||
f32 spaceWidth = space.rect.right - space.rect.left;
|
||||
f32 offset = ((spaceWidth - markerWidth) * 0.5f) * getScale().x;
|
||||
f32 offset = ((space.rect.GetWidth() - marker.rect.GetWidth()) / 2.0f) * getScale().x;
|
||||
MoveCursorX(offset);
|
||||
Print(0xE057);
|
||||
MoveCursorX(offset);
|
||||
|
||||
@@ -621,28 +621,28 @@ namespace ipl {
|
||||
void BoardObject::set_thumb_text(const char* paneName, const wchar_t* thumbText) {
|
||||
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(paneName));
|
||||
|
||||
wchar_t local_28[THUMB_TEXT_LENGTH + 3 /* "..." */ + 1 /* NULL */] = L"";
|
||||
memset(local_28, 0, sizeof(local_28));
|
||||
wchar_t truncatedThumb[THUMB_TEXT_LENGTH + 3 /* "..." */ + 1 /* NULL */] = L"";
|
||||
memset(truncatedThumb, 0, sizeof(truncatedThumb));
|
||||
|
||||
if (thumbText != NULL) {
|
||||
for (int i = 0; i < THUMB_TEXT_LENGTH + 1 && thumbText[i] != (u16)'\n'; i++) {
|
||||
local_28[i] = thumbText[i];
|
||||
truncatedThumb[i] = thumbText[i];
|
||||
}
|
||||
}
|
||||
|
||||
if (System::getRegion() == SC_PRODUCT_AREA_JPN) {
|
||||
if (local_28[THUMB_TEXT_LENGTH] != 0) {
|
||||
local_28[THUMB_TEXT_LENGTH + 0] = L'…';
|
||||
if (truncatedThumb[THUMB_TEXT_LENGTH] != 0) {
|
||||
truncatedThumb[THUMB_TEXT_LENGTH + 0] = L'…';
|
||||
}
|
||||
} else {
|
||||
if (local_28[THUMB_TEXT_LENGTH] != 0) {
|
||||
local_28[THUMB_TEXT_LENGTH + 2] = '.';
|
||||
local_28[THUMB_TEXT_LENGTH + 1] = '.';
|
||||
local_28[THUMB_TEXT_LENGTH + 0] = '.';
|
||||
if (truncatedThumb[THUMB_TEXT_LENGTH] != 0) {
|
||||
truncatedThumb[THUMB_TEXT_LENGTH + 2] = '.';
|
||||
truncatedThumb[THUMB_TEXT_LENGTH + 1] = '.';
|
||||
truncatedThumb[THUMB_TEXT_LENGTH + 0] = '.';
|
||||
}
|
||||
}
|
||||
|
||||
textBox->SetString(local_28);
|
||||
textBox->SetString(truncatedThumb);
|
||||
}
|
||||
|
||||
void BoardObject::update(int chan) {
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
|
||||
#include "iplSystem.h"
|
||||
|
||||
__declspec(section ".sdata") extern char lbl_816966F9[];
|
||||
extern char lbl_816967B5[];
|
||||
__declspec(section ".sdata") extern char scPaneName_B_Stop[];
|
||||
extern char scPaneName_T_Stop[];
|
||||
extern "C" BOOL push_button_queue(void*, const void*);
|
||||
|
||||
namespace ipl {
|
||||
@@ -877,7 +877,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void OptOutButton::setText(u32 msgId) {
|
||||
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_816967B5));
|
||||
nw4r::lyt::TextBox* textBox = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scPaneName_T_Stop));
|
||||
textBox->SetString(System::getMessage(msgId));
|
||||
}
|
||||
|
||||
@@ -890,7 +890,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void OptOutButton::start_point_event(const char* paneName, controller::Interface* con) {
|
||||
if (strcmp(paneName, lbl_816966F9) == 0) {
|
||||
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
|
||||
if (mbHovered == FALSE) {
|
||||
// Play hover in animation
|
||||
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_IN)->play();
|
||||
@@ -906,7 +906,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void OptOutButton::start_left_event(const char* paneName) {
|
||||
if (strcmp(paneName, lbl_816966F9) == 0) {
|
||||
if (strcmp(paneName, scPaneName_B_Stop) == 0) {
|
||||
if (mbHovered == TRUE) {
|
||||
mpLayout->getAnim(ANIM_OPT_OUT_FOCUS_OUT)->play();
|
||||
}
|
||||
@@ -1005,4 +1005,4 @@ namespace ipl {
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
char lbl_816967B5[] = "T_Stop";
|
||||
char scPaneName_T_Stop[] = "T_Stop";
|
||||
|
||||
@@ -215,19 +215,19 @@ namespace ipl {
|
||||
MESG_CALENDAR_DEC,
|
||||
};
|
||||
|
||||
static const char* lbl_8164C458[] = {
|
||||
static const char* scPaneName_T_CalMonth[] = {
|
||||
"T_CalMonth_a",
|
||||
"T_CalMonth_b",
|
||||
"T_CalMonth_c",
|
||||
};
|
||||
|
||||
static const char* lbl_8164C480[] = {
|
||||
static const char* scPaneName_N_Cal[] = {
|
||||
"N_Cal_a1",
|
||||
"N_Cal_b1",
|
||||
"N_Cal_c1",
|
||||
};
|
||||
|
||||
static const char* lbl_8164C4B0[] = {
|
||||
static const char* scPaneName_N_CalPos[] = {
|
||||
"N_CalPos_a",
|
||||
"N_CalPos_b",
|
||||
"N_CalPos_c",
|
||||
@@ -661,9 +661,9 @@ namespace ipl {
|
||||
utility::Calendar::getLastMonth(*mpBoardDate, &last);
|
||||
utility::Calendar::getNextMonth(*mpBoardDate, &next);
|
||||
|
||||
set_textbox_month(lbl_8164C458[0], last);
|
||||
set_textbox_month(lbl_8164C458[1], *mpBoardDate);
|
||||
set_textbox_month(lbl_8164C458[2], next);
|
||||
set_textbox_month(scPaneName_T_CalMonth[0], last);
|
||||
set_textbox_month(scPaneName_T_CalMonth[1], *mpBoardDate);
|
||||
set_textbox_month(scPaneName_T_CalMonth[2], next);
|
||||
}
|
||||
|
||||
void Calendar::set_textbox_month(const char* paneName, const utility::Date& date) {
|
||||
@@ -714,31 +714,31 @@ namespace ipl {
|
||||
|
||||
OSCalendarTime curTime = System::getCurrentTime();
|
||||
|
||||
utility::Date local_64(curTime.year, curTime.mon + 1, curTime.mday);
|
||||
utility::Date local_70;
|
||||
utility::Date local_7c;
|
||||
utility::Date todayDate(curTime.year, curTime.mon + 1, curTime.mday);
|
||||
utility::Date lastMonth;
|
||||
utility::Date nextMonth;
|
||||
|
||||
utility::Calendar::getLastMonth(date, &local_70);
|
||||
utility::Calendar::getNextMonth(date, &local_7c);
|
||||
utility::Calendar::getLastMonth(date, &lastMonth);
|
||||
utility::Calendar::getNextMonth(date, &nextMonth);
|
||||
|
||||
int dateIndex;
|
||||
int iVar10;
|
||||
int weekOffset;
|
||||
if (mbAsian || mbUSA) {
|
||||
iVar10 = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
|
||||
weekOffset = 6 - utility::Calendar::getWeek(date.year, date.month, maxDays);
|
||||
} else {
|
||||
week--;
|
||||
if (week < 0) {
|
||||
week = 6;
|
||||
}
|
||||
iVar10 = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
|
||||
if (iVar10 >= 7) {
|
||||
iVar10 = 0;
|
||||
weekOffset = 6 - (utility::Calendar::getWeek(date.year, date.month, maxDays) - 1);
|
||||
if (weekOffset >= 7) {
|
||||
weekOffset = 0;
|
||||
}
|
||||
}
|
||||
|
||||
dateIndex = unk == 1 ? 0 : DATE_COUNT;
|
||||
|
||||
utility::Date local_88;
|
||||
utility::Date cellDate;
|
||||
|
||||
u32 attr;
|
||||
int val2;
|
||||
@@ -750,25 +750,25 @@ namespace ipl {
|
||||
|
||||
val = (maxDays + week);
|
||||
attr = 0;
|
||||
val2 = (iVar10 + val);
|
||||
val2 = (weekOffset + val);
|
||||
if ((week - i) > 0) {
|
||||
local_88.year = local_70.year;
|
||||
local_88.month = local_70.month;
|
||||
local_88.day = i + (local_70.day - week) + 1;
|
||||
cellDate.year = lastMonth.year;
|
||||
cellDate.month = lastMonth.month;
|
||||
cellDate.day = i + (lastMonth.day - week) + 1;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if ((val - i) > 0) {
|
||||
local_88.year = date.year;
|
||||
local_88.month = date.month;
|
||||
local_88.day = (i - week) + 1;
|
||||
cellDate.year = date.year;
|
||||
cellDate.month = date.month;
|
||||
cellDate.day = (i - week) + 1;
|
||||
attr |= 2;
|
||||
|
||||
if (local_88 == local_64) {
|
||||
if (cellDate == todayDate) {
|
||||
attr |= 1;
|
||||
}
|
||||
|
||||
switch (utility::Calendar::getWeek(local_88.year, local_88.month, local_88.day)) {
|
||||
switch (utility::Calendar::getWeek(cellDate.year, cellDate.month, cellDate.day)) {
|
||||
case 6: {
|
||||
attr |= 8;
|
||||
break;
|
||||
@@ -782,9 +782,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if ((val2 - i) > 0) {
|
||||
local_88.year = local_7c.year;
|
||||
local_88.month = local_7c.month;
|
||||
local_88.day = ((i - maxDays) - week) + 1;
|
||||
cellDate.year = nextMonth.year;
|
||||
cellDate.month = nextMonth.month;
|
||||
cellDate.day = ((i - maxDays) - week) + 1;
|
||||
goto out;
|
||||
} else {
|
||||
dateScn->setVisible(false);
|
||||
@@ -792,14 +792,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
out:
|
||||
dateScn->setDate(local_88);
|
||||
dateScn->setDate(cellDate);
|
||||
dateScn->setAttribute(attr);
|
||||
}
|
||||
}
|
||||
|
||||
void Calendar::set_date_pos(int unk) {
|
||||
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(lbl_8164C480[unk]);
|
||||
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(lbl_8164C4B0[unk]);
|
||||
nw4r::lyt::Pane* pane1 = mpLayout->FindPaneByName(scPaneName_N_Cal[unk]);
|
||||
nw4r::lyt::Pane* pane2 = mpLayout->FindPaneByName(scPaneName_N_CalPos[unk]);
|
||||
|
||||
int dateIndex = unk == 1 ? 0 : DATE_COUNT;
|
||||
|
||||
@@ -807,14 +807,14 @@ namespace ipl {
|
||||
Date* dateScn = ((Date*)nw4r::ut::List_GetNth(&mDateList, dateIndex));
|
||||
dateIndex++;
|
||||
|
||||
nw4r::math::VEC3 local_68;
|
||||
local_68.x = ((u16)i % 7) * 0x46;
|
||||
local_68.y = ((u16)i / 7) * -0x30;
|
||||
local_68.z = 0.0f;
|
||||
nw4r::math::VEC3 cellPos;
|
||||
cellPos.x = ((u16)i % 7) * 0x46;
|
||||
cellPos.y = ((u16)i / 7) * -0x30;
|
||||
cellPos.z = 0.0f;
|
||||
|
||||
MTXMultVec(pane2->GetGlobalMtx(), local_68, local_68);
|
||||
MTXMultVec(pane2->GetGlobalMtx(), cellPos, cellPos);
|
||||
|
||||
dateScn->setTranslate(local_68);
|
||||
dateScn->setTranslate(cellPos);
|
||||
dateScn->setRotate(pane1->GetRotate());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,40 +7,40 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
extern "C" char lbl_816967D8[];
|
||||
extern "C" char lbl_816967DE[];
|
||||
extern "C" char lbl_816967E4[];
|
||||
extern "C" char lbl_816967EB[];
|
||||
extern "C" char lbl_816967F2[];
|
||||
extern "C" char scW_Cal[];
|
||||
extern "C" char scT_Cal[];
|
||||
extern "C" char scCal_Ac[];
|
||||
extern "C" char scInfo_a[];
|
||||
extern "C" char scB_Cal[];
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8164C620[] = "N_CalDay_r";
|
||||
extern "C" const char scN_CalDay_r[] = "N_CalDay_r";
|
||||
#pragma pop
|
||||
|
||||
// clang-format off
|
||||
extern "C" const char* lbl_8164C62C[Date::ANIM_PANE_MAX] = {
|
||||
lbl_8164C620,
|
||||
lbl_816967D8,
|
||||
lbl_816967DE,
|
||||
lbl_816967E4,
|
||||
lbl_816967EB,
|
||||
extern "C" const char* scDateAnimPaneNames[Date::ANIM_PANE_MAX] = {
|
||||
scN_CalDay_r,
|
||||
scW_Cal,
|
||||
scT_Cal,
|
||||
scCal_Ac,
|
||||
scInfo_a,
|
||||
};
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8164C640[] = "my_IplTop_f.brlan";
|
||||
extern "C" const char lbl_8164C652[] = "N_CalDay_t";
|
||||
extern "C" const char lbl_8164C65D[] = "WIPL_SE_DATE_FOCUS";
|
||||
extern "C" const char scMyIplTopFBrlan[] = "my_IplTop_f.brlan";
|
||||
extern "C" const char scN_CalDay_t[] = "N_CalDay_t";
|
||||
extern "C" const char scSEDateFocus[] = "WIPL_SE_DATE_FOCUS";
|
||||
#pragma pop
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".sdata"
|
||||
extern "C" char lbl_816967D8[] = "W_Cal";
|
||||
extern "C" char lbl_816967DE[] = "T_Cal";
|
||||
extern "C" char lbl_816967E4[] = "Cal_Ac";
|
||||
extern "C" char lbl_816967EB[] = "Info_a";
|
||||
extern "C" char lbl_816967F2[] = "B_Cal";
|
||||
extern "C" char scW_Cal[] = "W_Cal";
|
||||
extern "C" char scT_Cal[] = "T_Cal";
|
||||
extern "C" char scCal_Ac[] = "Cal_Ac";
|
||||
extern "C" char scInfo_a[] = "Info_a";
|
||||
extern "C" char scB_Cal[] = "B_Cal";
|
||||
#pragma pop
|
||||
|
||||
static const Date::AnmFrame scAnmFrame[] = {
|
||||
@@ -73,7 +73,7 @@ namespace ipl {
|
||||
|
||||
// Bind animations
|
||||
for (int i = 0; i < ANIM_PANE_MAX; i++) {
|
||||
mpPaneAnims[i] = mpLayout->bind(lbl_8164C640, lbl_8164C62C[i], false);
|
||||
mpPaneAnims[i] = mpLayout->bind(scMyIplTopFBrlan, scDateAnimPaneNames[i], false);
|
||||
}
|
||||
mpLayout->finishBinding();
|
||||
|
||||
@@ -81,7 +81,7 @@ namespace ipl {
|
||||
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL);
|
||||
mpGui->setupScene(mpLayout);
|
||||
mpGui->setAllComponentTriggerTarget(false);
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_816967F2), true);
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scB_Cal), true);
|
||||
|
||||
// Init date
|
||||
mpDate = new utility::Date();
|
||||
@@ -128,19 +128,19 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Date::setRotate(const nw4r::math::VEC3& vec) {
|
||||
mpLayout->FindPaneByName(lbl_8164C652)->SetRotate(vec);
|
||||
mpLayout->FindPaneByName(scN_CalDay_t)->SetRotate(vec);
|
||||
}
|
||||
|
||||
void Date::setTranslate(const nw4r::math::VEC3& vec) {
|
||||
mpLayout->FindPaneByName(lbl_8164C652)->SetTranslate(vec);
|
||||
mpLayout->FindPaneByName(scN_CalDay_t)->SetTranslate(vec);
|
||||
}
|
||||
|
||||
void Date::setVisible(bool visible) {
|
||||
mpLayout->FindPaneByName(lbl_8164C62C[0])->SetVisible(visible);
|
||||
mpLayout->FindPaneByName(scDateAnimPaneNames[0])->SetVisible(visible);
|
||||
}
|
||||
|
||||
bool Date::getVisible() {
|
||||
return mpLayout->FindPaneByName(lbl_8164C62C[0])->IsVisible();
|
||||
return mpLayout->FindPaneByName(scDateAnimPaneNames[0])->IsVisible();
|
||||
}
|
||||
|
||||
void Date::setAttribute(int attr) {
|
||||
@@ -209,13 +209,13 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Date::start_point_event(const char* paneName, controller::Interface* con) {
|
||||
if (strcmp(paneName, lbl_816967F2) == 0) {
|
||||
if (strcmp(paneName, scB_Cal) == 0) {
|
||||
if (unk_0x3C == 0) {
|
||||
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
|
||||
onCmdRecv(1);
|
||||
|
||||
if (getVisible()) {
|
||||
snd::getSystem()->startSE(lbl_8164C65D);
|
||||
snd::getSystem()->startSE(scSEDateFocus);
|
||||
if (con != NULL) {
|
||||
con->rumble(1);
|
||||
}
|
||||
@@ -226,7 +226,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void Date::start_left_event(const char* paneName) {
|
||||
if (strcmp(paneName, lbl_816967F2) == 0) {
|
||||
if (strcmp(paneName, scB_Cal) == 0) {
|
||||
if (unk_0x3C == 1) {
|
||||
onCmdRecv(2);
|
||||
}
|
||||
@@ -262,7 +262,7 @@ namespace ipl {
|
||||
|
||||
numStr[index++] = 0;
|
||||
|
||||
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_8164C62C[2]));
|
||||
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scDateAnimPaneNames[2]));
|
||||
pane->SetString(numStr);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,27 +4,27 @@
|
||||
|
||||
#pragma push
|
||||
#pragma section const_type ".data"
|
||||
extern "C" const char lbl_8164D108[] = "it_ObjChannelEdit_b_SaveDataIn.brlan";
|
||||
extern "C" const char lbl_8164D12D[] = "it_ObjChannelEdit_b_SaveDataOut.brlan";
|
||||
extern "C" const char lbl_8164D153[] = "it_ObjChannelEdit_b_SaveDataFoucusIn.brlan";
|
||||
extern "C" const char lbl_8164D17E[] = "it_ObjChannelEdit_b_SaveDataFoucusOut.brlan";
|
||||
extern "C" const char lbl_8164D1AA[] = "N_Data16x9";
|
||||
extern "C" const char lbl_8164D1B5[] = "N_Data4x3";
|
||||
extern "C" const char lbl_8164D1BF[] = "B_Data_01";
|
||||
extern "C" const char lbl_8164D1C9[] = "B_Data_00";
|
||||
extern "C" const char lbl_8164D1D3[] = "N_Atari16x9";
|
||||
extern "C" const char lbl_8164D1DF[] = "N_Data_01";
|
||||
extern "C" const char lbl_8164D1E9[] = "N_Atari4x3";
|
||||
extern "C" const char lbl_8164D1F4[] = "N_Data_00";
|
||||
extern "C" const char lbl_8164D1FE[] = "DataBaseCover_00";
|
||||
extern "C" const char lbl_8164D20F[] = "DataBaseCover_01";
|
||||
extern "C" const char scBrlan_SaveDataIn[] = "it_ObjChannelEdit_b_SaveDataIn.brlan";
|
||||
extern "C" const char scBrlan_SaveDataOut[] = "it_ObjChannelEdit_b_SaveDataOut.brlan";
|
||||
extern "C" const char scBrlan_SaveDataFocusIn[] = "it_ObjChannelEdit_b_SaveDataFoucusIn.brlan";
|
||||
extern "C" const char scBrlan_SaveDataFocusOut[] = "it_ObjChannelEdit_b_SaveDataFoucusOut.brlan";
|
||||
extern "C" const char scPaneName_N_Data16x9[] = "N_Data16x9";
|
||||
extern "C" const char scPaneName_N_Data4x3[] = "N_Data4x3";
|
||||
extern "C" const char scPaneName_B_Data_01[] = "B_Data_01";
|
||||
extern "C" const char scPaneName_B_Data_00[] = "B_Data_00";
|
||||
extern "C" const char scPaneName_N_Atari16x9[] = "N_Atari16x9";
|
||||
extern "C" const char scPaneName_N_Data_01[] = "N_Data_01";
|
||||
extern "C" const char scPaneName_N_Atari4x3[] = "N_Atari4x3";
|
||||
extern "C" const char scPaneName_N_Data_00[] = "N_Data_00";
|
||||
extern "C" const char scPaneName_DataBaseCover_00[] = "DataBaseCover_00";
|
||||
extern "C" const char scPaneName_DataBaseCover_01[] = "DataBaseCover_01";
|
||||
#pragma section const_type ".sdata"
|
||||
extern "C" __declspec(section ".sdata") const char lbl_81696848[] = "G_Data";
|
||||
extern "C" __declspec(section ".sdata") const wchar_t lbl_81696850[] = L"???";
|
||||
extern "C" __declspec(section ".sdata") const char scGroup_G_Data[] = "G_Data";
|
||||
extern "C" __declspec(section ".sdata") const wchar_t scUnknownWstr[] = L"???";
|
||||
#pragma section sconst_type ".sdata2"
|
||||
extern "C" __declspec(section ".sdata2") const f32 lbl_81694900 = 0.5f;
|
||||
extern "C" __declspec(section ".sdata2") const f32 lbl_81694904 = 2.0f;
|
||||
extern "C" __declspec(section ".sdata2") const f64 lbl_81694908 = 4503599627370496.0;
|
||||
extern "C" __declspec(section ".sdata2") const f32 scHalfF = 0.5f;
|
||||
extern "C" __declspec(section ".sdata2") const f32 scTwoF = 2.0f;
|
||||
extern "C" __declspec(section ".sdata2") const f64 scF2IBias = 4503599627370496.0;
|
||||
#pragma pop
|
||||
|
||||
namespace ipl {
|
||||
@@ -33,26 +33,26 @@ namespace ipl {
|
||||
: AnmController(heap), ::gui::EventHandler(), mState(STATE_HIDDEN), mpThumbnail(NULL), mpBalloon(NULL), mbInitBalloon(false) {
|
||||
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
|
||||
|
||||
add_animation(lbl_8164D108, lbl_81696848);
|
||||
add_animation(lbl_8164D12D, lbl_81696848);
|
||||
add_animation(lbl_8164D153, lbl_81696848);
|
||||
add_animation(lbl_8164D17E, lbl_81696848);
|
||||
add_animation(scBrlan_SaveDataIn, scGroup_G_Data);
|
||||
add_animation(scBrlan_SaveDataOut, scGroup_G_Data);
|
||||
add_animation(scBrlan_SaveDataFocusIn, scGroup_G_Data);
|
||||
add_animation(scBrlan_SaveDataFocusOut, scGroup_G_Data);
|
||||
|
||||
mpLayout->finishBinding();
|
||||
|
||||
set_visible(lbl_8164D1AA, false);
|
||||
set_visible(lbl_8164D1B5, false);
|
||||
set_visible(scPaneName_N_Data16x9, false);
|
||||
set_visible(scPaneName_N_Data4x3, false);
|
||||
|
||||
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
|
||||
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
|
||||
mpGui->setAllComponentTriggerTarget(false);
|
||||
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1BF), true);
|
||||
add_anmpane(lbl_8164D1BF, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scPaneName_B_Data_01), true);
|
||||
add_anmpane(scPaneName_B_Data_01, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
|
||||
} else {
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1C9), true);
|
||||
add_anmpane(lbl_8164D1C9, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
|
||||
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scPaneName_B_Data_00), true);
|
||||
add_anmpane(scPaneName_B_Data_00, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,11 +92,11 @@ namespace ipl {
|
||||
|
||||
nw4r::math::VEC2 scale = mpThumbnail->getLytObj()->GetRootPane()->GetScale();
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
scale *= get_scale(lbl_8164D1D3).x;
|
||||
scale *= get_scale(lbl_8164D1DF).x;
|
||||
scale *= get_scale(scPaneName_N_Atari16x9).x;
|
||||
scale *= get_scale(scPaneName_N_Data_01).x;
|
||||
} else {
|
||||
scale *= get_scale(lbl_8164D1E9).x;
|
||||
scale *= get_scale(lbl_8164D1F4).x;
|
||||
scale *= get_scale(scPaneName_N_Atari4x3).x;
|
||||
scale *= get_scale(scPaneName_N_Data_00).x;
|
||||
}
|
||||
mpThumbnail->getLytObj()->GetRootPane()->SetScale(scale);
|
||||
}
|
||||
@@ -127,8 +127,8 @@ namespace ipl {
|
||||
return;
|
||||
mpLayout->draw();
|
||||
|
||||
set_visible(lbl_8164D1FE, false);
|
||||
set_visible(lbl_8164D20F, false);
|
||||
set_visible(scPaneName_DataBaseCover_00, false);
|
||||
set_visible(scPaneName_DataBaseCover_01, false);
|
||||
|
||||
ChannelEdit* sceneChannelEdit = get_channel_edit();
|
||||
if (sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_R || sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_L)
|
||||
@@ -138,7 +138,7 @@ namespace ipl {
|
||||
if (mState == STATE_FADE_OUT)
|
||||
return;
|
||||
|
||||
if (!get_visible(lbl_8164D1B5) && !get_visible(lbl_8164D1AA))
|
||||
if (!get_visible(scPaneName_N_Data4x3) && !get_visible(scPaneName_N_Data16x9))
|
||||
return;
|
||||
|
||||
if (mpThumbnail == NULL) {
|
||||
@@ -171,11 +171,11 @@ namespace ipl {
|
||||
mpThumbnail->draw();
|
||||
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
set_visible(lbl_8164D20F, true);
|
||||
mpLayout->draw(lbl_8164D20F);
|
||||
set_visible(scPaneName_DataBaseCover_01, true);
|
||||
mpLayout->draw(scPaneName_DataBaseCover_01);
|
||||
} else {
|
||||
set_visible(lbl_8164D1FE, true);
|
||||
mpLayout->draw(lbl_8164D1FE);
|
||||
set_visible(scPaneName_DataBaseCover_00, true);
|
||||
mpLayout->draw(scPaneName_DataBaseCover_00);
|
||||
}
|
||||
|
||||
GXSetScissor(0, 0, System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight);
|
||||
@@ -187,11 +187,11 @@ namespace ipl {
|
||||
|
||||
void ChanAppBox::anmFadein() {
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
set_visible(lbl_8164D1AA, true);
|
||||
set_visible(lbl_8164D1B5, false);
|
||||
set_visible(scPaneName_N_Data16x9, true);
|
||||
set_visible(scPaneName_N_Data4x3, false);
|
||||
} else {
|
||||
set_visible(lbl_8164D1AA, false);
|
||||
set_visible(lbl_8164D1B5, true);
|
||||
set_visible(scPaneName_N_Data16x9, false);
|
||||
set_visible(scPaneName_N_Data4x3, true);
|
||||
}
|
||||
do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true);
|
||||
mState = STATE_FADE_IN;
|
||||
@@ -226,7 +226,7 @@ namespace ipl {
|
||||
|
||||
mbInitBalloon = true;
|
||||
if (mpThumbnail->getIsCorrupt()) {
|
||||
mpBalloon->init(lbl_81696850);
|
||||
mpBalloon->init(scUnknownWstr);
|
||||
} else {
|
||||
if (mpThumbnail->getMatchesTmpTitle()) {
|
||||
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
|
||||
@@ -251,7 +251,7 @@ namespace ipl {
|
||||
|
||||
mbInitBalloon = true;
|
||||
if (mpThumbnail->getIsCorrupt()) {
|
||||
mpBalloon->init(lbl_81696850);
|
||||
mpBalloon->init(scUnknownWstr);
|
||||
} else {
|
||||
if (mpThumbnail->getMatchesTmpTitle()) {
|
||||
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
|
||||
@@ -297,9 +297,9 @@ namespace ipl {
|
||||
|
||||
void ChanAppBox::clearEvent() {
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
clear_anmpane(lbl_8164D1BF);
|
||||
clear_anmpane(scPaneName_B_Data_01);
|
||||
} else {
|
||||
clear_anmpane(lbl_8164D1C9);
|
||||
clear_anmpane(scPaneName_B_Data_00);
|
||||
}
|
||||
|
||||
if (mpBalloon != NULL) {
|
||||
@@ -314,8 +314,8 @@ namespace ipl {
|
||||
|
||||
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadein, ANIM_DATA_IN, mState = STATE_IDLE);
|
||||
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadeout, ANIM_DATA_OUT, {
|
||||
set_visible(lbl_8164D1AA, false);
|
||||
set_visible(lbl_8164D1B5, false);
|
||||
set_visible(scPaneName_N_Data16x9, false);
|
||||
set_visible(scPaneName_N_Data4x3, false);
|
||||
mState = STATE_IDLE;
|
||||
});
|
||||
|
||||
|
||||
@@ -35,8 +35,8 @@ namespace ipl {
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))))));
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 = (unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
f32 temp_f3 = (mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r.x += temp_f3;
|
||||
r.y += temp_f3;
|
||||
r.z += temp_f3;
|
||||
@@ -51,8 +51,8 @@ namespace ipl {
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r += (unkVal0 * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
|
||||
r += (mStartTangent * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
|
||||
return r;
|
||||
}
|
||||
} // namespace math
|
||||
@@ -131,15 +131,15 @@ namespace ipl {
|
||||
extern "C" char mscBasePaneNames__Q33ipl5scene13ChannelSelect[];
|
||||
extern "C" char mscClockPaneNames__Q33ipl5scene13ChannelSelect[];
|
||||
extern "C" u32 mscMaskPaneName__Q33ipl5scene13ChannelSelect;
|
||||
extern "C" char lbl_8164DFE1[];
|
||||
extern "C" char lbl_8164DE64[];
|
||||
extern "C" char lbl_8164DE6D[];
|
||||
extern "C" char lbl_8164DE9C[];
|
||||
extern "C" char lbl_8164DFCB[];
|
||||
extern "C" char lbl_8164DFF1[];
|
||||
extern "C" char lbl_8164E000[];
|
||||
extern "C" char lbl_8164E024[];
|
||||
extern "C" char lbl_8164E038[];
|
||||
extern "C" char scSE_WIPL_SE_CH_HOLD[];
|
||||
extern "C" char scPaneName_N_GCIcon[];
|
||||
extern "C" char scPaneName_N_DiscUpdateIcon[];
|
||||
extern "C" char scSE_WSD_SELECT[];
|
||||
extern "C" char scSE_WIPL_SE_CH_TARGETTING[];
|
||||
extern "C" char scSE_WIPL_SE_CH_SET[];
|
||||
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[];
|
||||
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[];
|
||||
extern "C" char scSE_WIPL_SE_DECIDE[];
|
||||
extern "C" void draw__Q33ipl6layout6ObjectFPQ34nw4r3lyt4Pane();
|
||||
extern "C" void SetVisible__Q34nw4r3lyt4PaneFb();
|
||||
extern "C" void drawChannelThumbnails__Q33ipl5scene13ChannelSelectFv();
|
||||
@@ -855,8 +855,8 @@ namespace ipl {
|
||||
mpDiskInOutLyt->finishBinding();
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164DE64[] = "N_GCIcon";
|
||||
extern "C" char lbl_8164DE6D[] = "N_DiscUpdateIcon";
|
||||
extern "C" char scPaneName_N_GCIcon[] = "N_GCIcon";
|
||||
extern "C" char scPaneName_N_DiscUpdateIcon[] = "N_DiscUpdateIcon";
|
||||
extern "C" void* jumptable_8164DE80[7] = {
|
||||
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C),
|
||||
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C),
|
||||
@@ -1359,8 +1359,8 @@ namespace ipl {
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
lwz r3, 0x94(r3)
|
||||
lis r29, lbl_8164DE64@ha
|
||||
addi r4, r29, lbl_8164DE64@l
|
||||
lis r29, scPaneName_N_GCIcon@ha
|
||||
addi r4, r29, scPaneName_N_GCIcon@l
|
||||
li r5, 0x1
|
||||
lwz r3, 0x14(r3)
|
||||
lwz r12, 0x0(r3)
|
||||
@@ -1370,8 +1370,8 @@ namespace ipl {
|
||||
li r4, 0x1
|
||||
bl SetVisible__Q34nw4r3lyt4PaneFb
|
||||
lwz r3, 0x94(r31)
|
||||
lis r30, lbl_8164DE6D@ha
|
||||
addi r4, r30, lbl_8164DE6D@l
|
||||
lis r30, scPaneName_N_DiscUpdateIcon@ha
|
||||
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
|
||||
li r5, 0x1
|
||||
lwz r3, 0x14(r3)
|
||||
lwz r12, 0x0(r3)
|
||||
@@ -1419,7 +1419,7 @@ namespace ipl {
|
||||
bne updateDiskState_813AD134
|
||||
lwz r3, 0x84(r28)
|
||||
li r0, 0x0
|
||||
addi r4, r29, lbl_8164DE64@l
|
||||
addi r4, r29, scPaneName_N_GCIcon@l
|
||||
li r5, 0x1
|
||||
stb r0, 0x1b81(r3)
|
||||
lwz r3, 0x94(r31)
|
||||
@@ -1431,7 +1431,7 @@ namespace ipl {
|
||||
li r4, 0x0
|
||||
bl SetVisible__Q34nw4r3lyt4PaneFb
|
||||
lwz r3, 0x94(r31)
|
||||
addi r4, r30, lbl_8164DE6D@l
|
||||
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
|
||||
li r5, 0x1
|
||||
lwz r3, 0x14(r3)
|
||||
lwz r12, 0x0(r3)
|
||||
@@ -2087,10 +2087,11 @@ namespace ipl {
|
||||
mpMoveLytDrop->getAnim()->initAnmFrame();
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164DFCB[] = "WIPL_SE_CH_TARGETTING";
|
||||
extern "C" char lbl_8164DFE1[] = "WIPL_SE_CH_HOLD";
|
||||
extern "C" char lbl_8164DFF1[] = "WIPL_SE_CH_SET";
|
||||
extern "C" char lbl_8164E000[] = "WIPL_SE_CH_NOT_MOVE";
|
||||
extern "C" char scSE_WSD_SELECT[] = "WSD_SELECT";
|
||||
extern "C" char scSE_WIPL_SE_CH_TARGETTING[] = "WIPL_SE_CH_TARGETTING";
|
||||
extern "C" char scSE_WIPL_SE_CH_HOLD[] = "WIPL_SE_CH_HOLD";
|
||||
extern "C" char scSE_WIPL_SE_CH_SET[] = "WIPL_SE_CH_SET";
|
||||
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[] = "WIPL_SE_CH_NOT_MOVE";
|
||||
|
||||
void ChannelSelect::calcNormalGrab() {
|
||||
Button* button = getButton();
|
||||
@@ -2167,7 +2168,7 @@ namespace ipl {
|
||||
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
|
||||
mpGui->initPane(getChannelBasePane(i));
|
||||
}
|
||||
snd::getSystem()->startSE(lbl_8164DE9C);
|
||||
snd::getSystem()->startSE(scSE_WSD_SELECT);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -2193,7 +2194,7 @@ namespace ipl {
|
||||
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
|
||||
mpGui->initPane(getChannelBasePane(i));
|
||||
}
|
||||
snd::getSystem()->startSE(lbl_8164DE9C);
|
||||
snd::getSystem()->startSE(scSE_WSD_SELECT);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -2357,7 +2358,7 @@ namespace ipl {
|
||||
case ::gui::EventHandler::ON_POINT: {
|
||||
if (isReleasableArea(mCurrentPage, id) || (mCurrentPage == mMoveOldPage && id == mMoveOldIndex)) {
|
||||
searchList(mCurrentPage, id)->onPoint(2);
|
||||
snd::getSystem()->startSE(lbl_8164DFCB);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
|
||||
con->rumble(1);
|
||||
break;
|
||||
}
|
||||
@@ -2438,7 +2439,7 @@ namespace ipl {
|
||||
mbModuleSceneChange = true;
|
||||
unk_0x185 = true;
|
||||
|
||||
snd::getSystem()->startSEwithPos(lbl_8164DFE1, mDragPos.x);
|
||||
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_HOLD, mDragPos.x);
|
||||
|
||||
mState = STATE_NORMAL_GRAB;
|
||||
}
|
||||
@@ -2450,13 +2451,13 @@ namespace ipl {
|
||||
mpMoveLytDrop->GetRootPane()->SetTranslate(translate);
|
||||
mpMoveLytDrop->getAnim(0)->play();
|
||||
|
||||
snd::getSystem()->startSEwithPos(lbl_8164DFF1, mDragPos.x);
|
||||
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_SET, mDragPos.x);
|
||||
|
||||
mpMoveLytMask->getAnim(1)->play();
|
||||
|
||||
mState = STATE_NORMAL_MOVE_CHAN_IN;
|
||||
} else {
|
||||
snd::getSystem()->startSEwithPos(lbl_8164E000, mDragPos.x);
|
||||
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_NOT_MOVE, mDragPos.x);
|
||||
|
||||
mState = STATE_NORMAL_RELEASE_WAIT;
|
||||
}
|
||||
@@ -2519,8 +2520,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" char lbl_8164E024[] = "WIPL_SE_GRAY_BUTTON";
|
||||
extern "C" char lbl_8164E038[] = "WIPL_SE_DECIDE";
|
||||
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[] = "WIPL_SE_GRAY_BUTTON";
|
||||
extern "C" char scSE_WIPL_SE_DECIDE[] = "WIPL_SE_DECIDE";
|
||||
|
||||
void ChannelSelectEventHandler::onEvent(u32 compId, u32 event, void* data) {
|
||||
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
|
||||
@@ -2561,7 +2562,7 @@ namespace ipl {
|
||||
case ::gui::EventHandler::ON_POINT: {
|
||||
if (mpInstance->mState == ChannelSelect::STATE_NORMAL && chanObj->isValid()) {
|
||||
chanObj->onPoint(0);
|
||||
snd::getSystem()->startSE(lbl_8164DFCB);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
|
||||
con->rumble(1);
|
||||
}
|
||||
break;
|
||||
@@ -2599,13 +2600,13 @@ namespace ipl {
|
||||
if (System::isSafeMode()) {
|
||||
System::getDialog()->callBtn0(MESG_CHAN_SEL_SAFE_MODE, 180);
|
||||
mpInstance->mState = ChannelSelect::STATE_NORMAL_SAFE_MODE_DIALOG;
|
||||
snd::getSystem()->startSE(lbl_8164E024);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_GRAY_BUTTON);
|
||||
} else {
|
||||
mpInstance->setSomething();
|
||||
mpInstance->mState = ChannelSelect::STATE_START_BOARD_SCENE;
|
||||
mpInstance->tryToStartBoardScene();
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
snd::getSystem()->startSE(lbl_8164E038);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
|
||||
}
|
||||
} else if (Button::cmpButtonName(paneName, Button::BTN_SETTING) == 0) {
|
||||
button->setEventHandler(NULL);
|
||||
@@ -2615,7 +2616,7 @@ namespace ipl {
|
||||
System::getFader()->fadeOut();
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
mpInstance->mState = ChannelSelect::STATE_START_SETTING_SCENE;
|
||||
snd::getSystem()->startSE(lbl_8164E038);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
|
||||
} else if (Button::cmpButtonName(paneName, Button::BTN_ARROW_LEFT) == 0 && mpInstance->mCurrentPage > 0) {
|
||||
button->animation(Button::IDANIM_ARROW_LEFT_SELECT);
|
||||
mpInstance->preparePageScrolling(ChannelSelect::STATE_PREP_LEFT_PAGE_SCROLL);
|
||||
@@ -2650,7 +2651,7 @@ namespace ipl {
|
||||
System::getFader()->fadeOut();
|
||||
TVRCManager::getHandle()->setEnable(FALSE);
|
||||
mpInstance->mState = ChannelSelect::STATE_START_SD_MENU_SCENE;
|
||||
snd::getSystem()->startSE(lbl_8164E038);
|
||||
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -32,181 +32,181 @@ namespace ipl {
|
||||
ChannelTitle::TicketViewStorage ChannelTitle::msTicketView ALIGN32;
|
||||
ESTicketView ChannelTitle::msUnlockTicket;
|
||||
|
||||
extern "C" char lbl_81696A10[];
|
||||
extern "C" char lbl_81696A17[];
|
||||
extern "C" char lbl_81696A28[];
|
||||
extern "C" char lbl_81696A34[];
|
||||
extern "C" char lbl_81696A3A[];
|
||||
extern "C" char lbl_81696A44[];
|
||||
extern "C" char lbl_81696A54[];
|
||||
extern "C" char lbl_81696A5A[];
|
||||
extern "C" char lbl_81696A60[];
|
||||
extern "C" char lbl_81696A66[];
|
||||
extern "C" char lbl_81696A6C[];
|
||||
extern "C" char lbl_81696A72[];
|
||||
extern "C" char lbl_81696A78[];
|
||||
extern "C" char lbl_81696A7E[];
|
||||
extern "C" char lbl_81696A84[];
|
||||
extern "C" char lbl_81696A8A[];
|
||||
extern "C" char lbl_81696A90[];
|
||||
extern "C" char lbl_81696A96[];
|
||||
extern "C" char lbl_81696A9C[];
|
||||
extern "C" char lbl_81696AA3[];
|
||||
extern "C" char scPaneName_B_BtnA[];
|
||||
extern "C" char scPaneName_B_BtnB[];
|
||||
extern "C" char scGroup_Change[];
|
||||
extern "C" char scGroup_G_Wii[];
|
||||
extern "C" char scGroup_G_GC[];
|
||||
extern "C" char scGroup_G_Back[];
|
||||
extern "C" char scPaneName_Fre_a[];
|
||||
extern "C" char scPaneName_Fre_d[];
|
||||
extern "C" char scPaneName_Fre_i[];
|
||||
extern "C" char scPaneName_Fre_l[];
|
||||
extern "C" char scPaneName_Fre_e[];
|
||||
extern "C" char scPaneName_Fre_f[];
|
||||
extern "C" char scPaneName_Fre_g[];
|
||||
extern "C" char scPaneName_Fre_h[];
|
||||
extern "C" char scPaneName_Fre_b[];
|
||||
extern "C" char scPaneName_Fre_c[];
|
||||
extern "C" char scPaneName_Fre_j[];
|
||||
extern "C" char scPaneName_Fre_k[];
|
||||
extern "C" char scPaneName_T_BtnA[];
|
||||
extern "C" char scPaneName_T_BtnB[];
|
||||
|
||||
// clang-format off
|
||||
extern "C" char lbl_8164E768[] = "G_FocusBtnA";
|
||||
extern "C" char lbl_8164E774[] = "G_FocusBtnB";
|
||||
extern "C" char lbl_8164E780[] = "G_SelectBtnA";
|
||||
extern "C" char lbl_8164E78D[] = "G_SelectBtnB";
|
||||
extern "C" char lbl_8164E79A[] = "G_OnOffBtnA";
|
||||
extern "C" char lbl_8164E7A6[] = "G_OnOffBtnB";
|
||||
extern "C" char lbl_8164E7B2[] = "G_ChangeTextA";
|
||||
extern "C" char lbl_8164E7C0[] = "G_ChangeTextB";
|
||||
extern "C" char scGroup_G_FocusBtnA[] = "G_FocusBtnA";
|
||||
extern "C" char scGroup_G_FocusBtnB[] = "G_FocusBtnB";
|
||||
extern "C" char scGroup_G_SelectBtnA[] = "G_SelectBtnA";
|
||||
extern "C" char scGroup_G_SelectBtnB[] = "G_SelectBtnB";
|
||||
extern "C" char scGroup_G_OnOffBtnA[] = "G_OnOffBtnA";
|
||||
extern "C" char scGroup_G_OnOffBtnB[] = "G_OnOffBtnB";
|
||||
extern "C" char scGroup_G_ChangeTextA[] = "G_ChangeTextA";
|
||||
extern "C" char scGroup_G_ChangeTextB[] = "G_ChangeTextB";
|
||||
|
||||
const char* scAnimGroups[8+1] = {
|
||||
lbl_8164E768,
|
||||
lbl_8164E774,
|
||||
lbl_8164E780,
|
||||
lbl_8164E78D,
|
||||
lbl_8164E79A,
|
||||
lbl_8164E7A6,
|
||||
lbl_8164E7B2,
|
||||
lbl_8164E7C0,
|
||||
scGroup_G_FocusBtnA,
|
||||
scGroup_G_FocusBtnB,
|
||||
scGroup_G_SelectBtnA,
|
||||
scGroup_G_SelectBtnB,
|
||||
scGroup_G_OnOffBtnA,
|
||||
scGroup_G_OnOffBtnB,
|
||||
scGroup_G_ChangeTextA,
|
||||
scGroup_G_ChangeTextB,
|
||||
NULL
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164E7F4[] = "my_ChTop_a_FocusBtnA_off.brlan";
|
||||
extern "C" char lbl_8164E813[] = "my_ChTop_a_FocusBtn_on.brlan";
|
||||
extern "C" char lbl_8164E830[] = "my_ChTop_a_SelectBtn_Ac.brlan";
|
||||
extern "C" char lbl_8164E84E[] = "my_ChTop_a_OffBtn.brlan";
|
||||
extern "C" char lbl_8164E866[] = "my_ChTop_a_OnBtn.brlan";
|
||||
extern "C" char lbl_8164E87D[] = "my_ChTop_a_ChangeTextOut.brlan";
|
||||
extern "C" char lbl_8164E89C[] = "my_ChTop_a_ChangeTextIn.brlan";
|
||||
extern "C" char lbl_8164E8BA[] = "my_ChTop_a_ChangeIn.brlan";
|
||||
extern "C" char lbl_8164E8D4[] = "my_ChTop_a_ChangeRoop.brlan";
|
||||
extern "C" char lbl_8164E8F0[] = "my_ChTop_a_ChangeOut.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_FocusBtnA_off[] = "my_ChTop_a_FocusBtnA_off.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_FocusBtn_on[] = "my_ChTop_a_FocusBtn_on.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_SelectBtn_Ac[] = "my_ChTop_a_SelectBtn_Ac.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_OffBtn[] = "my_ChTop_a_OffBtn.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_OnBtn[] = "my_ChTop_a_OnBtn.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_ChangeTextOut[] = "my_ChTop_a_ChangeTextOut.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_ChangeTextIn[] = "my_ChTop_a_ChangeTextIn.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_ChangeIn[] = "my_ChTop_a_ChangeIn.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_ChangeRoop[] = "my_ChTop_a_ChangeRoop.brlan";
|
||||
extern "C" char scBrlan_my_ChTop_a_ChangeOut[] = "my_ChTop_a_ChangeOut.brlan";
|
||||
|
||||
const char* scAnimNames[10] = {
|
||||
lbl_8164E7F4,
|
||||
lbl_8164E813,
|
||||
lbl_8164E830,
|
||||
lbl_8164E84E,
|
||||
lbl_8164E866,
|
||||
lbl_8164E87D,
|
||||
lbl_8164E89C,
|
||||
lbl_8164E8BA,
|
||||
lbl_8164E8D4,
|
||||
lbl_8164E8F0
|
||||
scBrlan_my_ChTop_a_FocusBtnA_off,
|
||||
scBrlan_my_ChTop_a_FocusBtn_on,
|
||||
scBrlan_my_ChTop_a_SelectBtn_Ac,
|
||||
scBrlan_my_ChTop_a_OffBtn,
|
||||
scBrlan_my_ChTop_a_OnBtn,
|
||||
scBrlan_my_ChTop_a_ChangeTextOut,
|
||||
scBrlan_my_ChTop_a_ChangeTextIn,
|
||||
scBrlan_my_ChTop_a_ChangeIn,
|
||||
scBrlan_my_ChTop_a_ChangeRoop,
|
||||
scBrlan_my_ChTop_a_ChangeOut
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164E934[] = "banner.brlan";
|
||||
extern "C" char lbl_8164E941[] = "banner_Start.brlan";
|
||||
extern "C" char lbl_8164E954[] = "banner_Loop.brlan";
|
||||
extern "C" char scBrlan_banner[] = "banner.brlan";
|
||||
extern "C" char scBrlan_banner_Start[] = "banner_Start.brlan";
|
||||
extern "C" char scBrlan_banner_Loop[] = "banner_Loop.brlan";
|
||||
|
||||
const char* scBannerAnims[3] = {
|
||||
lbl_8164E934,
|
||||
lbl_8164E941,
|
||||
lbl_8164E954
|
||||
scBrlan_banner,
|
||||
scBrlan_banner_Start,
|
||||
scBrlan_banner_Loop
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164E974[] = "G_Comment0";
|
||||
extern "C" char lbl_8164E97F[] = "G_DiskIn";
|
||||
extern "C" char scGroup_G_Comment0[] = "G_Comment0";
|
||||
extern "C" char scGroup_G_DiskIn[] = "G_DiskIn";
|
||||
|
||||
const char* scDiskGroups[5] = {
|
||||
lbl_8164E974,
|
||||
lbl_81696A34,
|
||||
lbl_81696A3A,
|
||||
lbl_8164E97F,
|
||||
scGroup_G_Comment0,
|
||||
scGroup_G_Wii,
|
||||
scGroup_G_GC,
|
||||
scGroup_G_DiskIn,
|
||||
NULL
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164E99C[] = "my_DiskCh_a_Start.brlan";
|
||||
extern "C" char lbl_8164E9B4[] = "my_DiskCh_a_DiskStart.brlan";
|
||||
extern "C" char lbl_8164E9D0[] = "my_DiskCh_a_DiskLoop.brlan";
|
||||
extern "C" char lbl_8164E9EB[] = "my_DiskCh_a_DiskEnd.brlan";
|
||||
extern "C" char lbl_8164EA05[] = "my_DiskCh_a_DiskLost.brlan";
|
||||
extern "C" char lbl_8164EA20[] = "my_DiskCh_a_DiskIn.brlan";
|
||||
extern "C" char lbl_8164EA39[] = "my_DiskCh_a_DiskEject.brlan";
|
||||
extern "C" char lbl_8164EA55[] = "my_DiskCh_a_Unknown.brlan";
|
||||
extern "C" char lbl_8164EA6F[] = "my_DiskCh_a_UnknownLoop.brlan";
|
||||
extern "C" char lbl_8164EA8D[] = "my_DiskCh_a_UnknwnEject.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_Start[] = "my_DiskCh_a_Start.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskStart[] = "my_DiskCh_a_DiskStart.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskLoop[] = "my_DiskCh_a_DiskLoop.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskEnd[] = "my_DiskCh_a_DiskEnd.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskLost[] = "my_DiskCh_a_DiskLost.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskIn[] = "my_DiskCh_a_DiskIn.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_DiskEject[] = "my_DiskCh_a_DiskEject.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_Unknown[] = "my_DiskCh_a_Unknown.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_UnknownLoop[] = "my_DiskCh_a_UnknownLoop.brlan";
|
||||
extern "C" char scBrlan_my_DiskCh_a_UnknwnEject[] = "my_DiskCh_a_UnknwnEject.brlan";
|
||||
|
||||
const char* scDiskAnimNames[10] = {
|
||||
lbl_8164E99C,
|
||||
lbl_8164E9B4,
|
||||
lbl_8164E9D0,
|
||||
lbl_8164E9EB,
|
||||
lbl_8164EA05,
|
||||
lbl_8164EA20,
|
||||
lbl_8164EA39,
|
||||
lbl_8164EA55,
|
||||
lbl_8164EA6F,
|
||||
lbl_8164EA8D
|
||||
scBrlan_my_DiskCh_a_Start,
|
||||
scBrlan_my_DiskCh_a_DiskStart,
|
||||
scBrlan_my_DiskCh_a_DiskLoop,
|
||||
scBrlan_my_DiskCh_a_DiskEnd,
|
||||
scBrlan_my_DiskCh_a_DiskLost,
|
||||
scBrlan_my_DiskCh_a_DiskIn,
|
||||
scBrlan_my_DiskCh_a_DiskEject,
|
||||
scBrlan_my_DiskCh_a_Unknown,
|
||||
scBrlan_my_DiskCh_a_UnknownLoop,
|
||||
scBrlan_my_DiskCh_a_UnknwnEject
|
||||
};
|
||||
|
||||
extern "C" char lbl_8164EAD4[] = "my_DiskCh_a.brlyt";
|
||||
extern "C" char lbl_8164EAE6[] = "my_GCTop_a_BackLoop.brlan";
|
||||
extern "C" char scBrlyt_my_DiskCh_a[] = "my_DiskCh_a.brlyt";
|
||||
extern "C" char scBrlan_my_GCTop_a_BackLoop[] = "my_GCTop_a_BackLoop.brlan";
|
||||
|
||||
#pragma push
|
||||
#pragma section data_type ".sdata"
|
||||
extern "C" char lbl_81696A10[] = "B_BtnA";
|
||||
extern "C" char lbl_81696A17[] = "B_BtnB";
|
||||
extern "C" const char* lbl_81696A20[2] = {
|
||||
lbl_81696A10,
|
||||
lbl_81696A17,
|
||||
extern "C" char scPaneName_B_BtnA[] = "B_BtnA";
|
||||
extern "C" char scPaneName_B_BtnB[] = "B_BtnB";
|
||||
extern "C" const char* scPaneNames_B_Btn[2] = {
|
||||
scPaneName_B_BtnA,
|
||||
scPaneName_B_BtnB,
|
||||
};
|
||||
extern "C" char lbl_81696A28[] = "Change";
|
||||
extern "C" const char* lbl_81696A30[] = {
|
||||
lbl_81696A28,
|
||||
extern "C" char scGroup_Change[] = "Change";
|
||||
extern "C" const char* scGroupNames_Change[] = {
|
||||
scGroup_Change,
|
||||
};
|
||||
extern "C" char lbl_81696A34[] = "G_Wii";
|
||||
extern "C" char lbl_81696A3A[] = "G_GC";
|
||||
extern "C" char scGroup_G_Wii[] = "G_Wii";
|
||||
extern "C" char scGroup_G_GC[] = "G_GC";
|
||||
const char* scLayoutNames[] = {
|
||||
lbl_8164EAD4,
|
||||
scBrlyt_my_DiskCh_a,
|
||||
};
|
||||
extern "C" char lbl_81696A44[] = "G_Back";
|
||||
extern "C" char scGroup_G_Back[] = "G_Back";
|
||||
const char* scGCAnimGroups[] = {
|
||||
lbl_81696A44,
|
||||
scGroup_G_Back,
|
||||
};
|
||||
const char* scGCAnimNames[] = {
|
||||
lbl_8164EAE6,
|
||||
scBrlan_my_GCTop_a_BackLoop,
|
||||
};
|
||||
extern "C" char lbl_81696A54[] = "Fre_a";
|
||||
extern "C" char lbl_81696A5A[] = "Fre_d";
|
||||
extern "C" char lbl_81696A60[] = "Fre_i";
|
||||
extern "C" char lbl_81696A66[] = "Fre_l";
|
||||
extern "C" char lbl_81696A6C[] = "Fre_e";
|
||||
extern "C" char lbl_81696A72[] = "Fre_f";
|
||||
extern "C" char lbl_81696A78[] = "Fre_g";
|
||||
extern "C" char lbl_81696A7E[] = "Fre_h";
|
||||
extern "C" char lbl_81696A84[] = "Fre_b";
|
||||
extern "C" char lbl_81696A8A[] = "Fre_c";
|
||||
extern "C" char lbl_81696A90[] = "Fre_j";
|
||||
extern "C" char lbl_81696A96[] = "Fre_k";
|
||||
extern "C" char lbl_81696A9C[] = "T_BtnA";
|
||||
extern "C" char lbl_81696AA3[] = "T_BtnB";
|
||||
const char* lbl_81696AAC[] = {
|
||||
lbl_81696A9C,
|
||||
lbl_81696AA3,
|
||||
extern "C" char scPaneName_Fre_a[] = "Fre_a";
|
||||
extern "C" char scPaneName_Fre_d[] = "Fre_d";
|
||||
extern "C" char scPaneName_Fre_i[] = "Fre_i";
|
||||
extern "C" char scPaneName_Fre_l[] = "Fre_l";
|
||||
extern "C" char scPaneName_Fre_e[] = "Fre_e";
|
||||
extern "C" char scPaneName_Fre_f[] = "Fre_f";
|
||||
extern "C" char scPaneName_Fre_g[] = "Fre_g";
|
||||
extern "C" char scPaneName_Fre_h[] = "Fre_h";
|
||||
extern "C" char scPaneName_Fre_b[] = "Fre_b";
|
||||
extern "C" char scPaneName_Fre_c[] = "Fre_c";
|
||||
extern "C" char scPaneName_Fre_j[] = "Fre_j";
|
||||
extern "C" char scPaneName_Fre_k[] = "Fre_k";
|
||||
extern "C" char scPaneName_T_BtnA[] = "T_BtnA";
|
||||
extern "C" char scPaneName_T_BtnB[] = "T_BtnB";
|
||||
const char* scPaneNames_T_Btn[] = {
|
||||
scPaneName_T_BtnA,
|
||||
scPaneName_T_BtnB,
|
||||
};
|
||||
#pragma pop
|
||||
|
||||
const char* scWidePanes[3][4] = {
|
||||
{
|
||||
lbl_81696A54,
|
||||
lbl_81696A5A,
|
||||
lbl_81696A60,
|
||||
lbl_81696A66,
|
||||
scPaneName_Fre_a,
|
||||
scPaneName_Fre_d,
|
||||
scPaneName_Fre_i,
|
||||
scPaneName_Fre_l,
|
||||
}, {
|
||||
lbl_81696A6C,
|
||||
lbl_81696A72,
|
||||
lbl_81696A78,
|
||||
lbl_81696A7E,
|
||||
scPaneName_Fre_e,
|
||||
scPaneName_Fre_f,
|
||||
scPaneName_Fre_g,
|
||||
scPaneName_Fre_h,
|
||||
}, {
|
||||
lbl_81696A84,
|
||||
lbl_81696A8A,
|
||||
lbl_81696A90,
|
||||
lbl_81696A96,
|
||||
scPaneName_Fre_b,
|
||||
scPaneName_Fre_c,
|
||||
scPaneName_Fre_j,
|
||||
scPaneName_Fre_k,
|
||||
}
|
||||
};
|
||||
|
||||
@@ -341,12 +341,12 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[0]), MESG_CMN_WII_MENU);
|
||||
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[0]), MESG_CMN_WII_MENU);
|
||||
|
||||
if (System::getChannelManager()->checkNeedUpdate(mChanPage, mChanIndex)) {
|
||||
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
|
||||
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
|
||||
} else {
|
||||
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CMN_START);
|
||||
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CMN_START);
|
||||
}
|
||||
|
||||
if (isEnableToExecute(mChanPage, mChanIndex)) {
|
||||
@@ -390,7 +390,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
for (int i = ANIM_CHANGE_IN; i <= ANIM_CHANGE_OUT; i++) {
|
||||
mpChangeAnims[i] = mpLayout->bind(scAnimNames[i], lbl_81696A30[0], false, false);
|
||||
mpChangeAnims[i] = mpLayout->bind(scAnimNames[i], scGroupNames_Change[0], false, false);
|
||||
}
|
||||
|
||||
mpLayout->finishBinding();
|
||||
@@ -400,8 +400,8 @@ namespace ipl {
|
||||
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
|
||||
mpGui->setAllComponentTriggerTarget(false);
|
||||
|
||||
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_A]))->setTriggerTarget(true);
|
||||
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_B]))->setTriggerTarget(true);
|
||||
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_A]))->setTriggerTarget(true);
|
||||
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_B]))->setTriggerTarget(true);
|
||||
|
||||
mpLimitRemainLyt = new layout::Object(getSceneHeap(), mpLayoutFile, "arc", "my_Timer_a.brlyt");
|
||||
mpLimitDoneLyt = new layout::Object(getSceneHeap(), mpLayoutFile, "arc", "my_Timer_b.brlyt");
|
||||
@@ -1187,9 +1187,9 @@ namespace ipl {
|
||||
if (mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->getCurrentFrame() ==
|
||||
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->getMaxFrame()) {
|
||||
if (System::getChannelManager()->checkNeedUpdate(mChanPage, mChanIndex)) {
|
||||
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
|
||||
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
|
||||
} else {
|
||||
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_START_BTN, false);
|
||||
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_SEL_START_BTN, false);
|
||||
}
|
||||
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_OUT]->play();
|
||||
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->initAnmFrame();
|
||||
@@ -2464,7 +2464,7 @@ namespace ipl {
|
||||
if (unk_0x8C == 0) {
|
||||
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_OFF_BTN]->stop();
|
||||
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_ON_BTN]->play();
|
||||
mpGui->initPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_B]));
|
||||
mpGui->initPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_B]));
|
||||
mbHovered[BTN_B] = FALSE;
|
||||
}
|
||||
unk_0x8C = 1;
|
||||
@@ -2604,8 +2604,8 @@ namespace ipl {
|
||||
|
||||
wcscpy(limitStr, System::getMessage(MESG_CHAN_SEL_TIME_LIMIT));
|
||||
|
||||
wchar_t local_38[16] = L"";
|
||||
wchar_t local_58[16] = L"";
|
||||
wchar_t hourStr[16] = L"";
|
||||
wchar_t minuteStr[16] = L"";
|
||||
|
||||
if (hour == 0 && minute == 0) {
|
||||
swprintf(limitStr, 65, L"%ls %ls", limitStr, System::getMessage(MESG_CHAN_SEL_LIMIT_UNDER_60));
|
||||
@@ -2616,42 +2616,42 @@ namespace ipl {
|
||||
if (System::getLanguage() == SC_LANG_JAPANESE || System::getLanguage() == SC_LANG_KOREAN ||
|
||||
System::getLanguage() == SC_LANG_GERMAN) {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
} else if (System::getLanguage() == SC_LANG_FRENCH || System::getLanguage() == SC_LANG_ITALIAN) {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
} else {
|
||||
if (hour == 1) {
|
||||
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
|
||||
} else if (hour != 0) {
|
||||
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
|
||||
}
|
||||
|
||||
if (minute == 1) {
|
||||
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
|
||||
} else if (minute != 0) {
|
||||
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
|
||||
}
|
||||
}
|
||||
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, local_38, local_58);
|
||||
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, hourStr, minuteStr);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2822,12 +2822,12 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
if (con->downTrg(controller::BTN_INTERACT)) {
|
||||
if (strcmp(paneName, lbl_81696A20[ChannelTitle::BTN_A]) == 0) {
|
||||
if (strcmp(paneName, scPaneNames_B_Btn[ChannelTitle::BTN_A]) == 0) {
|
||||
mpInstance->mpGrpAnims[ChannelTitle::ANIM_GRP_SELECT_BTN_A][ChannelTitle::ANIM_SELECT_BTN]->play();
|
||||
snd::getSystem()->startSE("WIPL_SE_BT_PUSH");
|
||||
mpInstance->mState = ChannelTitle::STATE_START_ZOOM_OUT;
|
||||
mpInstance->tryToGoBackward();
|
||||
} else if (strcmp(paneName, lbl_81696A20[ChannelTitle::BTN_B]) == 0) {
|
||||
} else if (strcmp(paneName, scPaneNames_B_Btn[ChannelTitle::BTN_B]) == 0) {
|
||||
if (mpInstance->unk_0x8C != 2) {
|
||||
snd::getSystem()->startSE("WIPL_SE_GRAY_BUTTON");
|
||||
} else {
|
||||
@@ -2841,7 +2841,7 @@ namespace ipl {
|
||||
}
|
||||
case ::gui::EventHandler::ON_POINT: {
|
||||
for (int i = 0; i < ChannelTitle::BTN_MAX; i++) {
|
||||
if (strcmp(paneName, lbl_81696A20[i]) == 0) {
|
||||
if (strcmp(paneName, scPaneNames_B_Btn[i]) == 0) {
|
||||
if (i == 0 || mpInstance->unk_0x8C > 0) {
|
||||
mpInstance->mbHovered[i]++;
|
||||
if (mpInstance->mbHovered[i] <= TRUE) {
|
||||
@@ -2857,7 +2857,7 @@ namespace ipl {
|
||||
}
|
||||
case ::gui::EventHandler::ON_LEFT: {
|
||||
for (int i = 0; i < ChannelTitle::BTN_MAX; i++) {
|
||||
if (strcmp(paneName, lbl_81696A20[i]) == 0) {
|
||||
if (strcmp(paneName, scPaneNames_B_Btn[i]) == 0) {
|
||||
if (i == 0 || mpInstance->unk_0x8C > 0) {
|
||||
mpInstance->mbHovered[i]--;
|
||||
if (mpInstance->mbHovered[i] <= FALSE) {
|
||||
|
||||
@@ -53,16 +53,10 @@ void iplContest_813D54F8(BOOL success, NAT nat);
|
||||
void* IPLContestAlloc(int size);
|
||||
void IPLContestFree(void* block, u32 _unused);
|
||||
|
||||
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes);
|
||||
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes);
|
||||
void sNHTTPCleanupCallback();
|
||||
|
||||
void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
|
||||
char* pcVar1;
|
||||
char cVar2;
|
||||
char* pcVar3;
|
||||
char* pcVar4;
|
||||
int iVar5;
|
||||
|
||||
g_session.heapBuf = heapBuf;
|
||||
g_session.heap = MEMCreateExpHeapEx(heapBuf, 0x10000, 0);
|
||||
OSInitMutex(&g_session.mutex);
|
||||
@@ -416,9 +410,9 @@ void IPLContestFree(void* block, u32 _unused) {
|
||||
OSUnlockMutex(&g_session.mutex);
|
||||
}
|
||||
|
||||
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
|
||||
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes) {
|
||||
g_session.httpResponse = httpRes;
|
||||
if (param_1 == 0) {
|
||||
if (error == 0) {
|
||||
switch (NHTTPGetResultCode(httpRes)) {
|
||||
case 200: {
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_RECEIVED;
|
||||
@@ -440,7 +434,7 @@ void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
|
||||
}
|
||||
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
|
||||
switch (param_1) {
|
||||
switch (error) {
|
||||
case 0x4: {
|
||||
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52100;
|
||||
break;
|
||||
|
||||
@@ -234,10 +234,10 @@ namespace ipl {
|
||||
OSReport("NUP region code : %s\n", productAreaString);
|
||||
const char* isoCountryCode = SCUTILGetISOCountryCodeA2();
|
||||
OSReport("NUP country code : %s\n", isoCountryCode);
|
||||
int iVar8 = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
|
||||
int nupResult = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
|
||||
OSReport("NUP_Start()\n");
|
||||
if (iVar8 < 0) {
|
||||
switch (iVar8) {
|
||||
if (nupResult < 0) {
|
||||
switch (nupResult) {
|
||||
case -5000: {
|
||||
OSReport("FAIL ALLOC\n");
|
||||
}
|
||||
@@ -426,8 +426,8 @@ namespace ipl {
|
||||
int val;
|
||||
int len = 4;
|
||||
if (SOGetInterfaceOpt(NULL, SO_SOL_CONFIG, SO_CONFIG_ERROR, &val, &len) == 0 && val == -111) {
|
||||
int iVar7 = NETGetStartupErrorCode(-111);
|
||||
mNetSetupLastErr = (-iVar7 / 100) * 100;
|
||||
int startupErr = NETGetStartupErrorCode(-111);
|
||||
mNetSetupLastErr = (-startupErr / 100) * 100;
|
||||
mNetSetupLastErr = mNetSetup.getconntype();
|
||||
}
|
||||
Setting* settingScene = (Setting*)System::getScene(SCENE_SETTING);
|
||||
@@ -451,8 +451,6 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void* NakamuraTest::conntestthread(void*) {
|
||||
int iVar1;
|
||||
|
||||
IPLContestStart();
|
||||
while (true) {
|
||||
switch (IPLContestProcess()) {
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace ipl {
|
||||
OSMutex NetSetup::sAllocLock;
|
||||
NetSetup::StaticSOStartupInfo NetSetup::sSOStartupInfo;
|
||||
|
||||
void* NetSetup::iSOStartupEXThread(void* param_1) {
|
||||
void* NetSetup::iSOStartupEXThread(void* connType) {
|
||||
s32 cfgSetResult;
|
||||
int soStartupRes;
|
||||
SOInAddr soAddr;
|
||||
@@ -61,7 +61,7 @@ namespace ipl {
|
||||
soStartupRes = SOStartupEx(45000);
|
||||
if (soStartupRes < 0) {
|
||||
OSReport("[FAIL] SOStartup() failed.(%d)\n", soStartupRes);
|
||||
soStartupRes = NETGetStartupErrorCodeEx(soStartupRes, (int)param_1);
|
||||
soStartupRes = NETGetStartupErrorCodeEx(soStartupRes, (int)connType);
|
||||
OSReport("<Error Code: %d>\n", -soStartupRes);
|
||||
sSOStartupInfo.state = NET_SETUP_ERROR;
|
||||
sSOStartupInfo.lastErr = -soStartupRes;
|
||||
|
||||
@@ -1058,7 +1058,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
const ESTitleId* titleEntry = &mTitleIds[mCurrentTitle];
|
||||
System::getChannelManager()->fn_8133AA50(*titleEntry);
|
||||
System::getChannelManager()->unloadBanner(*titleEntry);
|
||||
|
||||
if (mpSDChannelSelect->getWorker()->get_async_result() == 0) {
|
||||
mCurrentTitle++;
|
||||
|
||||
@@ -571,7 +571,7 @@ namespace ipl {
|
||||
mWorkerCommand = 11;
|
||||
break;
|
||||
case 12:
|
||||
mpSDWorker->iplNandSD_81348EA8(
|
||||
mpSDWorker->check_sd_app_titles_async(
|
||||
command.arguments.pointers[0], command.arguments.pointers[1],
|
||||
command.arguments.pointers[2]);
|
||||
mWorkerCommand = 12;
|
||||
|
||||
@@ -86,10 +86,7 @@ static inline void setMemoryTitleLists(SDMemory* memory, SDMemory::TitleRange sd
|
||||
memory->setTitleLists(sdRange, nandRange);
|
||||
}
|
||||
|
||||
extern "C" char lbl_81696E30[];
|
||||
extern "C" char lbl_81696E37[];
|
||||
|
||||
static const char* sButtonNames[2] = {lbl_81696E30, lbl_81696E37};
|
||||
static const char* sButtonNames[2] = {"B_BtnA", "B_BtnB"};
|
||||
|
||||
static const int sCaptureSizes[2][2] = {{128, 96}, {176, 96}};
|
||||
|
||||
@@ -849,7 +846,7 @@ extern "C" void iplSDChannelTitle_813E7074(SDChannelTitle* scene) {
|
||||
extern "C" void iplSDChannelTitle_813E71A4(SDChannelTitle* scene) {
|
||||
if (!scene->mpChannelSelect->getWorker()->is_working()) {
|
||||
SCSetTmpTitleID(0);
|
||||
System::getChannelManager()->fn_8133A9F0();
|
||||
System::getChannelManager()->clearTmpChannel();
|
||||
int result = scene->mpChannelSelect->getWorker()->get_async_result();
|
||||
if (!result) {
|
||||
if (scene->mbCopiedTitle) {
|
||||
@@ -983,7 +980,7 @@ extern "C" void iplSDChannelTitle_813E7800(SDChannelTitle* scene) {
|
||||
|
||||
extern "C" void iplSDChannelTitle_813E787C(SDChannelTitle* scene) {
|
||||
if (scene->mbTmdReady) {
|
||||
if (!System::getChannelManager()->fn_8133A678(scene->mTitleId) && !utility::ESMisc::CheckTmdCountryCode(scene->mpTmd)) {
|
||||
if (!System::getChannelManager()->isMissingTicket(scene->mTitleId) && !utility::ESMisc::CheckTmdCountryCode(scene->mpTmd)) {
|
||||
System::getErrorHandler()->set(ErrorHandler::DEFAULT, 3, NULL, 0, -1);
|
||||
}
|
||||
scene->mMakerCode = scene->mpTmd->head.groupId;
|
||||
@@ -1043,8 +1040,8 @@ extern "C" void iplSDChannelTitle_813E7B30(SDChannelTitle* scene, ESTitleId titl
|
||||
delete scene->mpScriptFile;
|
||||
scene->mpScriptFile = NULL;
|
||||
}
|
||||
if (System::getChannelManager()->fn_8133A57C(title)) {
|
||||
scene->mpScriptFile = System::getChannelManager()->fn_8133A924(scene->mpRsoHeap, title);
|
||||
if (System::getChannelManager()->getBannerCSIdx(title)) {
|
||||
scene->mpScriptFile = System::getChannelManager()->readBannerCSAsync(scene->mpRsoHeap, title);
|
||||
scene->mbScriptFailed = false;
|
||||
scene->mScriptEnabled = 1;
|
||||
scene->mScriptState = 1;
|
||||
@@ -1097,7 +1094,7 @@ extern "C" void iplSDChannelTitle_813E7D14(SDChannelTitle* scene) {
|
||||
scene->mScriptState = 1;
|
||||
scene->mScriptHeapIndex = nextHeap;
|
||||
}
|
||||
if (System::getChannelManager()->fn_8133A634(scene->mTitleId) &&
|
||||
if (System::getChannelManager()->usesAltSound(scene->mTitleId) &&
|
||||
scene->mScriptFrame == scene->mScriptDuration - 240) {
|
||||
snd::getSystem()->stopBannerSound(180);
|
||||
}
|
||||
@@ -1155,7 +1152,7 @@ extern "C" void iplSDChannelTitle_813E8034(SDChannelTitle* scene) {
|
||||
scene->mpBannerAnimations[0]->play();
|
||||
}
|
||||
if (scene->mState != 6) {
|
||||
if (!System::getChannelManager()->fn_8133A634(scene->mTitleId) || !scene->mScriptEnabled) {
|
||||
if (!System::getChannelManager()->usesAltSound(scene->mTitleId) || !scene->mScriptEnabled) {
|
||||
iplSDChannelTitle_813E8160(scene);
|
||||
}
|
||||
if (!scene->mpBannerLayout) {
|
||||
@@ -1169,7 +1166,7 @@ extern "C" void iplSDChannelTitle_813E8034(SDChannelTitle* scene) {
|
||||
extern "C" void iplSDChannelTitle_813E8160(SDChannelTitle* scene) {
|
||||
if (scene->mpSoundFiles[scene->mLoadedIndex] && scene->mpSoundFiles[scene->mLoadedIndex]->checkData() == 1) {
|
||||
void* sound = scene->mpSoundFiles[scene->mLoadedIndex]->getBuffer();
|
||||
u32 size = System::getChannelManager()->fn_8133A5B8(scene->mTitleId);
|
||||
u32 size = System::getChannelManager()->getSoundSize(scene->mTitleId);
|
||||
snd::getSystem()->startBannerSound(sound, size, false);
|
||||
}
|
||||
}
|
||||
@@ -1230,7 +1227,7 @@ extern "C" void iplSDChannelTitle_813E8360(SDChannelTitle* scene) {
|
||||
}
|
||||
|
||||
extern "C" BOOL iplSDChannelTitle_813E847C(SDChannelTitle*, ESTmdView*, ESTitleId titleId) {
|
||||
if (!System::getChannelManager()->fn_8133A5F0(titleId) || ncd::NCDSetting::getConnectEnableFlag()) {
|
||||
if (!System::getChannelManager()->needsNetSetting(titleId) || ncd::NCDSetting::getConnectEnableFlag()) {
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
@@ -1429,8 +1426,8 @@ extern "C" void iplSDChannelTitle_813E8D14(SDChannelTitle*, nw4r::lyt::Pane* pan
|
||||
}
|
||||
|
||||
extern "C" nand::LayoutFile* iplSDChannelTitle_813E8DCC(SDChannelTitle*, ESTitleId title, nand::File** sound) {
|
||||
*sound = System::getChannelManager()->fn_8133A85C(System::getMem2App(), title);
|
||||
nand::MetaFile* banner = System::getChannelManager()->fn_8133A7A4(System::getMem2App(), title);
|
||||
*sound = System::getChannelManager()->readSoundMetaAsync(System::getMem2App(), title);
|
||||
nand::MetaFile* banner = System::getChannelManager()->readBannerMetaAsync(System::getMem2App(), title);
|
||||
return new (System::getMem2App(), 4) nand::LayoutFile(banner, NULL);
|
||||
}
|
||||
|
||||
@@ -1453,15 +1450,15 @@ extern "C" BOOL iplSDChannelTitle_813E8F04(SDChannelTitle* scene, ESTmdView* tmd
|
||||
return TRUE;
|
||||
}
|
||||
if (parental.enable & SC_PARENTAL_FLAG_ENABLED) {
|
||||
u32 restrictions = System::getChannelManager()->fn_8133A6B8(scene->mTitleId);
|
||||
u32 restrictions = System::getChannelManager()->isNewsChannelV6Plus(scene->mTitleId);
|
||||
u32 networkRestrictions = SCGetNetContentRestrictions();
|
||||
if (networkRestrictions & restrictions) {
|
||||
return FALSE;
|
||||
}
|
||||
if (SCGetWwwRestriction() && System::getChannelManager()->fn_8133A73C(scene->mTitleId)) {
|
||||
if (SCGetWwwRestriction() && System::getChannelManager()->isOperaChannel(scene->mTitleId)) {
|
||||
return FALSE;
|
||||
}
|
||||
if (System::getChannelManager()->fn_8133A73C(scene->mTitleId)) {
|
||||
if (System::getChannelManager()->isOperaChannel(scene->mTitleId)) {
|
||||
return TRUE;
|
||||
} else {
|
||||
return utility::ESMisc::CheckTmdParentalControl(tmd);
|
||||
|
||||
@@ -78,8 +78,8 @@ namespace ipl {
|
||||
int finish(NCDAossConfig* config, int* result);
|
||||
void printInfo();
|
||||
|
||||
static void* AOSSThread_813FCC8C(u32 id, s32 size);
|
||||
static void AOSSThread_813FCCE4(u32 id, void* ptr, s32 align);
|
||||
static void* aossAlloc(u32 id, s32 size);
|
||||
static void aossFree(u32 id, void* ptr, s32 align);
|
||||
|
||||
private:
|
||||
s32 mState; // 0x32C
|
||||
@@ -122,8 +122,8 @@ namespace ipl {
|
||||
return 0;
|
||||
}
|
||||
|
||||
config.alloc = AOSSThread_813FCC8C;
|
||||
config.free = AOSSThread_813FCCE4;
|
||||
config.alloc = aossAlloc;
|
||||
config.free = aossFree;
|
||||
|
||||
BOOL level = OSDisableInterrupts();
|
||||
|
||||
@@ -144,7 +144,7 @@ namespace ipl {
|
||||
return 1;
|
||||
}
|
||||
|
||||
void* AOSSThread::AOSSThread_813FCC8C(u32 id, s32 size) {
|
||||
void* AOSSThread::aossAlloc(u32 id, s32 size) {
|
||||
void* buffer;
|
||||
BOOL level = OSDisableInterrupts();
|
||||
buffer = MEMAllocFromAllocator(&m_allocator, size);
|
||||
@@ -152,7 +152,7 @@ namespace ipl {
|
||||
return buffer;
|
||||
}
|
||||
|
||||
void AOSSThread::AOSSThread_813FCCE4(u32 id, void* ptr, s32 align) {
|
||||
void AOSSThread::aossFree(u32 id, void* ptr, s32 align) {
|
||||
BOOL level = OSDisableInterrupts();
|
||||
MEMFreeToAllocator(&m_allocator, ptr);
|
||||
OSRestoreInterrupts(level);
|
||||
@@ -162,7 +162,7 @@ namespace ipl {
|
||||
mState = 0xF;
|
||||
AOSS_SetCallback(USBAPThread::callback);
|
||||
|
||||
if (AOSSi_InitLocal(AOSSThread_813FCC8C, AOSSThread_813FCCE4) == -1) {
|
||||
if (AOSSi_InitLocal(aossAlloc, aossFree) == -1) {
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
@@ -459,48 +459,48 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void NCDSetting::setWDPrivacyMode(u16 mode) {
|
||||
u16 uVar1;
|
||||
u16 privacyMode;
|
||||
|
||||
switch (mode) {
|
||||
case 0: {
|
||||
uVar1 = 0;
|
||||
privacyMode = 0;
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
uVar1 = 1;
|
||||
privacyMode = 1;
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
uVar1 = 2;
|
||||
privacyMode = 2;
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
uVar1 = 4;
|
||||
privacyMode = 4;
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
uVar1 = 5;
|
||||
privacyMode = 5;
|
||||
break;
|
||||
}
|
||||
case 6: {
|
||||
uVar1 = 6;
|
||||
privacyMode = 6;
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
uVar1 = 4;
|
||||
privacyMode = 4;
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
uVar1 = 1;
|
||||
privacyMode = 1;
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
uVar1 = 0;
|
||||
privacyMode = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
memset(&mConfig.profiles[mID].netif.wireless.config.manual.privacy.wep104, 0, 0x44);
|
||||
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = uVar1;
|
||||
mConfig.profiles[mID].netif.wireless.config.manual.privacy.mode = privacyMode;
|
||||
}
|
||||
|
||||
void NCDSetting::setPrivacy(u8* newKey, int len) {
|
||||
|
||||
@@ -185,7 +185,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case STATE_16: {
|
||||
fn_81409864();
|
||||
calc_exit_sequence();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -688,28 +688,28 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
void SettingSelect::fn_81409864() {
|
||||
void SettingSelect::calc_exit_sequence() {
|
||||
switch (unk_0x94) {
|
||||
case 0: {
|
||||
fn_814098F4();
|
||||
prepare_exit_abort();
|
||||
break;
|
||||
}
|
||||
case 1: {
|
||||
fn_unk_inline();
|
||||
wait_decide_se();
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
fn_81409988();
|
||||
start_exit_fade();
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
fn_814099EC();
|
||||
finish_exit_reboot();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SettingSelect::fn_814098F4() {
|
||||
void SettingSelect::prepare_exit_abort() {
|
||||
if (System::getChannelManager()->isReady()) {
|
||||
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
|
||||
controller::Interface* con = System::getController(i);
|
||||
@@ -724,20 +724,20 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
void SettingSelect::fn_unk_inline() {
|
||||
void SettingSelect::wait_decide_se() {
|
||||
if (!snd::getSystem()->isSEActive("WIPL_SE_DECIDE")) {
|
||||
unk_0x94 = 2;
|
||||
}
|
||||
}
|
||||
|
||||
void SettingSelect::fn_81409988() {
|
||||
void SettingSelect::start_exit_fade() {
|
||||
__WPADReconnect(TRUE);
|
||||
snd::getSystem()->stopAllSound(20);
|
||||
System::getFader()->fadeOut();
|
||||
unk_0x94 = 3;
|
||||
}
|
||||
|
||||
void SettingSelect::fn_814099EC() {
|
||||
void SettingSelect::finish_exit_reboot() {
|
||||
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN) {
|
||||
while (WPADGetStatus() != 0 || System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
|
||||
snd::getSystem()->calc();
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
#include <revolution/gx/GXStruct.h>
|
||||
#include <revolution/os/OSError.h>
|
||||
|
||||
extern "C" const unsigned char lbl_8169622C;
|
||||
extern "C" const unsigned char lbl_8169622D;
|
||||
extern "C" const unsigned char lbl_8169622E;
|
||||
extern "C" const unsigned char lbl_8169622F;
|
||||
extern "C" const char lbl_81639230[65];
|
||||
extern "C" const unsigned char scRsoFatalColorR;
|
||||
extern "C" const unsigned char scRsoFatalColorG;
|
||||
extern "C" const unsigned char scRsoFatalColorB;
|
||||
extern "C" const unsigned char scRsoFatalColorA;
|
||||
extern "C" const char scRsoFatalMsg[65];
|
||||
|
||||
#define NW4R_DB_ASSERT_H
|
||||
#define NW4R_ASSERT(x) \
|
||||
{ \
|
||||
if (!(x)) { \
|
||||
GXColor front = {*((volatile const unsigned char*)&lbl_8169622C), *((volatile const unsigned char*)&lbl_8169622D), *((volatile const unsigned char*)&lbl_8169622E), *((volatile const unsigned char*)&lbl_8169622F)}; \
|
||||
GXColor front = {*((volatile const unsigned char*)&scRsoFatalColorR), *((volatile const unsigned char*)&scRsoFatalColorG), *((volatile const unsigned char*)&scRsoFatalColorB), *((volatile const unsigned char*)&scRsoFatalColorA)}; \
|
||||
GXColor back = {0, 0, 0, 0}; \
|
||||
OSFatal((GXColor)front, (GXColor)back, lbl_81639230); \
|
||||
OSFatal((GXColor)front, (GXColor)back, scRsoFatalMsg); \
|
||||
} \
|
||||
}
|
||||
|
||||
@@ -326,15 +326,15 @@ __declspec(export) void IplRso_symbolMaker() {
|
||||
wideTextWriter->CalcStringRect(&rect, L"");
|
||||
}
|
||||
|
||||
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622C = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622D = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622E = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622F = 0;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorR = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorG = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorB = 255;
|
||||
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorA = 0;
|
||||
|
||||
extern "C" __declspec(section ".data") const char lbl_81639230[65] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
extern "C" __declspec(section ".data") const char scRsoFatalMsg[65] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
|
||||
|
||||
extern "C" __declspec(section ".data") __declspec(align(1)) const f32 rso_data_pad_f32 = 0.0f;
|
||||
extern "C" __declspec(section ".data") __declspec(align(1)) const u16 rso_data_pad_u16 = 0;
|
||||
extern "C" __declspec(section ".data") __declspec(align(1)) const u8 rso_data_pad_u8 = 0;
|
||||
|
||||
extern "C" __declspec(section ".sdata2") const f32 lbl_81694598 = 0.0f;
|
||||
extern "C" __declspec(section ".sdata2") const f32 scRsoZeroF = 0.0f;
|
||||
|
||||
@@ -10,10 +10,10 @@
|
||||
|
||||
#pragma sym on
|
||||
|
||||
extern "C" const f32 lbl_816945C8 = 1000.0f;
|
||||
extern "C" const f64 lbl_816945D0 = 1000000000.0;
|
||||
extern "C" const f64 lbl_816945D8 = 1.0;
|
||||
extern "C" const f64 lbl_816945E0 = 4503599627370496.0;
|
||||
extern "C" const f32 scTvrcMsPerSec = 1000.0f;
|
||||
extern "C" const f64 scTvrcNsecPerSec = 1000000000.0;
|
||||
extern "C" const f64 scTvrcOne = 1.0;
|
||||
extern "C" const f64 scTvrcFloatMagic = 4503599627370496.0;
|
||||
|
||||
extern "C" BOOL _isInitialized__7LibTVRC;
|
||||
extern "C" BOOL _isActive__7LibTVRC;
|
||||
@@ -53,11 +53,11 @@ extern "C" void __FTVRCLoop1Handler__7LibTVRCFP7OSAlarmP9OSContext();
|
||||
|
||||
#pragma push
|
||||
#pragma section data_type ".sdata"
|
||||
extern "C" char lbl_81696230[5] = {'T', 'V', 'R', '0', '\0'};
|
||||
extern "C" char scTvrcFileHeader[5] = {'T', 'V', 'R', '0', '\0'};
|
||||
#pragma pop
|
||||
|
||||
namespace LibTVRC {
|
||||
const char* TVRC_FILE_HEADER = lbl_81696230;
|
||||
const char* TVRC_FILE_HEADER = scTvrcFileHeader;
|
||||
u32 __tienHoseiNsec = 1100;
|
||||
u32 _limitMilli = 400;
|
||||
|
||||
@@ -267,7 +267,7 @@ TVRCSendStartAsync_valid:
|
||||
bne TVRCSendStartAsync_custom
|
||||
lwz r6, _tvrcFile__7LibTVRC
|
||||
lis r3, 2
|
||||
lfs f1, lbl_816945C8
|
||||
lfs f1, scTvrcMsPerSec
|
||||
lis r4, 0x8000
|
||||
lfs f0, 0xc(r6)
|
||||
subi r0, r3, 0x17b8
|
||||
@@ -309,7 +309,7 @@ TVRCSendStartAsync_no_repeat:
|
||||
TVRCSendStartAsync_timing:
|
||||
lfs f1, _onTimeRatio__7LibTVRC
|
||||
lis r4, 0x8000
|
||||
lfd f0, lbl_816945D0
|
||||
lfd f0, scTvrcNsecPerSec
|
||||
lis r27, 0x4330
|
||||
lwz r0, 0xf8(r4)
|
||||
lis r3, 2
|
||||
@@ -321,7 +321,7 @@ TVRCSendStartAsync_timing:
|
||||
divwu r26, r4, r0
|
||||
fdiv f2, f1, f0
|
||||
stw r27, 8(r1)
|
||||
lfd f1, lbl_816945E0
|
||||
lfd f1, scTvrcFloatMagic
|
||||
stw r25, 0xc(r1)
|
||||
lfd f0, 8(r1)
|
||||
fsub f0, f0, f1
|
||||
@@ -339,13 +339,13 @@ TVRCSendStartAsync_timing:
|
||||
bl __div2i
|
||||
lfs f2, _onTimeRatio__7LibTVRC
|
||||
lis r28, _tickWait__7LibTVRC@ha
|
||||
lfd f1, lbl_816945D8
|
||||
lfd f1, scTvrcOne
|
||||
addi r29, r28, _tickWait__7LibTVRC@l
|
||||
lfd f0, lbl_816945D0
|
||||
lfd f0, scTvrcNsecPerSec
|
||||
fsub f3, f1, f2
|
||||
lfs f2, _Hz__7LibTVRC
|
||||
stw r25, 0x14(r1)
|
||||
lfd f1, lbl_816945E0
|
||||
lfd f1, scTvrcFloatMagic
|
||||
fmul f3, f0, f3
|
||||
stw r27, 0x10(r1)
|
||||
lfd f0, 0x10(r1)
|
||||
|
||||
@@ -272,12 +272,12 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void CdbBackup::stt_wait_backup() {
|
||||
if (fn_8135B1C0() < 100) {
|
||||
System::getDialog()->setProgBarLength(fn_8135B1C0());
|
||||
if (getProgressPercent() < 100) {
|
||||
System::getDialog()->setProgBarLength(getProgressPercent());
|
||||
}
|
||||
|
||||
if (mbDoneProcess) {
|
||||
if (fn_8135B1C0() >= 100) {
|
||||
if (getProgressPercent() >= 100) {
|
||||
System::getDialog()->setProgBarLength(100);
|
||||
} else {
|
||||
System::getDialog()->terminate();
|
||||
@@ -360,7 +360,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
int CdbBackup::fn_8135B1C0() {
|
||||
int CdbBackup::getProgressPercent() {
|
||||
return ((mTotalFreeSize - mPrevFreeSize) * 100) / ((0x1400000 - unknown) - mPrevFreeSize);
|
||||
}
|
||||
|
||||
|
||||
@@ -1235,7 +1235,7 @@ namespace ipl {
|
||||
|
||||
#pragma pop
|
||||
|
||||
SEntry* Manager::fn_8133A4E0(ESTitleId titleId) {
|
||||
SEntry* Manager::findEntryByTitleId(ESTitleId titleId) {
|
||||
for (int page = 0; page < MAX_CHANNEL_PAGE; page++) {
|
||||
for (int index = 0; index < MAX_CHANNEL_INDEX; index++) {
|
||||
ESTitleId cmp = ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode);
|
||||
@@ -1255,8 +1255,8 @@ namespace ipl {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
u32 Manager::fn_8133A57C(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
u32 Manager::getBannerCSIdx(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL) {
|
||||
return channel->metaHdr->blockHdr.bannerCSIdx;
|
||||
} else {
|
||||
@@ -1264,8 +1264,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
u32 Manager::fn_8133A5B8(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
u32 Manager::getSoundSize(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL) {
|
||||
return channel->metaHdr->blockHdr.soundSize;
|
||||
} else {
|
||||
@@ -1273,8 +1273,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL Manager::fn_8133A5F0(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
BOOL Manager::needsNetSetting(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL && (channel->metaHdr->blockHdr.netSetting << 8)) {
|
||||
return TRUE;
|
||||
} else {
|
||||
@@ -1282,8 +1282,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL Manager::fn_8133A634(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
BOOL Manager::usesAltSound(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL && (channel->metaHdr->blockHdr.useAltSound << 14)) {
|
||||
return TRUE;
|
||||
} else {
|
||||
@@ -1291,8 +1291,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL Manager::fn_8133A678(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
BOOL Manager::isMissingTicket(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL && channel->missingTicket != FALSE) {
|
||||
return TRUE;
|
||||
} else {
|
||||
@@ -1300,8 +1300,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL Manager::fn_8133A6B8(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
BOOL Manager::isNewsChannelV6Plus(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
@@ -1315,8 +1315,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
BOOL Manager::fn_8133A73C(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
BOOL Manager::isOperaChannel(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
@@ -1329,8 +1329,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
nand::MetaFile* Manager::fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
nand::MetaFile* Manager::readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1343,8 +1343,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
nand::MetaFile* Manager::fn_8133A85C(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
nand::MetaFile* Manager::readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1357,8 +1357,8 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
nand::SharedFile* Manager::fn_8133A924(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
nand::SharedFile* Manager::readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1366,7 +1366,7 @@ namespace ipl {
|
||||
if (!channel->loadedBnr || channel->info.primaryType == channel::PRIMARY_TYPE_DISK) {
|
||||
return NULL;
|
||||
} else {
|
||||
u32 index = fn_8133A57C(titleId);
|
||||
u32 index = getBannerCSIdx(titleId);
|
||||
if (index == 0) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -1375,15 +1375,15 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
void Manager::fn_8133A9F0() {
|
||||
void Manager::clearTmpChannel() {
|
||||
if (mTmpChannel.bnrFile != NULL) {
|
||||
delete mTmpChannel.bnrFile;
|
||||
}
|
||||
memset(&mTmpChannel, 0, sizeof(mTmpChannel));
|
||||
}
|
||||
|
||||
void Manager::fn_8133AA50(ESTitleId titleId) {
|
||||
SEntry* channel = fn_8133A4E0(titleId);
|
||||
void Manager::unloadBanner(ESTitleId titleId) {
|
||||
SEntry* channel = findEntryByTitleId(titleId);
|
||||
if (channel != NULL) {
|
||||
channel->loadedBnr = false;
|
||||
}
|
||||
|
||||
@@ -389,7 +389,7 @@ namespace ipl {
|
||||
send_work(MESSAGE_CHECK_BACKUP_FITS);
|
||||
}
|
||||
|
||||
void NandSDWorker::iplNandSD_81348EA8(void* ptrA, void* ptrB, void* ptrC) {
|
||||
void NandSDWorker::check_sd_app_titles_async(void* ptrA, void* ptrB, void* ptrC) {
|
||||
myWork->paramA = ptrA;
|
||||
myWork->paramB = ptrB;
|
||||
myWork->paramC = ptrC;
|
||||
@@ -797,7 +797,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
case MESSAGE_UNK_49: {
|
||||
do_unk_8134C838();
|
||||
do_check_sd_app_titles();
|
||||
break;
|
||||
}
|
||||
case MESSAGE_GET_NAND_SAVE_SIZE: {
|
||||
@@ -2179,7 +2179,7 @@ namespace ipl {
|
||||
MEMFreeToExpHeap(myWork->mainHeap, titleIds);
|
||||
}
|
||||
|
||||
void NandSDWorker::do_unk_8134C838() {
|
||||
void NandSDWorker::do_check_sd_app_titles() {
|
||||
SDAppBanner* sdAppBanner = (SDAppBanner*)MEMAllocFromAllocator(&myWork->unkAllocator, sizeof(SDAppBanner));
|
||||
|
||||
/* i guess */
|
||||
|
||||
@@ -1003,39 +1003,21 @@ namespace ipl {
|
||||
return count - 1;
|
||||
}
|
||||
|
||||
asm int Manager::getAvailableInList(register const ESTitleId* titleIds, register u32 titleCount) {
|
||||
nofralloc
|
||||
li r8, 0
|
||||
li r6, 0
|
||||
li r7, 0xc
|
||||
mtctr r5
|
||||
cmplwi r5, 0
|
||||
ble getAvailableInList_L3
|
||||
getAvailableInList_L1:
|
||||
add r5, r4, r6
|
||||
lwzx r0, r4, r6
|
||||
lwz r5, 4(r5)
|
||||
or. r0, r5, r0
|
||||
bne getAvailableInList_L2
|
||||
divw r5, r8, r7
|
||||
mullw r0, r5, r7
|
||||
mulli r5, r5, 0xc0
|
||||
subf r0, r0, r8
|
||||
add r5, r3, r5
|
||||
slwi r0, r0, 4
|
||||
add r5, r5, r0
|
||||
lbz r0, 0x30(r5)
|
||||
cmplwi r0, 1
|
||||
beq getAvailableInList_L2
|
||||
mr r3, r8
|
||||
blr
|
||||
getAvailableInList_L2:
|
||||
addi r8, r8, 1
|
||||
addi r6, r6, 8
|
||||
bdnz getAvailableInList_L1
|
||||
getAvailableInList_L3:
|
||||
li r3, -1
|
||||
blr
|
||||
int Manager::getAvailableInList(const ESTitleId* titleIds, u32 titleCount) {
|
||||
int dens = 12;
|
||||
u32 i;
|
||||
for (i = 0; i < titleCount; i++) {
|
||||
if (titleIds[i] == 0) {
|
||||
int page = (int)i / dens;
|
||||
int slot = (int)i % dens;
|
||||
u8* p = (u8*)this + page * 0xc0;
|
||||
p += slot * 16;
|
||||
if (*(p + 0x30) != 1) {
|
||||
return (int)i;
|
||||
}
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
asm int Manager::isEqualChannel(register ESTitleId titleId0, register ESTitleId titleId1) {
|
||||
|
||||
@@ -39,12 +39,12 @@
|
||||
extern "C" ipl::System::Arg smArg__Q23ipl6System;
|
||||
extern "C" ipl::snd::System sSystem__Q23ipl3snd;
|
||||
extern "C" void initOnMemory__Q33ipl3snd6SystemFPCvPQ23EGG4HeapUl();
|
||||
extern "C" const f32 lbl_81694424;
|
||||
extern "C" const f32 lbl_81694428;
|
||||
extern "C" const f32 lbl_8169442C;
|
||||
extern "C" const f32 lbl_81694430;
|
||||
extern "C" const f32 lbl_81694434;
|
||||
extern "C" const f32 lbl_81694438;
|
||||
extern "C" const f32 scOrthoLeft;
|
||||
extern "C" const f32 scOrthoRight;
|
||||
extern "C" const f32 scOrthoBottom;
|
||||
extern "C" const f32 scOrthoTop;
|
||||
extern "C" const f32 scWideOrthoLeft;
|
||||
extern "C" const f32 scWideOrthoRight;
|
||||
extern "C" void* m_handle__Q23ipl11TVRCManager;
|
||||
extern "C" void _savegpr_27();
|
||||
extern "C" void _restgpr_27();
|
||||
@@ -1139,7 +1139,7 @@ namespace ipl {
|
||||
bl VISetBlack
|
||||
lwz r3, 0xb0(r28)
|
||||
li r0, 1
|
||||
lfd f31, lbl_81694424-0xc
|
||||
lfd f31, scOrthoLeft-0xc
|
||||
lis r30, 0x4330
|
||||
lbz r29, 0x3d(r3)
|
||||
lis r31, sSystem__Q23ipl3snd@ha
|
||||
@@ -1162,7 +1162,7 @@ namespace ipl {
|
||||
bl makeRawData__Q33ipl7utility11JpegDecoderFv
|
||||
warning_run_no_jpeg:
|
||||
lwz r3, 0x74(r28)
|
||||
lfs f1, lbl_81694424-0x14
|
||||
lfs f1, scOrthoLeft-0x14
|
||||
lwz r27, 0(r3)
|
||||
stw r30, 8(r1)
|
||||
fmr f2, f1
|
||||
@@ -1170,7 +1170,7 @@ namespace ipl {
|
||||
fmr f5, f1
|
||||
lhz r0, 6(r27)
|
||||
stw r3, 0xc(r1)
|
||||
lfs f6, lbl_81694424-0x4
|
||||
lfs f6, scOrthoLeft-0x4
|
||||
lfd f0, 8(r1)
|
||||
stw r0, 0x14(r1)
|
||||
fsubs f3, f0, f31
|
||||
@@ -1362,17 +1362,17 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void System::getProjectionRect4x3(nw4r::ut::Rect* rect) {
|
||||
rect->left = *((volatile const f32*)&lbl_81694424);
|
||||
rect->right = *((volatile const f32*)&lbl_81694428);
|
||||
rect->bottom = *((volatile const f32*)&lbl_8169442C);
|
||||
rect->top = *((volatile const f32*)&lbl_81694430);
|
||||
rect->left = *((volatile const f32*)&scOrthoLeft);
|
||||
rect->right = *((volatile const f32*)&scOrthoRight);
|
||||
rect->bottom = *((volatile const f32*)&scOrthoBottom);
|
||||
rect->top = *((volatile const f32*)&scOrthoTop);
|
||||
}
|
||||
|
||||
void System::getProjectionRect16x9(nw4r::ut::Rect* rect) {
|
||||
rect->left = *((volatile const f32*)&lbl_81694434);
|
||||
rect->right = *((volatile const f32*)&lbl_81694438);
|
||||
rect->bottom = *((volatile const f32*)&lbl_8169442C);
|
||||
rect->top = *((volatile const f32*)&lbl_81694430);
|
||||
rect->left = *((volatile const f32*)&scWideOrthoLeft);
|
||||
rect->right = *((volatile const f32*)&scWideOrthoRight);
|
||||
rect->bottom = *((volatile const f32*)&scOrthoBottom);
|
||||
rect->top = *((volatile const f32*)&scOrthoTop);
|
||||
}
|
||||
|
||||
GXRenderModeObj* System::getRenderModeObj() {
|
||||
@@ -1516,11 +1516,11 @@ namespace ipl {
|
||||
|
||||
#ifdef __MWERKS__
|
||||
#pragma force_active on
|
||||
extern "C" const f32 lbl_81694424 = -304.0f;
|
||||
extern "C" const f32 lbl_81694428 = 304.0f;
|
||||
extern "C" const f32 lbl_8169442C = 228.0f;
|
||||
extern "C" const f32 lbl_81694430 = -228.0f;
|
||||
extern "C" const f32 lbl_81694434 = -416.0f;
|
||||
extern "C" const f32 lbl_81694438 = 416.0f;
|
||||
extern "C" const f32 scOrthoLeft = -304.0f;
|
||||
extern "C" const f32 scOrthoRight = 304.0f;
|
||||
extern "C" const f32 scOrthoBottom = 228.0f;
|
||||
extern "C" const f32 scOrthoTop = -228.0f;
|
||||
extern "C" const f32 scWideOrthoLeft = -416.0f;
|
||||
extern "C" const f32 scWideOrthoRight = 416.0f;
|
||||
#pragma force_active off
|
||||
#endif
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
namespace ipl {
|
||||
TVRCManager* TVRCManager::m_handle;
|
||||
|
||||
int lbl_8169877C = 0;
|
||||
int sTvrcStartDelay = 0;
|
||||
|
||||
TVRCManager::TVRCManager(EGG::Heap* heap) : mbInitialized(FALSE), mpDBFile(NULL), mbResetting(FALSE), mbPrepTVRC(FALSE), mState(STATE_0) {
|
||||
/* TV model for testing at EAD? */
|
||||
@@ -280,17 +280,17 @@ namespace ipl {
|
||||
case STATE_3: {
|
||||
if (!snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
|
||||
snd::getSystem()->pauseOnBGM();
|
||||
lbl_8169877C = 5;
|
||||
sTvrcStartDelay = 5;
|
||||
mState = STATE_4;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case STATE_4: {
|
||||
if (mbResetting) {
|
||||
lbl_8169877C = 0;
|
||||
sTvrcStartDelay = 0;
|
||||
}
|
||||
|
||||
if (--lbl_8169877C <= 0 && !snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
|
||||
if (--sTvrcStartDelay <= 0 && !snd::getSystem()->isSEActive(HOMESE_GOTO_MENU)) {
|
||||
snd_shutup(TRUE);
|
||||
if (IS_ENABLED && !TVRCIsActive()) {
|
||||
TVRCSendStartAsync(trans_cmd(mCurrentCommand));
|
||||
|
||||
@@ -152,81 +152,81 @@ Rvl_decode_szs_done:
|
||||
}
|
||||
#else
|
||||
int Rvl_decode_szs(u8* out, u8* in) {
|
||||
register u8* pbVar1;
|
||||
register u8 bVar2;
|
||||
register u8 bVar3;
|
||||
register u8* pbVar5;
|
||||
register int iVar6;
|
||||
register int iVar7;
|
||||
register u32 uVar8;
|
||||
register u32 uVar9;
|
||||
register u32 uVar10;
|
||||
register u32 param_5;
|
||||
iVar6 = *(int*)(in + 4);
|
||||
uVar8 = 0;
|
||||
register u8* copySrc;
|
||||
register u8 hdrByte;
|
||||
register u8 extLenByte;
|
||||
register u8* inPtr;
|
||||
register int decodedSize;
|
||||
register int remaining;
|
||||
register u32 bitMask;
|
||||
register u32 copyLen;
|
||||
register u32 blockCount;
|
||||
register u32 flags;
|
||||
decodedSize = *(int*)(in + 4);
|
||||
bitMask = 0;
|
||||
in += 0x10;
|
||||
iVar7 = iVar6;
|
||||
remaining = decodedSize;
|
||||
do {
|
||||
next:
|
||||
while (1) {
|
||||
uVar8 >>= 1;
|
||||
pbVar5 = in;
|
||||
if (uVar8 == 0) {
|
||||
param_5 = *in;
|
||||
uVar8 = 0x80;
|
||||
pbVar5 = in + 1;
|
||||
bitMask >>= 1;
|
||||
inPtr = in;
|
||||
if (bitMask == 0) {
|
||||
flags = *in;
|
||||
bitMask = 0x80;
|
||||
inPtr = in + 1;
|
||||
}
|
||||
bVar2 = *pbVar5;
|
||||
if ((uVar8 & param_5) == 0) {
|
||||
hdrByte = *inPtr;
|
||||
if ((bitMask & flags) == 0) {
|
||||
break;
|
||||
}
|
||||
in = pbVar5 + 1;
|
||||
iVar7--;
|
||||
*out = bVar2;
|
||||
in = inPtr + 1;
|
||||
remaining--;
|
||||
*out = hdrByte;
|
||||
out++;
|
||||
if (iVar7 != 0) {
|
||||
if (remaining != 0) {
|
||||
goto next;
|
||||
}
|
||||
goto done;
|
||||
}
|
||||
uVar9 = bVar2 >> 4;
|
||||
in = pbVar5 + 2;
|
||||
if (uVar9 == 0) {
|
||||
bVar3 = *in;
|
||||
in = pbVar5 + 3;
|
||||
uVar9 = bVar3 + 0x10;
|
||||
copyLen = hdrByte >> 4;
|
||||
in = inPtr + 2;
|
||||
if (copyLen == 0) {
|
||||
extLenByte = *in;
|
||||
in = inPtr + 3;
|
||||
copyLen = extLenByte + 0x10;
|
||||
}
|
||||
pbVar5 = out - (((bVar2 & 0xf) << 8) | pbVar5[1]);
|
||||
iVar7 = (iVar7 - uVar9) - 2;
|
||||
*out = pbVar5[-1];
|
||||
out[1] = *pbVar5;
|
||||
pbVar5 += 2;
|
||||
uVar10 = uVar9 >> 3;
|
||||
inPtr = out - (((hdrByte & 0xf) << 8) | inPtr[1]);
|
||||
remaining = (remaining - copyLen) - 2;
|
||||
*out = inPtr[-1];
|
||||
out[1] = *inPtr;
|
||||
inPtr += 2;
|
||||
blockCount = copyLen >> 3;
|
||||
out += 2;
|
||||
if (uVar10 != 0) {
|
||||
if (blockCount != 0) {
|
||||
do {
|
||||
*out = pbVar5[-1];
|
||||
out[1] = *pbVar5;
|
||||
out[2] = pbVar5[1];
|
||||
out[3] = pbVar5[2];
|
||||
out[4] = pbVar5[3];
|
||||
out[5] = pbVar5[4];
|
||||
out[6] = pbVar5[5];
|
||||
out[7] = pbVar5[6];
|
||||
pbVar5 += 8;
|
||||
*out = inPtr[-1];
|
||||
out[1] = *inPtr;
|
||||
out[2] = inPtr[1];
|
||||
out[3] = inPtr[2];
|
||||
out[4] = inPtr[3];
|
||||
out[5] = inPtr[4];
|
||||
out[6] = inPtr[5];
|
||||
out[7] = inPtr[6];
|
||||
inPtr += 8;
|
||||
out += 8;
|
||||
uVar10--;
|
||||
} while (uVar10 != 0);
|
||||
blockCount--;
|
||||
} while (blockCount != 0);
|
||||
}
|
||||
for (uVar9 &= 7; uVar9 != 0; uVar9--) {
|
||||
pbVar1 = pbVar5 - 1;
|
||||
pbVar5++;
|
||||
*out = *pbVar1;
|
||||
for (copyLen &= 7; copyLen != 0; copyLen--) {
|
||||
copySrc = inPtr - 1;
|
||||
inPtr++;
|
||||
*out = *copySrc;
|
||||
out++;
|
||||
}
|
||||
} while (0 < iVar7);
|
||||
} while (0 < remaining);
|
||||
done:
|
||||
return iVar6;
|
||||
return decodedSize;
|
||||
}
|
||||
#endif
|
||||
#ifdef __MWERKS__
|
||||
@@ -490,225 +490,225 @@ L_Rvl_decode_ash_return:
|
||||
}
|
||||
#else
|
||||
int Rvl_decode_ash(u8* out, u8* in) {
|
||||
u8* puVar1;
|
||||
u32* puVar2;
|
||||
u32 uVar3;
|
||||
u32 uVar4;
|
||||
u32 uVar5;
|
||||
u32 uVar6;
|
||||
int iVar7;
|
||||
u16 uVar8;
|
||||
u16 uVar10;
|
||||
u8* puVar9;
|
||||
int iVar11;
|
||||
u32 uVar12;
|
||||
u32 uVar13;
|
||||
u32 uVar14;
|
||||
u32 uVar15;
|
||||
int iVar16;
|
||||
int iVar17;
|
||||
u32 uVar18;
|
||||
u32 uVar19;
|
||||
u32 uVar20;
|
||||
u16* puVar21;
|
||||
u8* dst;
|
||||
u32* inWordPtr;
|
||||
u32 decodedSize;
|
||||
u32 sym9;
|
||||
u32 sym11;
|
||||
u32 nodeVal;
|
||||
int needBits;
|
||||
u16 nodeCount;
|
||||
u16 nextNode;
|
||||
u8* litPtr;
|
||||
int bitOff1;
|
||||
u32 bitPos1;
|
||||
u32 shifted;
|
||||
u32 bitWord1;
|
||||
u32 tmp15;
|
||||
int stackDepth;
|
||||
int bitOff2;
|
||||
u32 bitPos2;
|
||||
u32 bitWord2;
|
||||
u32 tmp20;
|
||||
u16* stackPtr;
|
||||
|
||||
uVar3 = *(u32*)(in + 4) & 0xffffff;
|
||||
iVar11 = 0x10;
|
||||
uVar12 = 0;
|
||||
uVar18 = 0;
|
||||
uVar19 = *(u32*)(*(int*)(in + 8) + in);
|
||||
iVar17 = *(int*)(in + 8) + 4;
|
||||
puVar21 = (u16*)&work[0x4ff8];
|
||||
uVar8 = 0x200;
|
||||
iVar16 = 0;
|
||||
uVar14 = *(u32*)(in + 0xc);
|
||||
uVar10 = 0x200;
|
||||
decodedSize = *(u32*)(in + 4) & 0xffffff;
|
||||
bitOff1 = 0x10;
|
||||
bitPos1 = 0;
|
||||
bitPos2 = 0;
|
||||
bitWord2 = *(u32*)(*(int*)(in + 8) + in);
|
||||
bitOff2 = *(int*)(in + 8) + 4;
|
||||
stackPtr = (u16*)&work[0x4ff8];
|
||||
nodeCount = 0x200;
|
||||
stackDepth = 0;
|
||||
bitWord1 = *(u32*)(in + 0xc);
|
||||
nextNode = 0x200;
|
||||
do {
|
||||
while (1) {
|
||||
if (uVar12 == 0x1f) {
|
||||
uVar13 = *(u32*)(in + iVar11);
|
||||
uVar12 = 0;
|
||||
iVar11 = iVar11 + 4;
|
||||
if (bitPos1 == 0x1f) {
|
||||
shifted = *(u32*)(in + bitOff1);
|
||||
bitPos1 = 0;
|
||||
bitOff1 = bitOff1 + 4;
|
||||
} else {
|
||||
uVar12 = uVar12 + 1;
|
||||
uVar13 = uVar14 << 1;
|
||||
bitPos1 = bitPos1 + 1;
|
||||
shifted = bitWord1 << 1;
|
||||
}
|
||||
if (-1 < (int)uVar14) {
|
||||
if (-1 < (int)bitWord1) {
|
||||
break;
|
||||
}
|
||||
*puVar21 = uVar10 | 0x8000;
|
||||
puVar21[1] = uVar10 | 0x4000;
|
||||
puVar21 = puVar21 + 2;
|
||||
iVar16 = iVar16 + 2;
|
||||
uVar8 = uVar8 + 1;
|
||||
uVar14 = uVar13;
|
||||
uVar10 = uVar10 + 1;
|
||||
*stackPtr = nextNode | 0x8000;
|
||||
stackPtr[1] = nextNode | 0x4000;
|
||||
stackPtr = stackPtr + 2;
|
||||
stackDepth = stackDepth + 2;
|
||||
nodeCount = nodeCount + 1;
|
||||
bitWord1 = shifted;
|
||||
nextNode = nextNode + 1;
|
||||
}
|
||||
iVar7 = uVar12 + 9;
|
||||
if (iVar7 < 0x21) {
|
||||
uVar4 = uVar13 >> 0x17;
|
||||
if (iVar7 == 0x20) {
|
||||
uVar14 = *(u32*)(in + iVar11);
|
||||
uVar12 = 0;
|
||||
iVar11 = iVar11 + 4;
|
||||
needBits = bitPos1 + 9;
|
||||
if (needBits < 0x21) {
|
||||
sym9 = shifted >> 0x17;
|
||||
if (needBits == 0x20) {
|
||||
bitWord1 = *(u32*)(in + bitOff1);
|
||||
bitPos1 = 0;
|
||||
bitOff1 = bitOff1 + 4;
|
||||
} else {
|
||||
uVar14 = uVar13 << 9;
|
||||
uVar12 = uVar12 + 9;
|
||||
bitWord1 = shifted << 9;
|
||||
bitPos1 = bitPos1 + 9;
|
||||
}
|
||||
} else {
|
||||
puVar2 = (u32*)(in + iVar11);
|
||||
iVar11 = iVar11 + 4;
|
||||
uVar4 = uVar13 >> 0x17 | *puVar2 >> (0x40U - iVar7 & 0x3f);
|
||||
uVar12 = uVar12 - 0x17;
|
||||
uVar14 = *puVar2 << (uVar12 & 0x3f);
|
||||
inWordPtr = (u32*)(in + bitOff1);
|
||||
bitOff1 = bitOff1 + 4;
|
||||
sym9 = shifted >> 0x17 | *inWordPtr >> (0x40U - needBits & 0x3f);
|
||||
bitPos1 = bitPos1 - 0x17;
|
||||
bitWord1 = *inWordPtr << (bitPos1 & 0x3f);
|
||||
}
|
||||
while (1) {
|
||||
puVar21 = puVar21 - 1;
|
||||
uVar10 = *puVar21;
|
||||
iVar16 = iVar16 - 1;
|
||||
iVar7 = (uVar10 & 0x3fff) * 2;
|
||||
if ((uVar10 & 0x8000) == 0) {
|
||||
stackPtr = stackPtr - 1;
|
||||
nextNode = *stackPtr;
|
||||
stackDepth = stackDepth - 1;
|
||||
needBits = (nextNode & 0x3fff) * 2;
|
||||
if ((nextNode & 0x8000) == 0) {
|
||||
break;
|
||||
}
|
||||
*(u16*)(&work[0x7fe] + iVar7) = (u16)uVar4;
|
||||
uVar4 = uVar10 & 0x3fff;
|
||||
if (iVar16 == 0) {
|
||||
uVar8 = 0x800;
|
||||
iVar16 = 0;
|
||||
uVar10 = 0x800;
|
||||
*(u16*)(&work[0x7fe] + needBits) = (u16)sym9;
|
||||
sym9 = nextNode & 0x3fff;
|
||||
if (stackDepth == 0) {
|
||||
nodeCount = 0x800;
|
||||
stackDepth = 0;
|
||||
nextNode = 0x800;
|
||||
do {
|
||||
while (1) {
|
||||
if (uVar18 == 0x1f) {
|
||||
uVar13 = *(u32*)(in + iVar17);
|
||||
uVar18 = 0;
|
||||
iVar17 = iVar17 + 4;
|
||||
if (bitPos2 == 0x1f) {
|
||||
shifted = *(u32*)(in + bitOff2);
|
||||
bitPos2 = 0;
|
||||
bitOff2 = bitOff2 + 4;
|
||||
} else {
|
||||
uVar18 = uVar18 + 1;
|
||||
uVar13 = uVar19 << 1;
|
||||
bitPos2 = bitPos2 + 1;
|
||||
shifted = bitWord2 << 1;
|
||||
}
|
||||
if (-1 < (int)uVar19) {
|
||||
if (-1 < (int)bitWord2) {
|
||||
break;
|
||||
}
|
||||
*puVar21 = uVar10 | 0x8000;
|
||||
puVar21[1] = uVar10 | 0x4000;
|
||||
puVar21 = puVar21 + 2;
|
||||
iVar16 = iVar16 + 2;
|
||||
uVar8 = uVar8 + 1;
|
||||
uVar19 = uVar13;
|
||||
uVar10 = uVar10 + 1;
|
||||
*stackPtr = nextNode | 0x8000;
|
||||
stackPtr[1] = nextNode | 0x4000;
|
||||
stackPtr = stackPtr + 2;
|
||||
stackDepth = stackDepth + 2;
|
||||
nodeCount = nodeCount + 1;
|
||||
bitWord2 = shifted;
|
||||
nextNode = nextNode + 1;
|
||||
}
|
||||
iVar7 = uVar18 + 0xb;
|
||||
if (iVar7 < 0x21) {
|
||||
uVar5 = uVar13 >> 0x15;
|
||||
if (iVar7 == 0x20) {
|
||||
uVar19 = *(u32*)(in + iVar17);
|
||||
uVar18 = 0;
|
||||
iVar17 = iVar17 + 4;
|
||||
needBits = bitPos2 + 0xb;
|
||||
if (needBits < 0x21) {
|
||||
sym11 = shifted >> 0x15;
|
||||
if (needBits == 0x20) {
|
||||
bitWord2 = *(u32*)(in + bitOff2);
|
||||
bitPos2 = 0;
|
||||
bitOff2 = bitOff2 + 4;
|
||||
} else {
|
||||
uVar19 = uVar13 << 0xb;
|
||||
uVar18 = uVar18 + 0xb;
|
||||
bitWord2 = shifted << 0xb;
|
||||
bitPos2 = bitPos2 + 0xb;
|
||||
}
|
||||
} else {
|
||||
puVar2 = (u32*)(in + iVar17);
|
||||
iVar17 = iVar17 + 4;
|
||||
uVar5 = uVar13 >> 0x15 | *puVar2 >> (0x40U - iVar7 & 0x3f);
|
||||
uVar18 = uVar18 - 0x15;
|
||||
uVar19 = *puVar2 << (uVar18 & 0x3f);
|
||||
inWordPtr = (u32*)(in + bitOff2);
|
||||
bitOff2 = bitOff2 + 4;
|
||||
sym11 = shifted >> 0x15 | *inWordPtr >> (0x40U - needBits & 0x3f);
|
||||
bitPos2 = bitPos2 - 0x15;
|
||||
bitWord2 = *inWordPtr << (bitPos2 & 0x3f);
|
||||
}
|
||||
while (1) {
|
||||
puVar21 = puVar21 - 1;
|
||||
uVar10 = *puVar21;
|
||||
iVar16 = iVar16 - 1;
|
||||
iVar7 = (uVar10 & 0x3fff) * 2;
|
||||
if ((uVar10 & 0x8000) == 0) {
|
||||
stackPtr = stackPtr - 1;
|
||||
nextNode = *stackPtr;
|
||||
stackDepth = stackDepth - 1;
|
||||
needBits = (nextNode & 0x3fff) * 2;
|
||||
if ((nextNode & 0x8000) == 0) {
|
||||
break;
|
||||
}
|
||||
*(u16*)(&work[0x2ffa] + iVar7) = (u16)uVar5;
|
||||
uVar5 = uVar10 & 0x3fff;
|
||||
uVar6 = uVar4;
|
||||
uVar13 = uVar3;
|
||||
if (iVar16 == 0) {
|
||||
*(u16*)(&work[0x2ffa] + needBits) = (u16)sym11;
|
||||
sym11 = nextNode & 0x3fff;
|
||||
nodeVal = sym9;
|
||||
shifted = decodedSize;
|
||||
if (stackDepth == 0) {
|
||||
do {
|
||||
while (0x1ff < uVar6) {
|
||||
if (uVar12 == 0x1f) {
|
||||
uVar15 = *(u32*)(in + iVar11);
|
||||
iVar11 = iVar11 + 4;
|
||||
uVar12 = 0;
|
||||
while (0x1ff < nodeVal) {
|
||||
if (bitPos1 == 0x1f) {
|
||||
tmp15 = *(u32*)(in + bitOff1);
|
||||
bitOff1 = bitOff1 + 4;
|
||||
bitPos1 = 0;
|
||||
} else {
|
||||
uVar12 = uVar12 + 1;
|
||||
uVar15 = uVar14 << 1;
|
||||
bitPos1 = bitPos1 + 1;
|
||||
tmp15 = bitWord1 << 1;
|
||||
}
|
||||
if ((int)uVar14 < 0) {
|
||||
uVar6 = *(u16*)(&work[0x7fe] + uVar6 * 2);
|
||||
uVar14 = uVar15;
|
||||
if ((int)bitWord1 < 0) {
|
||||
nodeVal = *(u16*)(&work[0x7fe] + nodeVal * 2);
|
||||
bitWord1 = tmp15;
|
||||
} else {
|
||||
uVar6 = *(u16*)((u8*)work + uVar6 * 2);
|
||||
uVar14 = uVar15;
|
||||
nodeVal = *(u16*)((u8*)work + nodeVal * 2);
|
||||
bitWord1 = tmp15;
|
||||
}
|
||||
}
|
||||
uVar15 = uVar5;
|
||||
if (uVar6 < 0x100) {
|
||||
*out = (char)uVar6;
|
||||
tmp15 = sym11;
|
||||
if (nodeVal < 0x100) {
|
||||
*out = (char)nodeVal;
|
||||
out = out + 1;
|
||||
uVar13 = uVar13 - 1;
|
||||
shifted = shifted - 1;
|
||||
} else {
|
||||
while (0x7ff < uVar15) {
|
||||
if (uVar18 == 0x1f) {
|
||||
uVar20 = *(u32*)(in + iVar17);
|
||||
iVar17 = iVar17 + 4;
|
||||
uVar18 = 0;
|
||||
while (0x7ff < tmp15) {
|
||||
if (bitPos2 == 0x1f) {
|
||||
tmp20 = *(u32*)(in + bitOff2);
|
||||
bitOff2 = bitOff2 + 4;
|
||||
bitPos2 = 0;
|
||||
} else {
|
||||
uVar18 = uVar18 + 1;
|
||||
uVar20 = uVar19 << 1;
|
||||
bitPos2 = bitPos2 + 1;
|
||||
tmp20 = bitWord2 << 1;
|
||||
}
|
||||
if ((int)uVar19 < 0) {
|
||||
uVar15 = *(u16*)(&work[0x2ffa] + uVar15 * 2);
|
||||
uVar19 = uVar20;
|
||||
if ((int)bitWord2 < 0) {
|
||||
tmp15 = *(u16*)(&work[0x2ffa] + tmp15 * 2);
|
||||
bitWord2 = tmp20;
|
||||
} else {
|
||||
uVar15 = *(u16*)(&work[0xffc] + uVar15 * 2);
|
||||
uVar19 = uVar20;
|
||||
tmp15 = *(u16*)(&work[0xffc] + tmp15 * 2);
|
||||
bitWord2 = tmp20;
|
||||
}
|
||||
}
|
||||
uVar6 = uVar6 - 0xfd;
|
||||
puVar9 = out - uVar15;
|
||||
uVar13 = uVar13 - uVar6;
|
||||
uVar15 = uVar6 >> 3;
|
||||
if (uVar15 == 0) {
|
||||
nodeVal = nodeVal - 0xfd;
|
||||
litPtr = out - tmp15;
|
||||
shifted = shifted - nodeVal;
|
||||
tmp15 = nodeVal >> 3;
|
||||
if (tmp15 == 0) {
|
||||
goto LAB_813325b8;
|
||||
}
|
||||
do {
|
||||
*out = puVar9[-1];
|
||||
out[1] = *puVar9;
|
||||
out[2] = puVar9[1];
|
||||
out[3] = puVar9[2];
|
||||
out[4] = puVar9[3];
|
||||
out[5] = puVar9[4];
|
||||
out[6] = puVar9[5];
|
||||
out[7] = puVar9[6];
|
||||
puVar9 = puVar9 + 8;
|
||||
*out = litPtr[-1];
|
||||
out[1] = *litPtr;
|
||||
out[2] = litPtr[1];
|
||||
out[3] = litPtr[2];
|
||||
out[4] = litPtr[3];
|
||||
out[5] = litPtr[4];
|
||||
out[6] = litPtr[5];
|
||||
out[7] = litPtr[6];
|
||||
litPtr = litPtr + 8;
|
||||
out = out + 8;
|
||||
uVar15 = uVar15 - 1;
|
||||
} while (uVar15 != 0);
|
||||
for (uVar6 = uVar6 & 7; uVar6 != 0; uVar6 = uVar6 - 1) {
|
||||
tmp15 = tmp15 - 1;
|
||||
} while (tmp15 != 0);
|
||||
for (nodeVal = nodeVal & 7; nodeVal != 0; nodeVal = nodeVal - 1) {
|
||||
LAB_813325b8:
|
||||
puVar1 = puVar9 - 1;
|
||||
puVar9 = puVar9 + 1;
|
||||
*out = *puVar1;
|
||||
dst = litPtr - 1;
|
||||
litPtr = litPtr + 1;
|
||||
*out = *dst;
|
||||
out = out + 1;
|
||||
}
|
||||
}
|
||||
uVar6 = uVar4;
|
||||
} while (uVar13 != 0);
|
||||
return uVar3;
|
||||
nodeVal = sym9;
|
||||
} while (shifted != 0);
|
||||
return decodedSize;
|
||||
}
|
||||
}
|
||||
*(u16*)(&work[0xffc] + iVar7) = (u16)uVar5;
|
||||
uVar10 = uVar8;
|
||||
*(u16*)(&work[0xffc] + needBits) = (u16)sym11;
|
||||
nextNode = nodeCount;
|
||||
} while (1);
|
||||
}
|
||||
}
|
||||
*(u16*)((u8*)work + iVar7) = (u16)uVar4;
|
||||
uVar10 = uVar8;
|
||||
*(u16*)((u8*)work + needBits) = (u16)sym9;
|
||||
nextNode = nodeCount;
|
||||
} while (1);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -46,12 +46,12 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
|
||||
unkVal0 = param_5;
|
||||
unkVal1 = param_6;
|
||||
mStartTangent = startTangent;
|
||||
mEndTangent = endTangent;
|
||||
}
|
||||
|
||||
T get() const {
|
||||
@@ -64,11 +64,11 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(unkVal0 *
|
||||
(mStartTangent *
|
||||
(var_f27 +
|
||||
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -77,8 +77,8 @@ namespace ipl {
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
144
tools/decomp-assist/netlib.attempts.md
Normal file
144
tools/decomp-assist/netlib.attempts.md
Normal file
@@ -0,0 +1,144 @@
|
||||
|
||||
## Pass 3 (w0929 worker session)
|
||||
|
||||
### Member-function symbol-name dialect (new lever)
|
||||
Orig .o symbol names come from symbols.txt metadata, not ground truth. Orig's
|
||||
`__nupGetBootVersion__FP14ESTitleVersion` used an old no-class-scope `__F`
|
||||
member dialect; the fn is actually `s32 NUPContextInfo::__nupGetBootVersion(ESTitleVersion*)`.
|
||||
Writing it as a member fn + fixing symbols.txt to the `__14NUPContextInfoF` name
|
||||
made objdiff pair it (None → 99.36, insn-identical, 17 regname diffs remain).
|
||||
Correcting WRONG names in symbols.txt is legitimate (extracted objects never link).
|
||||
|
||||
### Re-tested-condition decode (new lever)
|
||||
`if (x != y) { result = ERR; } if (x != y) { *out = x; }` — re-testing the same
|
||||
comparison emits a dead second `cmplw`. Took `__nupGetBoot2Version`/`__nupOp`
|
||||
from 437 to 438=438 structural match.
|
||||
|
||||
### MD5 dual-lwbrx STEP
|
||||
Orig emits TWO `__lwbrx(word,0)` loads per step: first feeds the `>>` (rotate-low)
|
||||
chain `word + (const + (a+f))`, second feeds `word + const` → `(a+f) + wc` (`<<` side).
|
||||
Capture order matters: `_xw = __lwbrx(w)` (X side) then `_wc = __lwbrx(w) + *const`
|
||||
(Y side), `a += f` between decl and use, `(a) = b + (((a)+_wc) << n | (_xw + (const + a)) >> (32-n))`.
|
||||
Reversed `|` operands pick srwi-base + rlwimi (orig) over slwi+rlwimi. 57.1 → 70.8.
|
||||
Residual: orig's `word` walks in-place (`addi r4,r4,4`) vs MWCC strength-reduced
|
||||
`base + 4k` recomputes; post-inc/_wp capture forms don't defeat it. Documented tie.
|
||||
|
||||
### `!direct` arm-order (SOBasic RecvFrom/SendTo)
|
||||
Orig: `if (!direct) buffer = SOiAlloc(...); else buffer = data;` — alloc in-line,
|
||||
data out-of-line via `bne`. `if(direct) data else alloc` emits opposite layout.
|
||||
SendTo: `if (direct == 0)` form (not `switch(direct){default/case 1}` which emits
|
||||
`cmpwi 1; beq`, nor `!direct` ternary which flips arms back). RecvFrom: `!direct`.
|
||||
Both now instruction-identical (regname-only residual).
|
||||
|
||||
### Interface fn-pointer marshal order (hmac — partial)
|
||||
`context->interface.init(work)` vs `init(context->digestContext)`: reusing the
|
||||
`work` local matches orig's `mr r3,rX`; recomputing emits `addi r3,ctx,0x20`.
|
||||
NETHMACGetDigest orig keeps `context->digestContext` in a callee web for calls
|
||||
1/4/5 and materializes `work` via `mr r31,r30` at first use (web-split copy);
|
||||
my build rematerializes the addi — 3-insn gap, allocator-internal.
|
||||
|
||||
### Cold-block out-of-line (HttpStringFlush — parked)
|
||||
Orig emits `blt → growth-block` + `b → malloc` (growth block detached, cold).
|
||||
`if/else`, positive `if`, `!cond` ternary, `goto` forms all normalize to
|
||||
in-line growth. Same family as the documented select/cold-block walls.
|
||||
|
||||
### Base64Encode / ParseServerInfo / nupOp / GetTitleSize / GetBootVersion
|
||||
All verified: instruction-identical streams (452=452 ParseServerInfo) or tiny
|
||||
scheduling swaps — pure web-rotation / marshal-order ties, no source lever found.
|
||||
|
||||
### AESiEncryptBlock / AESiDecryptBlock / NETAESCreateEx
|
||||
158=158 / structurally complete — remaining diff is the interleave ORDER of the
|
||||
16 table-index `rlwinm` extracts vs `lwzx` loads across the 4 ENCRYPT terms
|
||||
(pure list-scheduler shape); ENCRYPT operand-assoc/order variants don't move it.
|
||||
|
||||
## Pass 4 (orchestrator resume — decode walls)
|
||||
|
||||
### MD5 base-materialization + increment placement (70.8 -> 79.2)
|
||||
Orig materializes `&indices` at the round-2 boundary (`lis/addi` mid-function), not in
|
||||
the prologue — `u32* index` declared at top but `index = indices` assigned BETWEEN
|
||||
loop 1 and loop 2. Orig also schedules `++constant` inside the step body (each step's
|
||||
end), not as a separate statement after STEP — `++constant` moved inside the STEP
|
||||
macro tail. Combined: 70.8 -> 79.2, 307=307 insns. `*++constant`/`*constant++` forms
|
||||
score higher (75.7) but read constants[1..64] — semantically wrong (OOB on last step),
|
||||
rejected. Residual: software-pipelining — orig prefetches next-step `lwz 4(rc)` /
|
||||
`lwz idx` / `lwbrx` into the current step's tail; MWCC won't pipeline with this web
|
||||
set. Tried: block-scoped round webs (C89 — no for-init decls; block-wrap BUILDFAIL
|
||||
fixup attempt regressed), `*index++`/`word++` in expr/macro (74.1), block/wptr
|
||||
elimination via context->buffer32 (70.0), const-1 init (73.1).
|
||||
|
||||
### AES extract/load interleave — all forms regress (60.35 stays)
|
||||
nextA-D temps confirmed (fused per-statement key-xor -> 44). Tried: key+=4 early
|
||||
(57.4), xor order rev (56.0), next-decl rev (58.7), xor operand swap key^next (56.4),
|
||||
for(rounds>1) (53.8), *key++ (57.4), reversed xor chain (52.8), right-assoc (56.0).
|
||||
Orig's interleave mixes extract/lwzx/rotlwi/xor across all 4 terms — MWCC list-
|
||||
scheduler shape, no source lever found. Documented wall.
|
||||
|
||||
### ParseServerInfo — instruction-identical, pure reg rotation (98.11)
|
||||
Normalized diff = 5 symbol-name artifacts only; raw diff = whole-fn callee-web
|
||||
rotation (orig binds &locals to r25/r22/r23 webs, mine r24/r25/r27 + one web escapes
|
||||
to r18). Decl-order rotation inert (all 4 orders = 98.11); per-block start/valueLength
|
||||
locals regressed (94.09) — shared decls confirmed. Documented wall.
|
||||
|
||||
## Pass 5 (orchestrator resume — nup_nhttp gaps)
|
||||
|
||||
### NhttpOp/BufFull/HttpStringFlush structure check
|
||||
All 9 nup_nhttp fns implemented — complete_code 22.6% reflects 3 sub-100 fns' whole
|
||||
sizes, not missing code. Same for nup (53.4%).
|
||||
|
||||
### BufFull 96.44 -> 97.58
|
||||
done-block store order: `*length = 0; next = NULL;` (orig emits `li r0,0; li r30,0;
|
||||
stw r0` — separate zero materializations per use). Residual (3 blocks): cmplw
|
||||
operand order on `received + *length < received` (sum-temp/operand-swap inert),
|
||||
next==NULL alloc cold-block (`beq→alloc;b→merge` vs `bne` — goto/else forms inert),
|
||||
req>=0x8000 set-block same cold-block family. Documented wall.
|
||||
|
||||
### HttpStringFlush 96.88 — cold-block, all forms inert
|
||||
Orig `blt→growth;b→merge` out-of-line growth block. Tried: double-goto
|
||||
(`if(req<total) goto grow; goto alloc;`), single-goto-skip, empty-else — all
|
||||
normalize to in-line `bge`. Same wall as BufFull alloc block.
|
||||
|
||||
### NhttpOp 98.79 — single `li r29,0` placement
|
||||
Orig rematerializes the `*colon=0`/`*end=0` store-zero fresh after memcpy
|
||||
(web-split); mine shares headerCopy's NULL web. `'\0'` literal + late-init
|
||||
headerCopy inert — allocator-internal. Documented tie.
|
||||
|
||||
## Pass 6 — md5 ProcessBlock 74.14 -> 81.68/81.71
|
||||
|
||||
Two decodes landed:
|
||||
- `_k = *constant` as a separate temp BEFORE the lwbrx pair (orig emits `lwz const`
|
||||
first, then the two word loads — a distinct constant web vs folding `*constant`
|
||||
into the _wc expression). 74.14 -> 80.86.
|
||||
- `_p` pointer capture inside STEP + post-increment args at call sites
|
||||
(`STEP(..., word++, 7)` and `STEP(..., block + *index++, 5)`). The `word++`
|
||||
evaluates once into `_p`, so both lwbrx see the same address while the pointer
|
||||
walks in place — reproduces orig's `addi r4,r4,4` per-step in-place walk
|
||||
(vs MWCC's `base+offset` temps from `++word` statements). `wptr` local deleted.
|
||||
index++ likewise folds to orig's stride-16/offset form. -> 81.68.
|
||||
- `(_wc + (a))` operand order -> 81.71.
|
||||
|
||||
Rejected: `++(word)` inside shared macro tail (no-op; semantically wrong for
|
||||
rounds 2-4 anyway), `word[i]` args (type error), xw-before-k decl order (74.13),
|
||||
(a)+=(f) before loads (buildfix attempt broke), shift-assoc `((_xw + _k) + a)` (79.5).
|
||||
|
||||
Residual (32 diff blocks): pure scheduler micro-order — orig prefetches
|
||||
next-step `lwz const`/`lwz idx`/`lwbrx` into the current step's tail; insn count
|
||||
306 = 306. Documented pipelining wall.
|
||||
|
||||
## Pass 6b — hmac globals + remaining wall checks
|
||||
|
||||
### hmac .sdata STB_GLOBAL decode
|
||||
Orig emits `lbl_81697AB0` (7B "hmac.c") + `lbl_81697AB8` (2B "\n") as STB_GLOBAL
|
||||
.sdata objects — real file-scope non-static char arrays in the original source.
|
||||
Decoded as `char hmac_file_name[]` + `char hmac_newline[]`; call sites updated.
|
||||
Codegen unchanged (93.36) — remaining Init diffs are (a) pool/work callee-web
|
||||
swap (r29/r31 rotation family), (b) `i` counter binding r4-vs-r3 in the unrolled
|
||||
xor loop. Levers tried: ptr-idx/ptr-walk loop forms (84-87, regress), int-i
|
||||
(77, regress — wrong cmp type), decl-swap (no-op).
|
||||
|
||||
### Base64Encode 86.54 — parked
|
||||
count→r7-vs-r10 binding + `li` placement among stores + `lbzx` scheduling.
|
||||
declswap/reset-late/count-=3/!=3 all no-op or regress. 63=63 insns otherwise.
|
||||
|
||||
### SOGetSockName 96.67 — parked
|
||||
Single `mr r3,r28` marshal-order placement diff (r3 arg last vs first).
|
||||
63=63 insns, reply-web identical. Scheduler-internal.
|
||||
358
tools/decomp-assist/sol-high-inputform-continuation.attempts.md
Normal file
358
tools/decomp-assist/sol-high-inputform-continuation.attempts.md
Normal file
@@ -0,0 +1,358 @@
|
||||
# tiInputForm continuation
|
||||
Baseline quick gate: instruction-exact 214/221; objdiff 216/221; code 45080/50656; data 908/3772; asm bodies 3; pool identical; regressions 0; DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
|
||||
Structural diagnosis before experiments:
|
||||
- onCursor: same 0x120 frame and 473 instructions; five differences at width temporaries and two multiplication operands. Inline Rect accessors affect operand form.
|
||||
- calcCursorPos: same 0xf0 frame and 326 instructions; scale components occupy reversed FP registers, rectangle arithmetic is jointly scheduled rather than the target's separate inline height/width boundaries.
|
||||
- LayoutByNW4R::create: 352/356 instructions; initial root query uses virtual getPane instead of direct FindPaneByName; later conditional query hoists receiver loads; animation-file pointer is cached across calls where target reloads it.
|
||||
- setLanguage: same frame and 237 instructions; two conditional pane-name blocks hoist layout/root loads before branch. No string-pool divergence.
|
||||
- Concatenated isEnableCursorCache/getStartPos: original eight-byte symbol covers two existing members. No source/config renaming or resizing allowed.
|
||||
- disasm_fn stops at paired-single instructions on this Capstone build; ctxdiff and per-instruction declsearch decoding expose the full body.
|
||||
Initial nine cursor trials were rerun with corrected pool_diff arguments below. First copies without pool output are excluded from the audit.
|
||||
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-0 | 540b49819992 | score (0, 4) instructions 473/473 |
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-1 | 1018ca1bcebf | score (0, 3) instructions 473/473 |
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-2 | 10371ce40618 | score (10, 17) instructions 473/473 |
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-3 | f728d01ca4c9 | score (0, 4) instructions 473/473 |
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-4 | 318a3e072a93 | score (4, 8) instructions 473/473 |
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-0 | df65ad444316 | score (14, 17) instructions 473/473 |
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-1 | 39992fee9a8b | score (14, 17) instructions 473/473 |
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-2 | db564c79896e | score (0, 7) instructions 473/473 |
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-3 | 9868b91a4ea9 | score (0, 3) instructions 473/473 |
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-0 | 540b49819992 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-1 | 1018ca1bcebf | score (0, 3) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-2 | 10371ce40618 | score (10, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-3 | f728d01ca4c9 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-4 | 318a3e072a93 | score (4, 8) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-0 | df65ad444316 | score (14, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-1 | 39992fee9a8b | score (14, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-2 | db564c79896e | score (0, 7) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-3 | 9868b91a4ea9 | score (0, 3) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-0 | fbfea889b955 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-1 | 30287152ca58 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-2 | db5ab9c485e4 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-3 | 03cd168ad159 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-4 | 58ce0d8ec056 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-5 | 74a1b2358802 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-6 | a5f82cf8538b | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-7 | b147b955a959 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-8 | 3930e547f58d | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-9 | ba9eb102785b | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-10 | 7ad938b508c7 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-11 | 3c182590a36c | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-0 | d11215cf5e08 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-0 | 266cd86b5276 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-0 | 9cfc32375c4d | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-1 | 3afe057a0e80 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-1 | 49f309a1542e | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-1 | 21300e88c458 | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-2 | 6040e571ab84 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-2 | 68e4541c6b7e | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-2 | 420ff29a9882 | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-3 | 6e91b9f42d87 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-3 | 11a0ffa84178 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-3 | e9c8fd782fdc | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-4 | e91f413718f5 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-4 | b6eb44567fbb | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-4 | 4a9aa7494020 | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-5 | f728d01ca4c9 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-5 | 67c80fb73b61 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-5 | 15913b71258b | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-0 | 229f61d14189 | score (26, 43) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-1 | 0c12625beaf2 | score (26, 43) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-2 | b2f56ff914f1 | score (80, 235) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-3 | 721eb7bbb34b | score (80, 235) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-4 | 23f72561d7f1 | score (26, 54) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-5 | 7382d3822dec | score (26, 54) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-6 | c099e471bba7 | score (26, 54) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-7 | b8accdca32b1 | score (26, 54) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-8 | 0c49513b1190 | score (72, 329) instructions 331/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-9 | 567002642739 | score (72, 329) instructions 331/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-10 | 30a4359e3249 | score (245, 397) instructions 401/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-11 | 81459b226e6c | score (245, 397) instructions 401/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-0 | ce49aebb516b | score (0, 5) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-1 | a135e0144bc9 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-2 | c286200c90fa | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-3 | e8a7bfb851a4 | score (0, 3) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-4 | 8c86eb679ff1 | score (0, 7) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-5 | 293a7c71503b | score (14, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-6 | b01025a3ca45 | score (0, 7) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-7 | 2003dd441280 | score (0, 7) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-8 | 917a6209708b | score (14, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-9 | d9346cd0dc50 | score (0, 7) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-10 | e70ab2990eaf | score (10, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-11 | 9a1a3c6f0761 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-12 | 20b779c34e7e | score (10, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-13 | 93c0fbd6d383 | score (0, 3) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-0 | de89b173bcd2 | score (0, 2) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-1 | 859f4ef7ab72 | score (0, 1) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-2 | 87ff22954cef | score (0, 2) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-3 | 1097890e7782 | score (0, 1) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-4 | 81faa3d995dc | score (0, 1) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-5 | 8e7f6ceaecca | score (0, 0) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
|
||||
Accepted onCursor: fresh full gate PASS; objdiff 100.0%; ctxdiff 473/473, diffs 0; pool identical; regressions 0; readability/forbidden 0; DOL correct. Inline width accessors throughout onCursor plus a single centered width expression preserve target temporary homes and multiplication operands. Shared headers unchanged.
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-0 | 0d0c42639971 | score (24, 186) instructions 239/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-1 | a2a02ac0dc07 | score (24, 186) instructions 239/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-2 | build failed; excluded
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-3 | fdbfdb7f264d | score (12, 22) instructions 237/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-4 | e659de7a358f | score (12, 22) instructions 237/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-5 | 9f7f572dbf04 | score (23, 190) instructions 252/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-6 | ba10179ece2a | score (31, 190) instructions 252/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-0 | 8e7f6ceaecca | score (20, 230) instructions 352/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-1 | 0a364a04c1a3 | score (15, 178) instructions 354/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-2 | 3dd47ea1b7d0 | score (11, 231) instructions 354/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-3 | eefda73f93e6 | score (6, 153) instructions 356/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-4 | 9420eff8e29f | score (20, 230) instructions 352/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-5 | 01d2c5a19793 | score (15, 178) instructions 354/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-6 | 62883ff07dd4 | score (11, 231) instructions 354/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-7 | 379e110e3fb7 | score (6, 153) instructions 356/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-0 | f1745af389f0 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-1 | build failed; excluded
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-2 | 29237d032c25 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-3 | d100c1be01c9 | score (0, 27) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-4 | 53166392bdfb | score (0, 27) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-5 | build failed; excluded
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-6 | 8eb55addec1d | score (0, 27) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-7 | 229f003b20cb | score (0, 27) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-0 | build failed; excluded
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-1 | build failed; excluded
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-2 | build failed; excluded
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-3 | build failed; excluded
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-4 | build failed; excluded
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-5 | build failed; excluded
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-6 | build failed; excluded
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-7 | build failed; excluded
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-8 | build failed; excluded
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-9 | build failed; excluded
|
||||
|
||||
Assembly conversion diagnosis:
|
||||
- Base::create target frame 0x20, 72 instructions. First C++ form has identical structure and frame, 26 register differences confined to circular row removal/insertion. The inline-helper boundary trials retain structure but change row/index register homes.
|
||||
- Base::calc target frame 0x40, 165 instructions. Animation, kana timer and color interpolation calls are structurally represented; remaining checks compare sine angle operands, float conversion/store scheduling and counter/phase updates.
|
||||
- RowInfoManager::init target leaf, 39 instructions. u16 loop index; row Back/Next/StrCount/DispRowCount stores; target re-reads capacity for free/active sentinels and uses update-address stores.
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-0 | 239a30680a4e | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-1 | d0c86385a93f | score (15, 21) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-2 | 0f58ed0ac038 | score (15, 21) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-3 | 49b8cf4e2fec | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-4 | 04b55da1bd68 | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-5 | 618bd5ec4be4 | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-6 | 33ff141f1f0a | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-7 | 1e799393dd2d | score (15, 24) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-8 | 9e6d79635811 | score (19, 22) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-9 | 33bef97a5cd5 | score (13, 21) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-0 | ec8b1b6f2d22 | score (8, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-1 | 09e37bef8e4a | score (8, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-2 | e789d7c358de | score (7, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-3 | 83832dfadf25 | score (7, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-4 | 86c40292827f | score (8, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-5 | d2f1f0e27b81 | score (8, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-6 | 4a519ea9b66e | score (7, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-7 | 417c06aece08 | score (7, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-inspect | 49b8cf4e2fec | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-0 | 2126f11ffa6e | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-1 | dafd3daec426 | score (10, 16) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-2 | 1ee30699a55d | score (10, 16) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-3 | 1e7b8c222fa3 | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-4 | 35c8f47bee42 | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-5 | 6767ce1a898b | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-6 | 43069bea0824 | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
|
||||
Calc semantic correction from target offsets: 0x78 is Decolated::isOnSustain, not 0xC0 isKanaFix. The store at Base+0x100 is mfDrawScrollY, not CharWriter cursorY. Initial calc trials used these incorrect APIs and were not candidates; corrected and rerun.
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-7 | ce8459d74e29 | score (10, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-8 | a76720f622cd | score (14, 17) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-9 | 6777eef4b9ad | score (8, 16) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-corrected-inspect | 1e7b8c222fa3 | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-inspect | ec8b1b6f2d22 | score (8, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-0 | 4640f7059093 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-1 | 2ba30cd77e4b | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-2 | 7f88daa38038 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-3 | 48a587ce1fde | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-4 | f18185222219 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-5 | 2ce8c5cc738f | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-6 | f3dfcf774839 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-7 | 2ce8c5cc738f | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-8 | ca4f607b4fd7 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-9 | 3b2250a30010 | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-10 | ca4f607b4fd7 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-11 | a18dc38b6b17 | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-0 | aa8541648f06 | score (5, 20) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-1 | e21fdd48c5c6 | score (5, 20) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-2 | faca7686c58e | score (5, 20) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-3 | b4249a99d930 | score (5, 20) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-4 | 9ab268f25ddd | score (5, 20) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-5 | ee59a86845cc | score (5, 16) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-6 | a3120eb506b9 | score (2, 6) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-7 | 1fe2ad3b1397 | score (2, 6) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-8 | a1beabe08f52 | score (2, 6) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-9 | 363f9e0250f8 | score (2, 6) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-10 | 79f77912079d | score (2, 6) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-11 | 902951983695 | score (2, 2) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-12 | 7b9abaf39016 | score (0, 4) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-13 | ffac791f24ec | score (0, 4) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-14 | be4f91ea1749 | score (0, 4) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-15 | b438cb6f1be9 | score (0, 4) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-16 | 862dc5c969dd | score (0, 4) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-17 | 2576056bcbd8 | score (0, 0) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
|
||||
Accepted Base::calc conversion: fresh full gate PASS; exact-name objdiff 100.0%; ctxdiff 165/165, diffs 0; pool identical; regressions/readability/forbidden 0; DOL correct. Ordinary phase, angle and blue locals plus inline sine/phase helpers reproduce conversion scheduling. Asm bodies 3 -> 2. Shared headers unchanged.
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-0 | dfc2c3928b7b | score (6, 29) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-1 | 79524dce7876 | score (1, 19) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-2 | 6ac603673f04 | score (7, 29) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-3 | de7cfab457b6 | score (1, 13) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-4 | e8c333cd6103 | score (6, 29) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-5 | 8a721e15fd5f | score (1, 19) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-6 | 86f2f41a660b | score (7, 29) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-7 | 28aa8b233900 | score (1, 13) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-helper-inspect | de7cfab457b6 | score (1, 13) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-0 | 1e041c5fef80 | score (30, 44) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-1 | 4f7f7c023d8b | score (30, 41) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-2 | 00e14a2f6393 | score (26, 43) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-3 | 0d019d99741b | score (26, 43) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-4 | 5627486657ea | score (47, 274) instructions 328/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-5 | 8868c258fb15 | score (47, 274) instructions 328/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-6 | 8d4526a2623b | score (43, 274) instructions 328/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-7 | 4031d758a885 | score (43, 274) instructions 328/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-8 | d143733e3881 | score (87, 236) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-9 | b4f2b359a081 | score (87, 236) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-10 | defd99d47ba5 | score (83, 236) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-11 | 411946c62b40 | score (83, 236) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-sentinel-link-pointer-0 | da8f49bed7c6 | score (0, 0) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
|
||||
RowInfoManager::init exact source: the inline initialization loop returns its final capacity read; the caller obtains the free sentinel separately, then retains one row-array pointer while linking last/first free rows. This removes the erroneous extra pointer reload after the last-row Next store. All 39 instructions now match.
|
||||
|
||||
Accepted RowInfoManager::init conversion: fresh full gate PASS; exact-name objdiff 100.0%; ctxdiff 39/39, diffs 0; pool identical; regressions/readability/forbidden 0; DOL correct; asm bodies 2 -> 1. Shared headers unchanged.
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-0 | e042cd32ef69 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-1 | ade50018c439 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-2 | 599cf4ca313c | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-3 | 49a2bbe294f3 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-4 | 62954c466ad1 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-5 | 91272c7d5545 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-6 | a53d64c51aa3 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-7 | e39b83eaa20b | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
|
||||
Conversion integration check: the full row-init gate passed exact/regression checks, but LayoutByNW4R::create fell from 95.02809% to 84.07865% because MWCC auto-inlined the newly available initializer. Target create explicitly calls RowInfoManager::init. Definition-only never_inline was too late for earlier callers. Added the repository-standard never_inline declaration only for TIINPUTFORM_IMPLEMENTATION inside the existing RowInfoManager guard; the TIMANAGER side retains its original void init declaration. Only this .cpp defines TIINPUTFORM_IMPLEMENTATION. No guard was removed or widened. Fresh full gate follows before committing this boundary correction.
|
||||
|
||||
Accepted initializer boundary correction: full gate PASS; LayoutByNW4R::create restored to 352/356 instructions and 95.02809%; RowInfoManager::init still 39/39, diffs 0 and objdiff 100.0%; pool identical, regressions/readability/forbidden 0; DOL correct.
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-0 | e042cd32ef69 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-1 | ade50018c439 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-2 | 599cf4ca313c | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-3 | 49a2bbe294f3 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-4 | 62954c466ad1 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-5 | 91272c7d5545 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-6 | a53d64c51aa3 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-7 | e39b83eaa20b | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-8 | df9472b3186e | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-9 | 6895d3bc27eb | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-10 | 5a0360a632d8 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-11 | 75e599406c64 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-12 | f344d29fa00d | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-13 | ac42aaba75f3 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-14 | 61f231e282c7 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-15 | c8e3540e4959 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-0 | f776393f0aed | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-1 | 2b0fb7b0c98b | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-2 | d5215b77be19 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-3 | 44f54d993847 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-4 | 8601c987d6ad | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-5 | 6f1e7633e326 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-6 | 6014399e7ba8 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-7 | 65428f0b90c0 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-0 | 4417f7ecc4a2 | score (12, 184) instructions 245/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-1 | b5b75ace0dc1 | score (8, 183) instructions 241/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-2 | 9afb465f5890 | score (12, 22) instructions 237/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-3 | 922960de967b | score (16, 26) instructions 237/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-4 | 149947ecad68 | score (12, 22) instructions 237/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-5 | 4e1574eddac8 | score (34, 250) instructions 256/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-0 | 49a0a5720575 | score (42, 59) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-1 | b068c5da5a9b | score (44, 62) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-2 | 3b2c10513378 | score (42, 59) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-3 | fdeede389926 | score (87, 234) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-4 | b5ed4ad23f31 | score (42, 59) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-5 | 05c76f1f77d6 | score (44, 62) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-6 | 17176a8e11bd | score (42, 59) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-7 | 93af05e2b2f8 | score (87, 234) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
|
||||
Base::create register search seed 0:
|
||||
```text
|
||||
declaration block:
|
||||
Info_* rows;
|
||||
Info_* selected;
|
||||
u16 previous;
|
||||
u16 next;
|
||||
u16 selectedIndex;
|
||||
Info_* listEnd;
|
||||
start (0, 26)
|
||||
improved (0, 25)
|
||||
improved (0, 22)
|
||||
improved (0, 20)
|
||||
best (0, 20) after 57 builds; kept in source:
|
||||
u16 previous;
|
||||
Info_* listEnd;
|
||||
Info_* rows;
|
||||
u16 next;
|
||||
Info_* selected;
|
||||
u16 selectedIndex;
|
||||
```
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-declsearch-0 | 126621259fa8 | score (0, 20) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
|
||||
Base::create register search seed 7:
|
||||
```text
|
||||
declaration block:
|
||||
u16 selectedIndex;
|
||||
Info_* rows;
|
||||
Info_* listEnd;
|
||||
u16 next;
|
||||
Info_* selected;
|
||||
u16 previous;
|
||||
start (0, 25)
|
||||
improved (0, 24)
|
||||
improved (0, 22)
|
||||
improved (0, 20)
|
||||
best (0, 20) after 52 builds; kept in source:
|
||||
u16 previous;
|
||||
Info_* rows;
|
||||
Info_* listEnd;
|
||||
u16 next;
|
||||
Info_* selected;
|
||||
u16 selectedIndex;
|
||||
```
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-declsearch-7 | 55560468d892 | score (0, 20) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
|
||||
Base::create register search seed 19:
|
||||
```text
|
||||
declaration block:
|
||||
Info_* selected;
|
||||
u16 next;
|
||||
u16 previous;
|
||||
u16 selectedIndex;
|
||||
Info_* rows;
|
||||
Info_* listEnd;
|
||||
start (0, 27)
|
||||
improved (0, 25)
|
||||
improved (0, 24)
|
||||
improved (0, 23)
|
||||
improved (0, 19)
|
||||
best (0, 19) after 59 builds; kept in source:
|
||||
u16 next;
|
||||
Info_* rows;
|
||||
Info_* selected;
|
||||
u16 previous;
|
||||
u16 selectedIndex;
|
||||
Info_* listEnd;
|
||||
```
|
||||
|
||||
Remaining source forms after structural trials:
|
||||
- calcCursorPos: scalar/vector scale forms, direct/inline rectangle extents, height/width temporaries and order were built. No exact C++ candidate; original 326-instruction body retained.
|
||||
- LayoutByNW4R::create: direct initial root lookup and animation-file slot references recover 356/356 instructions; conditional receiver load timing and register allocation still differ. Restored original body.
|
||||
- setLanguage: inline name/root selectors, explicit temporaries, duplicate calls, switch/loop/goto forms all built; receiver hoisting or extra branch instructions persist. Restored original body.
|
||||
- Base::create: circular row helpers and pointer/reference boundaries were built; plain C++ reaches 72/72 with zero structural differences. Declaration searches are the final register-only experiments; no non-exact conversion will be retained.
|
||||
- Concatenated cache/start symbol remains an eight-byte original symbol spanning two existing C++ members, without an exact-name source counterpart. Renaming or resizing either source/config symbol is forbidden; no trials can legitimately repair its identity.
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-declsearch-19 | 54bad2f75ddf | score (0, 19) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
|
||||
|
||||
Final open-function audit, all non-exact trials restored:
|
||||
calcCursorPos__Q39textinput9inputform4BaseFff: 32 distinct successfully built source variants, pool identical.
|
||||
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer: 8 distinct successfully built source variants, pool identical.
|
||||
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language: 12 distinct successfully built source variants, pool identical.
|
||||
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer: 33 distinct successfully built source variants, pool identical.
|
||||
Register search total: 168 builds, three distinct initial declaration orders; best C++ Base::create score structural 0 / exact 19, instructions 72/72; restored. Asm bodies 3 -> 1.
|
||||
|
||||
Final full clean-build gate PASS. Instruction-exact 214 -> 215; objdiff-exact 216 -> 217; code bytes 45080 -> 46972; data 908 -> 908; asm bodies 3 -> 1. Pool identical, regressions 0, forbidden/readability 0, DOL SHA1 correct. All unaccepted source trials restored.
|
||||
@@ -0,0 +1,65 @@
|
||||
# tiInputForm matching continuation
|
||||
|
||||
Instruction-exact 214/221 -> 215/221. Objdiff-exact 216/221 -> 217/221.
|
||||
Matched code 45080/50656 -> 46972/50656 bytes. Matched data 908/3772 -> 908/3772 bytes.
|
||||
Assembly bodies 3 -> 1. Exact C++ conversions: Base::calc, Base::RowInfoManager::init.
|
||||
New exact function: Base::onCursor.
|
||||
|
||||
The cursor change uses existing rectangle width accessors and computes the centered marker offset in one expression. This preserves width temporary homes and both multiplication operand orders. Fresh ctxdiff: 473/473 instructions, diffs 0.
|
||||
|
||||
The calculation conversion follows the actual sustain virtual slot and cached draw-scroll field. Separate blue, phase and angle values preserve conversion/store/sine scheduling. Ordinary inline sine and phase helpers reproduce the target operand order. Fresh ctxdiff: 165/165 instructions, diffs 0.
|
||||
|
||||
The row initializer uses an inline loop returning its final capacity read, then retains the row-array pointer for linking the final and first free rows. Fresh ctxdiff: 39/39 instructions, diffs 0. The original creation functions call the initializer out of line. The repository-standard never_inline attribute is therefore applied to its declaration only under TIINPUTFORM_IMPLEMENTATION, inside the existing guard. The other existing guard sides keep their declarations. A definition-only attribute was ineffective and was removed. The final header correction restores LayoutByNW4R::create to its original 352/356 instructions and 95.02809%.
|
||||
|
||||
## Remaining functions
|
||||
|
||||
| Function | Objdiff | Evidence |
|
||||
| --- | --- | --- |
|
||||
| Base::calcCursorPos | 91.622696% | 326/326 instructions; cached scale register homes and rectangle arithmetic scheduling differ. 32 distinct built source variants. |
|
||||
| LayoutByNW4R::create | 95.02809% | 352/356 instructions; initial root lookup, conditional receiver timing and animation-file pointer reload boundaries differ. 8 distinct built variants. Direct root lookup and file-slot references reach 356/356 but remain non-exact. |
|
||||
| LayoutByNW4R::setLanguage | 96.44726% | 237/237 instructions; root receiver loads move ahead of conditional pane-name selection. 12 distinct built variants. |
|
||||
| Concatenated isEnableCursorCache/getStartPos | None | Original eight-byte symbol spans two existing members. No permitted source/config identity change repairs this pairing. |
|
||||
|
||||
Base::create remains an instruction-exact assembly body. Its C++ conversion trials reached 72/72 instructions with zero structural differences. Three final declaration searches performed 168 builds; best result retains 19 register differences. All non-exact conversions were restored. Its 33 distinct successfully built source variants are recorded in the attempts log.
|
||||
|
||||
The remaining actual functions and the remaining assembly conversion each have at least three distinct built source attempts. No shared guard side was removed or widened. No configuration, symbol sizes, other translation-unit source, protected tools or baseline reports were changed.
|
||||
|
||||
Data remains incomplete in objdiff. Existing weak/deduplicated data and the concatenated source-symbol identity remain unresolved; this run makes no full-unit or linked-completion claim. Two existing instruction-gate branch-normalization artifacts also remain; their objdiff scores are 100%. No symbols or offsets were adjusted to alter their counts.
|
||||
|
||||
## Local commits
|
||||
|
||||
- 7ebf38b7 match input form cursor marker spacing
|
||||
- 0d9e4bd0 replace input form calculation assembly with c++
|
||||
- 9ea85e5a replace row initialization assembly with c++
|
||||
- fc9db92c preserve row initializer call boundary
|
||||
|
||||
## Final full gate
|
||||
|
||||
```text
|
||||
full build: ok
|
||||
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
[src/keyboard/tiInputForm] pool: IDENTICAL
|
||||
[src/keyboard/tiInputForm] objdiff: code 46972/50656 data 908/3772 functions 217/221 fuzzy 99.5623 linked code 0
|
||||
[src/keyboard/tiInputForm] instruction-exact functions: 215/221
|
||||
[src/keyboard/tiInputForm] section .bss size 96 match None
|
||||
[src/keyboard/tiInputForm] section .ctors size 4 match 100.0
|
||||
[src/keyboard/tiInputForm] section .data size 2736 match 65.53332
|
||||
[src/keyboard/tiInputForm] section .rodata size 760 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sbss size 32 match 33.333336
|
||||
[src/keyboard/tiInputForm] section .sdata size 40 match 100.0
|
||||
[src/keyboard/tiInputForm] section .sdata2 size 104 match 100.0
|
||||
[src/keyboard/tiInputForm] section .text size 50656 match 99.5623
|
||||
[src/keyboard/tiInputForm] below 100: calcCursorPos__Q39textinput9inputform4BaseFff 91.622696
|
||||
[src/keyboard/tiInputForm] below 100: create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 95.02809
|
||||
[src/keyboard/tiInputForm] below 100: setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language 96.44726
|
||||
[src/keyboard/tiInputForm] below 100: isEnableCursorCache__Q39textinput10textdrawer4BaseCFvgetStartPos__Q39textinput10textdrawer4BaseCFv None
|
||||
[src/keyboard/tiInputForm] baseline: code 45080/50656 data 908 functions 216 fuzzy 99.5591
|
||||
regressions vs baseline: 0
|
||||
global matched_code_percent: 87.67423 -> 87.73740
|
||||
global fuzzy_match_percent: 99.36937 -> 99.36944
|
||||
global complete_code_percent: 61.81448 -> 61.81448
|
||||
global matched_data_percent: 91.15570 -> 91.15570
|
||||
forbidden patterns added (net, per file): 0
|
||||
readability warnings (net, per file; must be 0 in the final result): 0
|
||||
GATE PASS
|
||||
```
|
||||
Reference in New Issue
Block a user