Compare commits
90 Commits
agent/w092
...
agent/data
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4f654f72a9 | ||
|
|
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 | ||
|
|
d5204f5c62 | ||
|
|
cedc1f1390 | ||
|
|
ff0cce33f6 | ||
|
|
2beeb23a47 | ||
|
|
35d9ed53b1 | ||
|
|
015d50906c | ||
|
|
348da5bd89 | ||
|
|
cdceb82200 | ||
|
|
1b56ea5051 | ||
|
|
3946983f96 | ||
|
|
85d75cd0cf | ||
|
|
af39f2678f | ||
|
|
d613662c54 | ||
|
|
0e6e235004 | ||
|
|
020e1b6f0b | ||
|
|
3440aab039 | ||
|
|
dab806eaa2 | ||
|
|
f4fd16f88f | ||
|
|
3d8de1a356 | ||
|
|
8e43db0528 | ||
|
|
21c9b95b1b | ||
|
|
d4bdd3462c | ||
|
|
f7d81a0196 | ||
|
|
4f35874d02 | ||
|
|
0a5cbaf78e | ||
|
|
6e7c016ae3 | ||
|
|
e60306db62 | ||
|
|
5d0ced6a15 | ||
|
|
858a507ddf | ||
|
|
ce424f1a3e | ||
|
|
bcb37e07ef | ||
|
|
11094c638a | ||
|
|
cb49bde9c6 | ||
|
|
df9fd72e87 | ||
|
|
0c554a1602 | ||
|
|
f00336cc8b | ||
|
|
842bbc6942 | ||
|
|
ab01520044 | ||
|
|
5f948d3f3a | ||
|
|
699f844395 | ||
|
|
3afb9d8425 | ||
|
|
72c3f4ba2d | ||
|
|
905c45b998 | ||
|
|
5a849425b1 | ||
|
|
fd11ddb195 | ||
|
|
d9b51418b9 | ||
|
|
87e7ab6922 | ||
|
|
d186251506 | ||
|
|
cb58211725 | ||
|
|
2dbf80c418 | ||
|
|
faee1f779d | ||
|
|
a324e9a843 | ||
|
|
2bddfcde52 | ||
|
|
776b7981df | ||
|
|
539693c76a | ||
|
|
3134c4c05a | ||
|
|
d60d10868a | ||
|
|
735b0ab878 | ||
|
|
ea8d4d3b8a | ||
|
|
7329402a2c | ||
|
|
e46168062b | ||
|
|
b2074a70d7 |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 98.93% | 86.42% | 60.34% | 90.92% |
|
||||
| 99.37% | 87.69% | 61.93% | 91.37% |
|
||||
|
||||
units 902/1027 complete, functions 12141/12563 matched.
|
||||
units 917/1027 complete, functions 12211/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 -->
|
||||
|
||||
@@ -1111,7 +1111,7 @@ src/keyboard/MyTiInputForm.cpp:
|
||||
|
||||
src/keyboard/MyTiLetterForm.cpp:
|
||||
.text start:0x81444730 end:0x814454D8
|
||||
.rodata start:0x816168B8 end:0x81616B88
|
||||
.rodata start:0x816168B8 end:0x81616BC8
|
||||
.data start:0x81668860 end:0x81668CD8
|
||||
.sdata2 start:0x81694EB0 end:0x81694ED0
|
||||
.sdata start:0x81697528 end:0x81697570
|
||||
@@ -1138,7 +1138,7 @@ src/keyboard/tiHKBManager.cpp:
|
||||
src/keyboard/tiHwKeyboard.cpp:
|
||||
.bss start:0x810C8940 end:0x810C8950
|
||||
.text start:0x81448AA4 end:0x81449C98
|
||||
.rodata start:0x81616B88 end:0x81616C78
|
||||
.rodata start:0x81616BC8 end:0x81616C78
|
||||
.data start:0x81668EF8 end:0x81669018
|
||||
.sdata2 start:0x81694EF8 end:0x81694F08
|
||||
.sdata start:0x81697570 end:0x81697578
|
||||
@@ -1405,7 +1405,7 @@ libs/RVLMiddleware/eZiText/src/clib/zikorean.c:
|
||||
extab start:0x81330748 end:0x81330760
|
||||
extabindex start:0x8133147C end:0x813314A0
|
||||
.text start:0x814813FC end:0x81482840
|
||||
.data start:0x8166B2B0 end:0x8166B3D0
|
||||
.data start:0x8166B2B0 end:0x8166B3A8
|
||||
|
||||
libs/RVLMiddleware/eZiText/src/clib/ziswordw.c:
|
||||
extab start:0x81330760 end:0x81330770
|
||||
@@ -1417,6 +1417,7 @@ libs/RVLMiddleware/eZiText/src/clib/zkokeyp.c:
|
||||
extab start:0x81330770 end:0x813307A8
|
||||
extabindex start:0x813314B8 end:0x8133150C
|
||||
.text start:0x8148302C end:0x8148447C
|
||||
.data start:0x8166B3A8 end:0x8166B3D0
|
||||
|
||||
libs/RVLMiddleware/eZiText/src/clib/zierror.c:
|
||||
.text start:0x8148447C end:0x81484484
|
||||
@@ -4192,11 +4193,11 @@ libs/RVL_SDK/src/fa/driver/nand_drv.c:
|
||||
.sbss start:0x816996C0 end:0x816996E0
|
||||
|
||||
libs/RVL_SDK/src/fa/driver/sd_drv.c:
|
||||
.bss start:0x811AF460 end:0x811AF6C0
|
||||
.bss start:0x811AF460 end:0x811AF6C0 align:32
|
||||
.text start:0x815EA41C end:0x815ED20C
|
||||
.rodata start:0x816329E8 end:0x81632B58
|
||||
.data start:0x81690D18 end:0x81691728
|
||||
.sbss start:0x816996E0 end:0x81699708
|
||||
.sbss start:0x816996E0 end:0x81699708 align:32
|
||||
|
||||
libs/RVL_SDK/src/fa/driver/pfd_cmn.c:
|
||||
.text start:0x815ED20C end:0x815ED324
|
||||
|
||||
@@ -2042,8 +2042,8 @@ isEqualChannel__Q33ipl8savedata7ManagerFUxUx = .text:0x813594B0; // type:functio
|
||||
isDefaultChannel__Q33ipl8savedata7ManagerFUlUl = .text:0x8135954C; // type:function size:0x50
|
||||
updateVersion__Q33ipl8savedata7ManagerFUlUl = .text:0x8135959C; // type:function size:0xD4
|
||||
setDefaultSDMenu__Q33ipl8savedata7ManagerFv = .text:0x81359670; // type:function size:0x48 scope:local
|
||||
iplSavedata_813596B8__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
|
||||
iplSavedata_813597A0 = .text:0x813597A0; // type:function size:0x40 scope:local
|
||||
pushTitleCache__Q33ipl8savedata7ManagerFUx = .text:0x813596B8; // type:function size:0xE8
|
||||
isTitleCached = .text:0x813597A0; // type:function size:0x40
|
||||
nand_error_handling__Q33ipl8savedata7ManagerFi = .text:0x813597E0; // type:function size:0xDC
|
||||
__ct__Q33ipl7channel9RsoThreadFPQ23EGG4Heap = .text:0x813598BC; // type:function size:0x6C
|
||||
__dt__Q33ipl7channel9RsoThreadFv = .text:0x81359928; // type:function size:0x70
|
||||
@@ -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
|
||||
@@ -5829,7 +5829,7 @@ doAfterDrawProcess__Q39textinput9inputform4BaseFPCwUlRCQ49textinput10textdrawer4
|
||||
finishDraw__Q39textinput9inputform4BaseFUl = .text:0x81427DC0; // type:function size:0x4
|
||||
addSender__Q29textinput15CommandReceiverFPQ29textinput13CommandSender = .text:0x81427DC4; // type:function size:0x8
|
||||
getDrawModifyStartLine__Q39textinput10textdrawer4BaseCFv = .text:0x81427DCC; // type:function size:0x8
|
||||
isEnableCursorCache__Q39textinput10textdrawer4BaseCFvgetStartPos__Q39textinput10textdrawer4BaseCFv = .text:0x81427DD4; // type:function size:0x8
|
||||
isEnableCursorCache__Q39textinput10textdrawer4BaseCFv = .text:0x81427DD4; // type:function size:0x8
|
||||
getStartPos__Q39textinput10textdrawer4BaseCFv = .text:0x81427DDC; // type:function size:0x8
|
||||
setVIWidth__Q39textinput10textdrawer4BaseFf = .text:0x81427DE4; // type:function size:0x8
|
||||
setCandidateBox__Q39textinput12candidatebox18CandidateBoxCallerFPQ39textinput12candidatebox4Base = .text:0x81427DEC; // type:function size:0x8
|
||||
@@ -13113,7 +13113,7 @@ pfstub_com_massage = .text:0x815E6C40; // type:function size:0xE4
|
||||
pfstub_store_result = .text:0x815E6D24; // type:function size:0xC4
|
||||
PFSYS_initializeSYS = .text:0x815E6DE8; // type:function size:0x4
|
||||
PFSYS_GetCurrentContextID = .text:0x815E6DEC; // type:function size:0x18
|
||||
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x74
|
||||
PFSYS_TimeStamp = .text:0x815E6E04; // type:function size:0x7C
|
||||
pfstub_call_function_standard = .text:0x815E6E80; // type:function size:0x584
|
||||
pfstub_attach = .text:0x815E7404; // type:function size:0x50
|
||||
pfstub_buffering = .text:0x815E7454; // type:function size:0x50
|
||||
@@ -13202,7 +13202,7 @@ pfd_sddrv_pread = .text:0x815EAADC; // type:function size:0x38
|
||||
pfd_sddrv_pwrite = .text:0x815EAB14; // type:function size:0x38
|
||||
pfd_sddrv_unmount = .text:0x815EAB4C; // type:function size:0x34
|
||||
pfd_sddrv_finalize = .text:0x815EAB80; // type:function size:0xE4
|
||||
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x180
|
||||
pfd_sddrv_get_disk_info = .text:0x815EAC64; // type:function size:0x188
|
||||
pfd_sddrv_init_drv_tbl = .text:0x815EADEC; // type:function size:0x18
|
||||
pfd_sddrv_registar_callback = .text:0x815EAE04; // type:function size:0x10
|
||||
pfd_sddrv_is_media_insert = .text:0x815EAE14; // type:function size:0x98
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -21552,7 +21552,7 @@ 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
|
||||
lbl_81696230 = .sdata:0x81696230; // type:object size:0x5 data:string
|
||||
scTvrcFileHeader = .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
|
||||
_limitMilli__7LibTVRC = .sdata:0x81696240; // 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
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
30
configure.py
30
configure.py
@@ -812,8 +812,8 @@ config.libs = [
|
||||
]
|
||||
),
|
||||
IPLSection("memoryCard", [
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCard.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplMemoryCardBase.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplMemoryCardManager.cpp"),
|
||||
Object(Matching, "scene/memoryCard/iplGCSaveData.cpp"),
|
||||
Object(NonMatching, "scene/memoryCard/iplGCWindow.cpp"),
|
||||
@@ -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"]),
|
||||
@@ -987,7 +987,7 @@ config.libs = [
|
||||
Object(NonMatching, "clib/zi8alpha.c"),
|
||||
Object(Matching, "clib/zi8alts.c"),
|
||||
Object(NonMatching, "clib/zi8cgetc.c"),
|
||||
Object(NonMatching, "clib/zi8cinfo.c"),
|
||||
Object(Matching, "clib/zi8cinfo.c"),
|
||||
Object(Matching, "clib/zi8copy.c"),
|
||||
Object(NonMatching, "clib/zi8dawg.c"),
|
||||
Object(Matching, "clib/zi8getc.c"),
|
||||
@@ -1004,7 +1004,7 @@ config.libs = [
|
||||
Object(Matching, "clib/zi8ver.c"),
|
||||
Object(Matching, "clib/zi8ZHuwd.c"),
|
||||
Object(NonMatching, "clib/zidawg1.c"),
|
||||
Object(NonMatching, "clib/zikorean.c"),
|
||||
Object(Matching, "clib/zikorean.c"),
|
||||
Object(NonMatching, "clib/ziswordw.c"),
|
||||
Object(NonMatching, "clib/zkokeyp.c"),
|
||||
Object(Matching, "clib/zierror.c"),
|
||||
@@ -1025,7 +1025,7 @@ config.libs = [
|
||||
Object(NonMatching, "cdb/CDBRecord.c"),
|
||||
Object(Matching, "cdb/CDBRecordFile.c"),
|
||||
Object(Matching, "cdb/CDBRecordKey.c"),
|
||||
Object(NonMatching, "cdb/CDBIntArray.c"),
|
||||
Object(Matching, "cdb/CDBIntArray.c"),
|
||||
Object(Matching, "cdb/CDBSystem.c"),
|
||||
Object(Matching, "cdb/CDBAttr.c"),
|
||||
Object(Matching, "cdb/CDBFBridge.c"),
|
||||
@@ -1698,7 +1698,7 @@ config.libs = [
|
||||
Object(NonMatching, "fa/pf_entry_iterator.c"),
|
||||
Object(NonMatching, "fa/pf_fat.c"),
|
||||
Object(NonMatching, "fa/pf_fat12.c"),
|
||||
Object(NonMatching, "fa/pf_fat16.c"),
|
||||
Object(Matching, "fa/pf_fat16.c"),
|
||||
Object(Matching, "fa/pf_fat32.c"),
|
||||
Object(Matching, "fa/pf_fatfs.c"),
|
||||
Object(NonMatching, "fa/pf_file.c"),
|
||||
@@ -1706,7 +1706,7 @@ config.libs = [
|
||||
Object(Matching, "fa/pf_sector.c"),
|
||||
Object(NonMatching, "fa/pf_volume.c"),
|
||||
Object(Matching, "fa/pf_volume_apiadd.c"),
|
||||
Object(NonMatching, "fa/pf_cp932.c"),
|
||||
Object(Matching, "fa/pf_cp932.c"),
|
||||
Object(Matching, "fa/pf_api_util.c"),
|
||||
Object(Matching, "fa/pf_attach.c"),
|
||||
Object(Matching, "fa/pf_buffering.c"),
|
||||
@@ -1800,7 +1800,7 @@ config.libs = [
|
||||
Object(Matching, "fa/pf_w_rmdir.c"),
|
||||
Object(Matching, "fa/pf_w_xdivide.c"),
|
||||
Object(Matching, "fa/pf_filelock.c"),
|
||||
Object(NonMatching, "fa/pf_stub.c"),
|
||||
Object(Matching, "fa/pf_stub.c"),
|
||||
Object(Matching, "fa/pf_system.c"),
|
||||
Object(Matching, "fa/pf_stub_standard.c"),
|
||||
Object(Matching, "fa/pfs_attach.c"),
|
||||
@@ -1851,15 +1851,15 @@ config.libs = [
|
||||
Object(Matching, "fa/api/FASetThreadPriority.c"),
|
||||
Object(Matching, "fa/api/FAUnmount.c"),
|
||||
|
||||
Object(NonMatching, "fa/kernel/pfk_api.c"),
|
||||
Object(Matching, "fa/kernel/pfk_api.c"),
|
||||
|
||||
Object(NonMatching, "fa/driver/nand_drv.c"),
|
||||
Object(Matching, "fa/driver/nand_drv.c"),
|
||||
Object(NonMatching, "fa/driver/sd_drv.c"),
|
||||
Object(NonMatching, "fa/driver/pfd_cmn.c"),
|
||||
Object(NonMatching, "fa/driver/msc_drv.c"),
|
||||
Object(Matching, "fa/driver/pfd_cmn.c"),
|
||||
Object(Matching, "fa/driver/msc_drv.c"),
|
||||
|
||||
Object(NonMatching, "fa/msc/puh_msc.c"),
|
||||
Object(NonMatching, "fa/msc/puh_msc_cmd.c"),
|
||||
Object(Matching, "fa/msc/puh_msc.c"),
|
||||
Object(Matching, "fa/msc/puh_msc_cmd.c"),
|
||||
Object(NonMatching, "fa/msc/puh_msc_blk.c"),
|
||||
]
|
||||
),
|
||||
|
||||
@@ -96,7 +96,7 @@ CHANSVmNativeClass* CHANSVmAddNativeClass(CHANSVm* vm, const char* clsName, CHAN
|
||||
/*** CHANS Image ***/
|
||||
/************************/
|
||||
|
||||
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm);
|
||||
typedef vmBoolInt (*CHANSVmImageCtorCallback)(CHANSVm* vm, vmPtr data);
|
||||
typedef vmPtr (*CHANSVmImageAllocatorCallback)(CHANSVm* vm, u32 size);
|
||||
|
||||
void CHANSVmImageRegisterAllocator(CHANSVmImageAllocatorCallback allocCb, CHANSVmImageCtorCallback ctorCb);
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -187,7 +187,19 @@ namespace textinput {
|
||||
void SetFocusedText(s32 pane) { mnFocusedIdx = pane; }
|
||||
s32 GetFocusedText() { return mnFocusedIdx; }
|
||||
f32 GetWidthScale_() const { return 608.0f / mfScreenWidth; }
|
||||
#ifdef TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
f32 GetMargin_() const {
|
||||
f32 margin;
|
||||
if (mfScreenWidth > 700.0f) {
|
||||
margin = 10.0f;
|
||||
} else {
|
||||
margin = 20.0f;
|
||||
}
|
||||
return margin;
|
||||
}
|
||||
#else
|
||||
f32 GetMargin_() const { return mfScreenWidth > 700.0f ? 10.0f : 20.0f; }
|
||||
#endif
|
||||
s32 GetNextPageIdx_(s32 page) const;
|
||||
s32 GetPrevPageIdx_(s32 page) const;
|
||||
s32 GetDispNum() const;
|
||||
|
||||
@@ -145,7 +145,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 +384,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
|
||||
|
||||
@@ -20,7 +20,11 @@ namespace gui {
|
||||
class Manager;
|
||||
class EventHandler;
|
||||
|
||||
#if defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) Interface {
|
||||
#else
|
||||
class Interface {
|
||||
#endif
|
||||
public:
|
||||
virtual void create() {} // 0x08 (0x02)
|
||||
|
||||
@@ -30,14 +34,14 @@ namespace gui {
|
||||
virtual void draw(Mtx& mtx) {} // 0x14 (0x05)
|
||||
virtual void draw() {} // 0x18 (0x06)
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~Interface(); // 0x1C (0x07)
|
||||
#else
|
||||
virtual ~Interface() {} // 0x1C (0x07)
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_WINDOW_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
class __declspec(novtable) EventHandler {
|
||||
#else
|
||||
class EventHandler {
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
mbDisableCon(bDisableCon) {}
|
||||
#endif
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#if defined(IPL_CHANNEL_TITLE_NOVTABLE) || defined(IPL_GC_SAVEDATA_NOVTABLE) || defined(IPL_MEMORY_CARD_NOVTABLE)
|
||||
virtual ~PaneManager();
|
||||
#else
|
||||
virtual ~PaneManager() {}
|
||||
|
||||
@@ -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,55 @@ 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
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
} // namespace math
|
||||
} // namespace ipl
|
||||
#include "math/iplMathTypes.h"
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
template <>
|
||||
class HermiteIntp<VEC3> : public utility::FrameController {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
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;
|
||||
VEC3 result =
|
||||
(mStart * (1.0f + (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))))) -
|
||||
(mEnd * (inverseDuration * (inverseDuration *
|
||||
(inverseDuration * (frame * (2.0f * frame * frame)))) -
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
return result;
|
||||
}
|
||||
protected:
|
||||
VEC3 mStart;
|
||||
VEC3 mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class GCWindow : public MemoryBase, public MemCardEventHandler {
|
||||
class GCWindow : public MemoryBase, public MemCardEventListener {
|
||||
#ifdef IPL_MEMORY_CARD_CPP
|
||||
friend class MemoryCard;
|
||||
#endif
|
||||
@@ -48,6 +48,25 @@ private:
|
||||
void set_texture(const char*, const GXTexObj&);
|
||||
public:
|
||||
virtual void onMemEvent(long, u8);
|
||||
#ifdef IPL_GC_WINDOW_CPP
|
||||
virtual void on_wait_anim() = 0;
|
||||
virtual void on_exit() = 0;
|
||||
virtual void on_error() = 0;
|
||||
virtual void on_format() = 0;
|
||||
virtual void on_dialog_result() = 0;
|
||||
virtual void on_select_in() = 0;
|
||||
virtual void on_message_done() = 0;
|
||||
virtual void on_button_trig() = 0;
|
||||
#else
|
||||
virtual void on_wait_anim();
|
||||
virtual void on_exit();
|
||||
virtual void on_error();
|
||||
virtual void on_format();
|
||||
virtual void on_dialog_result();
|
||||
virtual void on_select_in();
|
||||
virtual void on_message_done();
|
||||
virtual void on_button_trig();
|
||||
#endif
|
||||
bool isProcess();
|
||||
void stop_wait_anim();
|
||||
|
||||
|
||||
@@ -35,7 +35,11 @@ namespace ipl {
|
||||
MemoryBase* mpBase; // 0x0C
|
||||
};
|
||||
|
||||
#ifdef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
class __declspec(novtable) MemoryBase {
|
||||
#else
|
||||
class MemoryBase {
|
||||
#endif
|
||||
public:
|
||||
class Anm {
|
||||
public:
|
||||
|
||||
@@ -12,13 +12,61 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
class MemCardEventHandler {
|
||||
class __declspec(novtable) MemCardEventListener {
|
||||
public:
|
||||
MemCardEventListener() {}
|
||||
|
||||
virtual ~MemCardEventListener() {}
|
||||
|
||||
virtual void onMemEvent(long event, u8 slot);
|
||||
};
|
||||
|
||||
class MemCardEventHandler : public MemCardEventListener {
|
||||
public:
|
||||
MemCardEventHandler() {}
|
||||
|
||||
virtual ~MemCardEventHandler();
|
||||
|
||||
virtual void onMemEvent(long event, u8 slot);
|
||||
|
||||
virtual void onMount(u8 slot) = 0;
|
||||
virtual void onUnmount(u8 slot) = 0;
|
||||
virtual void onAttach(u8 slot) = 0;
|
||||
virtual void onDetach(u8 slot) = 0;
|
||||
virtual void onCheck(u8 slot) = 0;
|
||||
virtual void onFormat(u8 slot) = 0;
|
||||
virtual void onRepair(u8 slot) = 0;
|
||||
virtual void onRead(u8 slot) = 0;
|
||||
virtual void onWrite(u8 slot) = 0;
|
||||
virtual void onOpen(u8 slot) = 0;
|
||||
virtual void onClose(u8 slot) = 0;
|
||||
virtual void onCreate(u8 slot) = 0;
|
||||
virtual void onDelete(u8 slot) = 0;
|
||||
virtual void onCopy(u8 slot) = 0;
|
||||
virtual void onMove(u8 slot) = 0;
|
||||
virtual void onRename(u8 slot) = 0;
|
||||
virtual void onVerify(u8 slot) = 0;
|
||||
virtual void onCommit(u8 slot) = 0;
|
||||
virtual void onProbe(u8 slot) = 0;
|
||||
virtual void onMountAsync(u8 slot) = 0;
|
||||
virtual void onUnmountAsync(u8 slot) = 0;
|
||||
virtual void onCheckAsync(u8 slot) = 0;
|
||||
virtual void onFormatAsync(u8 slot) = 0;
|
||||
virtual void onReadAsync(u8 slot) = 0;
|
||||
virtual void onWriteAsync(u8 slot) = 0;
|
||||
virtual void onCreateAsync(u8 slot) = 0;
|
||||
virtual void onDeleteAsync(u8 slot) = 0;
|
||||
virtual void onCopyAsync(u8 slot) = 0;
|
||||
virtual void onMoveAsync(u8 slot) = 0;
|
||||
virtual void onRenameAsync(u8 slot) = 0;
|
||||
virtual void onVerifyAsync(u8 slot) = 0;
|
||||
virtual void onCommitAsync(u8 slot) = 0;
|
||||
virtual void onProbeAsync(u8 slot) = 0;
|
||||
virtual void onFreeBlocks(u8 slot) = 0;
|
||||
virtual void onGetLength(u8 slot) = 0;
|
||||
virtual void onSetAttrib(u8 slot) = 0;
|
||||
virtual void onGetAttrib(u8 slot) = 0;
|
||||
virtual void onSlotStatus(u8 slot) = 0;
|
||||
};
|
||||
|
||||
typedef struct MCFile {
|
||||
@@ -56,6 +104,44 @@ namespace ipl {
|
||||
}
|
||||
virtual ~MemoryCardManager();
|
||||
|
||||
virtual void onMount(u8 slot) = 0;
|
||||
virtual void onUnmount(u8 slot) = 0;
|
||||
virtual void onAttach(u8 slot) = 0;
|
||||
virtual void onDetach(u8 slot) = 0;
|
||||
virtual void onCheck(u8 slot) = 0;
|
||||
virtual void onFormat(u8 slot) = 0;
|
||||
virtual void onRepair(u8 slot) = 0;
|
||||
virtual void onRead(u8 slot) = 0;
|
||||
virtual void onWrite(u8 slot) = 0;
|
||||
virtual void onOpen(u8 slot) = 0;
|
||||
virtual void onClose(u8 slot) = 0;
|
||||
virtual void onCreate(u8 slot) = 0;
|
||||
virtual void onDelete(u8 slot) = 0;
|
||||
virtual void onCopy(u8 slot) = 0;
|
||||
virtual void onMove(u8 slot) = 0;
|
||||
virtual void onRename(u8 slot) = 0;
|
||||
virtual void onVerify(u8 slot) = 0;
|
||||
virtual void onCommit(u8 slot) = 0;
|
||||
virtual void onProbe(u8 slot) = 0;
|
||||
virtual void onMountAsync(u8 slot) = 0;
|
||||
virtual void onUnmountAsync(u8 slot) = 0;
|
||||
virtual void onCheckAsync(u8 slot) = 0;
|
||||
virtual void onFormatAsync(u8 slot) = 0;
|
||||
virtual void onReadAsync(u8 slot) = 0;
|
||||
virtual void onWriteAsync(u8 slot) = 0;
|
||||
virtual void onCreateAsync(u8 slot) = 0;
|
||||
virtual void onDeleteAsync(u8 slot) = 0;
|
||||
virtual void onCopyAsync(u8 slot) = 0;
|
||||
virtual void onMoveAsync(u8 slot) = 0;
|
||||
virtual void onRenameAsync(u8 slot) = 0;
|
||||
virtual void onVerifyAsync(u8 slot) = 0;
|
||||
virtual void onCommitAsync(u8 slot) = 0;
|
||||
virtual void onProbeAsync(u8 slot) = 0;
|
||||
virtual void onFreeBlocks(u8 slot) = 0;
|
||||
virtual void onGetLength(u8 slot) = 0;
|
||||
virtual void onSetAttrib(u8 slot) = 0;
|
||||
virtual void onGetAttrib(u8 slot) = 0;
|
||||
|
||||
void calc();
|
||||
|
||||
bool isSlotReady(u8 slot);
|
||||
@@ -96,7 +182,7 @@ namespace ipl {
|
||||
u16 getFreeBlocks(u8 slot);
|
||||
#endif
|
||||
|
||||
void setEventHandler(MemCardEventHandler* eventHandler) {
|
||||
void setEventHandler(MemCardEventListener* eventHandler) {
|
||||
mpEventHandler = eventHandler;
|
||||
}
|
||||
|
||||
@@ -107,7 +193,7 @@ namespace ipl {
|
||||
s32 mLastResult; // 0x16930
|
||||
s32 mLastCmd; // 0x16934
|
||||
u32 unk_0x16938; // 0x16938
|
||||
MemCardEventHandler* mpEventHandler; // 0x1693C
|
||||
MemCardEventListener* mpEventHandler; // 0x1693C
|
||||
};
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -395,9 +395,9 @@ namespace ipl {
|
||||
NandSDWorker* mpSDWorker;
|
||||
ESTitleId32* mpSDTitleIds;
|
||||
SDChannelSelectTitleInfo* mpSDTitleInfo;
|
||||
NandSDWorker::TitleUsage* mpNandTitleInfo;
|
||||
s32 mFirstTitleCount;
|
||||
s32 mSecondTitleCount;
|
||||
mutable NandSDWorker::TitleUsage* mpNandTitleInfo;
|
||||
mutable s32 mFirstTitleCount;
|
||||
mutable s32 mSecondTitleCount;
|
||||
SDChannelObj* mpCurrentLoadedChannel;
|
||||
u32 mSDTitleCount;
|
||||
u32 mNandTitleCount;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -38,21 +38,49 @@ namespace ipl {
|
||||
int holdSE(const char* sndName);
|
||||
int holdSEwithPosDis(const char* sndName, f32 x, f32 y);
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void stopBGM(int unk = 0);
|
||||
#else
|
||||
int stopBGM(int unk = 0);
|
||||
#endif
|
||||
int stopBGM(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
int stopSE(nw4r::snd::SoundHandle* handle, int unk = 0);
|
||||
void stopAllSound(int unk = 0);
|
||||
|
||||
int resetAllSound();
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void muteOffBGM(int);
|
||||
#else
|
||||
int muteOffBGM(int);
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void muteOnBGM(int);
|
||||
#else
|
||||
int muteOnBGM(int);
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOnBGM();
|
||||
#else
|
||||
int pauseOnBGM();
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOffBGM();
|
||||
#else
|
||||
int pauseOffBGM();
|
||||
#endif
|
||||
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOnSE();
|
||||
#else
|
||||
int pauseOnSE();
|
||||
#endif
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
void pauseOffSE();
|
||||
#else
|
||||
int pauseOffSE();
|
||||
#endif
|
||||
|
||||
void setOutputMode(EAudioOutputMode mode);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace ipl {
|
||||
void stt_wait_fns_msg();
|
||||
void stt_wait_terminate();
|
||||
|
||||
int fn_8135B1C0();
|
||||
int getProgressPercent();
|
||||
|
||||
void error_handling();
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace ipl {
|
||||
class Manager;
|
||||
}
|
||||
namespace savedata {
|
||||
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
|
||||
class Manager {
|
||||
public:
|
||||
@@ -87,7 +87,7 @@ namespace ipl {
|
||||
channel::SInfo& getChanInfo(int page, int index) { return mData.chanInfo[page][index]; }
|
||||
textinput::extend::savedata::MemoSetting getMemoSetting() { return mData.memoSetting; }
|
||||
|
||||
void iplSavedata_813596B8(ESTitleId titleId);
|
||||
void pushTitleCache(ESTitleId titleId);
|
||||
|
||||
private:
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_ACCESS
|
||||
@@ -184,7 +184,7 @@ namespace ipl {
|
||||
u8 unused_0x504[28];
|
||||
|
||||
friend class channel::Manager;
|
||||
friend BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId);
|
||||
friend BOOL isTitleCached(void* manager, ESTitleId titleId);
|
||||
};
|
||||
} // namespace savedata
|
||||
} // namespace ipl
|
||||
|
||||
@@ -11,7 +11,11 @@ namespace nw4r {
|
||||
namespace snd {
|
||||
class SoundHandle : private ut::NonCopyable {
|
||||
public:
|
||||
#ifdef IPL_SOUND_MATCHING
|
||||
SoundHandle() NO_INLINE;
|
||||
#else
|
||||
SoundHandle() NO_INLINE : mSound(NULL) {}
|
||||
#endif
|
||||
~SoundHandle() { DetachSound(); }
|
||||
|
||||
void detail_AttachSound(detail::BasicSound* sound);
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace nw4r {
|
||||
Rect(f32 l, f32 t, f32 r, f32 b) : left(l), top(t), right(r), bottom(b) {}
|
||||
#endif
|
||||
|
||||
#ifndef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
|
||||
#if !defined(IPL_CONTROLLER_TRIVIAL_RECT_DTOR) && !defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
~Rect() {}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace nw4r {
|
||||
} // namespace detail
|
||||
|
||||
template <typename TDerived, typename TBase>
|
||||
#ifdef IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST
|
||||
#if defined(IPL_BOARD_OBJECT_EXTERNAL_DYNAMIC_CAST) || defined(IPL_MEMORYCARD_BASE_CPP)
|
||||
TDerived DynamicCast(TBase* pPtr);
|
||||
#else
|
||||
inline TDerived DynamicCast(TBase* pPtr) {
|
||||
|
||||
@@ -1411,131 +1411,22 @@ static s32 TMCJPEGDEC_parse_dht(s32 first, TMCCJPEGDecWork* work) {
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __MWERKS__
|
||||
static asm s32 TMCJPEGDEC_parse_dqt(register TMCCJPEGDecWork* work) {
|
||||
nofralloc
|
||||
|
||||
stwu r1, -0x130(r1)
|
||||
mflr r0
|
||||
lis r4, lbl_8161E080@ha
|
||||
stw r0, 0x134(r1)
|
||||
addi r4, r4, lbl_8161E080@l
|
||||
li r0, 0x20
|
||||
addi r6, r1, 0xc
|
||||
stmw r24, 0x110(r1)
|
||||
mr r30, r3
|
||||
addi r5, r4, -4
|
||||
mtctr r0
|
||||
|
||||
_parse_dqt_copy:
|
||||
lwz r4, 4(r5)
|
||||
lwzu r0, 8(r5)
|
||||
stw r4, 4(r6)
|
||||
stwu r0, 8(r6)
|
||||
bdnz _parse_dqt_copy
|
||||
|
||||
addi r31, r3, 0x58
|
||||
mr r4, r30
|
||||
addi r3, r1, 0xa
|
||||
bl TMCJPEGDEC_get_wbyte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_length
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_length:
|
||||
lhz r3, 0xa(r1)
|
||||
addi r29, r1, 0x10
|
||||
li r27, 1
|
||||
lis r28, TMCJPEGDEC_Zigzag_data@ha
|
||||
addi r0, r3, -2
|
||||
sth r0, 0xa(r1)
|
||||
|
||||
_parse_dqt_table:
|
||||
lhz r5, 0xa(r1)
|
||||
mr r4, r30
|
||||
addi r3, r1, 9
|
||||
addi r0, r5, -0x41
|
||||
sth r0, 0xa(r1)
|
||||
bl TMCJPEGDEC_get_byte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_qt_info
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_qt_info:
|
||||
lbz r0, 9(r1)
|
||||
cmplwi r0, 4
|
||||
ble _parse_dqt_valid_qt_info
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_valid_qt_info:
|
||||
add r3, r31, r0
|
||||
addi r26, r28, TMCJPEGDEC_Zigzag_data@l
|
||||
stb r27, 0x1790(r3)
|
||||
li r25, 0
|
||||
|
||||
_parse_dqt_coeff:
|
||||
lbz r24, 0(r26)
|
||||
cmpwi r24, 0x3f
|
||||
ble _parse_dqt_valid_coeff
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_valid_coeff:
|
||||
mr r4, r30
|
||||
addi r3, r1, 8
|
||||
bl TMCJPEGDEC_get_byte
|
||||
cmpwi r3, 0
|
||||
bge _parse_dqt_have_coeff
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_have_coeff:
|
||||
slwi r4, r24, 2
|
||||
lbz r3, 9(r1)
|
||||
add r0, r4, r31
|
||||
lbz r5, 8(r1)
|
||||
lwzx r4, r29, r4
|
||||
slwi r3, r3, 8
|
||||
mullw. r4, r5, r4
|
||||
stwx r4, r3, r0
|
||||
bne _parse_dqt_nonzero
|
||||
li r3, -0x41
|
||||
b _parse_dqt_return
|
||||
|
||||
_parse_dqt_nonzero:
|
||||
addi r25, r25, 1
|
||||
addi r26, r26, 1
|
||||
cmpwi r25, 0x40
|
||||
blt _parse_dqt_coeff
|
||||
lhz r0, 0xa(r1)
|
||||
cmpwi r0, 0
|
||||
bne _parse_dqt_table
|
||||
li r3, 0
|
||||
|
||||
_parse_dqt_return:
|
||||
lmw r24, 0x110(r1)
|
||||
lwz r0, 0x134(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x130
|
||||
blr
|
||||
}
|
||||
#else
|
||||
static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
typedef struct {
|
||||
u32 data[64];
|
||||
} CopyBlock64;
|
||||
|
||||
u8* scaleInfo;
|
||||
u32 tblCopy[65];
|
||||
u32* tblPtr;
|
||||
typedef struct { u32 coefficients[4][64]; } QuantizationTables;
|
||||
QuantizationTables* scaleInfo;
|
||||
u32 tblCopy[64];
|
||||
u32* d;
|
||||
u16 len;
|
||||
s32 r;
|
||||
|
||||
d = tblCopy;
|
||||
*(CopyBlock64*)(d + 1) = *(CopyBlock64*)lbl_8161E080;
|
||||
*(CopyBlock64*)d = *(CopyBlock64*)lbl_8161E080;
|
||||
|
||||
scaleInfo = (u8*)work + 0x58;
|
||||
scaleInfo = (QuantizationTables*)&work->scaleFlag;
|
||||
|
||||
r = TMCJPEGDEC_get_wbyte(&len, work);
|
||||
if (r < 0) {
|
||||
@@ -1543,8 +1434,6 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
}
|
||||
len -= 2;
|
||||
|
||||
tblPtr = &tblCopy[1];
|
||||
|
||||
do {
|
||||
u8 qtInfo;
|
||||
const u8* zigPtr;
|
||||
@@ -1563,11 +1452,10 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
return -0x41;
|
||||
}
|
||||
|
||||
scaleInfo[qtInfo + 0x1790] = 1; // quantTblFlag[0..3]
|
||||
((TMCUnknownInfo*)scaleInfo)->quantTblFlag[qtInfo] = 1;
|
||||
|
||||
zigPtr = TMCJPEGDEC_Zigzag_data;
|
||||
for (zzIdx = 0; zzIdx < 64; zzIdx++) {
|
||||
u32 tmp;
|
||||
|
||||
zz = *zigPtr;
|
||||
if (zz > 0x3F) {
|
||||
@@ -1579,9 +1467,8 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
return r;
|
||||
}
|
||||
|
||||
tmp = (zz << 2) + ((u32)qtInfo << 8);
|
||||
val = (u32)byte * tblPtr[zz];
|
||||
*(u32*)(tmp + scaleInfo) = val;
|
||||
val = (u32)byte * tblCopy[zz];
|
||||
scaleInfo->coefficients[qtInfo][zz] = val;
|
||||
if (val == 0) {
|
||||
return -0x41;
|
||||
}
|
||||
@@ -1592,7 +1479,6 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __MWERKS__
|
||||
static asm s32 TMCJPEGDEC_parse_sof(register TMCCJPEGDecWork* work) {
|
||||
|
||||
@@ -142,6 +142,9 @@ typedef struct ziFuzzyZYPairs {
|
||||
int rANDn : 1;
|
||||
int bANDp : 1;
|
||||
int gANDk : 1;
|
||||
int dANDt : 1;
|
||||
|
||||
int reserved : 20;
|
||||
} ziFuzzyZYPairs;
|
||||
|
||||
typedef struct _ziGetParam {
|
||||
@@ -357,8 +360,8 @@ typedef struct ziMatchParam {
|
||||
ziWChar first2; // 0x68
|
||||
ziWChar comp; // 0x6A
|
||||
ziU8 nSeg; // 0x6C
|
||||
ziU8 segs1[0xC0]; // 0x6D
|
||||
ziU8 segsD[0xC0]; // 0x12D
|
||||
ziU8 segs1[16][12]; // 0x6D
|
||||
ziU8 segsD[16][12]; // 0x12D
|
||||
ziU8 pad_0x1ED; // 0x1ED
|
||||
} ziMatchParam;
|
||||
|
||||
|
||||
@@ -269,10 +269,10 @@ Zi8UInt Zi8SpellingZY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
|
||||
Zi8UInt Zi8SpellingPY(ziU16 *output,Zi8UInt key,ziU8 includeTone)
|
||||
{
|
||||
Zi8UInt length = 0;
|
||||
ziU16 initialIndex = (ziU16)(((key & 0xffff) >> 9) & 0x3f);
|
||||
ziU16 finalIndex = (ziU16)(((key & 0xffff) >> 3) & 0x3f);
|
||||
ziU16 tone = (ziU16)(key & 7);
|
||||
Zi8UInt length = 0;
|
||||
volatile ziU16 tone = (ziU16)(key & 7);
|
||||
|
||||
output[0] = zi8PYinitialSpelling[initialIndex][0];
|
||||
output[1] = zi8PYinitialSpelling[initialIndex][1];
|
||||
|
||||
@@ -1074,7 +1074,7 @@ filterVowelCandidate:
|
||||
(((ZiAlphaWork*)workData)->dictionaries[language] == 0)))))) {
|
||||
if (language != ((ZiAlphaWork*)workData)->language) break;
|
||||
index = ((ZiAlphaWork*)workData)->dictionaryKinds[dictionaryIndex + 1];
|
||||
if ((index == 0xc) || (((index < 0xc && (index < 9)) && (4 < index)))) {
|
||||
if (index == 0xc || (index < 9 && index >= 5)) {
|
||||
if (Zi8getKeyLayout(language,0xeff1,&punctuationBuffer[0],1,workData) == 0) {
|
||||
punctuationBuffer[0] = 0;
|
||||
}
|
||||
@@ -1101,7 +1101,7 @@ filterVowelCandidate:
|
||||
punctuationCursor = &punctuationBuffer[0];
|
||||
dictionaryKind = 0xb;
|
||||
}
|
||||
else if ((int)(unsigned int)(ziU8)((ZiAlphaOptions*)optionData)->minWordLength <= (int)wordLength) {
|
||||
else if (((ZiAlphaOptions*)optionData)->minWordLength <= wordLength) {
|
||||
if (prefixVowelRestriction) {
|
||||
if (*wordCursor >= 0x30 && *wordCursor <= 0x39) goto retryDictionary;
|
||||
if (language == 0x2f) {
|
||||
@@ -1116,15 +1116,15 @@ filterVowelCandidate:
|
||||
{
|
||||
prepareCandidate:
|
||||
if (((elementCount == 1) && (dictionaryKind != 10)) &&
|
||||
((0xeff0 < *wordCursor && (*wordCursor < 0xf011)))) {
|
||||
((*wordCursor >= 0xeff1 && *wordCursor <= 0xf010))) {
|
||||
punctuationCandidate = ZI8_TRUE;
|
||||
break;
|
||||
}
|
||||
wordCursor[wordLength] = 0;
|
||||
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)elementCount < (int)wordLength))
|
||||
if (((exactLengthOnly != 0) && (elementCount != 0)) && ((int)wordLength > (int)elementCount))
|
||||
{
|
||||
wordLength = elementCount;
|
||||
wordCursor[elementCount] = 0;
|
||||
wordCursor[wordLength] = 0;
|
||||
}
|
||||
wordLength = (ziU16)Zi8DeTokenization(wordCursor,wordLength & 0xffff,wordCapacity & 0xffff,language);
|
||||
if (((phoneticInput) && ((unsigned int)parameters->elementCount < (wordLength & 0xff))) &&
|
||||
@@ -1151,7 +1151,7 @@ prepareCandidate:
|
||||
else {
|
||||
|
||||
if ((((keyLayoutCount == 0) || (((ZiAlphaOptions*)optionData)->lookupMode != '\0')) ||
|
||||
((int)(wordLength + prefixCount) < 2)) ||
|
||||
((int)(wordLength + prefixCount) <= 1)) ||
|
||||
(0x40 < (int)(wordLength + prefixCount))) goto emitCandidate;
|
||||
switch (dictionaryKind) {
|
||||
case 5:
|
||||
@@ -1161,13 +1161,14 @@ checkKeyLayout:
|
||||
keyLayoutCursor = keyLayout;
|
||||
candidateCharacterCount = wordLength + prefixCount;
|
||||
for (index = 0; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
|
||||
if (*keyLayoutCursor >= candidateCharacterCount) {
|
||||
if (*keyLayoutCursor < candidateCharacterCount) {
|
||||
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
|
||||
} else {
|
||||
if (*keyLayoutCursor++ > candidateCharacterCount) {
|
||||
index = (unsigned int)keyLayoutCount;
|
||||
}
|
||||
break;
|
||||
}
|
||||
keyLayoutCursor = keyLayoutCursor + *keyLayoutCursor + 1;
|
||||
}
|
||||
if ((int)index < (int)(unsigned int)keyLayoutCount) {
|
||||
for (elementIndex = 0; (int)elementIndex < (int)(unsigned int)candidateCharacterCount;
|
||||
@@ -1175,10 +1176,10 @@ checkKeyLayout:
|
||||
candidateBytes[elementIndex] = Zi8ConvertWC2UC(wordCursor[elementIndex - prefixCount],language,workData);
|
||||
}
|
||||
for (; (int)index < (int)(unsigned int)keyLayoutCount; index = index + 1) {
|
||||
for (elementIndex = 0;
|
||||
((int)elementIndex < (int)(unsigned int)candidateCharacterCount &&
|
||||
(candidateBytes[elementIndex] == keyLayoutCursor[elementIndex]));
|
||||
elementIndex = elementIndex + 1) {
|
||||
elementIndex = 0;
|
||||
while (elementIndex < candidateCharacterCount) {
|
||||
if (candidateBytes[elementIndex] != keyLayoutCursor[elementIndex]) break;
|
||||
elementIndex++;
|
||||
}
|
||||
if (elementIndex == candidateCharacterCount) {
|
||||
wordCursor[-prefixCount] = 0;
|
||||
@@ -1196,7 +1197,7 @@ emitCandidate:
|
||||
if (firstCandidate == 0) {
|
||||
if (((ZiAlphaOptions*)optionData)->countOnly != '\0') {
|
||||
if (((ZiAlphaOptions*)optionData)->suffixOnly != '\0') {
|
||||
if ((int)(wordLength + prefixCount) < (int)((ZiAlphaOptions*)optionData)->shortestWord) {
|
||||
if ((int)((ZiAlphaOptions*)optionData)->shortestWord > (int)(wordLength + prefixCount)) {
|
||||
((ZiAlphaOptions*)optionData)->shortestWord = wordLength + prefixCount;
|
||||
}
|
||||
if ((int)((ZiAlphaOptions*)optionData)->longestWord < (int)(wordLength + prefixCount)) {
|
||||
@@ -1223,23 +1224,17 @@ emitCandidate:
|
||||
} else {
|
||||
if (((((ZiAlphaWork*)workData)->suffixMode == '\0') && (wordCursor[1] == 0)) &&
|
||||
(candidateCount == 0)) {
|
||||
if ((*wordCursor < 0xeff1) || (0xf010 < *wordCursor)) {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
|
||||
}
|
||||
else {
|
||||
if (*wordCursor >= 0xeff1 && *wordCursor <= 0xf010) {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = 0;
|
||||
}
|
||||
}
|
||||
if (((dictionaryExact == 0) || (parameters->elementCount != ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
|| ((parameters->maxCandidates != 1 &&
|
||||
((candidateCount != 0 || (parameters->firstCandidate != 0)))))) {
|
||||
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
&& ((parameters->maxCandidates == 1 ||
|
||||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->singleCharacter = *wordCursor;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (dictionaryExact != 0 &&
|
||||
parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount &&
|
||||
(parameters->maxCandidates == 1 ||
|
||||
(candidateCount == 0 && parameters->firstCandidate == 0))) {
|
||||
for (index = 0; (int)index < (int)prefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[index]
|
||||
= wordCursor[index - prefixCount];
|
||||
@@ -1250,6 +1245,13 @@ emitCandidate:
|
||||
}
|
||||
((ZiAlphaWork*)workData)->rememberedWord[index + prefixCount] = 0;
|
||||
}
|
||||
else {
|
||||
if (((dictionaryExact == 0) && (parameters->elementCount == ((ZiAlphaWork*)workData)->rememberedCount))
|
||||
&& ((parameters->maxCandidates == 1 ||
|
||||
((candidateCount == 0 && (parameters->firstCandidate == 0)))))) {
|
||||
((ZiAlphaWork*)workData)->rememberedWord[0] = 0;
|
||||
}
|
||||
}
|
||||
if ((((ZiAlphaWork*)workData)->suffixMode == '\0') &&
|
||||
((((((dictionaryKind == 1 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 1) != 0)) ||
|
||||
((dictionaryKind == 3 && ((((ZiAlphaWork*)workData)->dictionaryFlags & 2) != 0)))) ||
|
||||
@@ -1434,7 +1436,7 @@ finishDictionaryPass:;
|
||||
if ((completionAllowed) &&
|
||||
((((((ZiAlphaWork*)workData)->suffixMode == '\0' && (2 < (int)elementCount)) &&
|
||||
(elements[elementCount - 2] == 0xeff1)) &&
|
||||
((unsigned int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
|
||||
((int)((ZiAlphaWork*)workData)->prefixCount == elementCount - 2)))) {
|
||||
((ZiAlphaWork*)workData)->prefixElementCount = ((ZiAlphaWork*)workData)->prefixCount + '\x01';
|
||||
((ZiAlphaWork*)workData)->suffixMode = 1;
|
||||
}
|
||||
@@ -1442,12 +1444,51 @@ finishDictionaryPass:;
|
||||
prefixPrepared = ZI8_TRUE;
|
||||
goto preparePrefix;
|
||||
}
|
||||
if ((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
|
||||
if (!((((completionAllowed) && (((ZiAlphaWork*)workData)->suffixMode != '\0')) &&
|
||||
((((ZiAlphaWork*)workData)->suffixLocked == '\0' && (2 < (int)elementCount)))) &&
|
||||
(((elements[elementCount - 2] == 0xeff1 &&
|
||||
((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
|
||||
(((unsigned int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
|
||||
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0')))))) {
|
||||
((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 2)) ||
|
||||
(((int)((ZiAlphaWork*)workData)->suffixCount == elementCount - 1 &&
|
||||
((Zi8IsAlphaPunct(elements[elementCount - 1])) != '\0'))))))) {
|
||||
tryAlternatePrefix:
|
||||
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
|
||||
if (language == parameters->language) {
|
||||
if (primaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
else if (secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
prefixPrepared = ZI8_FALSE;
|
||||
((ZiAlphaWork*)workData)->suffixMode = 0;
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 0;
|
||||
((ZiAlphaWork*)workData)->suffixCount = 0;
|
||||
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->prefix[index] =
|
||||
((ZiAlphaWork*)workData)->alternatePrefix[index];
|
||||
}
|
||||
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
|
||||
if (((ZiAlphaWork*)workData)->language == parameters->language) {
|
||||
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->language = parameters->language;
|
||||
}
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
|
||||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
|
||||
goto finishCandidates;
|
||||
if (completionAllowed) goto checkPrefixPunctuation;
|
||||
} else {
|
||||
if ((((ZiAlphaWork*)workData)->prefixEnabled == '\0') || (elements[elementCount - 1] != 0xeff1)) {
|
||||
if ((!primaryMatched) && (!secondaryMatched)) {
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 1;
|
||||
@@ -1488,7 +1529,7 @@ checkPrefixPunctuation:
|
||||
if (((ZiAlphaWork*)workData)->suffixLocked != '\0') {
|
||||
((ZiAlphaWork*)workData)->previousSuffixCount = ((ZiAlphaWork*)workData)->suffixElementCount;
|
||||
((ZiAlphaWork*)workData)->suffixElementCount = parameters->elementCount;
|
||||
elementIndex = (unsigned int)((ZiAlphaWork*)workData)->prefixCount + (unsigned int)((ZiAlphaWork*)workData)->suffixCount;
|
||||
elementIndex = (int)((ZiAlphaWork*)workData)->prefixCount + (int)((ZiAlphaWork*)workData)->suffixCount;
|
||||
if (elements[elementIndex] != 0xEFF1 && Zi8IsAlphaPunct(elements[elementIndex]) != 0) {
|
||||
((ZiAlphaWork*)workData)->suffix[((ZiAlphaWork*)workData)->suffixCount++] = elements[elementIndex];
|
||||
} else {
|
||||
@@ -1518,46 +1559,6 @@ checkPrefixPunctuation:
|
||||
goto preparePrefix;
|
||||
}
|
||||
}
|
||||
else {
|
||||
tryAlternatePrefix:
|
||||
if ((prefixPrepared) && (1 < ((ZiAlphaWork*)workData)->alternatePrefixCount)) {
|
||||
if (language == parameters->language) {
|
||||
if (primaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
else if (secondaryMatched) {
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
if (((ZiAlphaWork*)workData)->alternatePrefixCount != '\0') {
|
||||
wordCursor -= prefixCount;
|
||||
elements -= prefixCount;
|
||||
elementCount = elementCount + prefixCount;
|
||||
wordCapacity = wordCapacity + prefixCount;
|
||||
prefixCount = 0;
|
||||
prefixPrepared = ZI8_FALSE;
|
||||
((ZiAlphaWork*)workData)->suffixMode = 0;
|
||||
((ZiAlphaWork*)workData)->suffixLocked = 0;
|
||||
((ZiAlphaWork*)workData)->suffixCount = 0;
|
||||
for (index = 0; index < (int)(unsigned int)((ZiAlphaWork*)workData)->alternatePrefixCount; index = index + 1) {
|
||||
((ZiAlphaWork*)workData)->prefix[index] =
|
||||
((ZiAlphaWork*)workData)->alternatePrefix[index];
|
||||
}
|
||||
((ZiAlphaWork*)workData)->prefixCount = (ziU8)index;
|
||||
if (((ZiAlphaWork*)workData)->language == parameters->language) {
|
||||
((ZiAlphaWork*)workData)->language = parameters->subLanguage;
|
||||
}
|
||||
else {
|
||||
((ZiAlphaWork*)workData)->language = parameters->language;
|
||||
}
|
||||
((ZiAlphaWork*)workData)->alternatePrefixCount = 0;
|
||||
}
|
||||
}
|
||||
if ((((primaryMatched) && (secondaryMatched)) || (elementCount == 0)) ||
|
||||
(((language == parameters->language && (primaryMatched)) || ((language == parameters->subLanguage && (secondaryMatched))))))
|
||||
goto finishCandidates;
|
||||
if (completionAllowed) goto checkPrefixPunctuation;
|
||||
}
|
||||
if (!completionAllowed && ((ZiAlphaWork*)workData)->suffixMode == 0 && ((ZiAlphaWork*)workData)->prefixCount != 0 &&
|
||||
elementCount > 2 && ((ZiAlphaWork*)workData)->prefixCount == elementCount - 1 &&
|
||||
Zi8IsAlphaPunct(parameters->elements[((ZiAlphaWork*)workData)->prefixCount - 1]) != 0) goto checkPrefixFields;
|
||||
@@ -1617,7 +1618,7 @@ finishCandidates:
|
||||
} else {
|
||||
wordCursor = 0;
|
||||
}
|
||||
if (wordCursor != (ziU16 *)0x0) {
|
||||
if (wordCursor) {
|
||||
Zi8SetHighlightedWordW(wordCursor,parameters->language,parameters->subLanguage,workData);
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -643,7 +643,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
|
||||
{
|
||||
int strokeIndex;
|
||||
int outputCount;
|
||||
int extraCount;
|
||||
volatile int extraCount;
|
||||
|
||||
outputCount = 0;
|
||||
Zi8LogError(100, work);
|
||||
@@ -660,8 +660,7 @@ ziU32 Zi8GetSInfo(ziU8* strokes, ziU8* extraStrokes, ziWChar* outputBuffer, ziU8
|
||||
goto lowStroke;
|
||||
}
|
||||
badStroke:
|
||||
outputCount--;
|
||||
outputBuffer[(ziU8)outputCount] = 0;
|
||||
outputBuffer[(ziU8)--outputCount] = 0;
|
||||
return outputCount;
|
||||
lowStroke:
|
||||
outputBuffer[(ziU8)outputCount] = zi8StrokeCode(strokes[strokeIndex] & 0xf, work);
|
||||
|
||||
@@ -89,7 +89,12 @@ ziU32 Zi8MatchPUDdata_ZHS(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar*
|
||||
ZI_WORK->unk_0x310 = (ziU32)table + section->offset[0] * 0x100 + section->offset[1];
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
while ((entry = (ziU8*)ZI_WORK->unk_0x310) != 0) {
|
||||
for (;;) {
|
||||
entry = (ziU8*)ZI_WORK->unk_0x310;
|
||||
if (entry == 0) {
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
while ((ziS32)ZI_WORK->unk_0x318 < (ziS32)ZI_WORK->unk_0x314) {
|
||||
word = entry + 1;
|
||||
wordSize = *entry;
|
||||
@@ -158,8 +163,6 @@ next:
|
||||
fallback = 1;
|
||||
ZI_WORK->unk_0x318 = 0;
|
||||
}
|
||||
Zi8LogError(0x4B3, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* output, ziU16 capacity, ziU8 complete, ziU8 continuation ZI_NEED_WORK) {
|
||||
ziU32 result;
|
||||
@@ -167,11 +170,12 @@ ziU32 Zi8MatchPUDdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* out
|
||||
for (;;) {
|
||||
result = Zi8_8147FD7C(pattern, length, language, output, capacity, complete, continuation, __zi8_work_data);
|
||||
if ((ziU8)result != 0) break;
|
||||
if ((ZI_WORK->pudCount = ZI_WORK->pudCount + 1) > 16) {
|
||||
if (++ZI_WORK->pudCount <= 16) {
|
||||
continuation = 0;
|
||||
} else {
|
||||
ZI_WORK->pudCount = 1;
|
||||
break;
|
||||
}
|
||||
continuation = 0;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
if (candidate->length == length) {
|
||||
position = 0;
|
||||
while (position < length) {
|
||||
if ((ziU8)candidate->text[position] != (ziU8)word->text[position]) break;
|
||||
if (candidate->text[position] != word->text[position]) break;
|
||||
position++;
|
||||
}
|
||||
if (position == length) {
|
||||
@@ -56,8 +56,7 @@ ziBool Zi8_81480224(ziUserWord* word ZI_NEED_WORK) {
|
||||
previous = current;
|
||||
current = current->next;
|
||||
}
|
||||
length = ZI_WORK->uwdCount;
|
||||
ZI_WORK->uwdCount = length + 1;
|
||||
length = ZI_WORK->uwdCount++;
|
||||
added = &ZI_WORK->uwdNodes[length];
|
||||
if (previous == 0) {
|
||||
ZI_WORK->uwdList = added;
|
||||
@@ -91,8 +90,11 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ziWChar folded;
|
||||
int fallback = 0;
|
||||
int visited = 0;
|
||||
int position, prefixLength, previousOffset;
|
||||
ziU32 size, entryLanguage, entryLength;
|
||||
int prefixLength;
|
||||
int position, previousOffset;
|
||||
ziU32 size;
|
||||
ziU8 entryLanguage;
|
||||
ziU32 entryLength;
|
||||
ziU8* cursor;
|
||||
ziU8* begin;
|
||||
ziU8* boundary;
|
||||
@@ -103,18 +105,33 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ziUserDictionary* dictionary;
|
||||
int firstSegment;
|
||||
Zi8LogError(100, __zi8_work_data);
|
||||
if (!(ZI_WORK->unk_0x138 < 3 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
||||
if (!(ZI_WORK->unk_0x138 <= 2 && ZI_WORK->unk_0x138 != 0 && ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1] != 0)) {
|
||||
Zi8ReplaceLastError(0x19C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
dictionary = ZI_WORK->unk_0x130[ZI_WORK->unk_0x138 - 1];
|
||||
if (continuation == 0) {
|
||||
if (continuation != 0) {
|
||||
result = Zi8_814803F4(__zi8_work_data);
|
||||
entryLength = 0;
|
||||
if (result != 0) {
|
||||
entryLanguage = result->language;
|
||||
entryLength = result->length;
|
||||
if (entryLength >= capacity) {
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
for (position = 0; position < (ziS32)entryLength; position++) output[position] = Zi8ConvertUC2WC(result->text[position], entryLanguage, __zi8_work_data);
|
||||
}
|
||||
return entryLength;
|
||||
}
|
||||
{
|
||||
Zi8_8148047C(__zi8_work_data);
|
||||
ZI_WORK->unk_0x13C = 0;
|
||||
if (currentWord == 0 || currentLength == 0 || currentWord[currentLength - 1] != 0x20) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
prefixLength = 0;
|
||||
for (position = currentLength - 2; position >= 0 && currentWord[position] != 0x20; position--) prefixLength++;
|
||||
for (position = currentLength - 2; currentWord[position] != 0x20 && position >= 0; position--) prefixLength++;
|
||||
position++;
|
||||
if (prefixLength == 0 || prefixLength > 63) ZI_WORK->unk_0x140 = 0;
|
||||
else {
|
||||
ZI_WORK->unk_0x140 = 1;
|
||||
@@ -123,7 +140,7 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
ZI_WORK->unk_0x141[1] = language;
|
||||
ZI_WORK->unk_0x141[2] = prefixLength;
|
||||
previousOffset = 4;
|
||||
for (; ++position, prefixLength > 0; prefixLength--) {
|
||||
for (; prefixLength > 0; prefixLength--, position++) {
|
||||
folded = currentWord[position];
|
||||
ZI_WORK->unk_0x141[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = 0;
|
||||
@@ -131,12 +148,10 @@ ziU8 Zi8MatchUWDdata(ziWChar* pattern, ziU8 length, ziWChar* currentWord, ziU16
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data)) Zi8ChangeCharCase(0, &folded, language, __zi8_work_data);
|
||||
ZI_WORK->unk_0x184[previousOffset] = Zi8ConvertWC2UC(folded, language, __zi8_work_data);
|
||||
}
|
||||
if (ZI_WORK->unk_0x141[previousOffset] == 0) {
|
||||
if (ZI_WORK->unk_0x141[previousOffset++] == 0) {
|
||||
ZI_WORK->unk_0x140 = 0;
|
||||
previousOffset++;
|
||||
break;
|
||||
}
|
||||
previousOffset++;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -146,7 +161,8 @@ rescan:
|
||||
boundary = (ziU8*)dictionary + dictionary->boundary + 7;
|
||||
end = (ziU8*)dictionary + dictionary->end + 7;
|
||||
cursor = begin;
|
||||
firstSegment = begin < boundary;
|
||||
if (begin < boundary) firstSegment = 1;
|
||||
else firstSegment = 0;
|
||||
while (firstSegment ? cursor < boundary : cursor < end) {
|
||||
size = *cursor;
|
||||
candidate = (ziUserWord*)cursor;
|
||||
@@ -185,7 +201,7 @@ next:
|
||||
visited = 0;
|
||||
goto rescan;
|
||||
}
|
||||
if (complete != 0 && length == 1) {
|
||||
if (complete == 1 && length != 0 && continuation == 0) {
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
visited = 0;
|
||||
|
||||
@@ -22,7 +22,8 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
node += offset;
|
||||
if (((ziU32)header & 2) != 0) {
|
||||
if ((*(ziU8*)node & 0x80) != 0) {
|
||||
offset = *((ziU8*)node + 2) + ((*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000);
|
||||
offset = (*(ziU8*)node & 0x7f) * 0x10000 + ((ziU32)*((ziU8*)node + 1) & 0xffff) * 0x100 + 0x8000;
|
||||
offset += *((ziU8*)node + 2);
|
||||
} else {
|
||||
offset = ((ziU32)*(ziU8*)node & 0xffff) * 0x100;
|
||||
offset += (ziU32)*((ziU8*)node + 1);
|
||||
@@ -43,7 +44,7 @@ ziU32 ZiDAWGGetChild(ziU32 node) {
|
||||
|
||||
ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
ziU16 header;
|
||||
ziU8* cursor;
|
||||
ziU8* cursor = node;
|
||||
ziS32 depth;
|
||||
ziS32 offset;
|
||||
|
||||
@@ -53,29 +54,29 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
if ((header & 4) == 0) {
|
||||
node = 0;
|
||||
} else {
|
||||
cursor = node;
|
||||
if ((header & 8) != 0) {
|
||||
if ((node[0] & 0xf) == 0xf) {
|
||||
cursor = node + 2;
|
||||
node += 2;
|
||||
} else {
|
||||
cursor = node + 1;
|
||||
node += 1;
|
||||
}
|
||||
|
||||
if ((header & 2) != 0) {
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
if ((*node & 0x80) == 0) {
|
||||
node += 2;
|
||||
} else {
|
||||
cursor += 3;
|
||||
node += 3;
|
||||
}
|
||||
}
|
||||
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
node += (ziU32)cursor[1] + (ziU32)*cursor * 0x100;
|
||||
if ((*node & 0x80) != 0) {
|
||||
node += (*node & 0x7f) * 0x10000 + (ziU32)node[1] * 0x100 +
|
||||
(ziU32)node[2] + 0x8000;
|
||||
} else {
|
||||
node += (*cursor & 0x7f) * 0x10000 + (ziU32)cursor[1] * 0x100 +
|
||||
0x8000 + (ziU32)cursor[2];
|
||||
node += (ziU16)*node * 0x100 + (ziU32)node[1];
|
||||
}
|
||||
} else {
|
||||
cursor = node;
|
||||
do {
|
||||
header = nodeHeaderTable[cursor[0] >> 4];
|
||||
if ((cursor[0] & 0xf) == 0xf) {
|
||||
@@ -89,24 +90,24 @@ ziU8* ZiDAWGGetSibling(ziU8* node) {
|
||||
if ((header & 1) != 0) {
|
||||
if ((header & 2) == 0) {
|
||||
depth++;
|
||||
} else if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
} else {
|
||||
} else if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
}
|
||||
}
|
||||
|
||||
if ((header & 4) == 0) {
|
||||
depth--;
|
||||
} else if ((header & 8) != 0) {
|
||||
if ((*cursor & 0x80) == 0) {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
} else {
|
||||
if ((*cursor & 0x80) != 0) {
|
||||
cursor += 3;
|
||||
offset += 3;
|
||||
} else {
|
||||
cursor += 2;
|
||||
offset += 2;
|
||||
}
|
||||
depth--;
|
||||
}
|
||||
@@ -163,16 +164,10 @@ ziU32 ZiDAWGGetGraphInfo(zi8DawgCtx* context, ziU8* entry, ziU16* keys) {
|
||||
result = 0;
|
||||
pair = (((ziU16)entry[0] << 8) + entry[1]);
|
||||
if (pair != 0) {
|
||||
goto graph_invalid;
|
||||
return 0;
|
||||
}
|
||||
pair = (((ziU16)entry[2] << 8) + entry[3]);
|
||||
if (pair == 0) {
|
||||
goto graph_valid;
|
||||
}
|
||||
graph_invalid:
|
||||
result = 0;
|
||||
goto graph_done;
|
||||
graph_valid:
|
||||
end = (ziU32)(entry + (((ziU16)entry[4] << 8) + entry[5] + 1) * 10);
|
||||
entry += 10;
|
||||
depth = 0;
|
||||
@@ -182,19 +177,18 @@ graph_valid:
|
||||
}
|
||||
|
||||
while (1) {
|
||||
if (*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||
if (*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8))) {
|
||||
break;
|
||||
}
|
||||
entry += (entry[1] + ((ziU16)entry[0] << 8)) * 10 + 10;
|
||||
if ((end <= (ziU32)entry) ||
|
||||
(*keys == (ziU16)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||
if (((ziU32)entry >= end) ||
|
||||
(*keys == (ziS32)(entry[3] + ((ziU16)entry[2] << 8)))) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (end <= (ziU32)entry) {
|
||||
result = 0;
|
||||
break;
|
||||
if ((ziU32)entry >= end) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
result = graph + (ziU32)entry[4] * 0x10000 + ((ziU16)entry[5] << 8) +
|
||||
@@ -215,8 +209,7 @@ graph_valid:
|
||||
depth++;
|
||||
keys++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
graph_done:
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ typedef struct ziUserKeys {
|
||||
typedef struct ziChineseEntry {
|
||||
ziU8 data[9];
|
||||
ziU8 offsetHigh;
|
||||
ziU16 offsetLow;
|
||||
ziU8 offsetLow[2];
|
||||
} ziChineseEntry;
|
||||
|
||||
ziU8 Zi8GetCandidatesOrCount(ziGetParam*, ziSearchState* ZI_NEED_WORK);
|
||||
@@ -26,19 +26,22 @@ ziPtr Zi8GetTableAddress(ziU8, ziU8 ZI_NEED_WORK);
|
||||
ziU16 Zi8Uni2Ord(ziWChar ZI_NEED_WORK);
|
||||
|
||||
ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
ziU8 remaining, group;
|
||||
ziU16 value = 0;
|
||||
int count;
|
||||
int offset;
|
||||
ziU8 group;
|
||||
ziU8 remaining;
|
||||
ziU16 value;
|
||||
ziWChar* cursor;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziSearchState search;
|
||||
ziGetParam request;
|
||||
ziWChar ordinals[65];
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
int length, count, offset;
|
||||
int length;
|
||||
int unmatched;
|
||||
ziChineseEntry* entry;
|
||||
ziU8* data;
|
||||
ziU8 formats[8] = {1, 5, 0, 0, 0, 0, 0, 0};
|
||||
ziU32 savedFormats = ZI_WORK->unk_0x1410;
|
||||
ziU8 savedCount = ZI_WORK->unk_0x1418;
|
||||
search.flags = 0;
|
||||
search.word = 0;
|
||||
search.length = 0;
|
||||
@@ -52,7 +55,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
if (language != 1) {
|
||||
for (length = 0; word[length] != 0; length++) {
|
||||
if (word[length] > 0xEFF0 || length == 64) return 0;
|
||||
if (word[length] >= 0xEFF1 || length == 64) return 0;
|
||||
}
|
||||
((ziU8*)&search.length)[0] = length;
|
||||
((ziU8*)&search.flags)[2] = 1;
|
||||
@@ -91,21 +94,34 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
if (language == 1) {
|
||||
length = 0;
|
||||
do {
|
||||
if (word[length] == 0) {
|
||||
count = length - 1;
|
||||
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||
if (ordinals[length] == 0xFFFF) return 0;
|
||||
length++;
|
||||
if (length == 64) return 0;
|
||||
} while (word[length] != 0);
|
||||
{
|
||||
if (length == 1) return 1;
|
||||
count = --length;
|
||||
ordinals[count] |= 0x8000;
|
||||
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
|
||||
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | entry->offsetLow);
|
||||
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
|
||||
if (ZI_WORK->unk_0x16 != 0) {
|
||||
group = *data & 7;
|
||||
if (group == 5) offset = 4;
|
||||
else if (group < 5) {
|
||||
if (group == 2) offset = 2;
|
||||
else if (group < 2) offset = 1;
|
||||
else offset = 3;
|
||||
} else offset = 1;
|
||||
switch (*data & 7) {
|
||||
case 2:
|
||||
offset = 2;
|
||||
break;
|
||||
case 3:
|
||||
case 4:
|
||||
offset = 3;
|
||||
break;
|
||||
case 5:
|
||||
offset = 4;
|
||||
break;
|
||||
default:
|
||||
offset = 1;
|
||||
break;
|
||||
}
|
||||
data += offset;
|
||||
}
|
||||
if ((*data & 0x80) == 0) return 0;
|
||||
@@ -134,11 +150,7 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
Zi8LogError(0x2BD, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
ordinals[length] = Zi8Uni2Ord(word[length], __zi8_work_data);
|
||||
if (ordinals[length] == 0xFFFF) return 0;
|
||||
length++;
|
||||
} while (length != 64);
|
||||
}
|
||||
} else Zi8ReplaceLastError(0x26C, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
@@ -156,10 +168,9 @@ ziWChar Zi8ConvertUC2UserKey(ziChar character, ziU8 language ZI_NEED_WORK) {
|
||||
}
|
||||
}
|
||||
found:
|
||||
if (key < 32) {
|
||||
if (key == 0) return 0xEFFA;
|
||||
if (key >= 1 && key <= 9) return key + 0xEFF0;
|
||||
if (key <= 31) return key + 0xEFF1;
|
||||
}
|
||||
if (key >= 32) return 0;
|
||||
if (key == 0) return 0xEFFA;
|
||||
if (key >= 1 && key <= 9) return key + 0xEFF0;
|
||||
if (key <= 31) return key + 0xEFF1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -44,13 +44,12 @@ static ziU8 ziNumKeysWithChars(ziU8 language, ziPtr __zi8_work_data) {
|
||||
}
|
||||
|
||||
ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data) {
|
||||
ziU8 numKeys;
|
||||
ziU16 tableCount;
|
||||
ziU8 numKeys;
|
||||
ziU8* dataAddress;
|
||||
ziUserKeyMap* customTable;
|
||||
ziU32 totalCharacters;
|
||||
ziU16 charCount;
|
||||
ziU32 keyIndex;
|
||||
ziU16 keyIndex;
|
||||
ziWChar* keyChars;
|
||||
|
||||
dataAddress = 0;
|
||||
@@ -93,15 +92,15 @@ tables_ready:
|
||||
return 0;
|
||||
}
|
||||
|
||||
totalCharacters = 0;
|
||||
keyIndex = totalCharacters;
|
||||
tableCount = 0;
|
||||
keyIndex = tableCount;
|
||||
for (; (ziU16)keyIndex < key; keyIndex++) {
|
||||
totalCharacters += dataAddress[(ziU16)keyIndex];
|
||||
tableCount += dataAddress[(ziU16)keyIndex];
|
||||
}
|
||||
if ((charCount = (ziU8)dataAddress[key]) == 0) {
|
||||
return 0;
|
||||
}
|
||||
dataAddress = dataAddress + numKeys + ((totalCharacters & 0xffff) * 2);
|
||||
dataAddress = dataAddress + numKeys + (tableCount * 2);
|
||||
keyIndex = 0;
|
||||
for (; (ziU16)keyIndex < charCount; keyIndex++) {
|
||||
chars[(ziU16)keyIndex] = (ziU16)dataAddress[(ziU16)keyIndex * 2] |
|
||||
|
||||
@@ -23,48 +23,60 @@ ziU8 Zi8DetachOEMdata(ziU8 id ZI_NEED_WORK) {
|
||||
}
|
||||
ziU8 Zi8MatchOEMdata(ziWChar* pattern, ziU8 length, ziU8 language, ziWChar* word, ziU16 capacity, ziBool complete, ziBool continuation ZI_NEED_WORK) {
|
||||
ziWChar folded;
|
||||
ziU8 fallback = 0;
|
||||
ziU32 index;
|
||||
ziS32 index;
|
||||
ziU32 position;
|
||||
ziU32 fallback = 0;
|
||||
if (!continuation) ZI_WORK->oemIdx = 0;
|
||||
index = ZI_WORK->oemIdx;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen || ZI_WORK->oemMatch == 0) goto noMatch;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto failed;
|
||||
if (ZI_WORK->oemMatch == 0) goto failed;
|
||||
capacity--;
|
||||
if (length >= capacity) goto noMatch;
|
||||
word[capacity] = 0;
|
||||
word[length] = complete ? 1 : 0;
|
||||
for (;;) {
|
||||
if ((ziS32)index >= ZI_WORK->oemLen || !ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) {
|
||||
if (length != 1 || !complete || continuation) goto noMatch;
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
index = 0;
|
||||
continue;
|
||||
}
|
||||
position = 0;
|
||||
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
|
||||
for (; (ziS32)position < length; position++) {
|
||||
if (pattern[position] < 0xEFF1 || pattern[position] > 0xF37F) {
|
||||
if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
}
|
||||
} else if (pattern[position] != Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) break;
|
||||
}
|
||||
}
|
||||
if ((ziS32)position >= length) {
|
||||
if (fallback) {
|
||||
*word = *pattern;
|
||||
return 1;
|
||||
}
|
||||
ZI_WORK->oemIdx = index + 1;
|
||||
while (word[position] != 0) position++;
|
||||
return position;
|
||||
}
|
||||
word[length] = complete ? 1 : 0;
|
||||
index++;
|
||||
if ((ziS32)length >= (ziS32)capacity) {
|
||||
failed:
|
||||
return 0;
|
||||
}
|
||||
noMatch:
|
||||
word[capacity] = 0;
|
||||
if (complete) word[length] = 1; else word[length] = 0;
|
||||
goto matchRetry;
|
||||
posEntry:
|
||||
position = 0;
|
||||
if ((complete && word[length] == 0) || (!complete && word[length] != 0)) {
|
||||
for (; (ziS32)position < length; position++) {
|
||||
if (pattern[position] >= 0xEFF1 && pattern[position] <= 0xF37F) {
|
||||
if (pattern[position] == Zi8ConvertWC2Key(word[position], language, __zi8_work_data)) continue;
|
||||
break;
|
||||
} else if (word[position] != pattern[position]) {
|
||||
if (!ZI_WORK->unk_0x1F || language == 1) break;
|
||||
folded = pattern[position];
|
||||
if (!Zi8ChangeCharCase(1, &folded, language, __zi8_work_data) || folded != word[position]) break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((ziS32)position < length) {
|
||||
if (complete) word[length] = 1; else word[length] = 0;
|
||||
index++;
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
|
||||
goto matchRetry;
|
||||
}
|
||||
if (fallback) {
|
||||
index = 0;
|
||||
*word = *pattern;
|
||||
return 1;
|
||||
}
|
||||
index++;
|
||||
ZI_WORK->oemIdx = index;
|
||||
while (word[position] != 0) position++;
|
||||
return position;
|
||||
matchRetry:
|
||||
if ((ziS32)index >= ZI_WORK->oemLen) goto oemFailed;
|
||||
if (!ZI_WORK->oemMatch(index, word, capacity, ZI_WORK->oemData)) goto oemFailed;
|
||||
goto posEntry;
|
||||
oemFailed:
|
||||
if (length != 1 || !complete || continuation) goto tail0;
|
||||
complete = 0;
|
||||
fallback = 1;
|
||||
index = 0;
|
||||
goto matchRetry;
|
||||
tail0:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <revolution/fa.h>
|
||||
|
||||
static FAInsertCallback g_attach_func;
|
||||
static FAEjectCallback g_detach_func;
|
||||
static FAInsertCallback g_attach_func;
|
||||
|
||||
extern s32 uhf_msc_is_media_insert(void);
|
||||
|
||||
|
||||
@@ -24,9 +24,9 @@ char NAND_Org_Path[64];
|
||||
NAND_DISK_INFO nanddisk_info[23];
|
||||
NAND_SEMAPHORE csem;
|
||||
NAND_SEMAPHORE osem;
|
||||
s32 Nanddisk_Internal_Info_Init;
|
||||
s32 NAND_Init;
|
||||
s32 fa_nanad_semid;
|
||||
s32 Nanddisk_Internal_Info_Init = 0;
|
||||
s32 NAND_Init = 0;
|
||||
s32 fa_nanad_semid = 0;
|
||||
|
||||
static inline s32 find_disk(PDM_DISK* disk, NAND_DISK_INFO** result) {
|
||||
NAND_DISK_INFO* info;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include <private/fa/puh_msc.h>
|
||||
|
||||
static s32 st_uhs_msc_status;
|
||||
static s32 st_uhs_msc_msgid;
|
||||
static s32 st_uhs_msc_tskid;
|
||||
s32 uhg_msc_memid_8169971C;
|
||||
static s32 st_uhs_msc_tskid;
|
||||
static s32 st_uhs_msc_msgid;
|
||||
static s32 st_uhs_msc_status;
|
||||
static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command);
|
||||
|
||||
s32 usbh_msc_read10(UHF_MSC_DEVICE* device, u32 sector, u16 count, void* buffer, void* sense) {
|
||||
|
||||
@@ -26,11 +26,10 @@ FAFuncTbl st_uhs_msc_blk_func = {
|
||||
};
|
||||
|
||||
static inline UHF_MSC_DEVICE* uhf_msc_blk_find_device(FADisk* disk) {
|
||||
UHF_MSC_DEVICE* entry = uhg_msc_blk_device_tbl;
|
||||
UHF_MSC_DEVICE* device = NULL;
|
||||
u32 index;
|
||||
for (index = 0; index < 8; entry++, index++) {
|
||||
if (entry->disk == disk) {
|
||||
for (index = 0; index < 8; index++) {
|
||||
if (uhg_msc_blk_device_tbl[index].disk == disk) {
|
||||
device = &uhg_msc_blk_device_tbl[index];
|
||||
break;
|
||||
}
|
||||
@@ -88,9 +87,8 @@ s32 uhf_msc_blk_mount(FADisk* disk) {
|
||||
}
|
||||
|
||||
s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* completed) {
|
||||
u16 transfer_blocks;
|
||||
UHF_MSC_DEVICE* device;
|
||||
s32 error;
|
||||
UHF_MSC_DEVICE* device;
|
||||
u32 block_size;
|
||||
u8* transfer_buffer;
|
||||
u32 transfer_limit;
|
||||
@@ -129,7 +127,7 @@ s32 uhf_msc_blk_pread(FADisk* disk, u8* buffer, u32 sector, u32 blocks, u32* com
|
||||
transfer_buffer = buffer;
|
||||
}
|
||||
do {
|
||||
transfer_blocks = transfer_limit;
|
||||
u16 transfer_blocks = transfer_limit;
|
||||
if (blocks <= transfer_limit) {
|
||||
transfer_blocks = blocks;
|
||||
}
|
||||
|
||||
@@ -10,24 +10,34 @@ pf_s32 pdm_part_is_master_boot_sector(pf_u8* buf, pf_u32 total, pf_bool* p_is_mb
|
||||
pf_s16 index;
|
||||
pf_u32 start[4];
|
||||
pf_u32 count[4];
|
||||
pf_u32* p_start;
|
||||
pf_u32* p_count;
|
||||
*p_is_mbr = 0;
|
||||
if (buf[510] != 0x55 || buf[511] != 0xAA) { return 2; }
|
||||
p_start = start;
|
||||
p_count = count;
|
||||
for (index = 0; index < 4; index++) {
|
||||
start[index] = 0;
|
||||
start[index] = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
|
||||
count[index] = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
|
||||
if (start[index] != 0 && count[index] != 0) {
|
||||
*p_start = 0;
|
||||
*p_start = (((pf_u32)buf[456] << 16) + buf[454]) + (((pf_u32)buf[457] << 24) + ((pf_u32)buf[455] << 8));
|
||||
*p_count = (((pf_u32)buf[460] << 16) + buf[458]) + (((pf_u32)buf[461] << 24) + ((pf_u32)buf[459] << 8));
|
||||
if (*p_start != 0 && *p_count != 0) {
|
||||
if (index == 0) { *p_is_mbr = 1; }
|
||||
} else {
|
||||
if (index == 0) { return 2; }
|
||||
}
|
||||
p_start++;
|
||||
p_count++;
|
||||
buf += 16;
|
||||
}
|
||||
p_start = start;
|
||||
p_count = count;
|
||||
for (index = 0; index < 4; index++) {
|
||||
if (start[index] + count[index] > total) {
|
||||
if (*p_start + *p_count > total) {
|
||||
if (index == 0) { *p_is_mbr = 0; }
|
||||
return 2;
|
||||
}
|
||||
p_start++;
|
||||
p_count++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#define PF_FA_CP932_TABLE
|
||||
#define VFiPFCODE_CP932_OEM2Unicode PFCODE_CP932_OEM2Unicode
|
||||
#define VFiPFCODE_CP932_OEMCharWidth PFCODE_CP932_OEMCharWidth
|
||||
#define VFiPFCODE_CP932_Unicode2OEM PFCODE_CP932_Unicode2OEM
|
||||
|
||||
@@ -1070,7 +1070,7 @@ pf_s32 PFDIR_p_move(PF_VOLUME* volume, PF_STR* old_path, PF_STR* new_path) {
|
||||
|
||||
error = PFENT_ITER_GetEntryOfPath(&source_iter, &source_entry, volume, (PFDIR_STR*)old_path, 0);
|
||||
if (error != 0) { return error; }
|
||||
if (PFPATH_GetVolumeFromPath(new_path) != volume) { return 0x1F; }
|
||||
if (volume != PFPATH_GetVolumeFromPath(new_path)) { return 0x1F; }
|
||||
error = PFPATH_SplitPath((PFDIR_STR*)new_path, &directory, &destination_name);
|
||||
if (error != 0) { return error; }
|
||||
if (PFSTR_GetCodeMode(&destination_name) == 2) {
|
||||
|
||||
@@ -728,20 +728,23 @@ pf_s32 PFENT_ITER_GetEntryOfIter(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
|
||||
|
||||
pf_s32 PFENT_ITER_GetLFNEntryName(PFITER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent) {
|
||||
pf_u32 i;
|
||||
pf_u32 index;
|
||||
pf_s32 err;
|
||||
if (p_ent->num_entry_LFNs != 0 && !(p_ent->small_letter_flag & 0x18)) {
|
||||
index = 0;
|
||||
for (i = 0; i < p_ent->num_entry_LFNs; ++i) {
|
||||
pf_u16* destination;
|
||||
err = PFENT_ITER_Retreat(p_iter, 0);
|
||||
if (err != 0) return err;
|
||||
err = PFENT_ITER_LoadEntry(p_iter);
|
||||
if (err != 0) return err;
|
||||
destination = &p_ent->long_name[(i * 26U) / 2U];
|
||||
destination = &p_ent->long_name[index];
|
||||
pf_memcpy(destination, &p_iter->buf[1], 10);
|
||||
pf_memcpy(destination + 5, &p_iter->buf[14], 12);
|
||||
pf_memcpy(destination + 11, &p_iter->buf[28], 4);
|
||||
index += 13;
|
||||
}
|
||||
p_ent->long_name[(p_ent->num_entry_LFNs * 26U) / 2U] = 0;
|
||||
p_ent->long_name[index] = 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -126,6 +126,7 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
|
||||
pf_s32 fat_offset;
|
||||
pf_u32 fat_sector;
|
||||
pf_s32 result;
|
||||
pf_u32 next_sector;
|
||||
fat_offset = (pf_u16)(cluster + (cluster >> 1));
|
||||
fat_sector = (pf_u16)(p_vol->bpb.active_FAT_sector + (fat_offset >> p_vol->bpb.log2_bytes_per_sector));
|
||||
offset_in_sector = fat_offset & (p_vol->bpb.bytes_per_sector - 1);
|
||||
@@ -146,10 +147,10 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
|
||||
p_page->p_buf[(pf_u16)offset_in_sector] = (p_page->p_buf[(pf_u16)offset_in_sector] & 0xF) | ((value << 4) & 0xF0);
|
||||
if ((pf_u16)offset_in_sector == (pf_u32)(p_vol->bpb.bytes_per_sector - 1)) {
|
||||
FLUSH_FAT_BUFFER();
|
||||
offset_in_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, offset_in_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
next_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, next_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
if (err != 0) { return err; }
|
||||
p_page->sector = offset_in_sector;
|
||||
p_page->sector = next_sector;
|
||||
p_page->p_buf[0] = value >> 4;
|
||||
} else {
|
||||
((pf_u16)offset_in_sector + p_page->p_buf)[1] = value >> 4;
|
||||
@@ -158,10 +159,10 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
|
||||
p_page->p_buf[(pf_u16)offset_in_sector] = value;
|
||||
if ((pf_u16)offset_in_sector == (pf_u32)(p_vol->bpb.bytes_per_sector - 1)) {
|
||||
FLUSH_FAT_BUFFER();
|
||||
offset_in_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, offset_in_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
next_sector = fat_sector + 1;
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, next_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
if (err != 0) { return err; }
|
||||
p_page->sector = offset_in_sector;
|
||||
p_page->sector = next_sector;
|
||||
p_page->p_buf[0] = (p_page->p_buf[0] & 0xF0) | ((pf_u8)(value >> 8));
|
||||
} else {
|
||||
((pf_u16)offset_in_sector + p_page->p_buf)[1] = (((pf_u16)offset_in_sector + p_page->p_buf)[1] & 0xF0) | ((pf_u8)(value >> 8));
|
||||
|
||||
@@ -102,7 +102,7 @@ pf_s32 PFFAT16_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_u32 cluster, pf_u32 val
|
||||
err = VFiPFSEC_ReadFAT(p_vol, p_page->p_buf, fat_sector, 0, p_vol->bpb.bytes_per_sector);
|
||||
}
|
||||
p_page->p_buf[offset_in_sector] = value;
|
||||
(offset_in_sector + p_page->p_buf)[1] = value >> 8;
|
||||
p_page->p_buf[offset_in_sector + 1] = value >> 8;
|
||||
if (err != 0) {
|
||||
result = err;
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ void* pfstub_entry(void* argument) {
|
||||
pf_vol_set.context_id = message->task_id;
|
||||
if (message->operation >= 0 && message->operation < 100) {
|
||||
pfstub_call_function_standard(message);
|
||||
} else if (received->operation >= 100 && received->operation < 200) {
|
||||
} else if (((s32*)received)[1] >= 100 && ((s32*)received)[1] < 200) {
|
||||
pfstub_call_function_unicode(message);
|
||||
} else {
|
||||
message->result.status = -1;
|
||||
|
||||
@@ -400,132 +400,131 @@ static void kbdProcKey(u32 key, u32 pressed, u32 channel) {
|
||||
}
|
||||
|
||||
static void kbdProcMod(u32 key, u32 pressed, u32 channel) {
|
||||
u32 stateBuf[1];
|
||||
KBDModifierState* state;
|
||||
KBDChannel* data;
|
||||
u32 modState;
|
||||
s32 delta;
|
||||
u8 flags;
|
||||
|
||||
u32 finalState;
|
||||
s8 value;
|
||||
data = &kbdData[channel];
|
||||
delta = (pressed & 1) != 0 ? 1 : -1;
|
||||
state = (KBDModifierState*)stateBuf;
|
||||
state->value = kbdData[channel].modState;
|
||||
flags = kbdKeyMaps.maps[kbdData[channel].country].flags;
|
||||
flags = kbdKeyMaps.maps[data->country].flags;
|
||||
|
||||
kbdGetModState(channel, &state->value);
|
||||
kbdGetModState(channel, &modState);
|
||||
switch (key) {
|
||||
case 0xF001:
|
||||
if (kbdData[channel].lockState != 0) {
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state->value ^= 2;
|
||||
modState ^= 2;
|
||||
}
|
||||
} else {
|
||||
value = kbdData[channel].lockCount[1] + delta;
|
||||
kbdData[channel].lockCount[1] = value;
|
||||
state->keys.rightControl = (u8)value != 0;
|
||||
value = data->lockCount[1] + delta;
|
||||
data->lockCount[1] = value;
|
||||
modState = (modState & ~0x2) | (((u8)value != 0) << 1);
|
||||
}
|
||||
break;
|
||||
case 0xF005:
|
||||
if (kbdData[channel].lockState != 0) {
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state->value ^= 0x20;
|
||||
modState ^= 0x20;
|
||||
}
|
||||
} else {
|
||||
value = kbdData[channel].lockCount[4] + delta;
|
||||
kbdData[channel].lockCount[4] = value;
|
||||
state->keys.rightAlt = (u8)value != 0;
|
||||
value = data->lockCount[4] + delta;
|
||||
data->lockCount[4] = value;
|
||||
modState = (modState & ~0x20) | (((u8)value != 0) << 5);
|
||||
}
|
||||
break;
|
||||
case 0xF000:
|
||||
if (kbdData[channel].lockState != 0) {
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state->value ^= 1;
|
||||
modState ^= 1;
|
||||
}
|
||||
} else {
|
||||
value = kbdData[channel].lockCount[0] + delta;
|
||||
kbdData[channel].lockCount[0] = value;
|
||||
state->keys.leftControl = (u8)value != 0;
|
||||
value = data->lockCount[0] + delta;
|
||||
data->lockCount[0] = value;
|
||||
modState = (modState & ~0x1) | ((u8)value != 0);
|
||||
}
|
||||
break;
|
||||
case 0xF008:
|
||||
if (((pressed & 1) != 0) && (kbdData[channel].lockProcessing != 0)) {
|
||||
state->value ^= 0x200;
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
modState ^= 0x200;
|
||||
}
|
||||
break;
|
||||
case 0xF007:
|
||||
if (((pressed & 1) != 0) && (kbdData[channel].lockProcessing != 0)) {
|
||||
state->value ^= 0x100;
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
modState ^= 0x100;
|
||||
}
|
||||
break;
|
||||
case 0xF006:
|
||||
if (((pressed & 1) != 0) && (kbdData[channel].lockProcessing != 0)) {
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
u32 oldState;
|
||||
u32 lockState;
|
||||
oldState = state->value;
|
||||
oldState = modState;
|
||||
lockState = oldState & 0xC0;
|
||||
switch (lockState) {
|
||||
case 0:
|
||||
if ((flags & 1) == 1) {
|
||||
state->value = oldState | 0x40;
|
||||
modState = oldState | 0x40;
|
||||
}
|
||||
break;
|
||||
case 0x40:
|
||||
{
|
||||
state->value = oldState & 0xFFFFFFBF;
|
||||
modState = oldState & 0xFFFFFFBF;
|
||||
if ((flags & 4) == 4) {
|
||||
state->value = oldState & 0xFFFFFFBF | 0x80;
|
||||
modState = oldState & 0xFFFFFFBF | 0x80;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 0x80:
|
||||
state->value = oldState & 0xFFFFFF7F;
|
||||
modState = oldState & 0xFFFFFF7F;
|
||||
break;
|
||||
case 0xC0:
|
||||
state->value = oldState & 0xFFFFFF3F;
|
||||
modState = oldState & 0xFFFFFF3F;
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 0xF002:
|
||||
if (kbdData[channel].lockState != 0) {
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state->value ^= 4;
|
||||
modState ^= 4;
|
||||
}
|
||||
} else {
|
||||
value = kbdData[channel].lockCount[2] + delta;
|
||||
kbdData[channel].lockCount[2] = value;
|
||||
state->keys.leftShift = (u8)value != 0;
|
||||
value = data->lockCount[2] + delta;
|
||||
data->lockCount[2] = value;
|
||||
modState = (modState & ~0x4) | (((u8)value != 0) << 2);
|
||||
}
|
||||
break;
|
||||
case 0xF003:
|
||||
if (kbdData[channel].lockState != 0) {
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state->value ^= 8;
|
||||
modState ^= 8;
|
||||
}
|
||||
} else {
|
||||
value = kbdData[channel].lockCount[3] + delta;
|
||||
kbdData[channel].lockCount[3] = value;
|
||||
state->keys.rightShift = (u8)value != 0;
|
||||
value = data->lockCount[3] + delta;
|
||||
data->lockCount[3] = value;
|
||||
modState = (modState & ~0x8) | (((u8)value != 0) << 3);
|
||||
}
|
||||
break;
|
||||
case 0xF004:
|
||||
if (kbdData[channel].lockState != 0) {
|
||||
if (data->lockState != 0) {
|
||||
if ((pressed & 1) != 0) {
|
||||
state->value ^= 0x10;
|
||||
modState ^= 0x10;
|
||||
}
|
||||
} else {
|
||||
value = kbdData[channel].lockCount[5] + delta;
|
||||
kbdData[channel].lockCount[5] = value;
|
||||
state->keys.leftAlt = (u8)value != 0;
|
||||
value = data->lockCount[5] + delta;
|
||||
data->lockCount[5] = value;
|
||||
modState = (modState & ~0x10) | (((u8)value != 0) << 4);
|
||||
}
|
||||
break;
|
||||
case 0xF021:
|
||||
if (((pressed & 1) != 0) && (kbdData[channel].lockProcessing != 0)) {
|
||||
state->value ^= 0x400;
|
||||
if (((pressed & 1) != 0) && (data->lockProcessing != 0)) {
|
||||
modState ^= 0x400;
|
||||
}
|
||||
break;
|
||||
}
|
||||
finalState = state->value | 0x1000;
|
||||
finalState = modState | 0x1000;
|
||||
KBDSetModState(channel, finalState);
|
||||
}
|
||||
|
||||
@@ -623,7 +622,7 @@ USBKBDErr KBDSetLedsAsync(u32 channel, u32 leds, USBKBDCmdLEDCallback callback,
|
||||
|
||||
USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
|
||||
u32 index;
|
||||
u32 ofs;
|
||||
KBDLEDCommand* command;
|
||||
BOOL interrupts;
|
||||
USBKBDErr result;
|
||||
u8 ledBits;
|
||||
@@ -639,14 +638,14 @@ USBKBDErr KBDSetLeds(u32 channel, u32 leds) {
|
||||
ledBits = leds & 0xff;
|
||||
interrupts = OSDisableInterrupts();
|
||||
index = 0;
|
||||
ofs = 0;
|
||||
command = kbdCmdBuf;
|
||||
while (index < 12) {
|
||||
if (*(u32*)&((u8*)kbdCmdBuf)[ofs] == 0) {
|
||||
*(u32*)&((u8*)kbdCmdBuf)[ofs] = (u32)kbdData[channel].device;
|
||||
if (command->device == 0) {
|
||||
command->device = (u32)kbdData[channel].device;
|
||||
break;
|
||||
}
|
||||
index++;
|
||||
ofs += sizeof(KBDLEDCommand);
|
||||
command++;
|
||||
}
|
||||
OSRestoreInterrupts(interrupts);
|
||||
if (index == 12) {
|
||||
@@ -839,30 +838,28 @@ USBKBDErr KBDSetModState(u32 channel, u32 value) {
|
||||
kbdData[channel].modState = value & ~0x1000;
|
||||
} else {
|
||||
BOOL interrupts;
|
||||
KBDModifierState* state;
|
||||
KBDModifierState oldState;
|
||||
KBDModifierState newState;
|
||||
interrupts = OSDisableInterrupts();
|
||||
state = (KBDModifierState*)&kbdData[channel].modState;
|
||||
newState.value = value & 0xfc0;
|
||||
oldState = *state;
|
||||
oldState.value = kbdData[channel].modState;
|
||||
newState.bits.physical = oldState.bits.physical;
|
||||
*state = newState;
|
||||
kbdData[channel].modState = newState.value;
|
||||
OSRestoreInterrupts(interrupts);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
u16 KBDTranslateHidCode(u32 keyCode, u32 modifiers, s32 country) {
|
||||
KBDKeyMap* map;
|
||||
u16* table;
|
||||
u32 keyIndex;
|
||||
u16 entry;
|
||||
s32 mask;
|
||||
u16* table;
|
||||
u16 activeFlag;
|
||||
u16 entry;
|
||||
KBDKeyMap* map;
|
||||
s32 offset;
|
||||
s32 group;
|
||||
u32 shiftFlag;
|
||||
u16 activeFlag;
|
||||
u32 keyIndex;
|
||||
|
||||
if (kbdInitialized == FALSE) {
|
||||
return 0xFFFF;
|
||||
|
||||
@@ -268,10 +268,10 @@ void KPADSetPosParam(s32 chan, f32 x, f32 y) {
|
||||
}
|
||||
|
||||
static void reset_kpad(KPADInside* kpad) {
|
||||
f32 sensorDistance;
|
||||
f32 upperY;
|
||||
f32 distanceValue;
|
||||
f32 zero;
|
||||
f32 upperY;
|
||||
f32 sensorDistance;
|
||||
f32 lowerY;
|
||||
f32 one;
|
||||
f32 negativeOne;
|
||||
@@ -1607,8 +1607,8 @@ static void KPADiSamplingCallback(s32 chan) {
|
||||
u32 device;
|
||||
if (WPADProbe(chan, &device) != -1) {
|
||||
u8 index = kpad->ringIndex;
|
||||
KPADSample* status;
|
||||
u32 tier;
|
||||
KPADSample* status;
|
||||
u32 enabled;
|
||||
u32 tableIndex;
|
||||
if (index >= 16) {
|
||||
|
||||
@@ -156,10 +156,10 @@ void KPRInitRegionUS(void) {
|
||||
}
|
||||
|
||||
void KPRInitQueue(KPRQueue* queue) {
|
||||
static u8 once;
|
||||
if (!once) {
|
||||
static union { u64 align; u8 flag; } once;
|
||||
if (!once.flag) {
|
||||
OSRegisterVersion(__KPRVersion);
|
||||
once = TRUE;
|
||||
once.flag = TRUE;
|
||||
}
|
||||
queue->mode = KPR_MODE_ALT_KEYPAD;
|
||||
queue->oCount = 0;
|
||||
@@ -244,10 +244,9 @@ u8 KPRLookAhead(KPRQueue* queue, u16* destination, u32 capacity) {
|
||||
|
||||
BOOL KPRProcessAltKeypad(KPRQueue* queue, u16 character) {
|
||||
if (queue->altVal != 0) {
|
||||
u32 leadingZero = queue->altVal & 0x80000000;
|
||||
u32 accumulator = queue->altVal;
|
||||
u32 accumulator = queue->altVal & 0x7FFFFFFF;
|
||||
u32 value;
|
||||
accumulator &= 0x7FFFFFFF;
|
||||
u32 leadingZero = queue->altVal & 0x80000000;
|
||||
queue->altVal = accumulator;
|
||||
if (character >= 0xF130 && character <= 0xF139) {
|
||||
if (accumulator > 0x6666666) {
|
||||
@@ -302,7 +301,7 @@ BOOL KPRProcessAltKeypad(KPRQueue* queue, u16 character) {
|
||||
void KPRProcessDeadKeys(KPRQueue* queue) {
|
||||
int index;
|
||||
int firstFallback;
|
||||
int secondFallback;
|
||||
u32 secondFallback;
|
||||
if (queue->iCount == 1) {
|
||||
for (index = 0; index < 107; ++index) {
|
||||
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent) {
|
||||
@@ -313,17 +312,15 @@ void KPRProcessDeadKeys(KPRQueue* queue) {
|
||||
queue->iCount = 0;
|
||||
return;
|
||||
}
|
||||
firstFallback = 0;
|
||||
secondFallback = 107;
|
||||
for (index = 0; index < 107; ++index) {
|
||||
u16 first = queue->text[queue->oCount];
|
||||
if (first == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {
|
||||
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {
|
||||
queue->text[queue->oCount] = kprDeadKeyMap[index].composed;
|
||||
queue->iCount = 0;
|
||||
++queue->oCount;
|
||||
return;
|
||||
}
|
||||
if (first == kprDeadKeyMap[index].accent && first == kprDeadKeyMap[index].base) {
|
||||
if (queue->text[queue->oCount] == kprDeadKeyMap[index].accent && queue->text[queue->oCount] == kprDeadKeyMap[index].base) {
|
||||
firstFallback = index;
|
||||
}
|
||||
if (queue->text[queue->oCount + 1] == kprDeadKeyMap[index].accent && queue->text[queue->oCount + 1] == kprDeadKeyMap[index].base) {
|
||||
|
||||
@@ -367,7 +367,8 @@ static s32 __nupGetServerInfo(char* serverAddress, char* messageId, unsigned lon
|
||||
} else {
|
||||
snprintf(endpoint, endpointSize, "https://%s/nus/services/NetUpdateSOAP", serverAddress);
|
||||
requestSize = strlen(messageId) + strlen(productArea);
|
||||
requestSize += strlen(countryCode) + 0x449;
|
||||
unsigned long countryLength = strlen(countryCode);
|
||||
requestSize += countryLength + 0x449;
|
||||
if (auditData != 0) {
|
||||
requestSize += strlen(auditData);
|
||||
}
|
||||
@@ -1174,7 +1175,7 @@ static inline s32 __nupGetBoot2Version(u16* version) {
|
||||
if (result == 0) {
|
||||
u16 checkedVersion = bootVersion;
|
||||
*version = checkedVersion;
|
||||
result = checkedVersion == bootVersion ? result : -0x1389;
|
||||
if (checkedVersion != bootVersion) { result = -0x1389; }
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -1224,9 +1225,9 @@ static inline void __nupSetStatus(NUPContextInfo* context, s32 status) {
|
||||
extern "C" void* __nupOp(void* argument) {
|
||||
u8* response = 0;
|
||||
ESTmdView* tmdView = 0;
|
||||
char* auditData = 0;
|
||||
u32 needsAudit;
|
||||
u32 currentDeviceId;
|
||||
u32 needsAudit;
|
||||
char* auditData = 0;
|
||||
s32 result;
|
||||
u16 serverBootVersion = 0;
|
||||
u16 bootTitleVersion;
|
||||
|
||||
@@ -562,9 +562,9 @@ static s32 WAD_815BFFA8(WADImportLoopArgs* args) {
|
||||
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags,
|
||||
WADProcessCallback processCallback) {
|
||||
s32 result = 0;
|
||||
ESTitleMeta* titleMeta;
|
||||
void* firstBuffer = 0;
|
||||
void* secondBuffer = 0;
|
||||
ESHash* sharedContentHashes = 0;
|
||||
ESContentId* installedContentIds = 0;
|
||||
ESContentMeta* matchingContents = 0;
|
||||
u32 importedBytes = 0;
|
||||
u32 contentCount;
|
||||
u32 headerReadSize;
|
||||
@@ -574,11 +574,11 @@ s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 o
|
||||
WADThreadStack* threadStack = 0;
|
||||
s32 contentFd;
|
||||
s32 titleImportStarted = FALSE;
|
||||
ESTitleMeta* installedTitleMeta = 0;
|
||||
ESContentId* installedContentIds = 0;
|
||||
ESTitleMeta* titleMeta;
|
||||
void* firstBuffer = 0;
|
||||
s32 contentImportStarted = FALSE;
|
||||
ESContentMeta* matchingContents = 0;
|
||||
ESHash* sharedContentHashes = 0;
|
||||
void* secondBuffer = 0;
|
||||
ESTitleMeta* installedTitleMeta = 0;
|
||||
WADStream stream;
|
||||
WADUnpackInfo unpackInfo;
|
||||
WADSaveDataHeader wadHeader ALIGN32;
|
||||
@@ -1177,8 +1177,8 @@ cleanup:
|
||||
|
||||
static s32 WAD_815C1288(WADExportLoopArgs* args) {
|
||||
ESFd fd = args->fd;
|
||||
u32 remaining = args->size;
|
||||
u32 size;
|
||||
u32 remaining = args->size;
|
||||
u32 bufferIndex = 0;
|
||||
WADImportTransfer* transfer = args->transfer;
|
||||
s32 result = 0;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -821,9 +821,9 @@ CDBErr CDBRecordDecrypt(CDBRecord* record, void* buffer, u32 size, u32* dataSize
|
||||
u32 fileDataSize;
|
||||
u32 fileSize;
|
||||
u8 iv[16];
|
||||
CDBRecordKey comparisonKey;
|
||||
u8 digest[20] ATTRIBUTE_ALIGN(64);
|
||||
u8 wiiIdKey[64] ATTRIBUTE_ALIGN(16);
|
||||
u8 digest[20] ATTRIBUTE_ALIGN(64);
|
||||
CDBRecordKey comparisonKey;
|
||||
NETHMACContext hmac;
|
||||
CDBAttrSignature signature;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -347,6 +347,10 @@ NWC24Err NWC24SetDlPriority(NWC24DlTask* dlTask, u8 dlPriority) {
|
||||
|
||||
|
||||
|
||||
static inline void ReadDlTaskIdentifier(const NWC24DlTask* dlTask, u16* identifier) {
|
||||
*identifier = ((const DlTaskData*)dlTask)->id;
|
||||
}
|
||||
|
||||
static inline NWC24Err SetDlTaskNextTime(NWC24DlTask* dlTask, OSTime time) {
|
||||
NWC24Work* work = NWC24WorkP;
|
||||
DlTaskListHeader* header = work != NULL ? (DlTaskListHeader*)work->dlHead : NULL;
|
||||
@@ -358,7 +362,7 @@ static inline NWC24Err SetDlTaskNextTime(NWC24DlTask* dlTask, OSTime time) {
|
||||
else if (task->id != 0xffff && task->id >= header->maxTaskCount) { result = NWC24_ERR_INVALID_VALUE; }
|
||||
else { result = NWC24_OK; }
|
||||
if (result != NWC24_OK) { return result; }
|
||||
taskId = task->id;
|
||||
ReadDlTaskIdentifier(dlTask, &taskId);
|
||||
if (taskId == 0xffff) { return NWC24_ERR_FAILED; }
|
||||
time /= 60;
|
||||
header = work != NULL ? (DlTaskListHeader*)work->dlHead : NULL;
|
||||
@@ -421,7 +425,7 @@ NWC24Err NWC24SetDlInterval(NWC24DlTask* dlTask, u16 dlInterval) {
|
||||
}
|
||||
}
|
||||
if (result == NWC24_OK) {
|
||||
taskId = task->id;
|
||||
ReadDlTaskIdentifier(dlTask, &taskId);
|
||||
if (taskId != 0xffff) {
|
||||
nextTime /= 60;
|
||||
if (work != NULL) {
|
||||
@@ -543,12 +547,12 @@ NWC24Err NWC24DumpDlTask(NWC24DlTask* dlTask) {
|
||||
}
|
||||
|
||||
NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
|
||||
NWC24Err result;
|
||||
DlTaskListHeader* entriesHeader;
|
||||
NWC24Work* work;
|
||||
u16 taskId;
|
||||
u16 maxTaskCount;
|
||||
DlTaskListHeader* header;
|
||||
DlTaskListHeader* entriesHeader;
|
||||
NWC24Err result;
|
||||
|
||||
if (NWC24WorkP != NULL) {
|
||||
header = (DlTaskListHeader*)NWC24WorkP->dlHead;
|
||||
@@ -580,7 +584,7 @@ NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
|
||||
}
|
||||
|
||||
entriesHeader = (DlTaskListHeader*)work->dlHead;
|
||||
do {
|
||||
while (taskId < (work == NULL ? (DlTaskListHeader*)NULL : entriesHeader)->maxTaskCount) {
|
||||
header = work != NULL ? entriesHeader : NULL;
|
||||
if (taskId >= header->maxTaskCount || taskId == 0xffff) {
|
||||
result = NWC24_ERR_INVALID_VALUE;
|
||||
@@ -594,20 +598,20 @@ NWC24Err NWC24IterateDlTask(NWC24DlId* dlIterateId, BOOL begin) {
|
||||
return NWC24_OK;
|
||||
}
|
||||
taskId++;
|
||||
} while (taskId < (work != NULL ? entriesHeader : (DlTaskListHeader*)NULL)->maxTaskCount);
|
||||
}
|
||||
return NWC24_ERR_DONE;
|
||||
}
|
||||
|
||||
NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIterateId) {
|
||||
DlTaskIterationState* state = (DlTaskIterationState*)dlIterateWork;
|
||||
s32 (*getValue)(NWC24DlId);
|
||||
NWC24DlId taskId;
|
||||
s32 value;
|
||||
BOOL descending;
|
||||
BOOL passesSelected;
|
||||
BOOL bestCandidate;
|
||||
NWC24Err result;
|
||||
BOOL found = FALSE;
|
||||
s32 (*getValue)(NWC24DlId);
|
||||
NWC24Err result;
|
||||
|
||||
if (state->valid == 0) {
|
||||
return NWC24_ERR_INVALID_VALUE;
|
||||
@@ -635,8 +639,8 @@ NWC24Err NWC24IterateDlTaskEx(NWC24DlIterateWork* dlIterateWork, NWC24DlId* dlIt
|
||||
if (value == state->comparisonValue && (s32)state->comparisonId < (s32)taskId) {
|
||||
*dlIterateId = taskId;
|
||||
state->comparisonValue = value;
|
||||
state->selectedValue = value;
|
||||
state->comparisonId = taskId;
|
||||
state->selectedValue = value;
|
||||
return NWC24_OK;
|
||||
}
|
||||
result = NWC24IterateDlTask(&taskId, FALSE);
|
||||
@@ -714,6 +718,16 @@ static inline NWC24Err CheckDlTaskRetry(NWC24DlTask* dlTask, u8 retryCount) {
|
||||
if ((retryMask & (1 << retryCount)) == 0) { return NWC24_ERR_DISABLED; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
static inline NWC24Err UpdateDlTaskAccessTime(NWC24DlTask* dlTask) {
|
||||
OSTime universalTime;
|
||||
NWC24Err result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result >= NWC24_OK) {
|
||||
result = SetDlTaskAccessTime(dlTask, universalTime);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
DlTaskListHeader* header;
|
||||
@@ -725,11 +739,7 @@ NWC24Err NWC24UpdateDlTask(NWC24DlTask* dlTask) {
|
||||
if (result != NWC24_OK) { return result; }
|
||||
taskId = task->id;
|
||||
if (taskId == 0xffff || taskId >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
|
||||
result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result >= NWC24_OK) {
|
||||
result = SetDlTaskAccessTime(dlTask, universalTime);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
}
|
||||
result = UpdateDlTaskAccessTime(dlTask);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
result = ValidateDlTask(dlTask, TRUE);
|
||||
if (result == NWC24_OK) {
|
||||
@@ -778,23 +788,26 @@ NWC24Err NWC24AddDlTask(NWC24DlTask* dlTask) {
|
||||
result = CheckDlTaskListHeader(header);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
result = AddTaskInternal(dlTask, GetCachedDlHeader()->taskCount, GetCachedDlHeader()->maxTaskCount);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
universalTime = 0;
|
||||
result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
{
|
||||
s32 intervalSeconds;
|
||||
s64 nextTime;
|
||||
intervalSeconds = ((DlTaskData*)dlTask)->interval * 60;
|
||||
nextTime = universalTime + intervalSeconds;
|
||||
return SetDlTaskNextTime(dlTask, nextTime);
|
||||
if (result >= NWC24_OK) {
|
||||
universalTime = 0;
|
||||
result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
{
|
||||
s32 intervalSeconds;
|
||||
s64 nextTime;
|
||||
intervalSeconds = ((DlTaskData*)dlTask)->interval * 60;
|
||||
nextTime = universalTime + intervalSeconds;
|
||||
return SetDlTaskNextTime(dlTask, nextTime);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
NWC24Err NWC24GetDlTask(NWC24DlTask* dlTask, NWC24DlId dlId) {
|
||||
DlTaskListHeader* header;
|
||||
NWC24File file;
|
||||
DlTaskData* task = (DlTaskData*)dlTask;
|
||||
NWC24Err result;
|
||||
NWC24Err operationResult;
|
||||
|
||||
@@ -847,7 +860,7 @@ NWC24Err NWC24GetDlTask(NWC24DlTask* dlTask, NWC24DlId dlId) {
|
||||
if (operationResult < NWC24_OK) {
|
||||
result = operationResult;
|
||||
} else {
|
||||
operationResult = NWC24FRead(dlTask, 0x200, &file);
|
||||
operationResult = NWC24FRead(task, 0x200, &file);
|
||||
result = NWC24_OK;
|
||||
if (operationResult < NWC24_OK) {
|
||||
result = operationResult;
|
||||
@@ -879,17 +892,13 @@ NWC24Err NWC24PurgeOldestDlTask() {
|
||||
state.initialized = 1;
|
||||
state.valid = 1;
|
||||
|
||||
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
|
||||
while (result == NWC24_OK) {
|
||||
while ((result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId)) == NWC24_OK) {
|
||||
header = GetCachedDlHeader();
|
||||
if (taskId >= header->taskCount) { break; }
|
||||
result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId);
|
||||
}
|
||||
|
||||
if (result == NWC24_ERR_DONE) {
|
||||
return NWC24_ERR_FAILED;
|
||||
}
|
||||
if (result < NWC24_OK) {
|
||||
if (result == NWC24_ERR_DONE) { result = NWC24_ERR_FAILED; }
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1014,9 +1023,7 @@ NWC24Err NWC24ExtendDlTaskList(u32 num) {
|
||||
result = WriteDlHeader(&file);
|
||||
closeList:
|
||||
closeResult = NWC24FClose(&file);
|
||||
if (result != NWC24_OK) {
|
||||
closeResult = result;
|
||||
}
|
||||
closeResult = result != NWC24_OK ? result : closeResult;
|
||||
result = NWC24iLoadDlHeader();
|
||||
if (closeResult != NWC24_OK) {
|
||||
result = closeResult;
|
||||
@@ -1215,13 +1222,16 @@ static inline NWC24Err ValidateDlTaskUrl(NWC24DlTask* dlTask) {
|
||||
DlTaskListHeader* header = GetCachedDlHeader();
|
||||
NWC24Err result;
|
||||
if (task->id >= header->maxTaskCount && task->id != 0xffff) { return NWC24_ERR_INVALID_VALUE; }
|
||||
result = NWC24iCheckStringLength(task->url, 7, 0x100);
|
||||
if (result >= NWC24_OK) {
|
||||
if (strncmp(task->url, "http://", 7) != 0 && strncmp(task->url, "https://", 8) != 0) { result = NWC24_ERR_FORMAT; }
|
||||
else { result = NWC24_OK; }
|
||||
{
|
||||
const char* url = task->url;
|
||||
result = NWC24iCheckStringLength(url, 7, 0x100);
|
||||
if (result >= NWC24_OK) {
|
||||
if (strncmp(url, "http://", 7) != 0 && strncmp(url, "https://", 8) != 0) { result = NWC24_ERR_FORMAT; }
|
||||
else { result = NWC24_OK; }
|
||||
}
|
||||
if (result < NWC24_OK) { return result; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
if (result < NWC24_OK) { return result; }
|
||||
return NWC24_OK;
|
||||
}
|
||||
|
||||
static inline NWC24Err FindFreeDlTask(NWC24DlTask* dlTask, u16 taskCount, u16 maxTaskCount) {
|
||||
@@ -1251,11 +1261,7 @@ static inline NWC24Err UpdateDlTaskInline(NWC24DlTask* dlTask) {
|
||||
if (result != NWC24_OK) { return result; }
|
||||
taskId = task->id;
|
||||
if (taskId == 0xffff || taskId >= GetCachedDlHeader()->maxTaskCount) { return NWC24_ERR_INVALID_VALUE; }
|
||||
result = NWC24iGetUniversalTime(&universalTime);
|
||||
if (result >= NWC24_OK) {
|
||||
result = SetDlTaskAccessTime(dlTask, universalTime);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
}
|
||||
result = UpdateDlTaskAccessTime(dlTask);
|
||||
if (result < NWC24_OK) { return result; }
|
||||
result = ValidateDlTask(dlTask, TRUE);
|
||||
if (result == NWC24_OK) {
|
||||
@@ -1263,9 +1269,7 @@ static inline NWC24Err UpdateDlTaskInline(NWC24DlTask* dlTask) {
|
||||
task->unknown_0x1a = 0;
|
||||
}
|
||||
if (task->retryEnabled == 1) {
|
||||
for (;;) {
|
||||
result = CheckDlTaskRetry(dlTask, task->retryCount);
|
||||
if (result != NWC24_ERR_DISABLED) { break; }
|
||||
while ((result = CheckDlTaskRetry(dlTask, task->retryCount)) == NWC24_ERR_DISABLED) {
|
||||
task->retryCount = (task->retryCount + 1) & 0x1f;
|
||||
}
|
||||
if (result < NWC24_OK) { return result; }
|
||||
|
||||
208
sol-high-attempts.jsonl
Normal file
208
sol-high-attempts.jsonl
Normal file
File diff suppressed because one or more lines are too long
47
sol-high-results.txt
Normal file
47
sol-high-results.txt
Normal file
@@ -0,0 +1,47 @@
|
||||
Final matching audit
|
||||
|
||||
src/scene/sdChannelSelect/iplSDChannelSelect: exact 114/129 -> 116/129; objdiff code 25472 -> 26472/33828; data 224 -> 224/2960
|
||||
|
||||
create__Q33ipl5scene15SDChannelSelectFv | objdiff 97.73972% | 145/146 instructions; BS2 loop uses different retained manager/string bases | 7 distinct source attempts, 6 compiled
|
||||
handleSDTitleListResult__Q33ipl5scene15SDChannelSelectFv | objdiff 99.15205% | 170/171 instructions; timer branch form and loop register selection | 5 distinct source attempts, 5 compiled
|
||||
collectTitlesByUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.81188% | 101/101 instructions; count increment and threshold loads scheduled differently | 7 distinct source attempts, 7 compiled
|
||||
collectTitlesFromNandUsage__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.833336% | 102/102 instructions; count increment and threshold loads scheduled differently | 7 distinct source attempts, 7 compiled
|
||||
collectTitlesByChannelOrder__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.29365% | 126/126 instructions; title registers, indexed operand order, threshold-load scheduling | 7 distinct source attempts, 7 compiled
|
||||
collectTitlesBySpecialChannels__Q33ipl5scene15SDChannelSelectFPClPClPUxPcPUl | objdiff 97.55125% | 361/361 instructions; four count-increment/threshold-load schedules | 7 distinct source attempts, 7 compiled
|
||||
flushSaveDataAndMountSD__Q33ipl5scene15SDChannelSelectFv | objdiff 99.65714% | 35/35 instructions; heap and save-manager loads occur in reversed order | 3 distinct source attempts, 3 compiled
|
||||
calcCommon__Q33ipl5scene15SDChannelSelectFv | objdiff 99.07407% | 109/108 instructions; target omits setup of the second event-handler argument | 3 distinct source attempts, 3 compiled
|
||||
drawChannelTransitionObjects__Q33ipl5scene15SDChannelSelectFv | objdiff 95.35849% | 153/159 instructions; state-range branches, switch lowering, and register selection | 7 distinct source attempts, 7 compiled
|
||||
initializeNormalPage__Q33ipl5scene15SDChannelSelectFv | objdiff 98.93617% | 95/94 instructions; target omits setup of the second event-handler argument | 3 distinct source attempts, 3 compiled
|
||||
selectChannel__Q33ipl5scene15SDChannelSelectFii | objdiff 98.305084% | 60/59 instructions; target omits setup of the second event-handler argument | 3 distinct source attempts, 3 compiled
|
||||
setChannelScissor__Q33ipl5scene15SDChannelSelectCFPCQ33ipl5scene12SDChannelObj | objdiff 93.4721% | 233/233 instructions; floating-point evaluation order and register allocation | 3 distinct source attempts, 3 compiled
|
||||
onEventDerived__Q43ipl5scene32@unnamed@iplSDChannelSelect_cpp@33SDChannelSelectButtonEventHandlerFUlUlPCQ33ipl10controller9Interface | objdiff 98.541664% | 144/144 instructions; event branch form and opt-out argument setup | 6 distinct source attempts, 4 compiled
|
||||
|
||||
src/keyboard/tiCandidateBox: exact 103/112 -> 104/112; objdiff code 17212 -> 17996/24000; data 1132 -> 1132/4652
|
||||
|
||||
create__Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | objdiff 92.71023% | 351/352 instructions; inlined initialization loop and retained pane-name addresses | 4 distinct source attempts, 4 compiled
|
||||
createAnmPane___Q39textinput12candidatebox12LayoutByNW4RFP12MEMAllocator | objdiff 96.56481% | 214/216 instructions; inlined constructor/vtable lifetime and register selection | 3 distinct source attempts, 3 compiled
|
||||
CalcPaneLocate___Q39textinput12candidatebox10UITextAreaFv | objdiff 99.78161% | 435/435 instructions; 18 floating-point register differences | 7 distinct source attempts, 7 compiled
|
||||
GetNextPageIdx___Q39textinput12candidatebox10UITextAreaCFl | objdiff 100.0% | 130/130 instructions; eight unresolved SDA21 base-register fields; C conversion left 12 register differences and was restored to preserve baseline objdiff 100% | 10 distinct source attempts, 10 compiled
|
||||
GetPrevPageIdx___Q39textinput12candidatebox10UITextAreaCFl | objdiff 99.57365% | 129/129 instructions; 11 floating-point register differences | 11 distinct source attempts, 11 compiled
|
||||
StartScroll__Q39textinput12candidatebox10UITextAreaFl | objdiff 99.78378% | 185/185 instructions; eight floating-point register differences | 12 distinct source attempts, 12 compiled
|
||||
StartScrollToIdx__Q39textinput12candidatebox10UITextAreaFl | objdiff 99.809784% | 184/184 instructions; seven floating-point register differences | 12 distinct source attempts, 12 compiled
|
||||
onGUIEvent__Q39textinput12candidatebox10UITextAreaFRQ39textinput3gui13PaneComponentUlPQ49textinput11nw4rmanager14TiEventHandler5Input | objdiff 100.0% | 450/450 instructions; objdiff 100%; gate misnormalizes two CR1 branches using the CR operand instead of the branch destination | 3 distinct source attempts, 3 compiled
|
||||
|
||||
src/keyboard/tiCellPhone: exact 83/86 -> 83/86; objdiff code 12824 -> 12824/19028; data 3860 -> 3860/3860
|
||||
|
||||
onKey__Q49textinput8keyboard13cellphonetype4BaseFUlPv | objdiff 99.67009% | 682/682 instructions; 37 register differences across inlined lookup scopes | 7 distinct source attempts, 7 compiled
|
||||
create__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFP12MEMAllocator | objdiff 99.8949% | 333/333 instructions; seven register differences in the toggle animation loop | 10 distinct source attempts, 9 compiled
|
||||
init__Q49textinput8keyboard13cellphonetype12LayoutByNW4RFv | objdiff 98.52612% | 536/536 instructions; 155 register differences; same frame and operation sequence; no tested lifetime/declaration change fixed allocation | 6 distinct source attempts, 6 compiled
|
||||
|
||||
Open-function audit: 24 functions; minimum 3 source attempts each.
|
||||
No shared keyboard headers were edited. No configuration or target symbol sizes were edited.
|
||||
The 83/86 CellPhone instruction-exact count did not improve. Its create fuzzy score improved from 99.81982% to 99.8949%.
|
||||
CandidateBox has two objdiff-100 functions excluded by the raw instruction gate: GetNextPageIdx and onGUIEvent. Raw relocation fields and CR1 branch normalization account for that discrepancy; no gate tools were changed.
|
||||
String pools remain identical. Object data percentages are partial in SDChannelSelect and CandidateBox; this run does not claim unit completion.
|
||||
Writing skill applied: unslop.
|
||||
|
||||
Final full gate: GATE PASS
|
||||
Regressions vs baseline: 0
|
||||
Forbidden patterns: 0
|
||||
Readability warnings: 0
|
||||
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d
|
||||
@@ -63,7 +63,7 @@ BOOL AbortFlag = FALSE;
|
||||
volatile int lbl_81698A44 = 0;
|
||||
volatile int lbl_81698A48 = 0;
|
||||
volatile int lbl_81698A4C = 0;
|
||||
u32 lbl_81698A50 = 0;
|
||||
vu32 lbl_81698A50 = 0;
|
||||
u32 lbl_81698A54 = 0;
|
||||
u32 lbl_81698A58 = 0;
|
||||
u32 lbl_81698A5C = 0;
|
||||
@@ -83,17 +83,17 @@ u32 lbl_81698A9C = 0;
|
||||
u64 lbl_81698AA0 = 0;
|
||||
u32 lbl_81698AA8 = 0;
|
||||
u32 lbl_81698AAC = 0;
|
||||
u32 lbl_81698AB0 = 0;
|
||||
u32 lbl_81698AB4 = 0;
|
||||
vu32 lbl_81698AB0 = 0;
|
||||
vu32 lbl_81698AB4 = 0;
|
||||
u8 *lbl_81698AB8 = NULL;
|
||||
NANDFileInfo *lbl_81698ABC = NULL;
|
||||
u32 lbl_81698AC0 = 0;
|
||||
NANDCallback lbl_81698AC4 = NULL;
|
||||
vu32 lbl_81698AC0 = 0;
|
||||
volatile NANDCallback lbl_81698AC4 = NULL;
|
||||
u32 lbl_81698AC8 = 0;
|
||||
u32 lbl_81698ACC = 0;
|
||||
vu32 lbl_81698ACC = 0;
|
||||
u32 lbl_81698AD0 = 0;
|
||||
u32 lbl_81698AD4 = 0;
|
||||
u32 lbl_81698AD8 = 0;
|
||||
vu32 lbl_81698AD4 = 0;
|
||||
vu32 lbl_81698AD8 = 0;
|
||||
vu32 lbl_81698ADC = 0;
|
||||
vu32 lbl_81698AE0 = 0;
|
||||
u32 *lbl_81698AE4 = 0;
|
||||
@@ -1045,8 +1045,8 @@ void BS2NANDDivideCallback(s32 result, NANDCommandBlock *block) {
|
||||
} else if (result < 0) {
|
||||
NandCompletion(result, block);
|
||||
} else {
|
||||
NandTransferred = NandTransferred + result;
|
||||
NandBuffer = NandBuffer + result;
|
||||
NandBuffer += result;
|
||||
NandTransferred += result;
|
||||
if (NandLength - NandTransferred > 0x40000) {
|
||||
if (NandOperation == 1) {
|
||||
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, 0x40000);
|
||||
@@ -1059,7 +1059,7 @@ void BS2NANDDivideCallback(s32 result, NANDCommandBlock *block) {
|
||||
NandCompletion(ret, block);
|
||||
}
|
||||
} else {
|
||||
if (NandLength != NandTransferred) {
|
||||
if (NandLength - NandTransferred != 0) {
|
||||
if (NandOperation == 1) {
|
||||
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, NandLength - NandTransferred);
|
||||
ret = NANDWriteAsync(NandFile, (void *)NandBuffer, NandLength - NandTransferred, BS2NANDDivideCallback, block);
|
||||
@@ -1084,17 +1084,12 @@ void BS2NANDDivideReadAsync(NANDFileInfo *info, void *buffer, u32 length, NANDCa
|
||||
NandTransferred = 0;
|
||||
NandFile = info;
|
||||
NandBuffer = (u8 *)buffer;
|
||||
switch (NandLength > 0x40000) {
|
||||
default: {
|
||||
if (NandLength > 0x40000) {
|
||||
BS2Report("NANDReadAsync buf:0x%08X, length:0x%08X\n", NandBuffer, 0x40000);
|
||||
NANDReadAsync(NandFile, (void *)NandBuffer, 0x40000, BS2NANDDivideCallback, block);
|
||||
break;
|
||||
}
|
||||
case 0: {
|
||||
} else {
|
||||
BS2Report("NANDReadAsync buf:0x%08X, length:0x%08X\n", NandBuffer, NandLength);
|
||||
NANDReadAsync(NandFile, (void *)NandBuffer, NandLength, BS2NANDDivideCallback, block);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1105,17 +1100,12 @@ void BS2NANDDivideWriteAsync(NANDFileInfo *info, const void *buffer, u32 length,
|
||||
NandTransferred = 0;
|
||||
NandFile = info;
|
||||
NandBuffer = (u8 *)buffer;
|
||||
switch (NandLength > 0x40000) {
|
||||
default: {
|
||||
if (NandLength > 0x40000) {
|
||||
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, 0x40000);
|
||||
NANDWriteAsync(NandFile, (void *)NandBuffer, 0x40000, BS2NANDDivideCallback, block);
|
||||
break;
|
||||
}
|
||||
case 0: {
|
||||
} else {
|
||||
BS2Report("NANDWriteAsync buf:0x%08X, length:0x%08X\n", NandBuffer, NandLength);
|
||||
NANDWriteAsync(NandFile, (void *)NandBuffer, NandLength, BS2NANDDivideCallback, block);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1202,8 +1192,8 @@ BOOL CheckBS2CommandStatus() {
|
||||
if (BS2BootCaching != 0) {
|
||||
BS2Report("Write partition ifno\n");
|
||||
NandPending = 1;
|
||||
CacheCommandComplete = 1;
|
||||
CacheLength += OSRoundUp32B(((DVDGameTOC *)DataToc)->partitionCount * sizeof(DVDPartitionInfo)) + 32;
|
||||
CacheCommandComplete = 1;
|
||||
if ((unsigned int)CacheLength > 0xb00000) {
|
||||
BS2NANDCallback(-1, NULL);
|
||||
return 1;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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"
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#define TI_CANDIDATEBOX_IMPLEMENTATION
|
||||
#include "keyboard/tiCandidateBox.h"
|
||||
|
||||
#include "keyboard/tiManager.h"
|
||||
@@ -407,8 +408,9 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void LayoutByNW4R::createAnmPane_(MEMAllocator* allocator) {
|
||||
CandidateTextAnmPane* pane;
|
||||
for (u16 i = 0; i < ARRAY_LENGTH(lbl_8165D2F8.panes); i++) {
|
||||
CandidateTextAnmPane* pane = NULL;
|
||||
pane = NULL;
|
||||
const PaneToAnimation& p = lbl_8165D2F8.panes[i];
|
||||
switch (p.type) {
|
||||
case KT_ScrollButton: {
|
||||
@@ -1052,9 +1054,11 @@ namespace textinput {
|
||||
f32 fontSizeWidth = pTextBox->GetFontSize().width;
|
||||
f32 charSpace = pTextBox->GetCharSpace();
|
||||
f32 acc = 0.0f;
|
||||
for (int i = 0; text[i] != L'\0'; i++) {
|
||||
const wchar_t* character = text;
|
||||
while (*character != L'\0') {
|
||||
acc += charSpace;
|
||||
acc += f->GetCharWidth(text[i]);
|
||||
acc += f->GetCharWidth(*character);
|
||||
++character;
|
||||
}
|
||||
return acc * (fontSizeWidth / f->GetWidth()) + 0.01f;
|
||||
}
|
||||
@@ -1237,7 +1241,7 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void UITextArea::Draw(const nw4r::lyt::DrawInfo& drawInfo) {
|
||||
// NONMATCHING
|
||||
textdrawer::Base::ViewPort viewport;
|
||||
s32 selected = GetSelectedPaneIdx();
|
||||
if (!IsScrolling()) {
|
||||
for (u32 i = 0; i < NUM_PANES; i++) {
|
||||
@@ -1247,31 +1251,26 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
struct {
|
||||
f32 left;
|
||||
f32 width;
|
||||
} scissor;
|
||||
nw4r::ut::Rect r = mpTextAreaPane->getPane()->GetPaneRect(drawInfo);
|
||||
// TODO - These vectors are zero-initialized using GPRs first...
|
||||
Vec v1 = {0, 0, 0};
|
||||
Vec v2 = {0, 0, 0};
|
||||
v1.x = r.left;
|
||||
v1.y = r.top;
|
||||
Vec v2 = {0, 0, 0};
|
||||
v2.x = r.right;
|
||||
v2.y = r.bottom;
|
||||
MTXMultVec(mpTextAreaPane->getTextPane()->GetGlobalMtx(), &v1, &v1);
|
||||
MTXMultVec(mpTextAreaPane->getTextPane()->GetGlobalMtx(), &v2, &v2);
|
||||
u32 left, top, wd, ht;
|
||||
GXGetScissor(&left, &top, &wd, &ht);
|
||||
// TODO - These floats need to be stored to the stack
|
||||
f32 scale = 640.0f / mfScreenWidth;
|
||||
scissor.left = v1.x + mfScreenWidth / 2.0f;
|
||||
scissor.left += scissor.left * (scale - 1.0f);
|
||||
scissor.width = scale * (v2.x - v1.x);
|
||||
GXSetScissor(scissor.left, top, scissor.width, ht);
|
||||
viewport.xOrig = v1.x + mfScreenWidth / 2.0f;
|
||||
viewport.xOrig += viewport.xOrig * (scale - 1.0f);
|
||||
viewport.wd = scale * (v2.x - v1.x);
|
||||
GXSetScissor(viewport.xOrig, top, viewport.wd, ht);
|
||||
mpTextsPane->getPane()->Draw(drawInfo);
|
||||
if (!IsScrolling()) {
|
||||
GXSetScissor(left, top, (scissor.width + scissor.left) - left, ht);
|
||||
GXSetScissor(left, top, (viewport.wd + viewport.xOrig) - left, ht);
|
||||
for (u32 i = 0; i < NUM_PANES; i++) {
|
||||
if (i == selected || mpTextAnmPane[i]->getState() == ANM_FocusOut) {
|
||||
mpTextBoxPane[i]->getPane()->SetVisible(true);
|
||||
@@ -1282,153 +1281,28 @@ namespace textinput {
|
||||
GXSetScissor(left, top, wd, ht);
|
||||
}
|
||||
|
||||
extern "C" asm void GetNextPageIdx___Q39textinput12candidatebox10UITextAreaCFl() {
|
||||
nofralloc
|
||||
stwu r1, -0xc0(r1)
|
||||
mflr r0
|
||||
stw r0, 0xc4(r1)
|
||||
stfd f31, 0xb0(r1)
|
||||
psq_st f31, 0xb8(r1), 0, 0
|
||||
stfd f30, 0xa0(r1)
|
||||
psq_st f30, 0xa8(r1), 0, 0
|
||||
stfd f29, 0x90(r1)
|
||||
psq_st f29, 0x98(r1), 0, 0
|
||||
stfd f28, 0x80(r1)
|
||||
psq_st f28, 0x88(r1), 0, 0
|
||||
stfd f27, 0x70(r1)
|
||||
psq_st f27, 0x78(r1), 0, 0
|
||||
stfd f26, 0x60(r1)
|
||||
psq_st f26, 0x68(r1), 0, 0
|
||||
stfd f25, 0x50(r1)
|
||||
psq_st f25, 0x58(r1), 0, 0
|
||||
stfd f24, 0x40(r1)
|
||||
psq_st f24, 0x48(r1), 0, 0
|
||||
stfd f23, 0x30(r1)
|
||||
psq_st f23, 0x38(r1), 0, 0
|
||||
addi r11, r1, 0x30
|
||||
bl _savegpr_24
|
||||
lfs f0, lbl_81694DA8(r2)
|
||||
mr r24, r3
|
||||
lfs f1, 0x1fc(r3)
|
||||
mr r25, r4
|
||||
lwz r5, 0xd8(r3)
|
||||
fdivs f25, f0, f1
|
||||
lfs f0, lbl_81694DB4(r2)
|
||||
lwz r5, 0x9c(r5)
|
||||
lwz r3, 0x38(r3)
|
||||
lfs f31, 0x4c(r5)
|
||||
lwz r27, 0x9c(r3)
|
||||
fcmpo cr0, f1, f0
|
||||
ble GetNextPageIdx_L1
|
||||
lfs f28, lbl_81694DAC(r2)
|
||||
b GetNextPageIdx_L2
|
||||
GetNextPageIdx_L1:
|
||||
lfs f28, lbl_81694DB0(r2)
|
||||
GetNextPageIdx_L2:
|
||||
fneg f23, f28
|
||||
lfd f29, lbl_81694DC8(r2)
|
||||
lfs f30, lbl_81694DBC(r2)
|
||||
mr r26, r25
|
||||
slwi r28, r4, 7
|
||||
lis r31, 0x4330
|
||||
b GetNextPageIdx_L3
|
||||
GetNextPageIdx_L4:
|
||||
lwz r0, 0x1e8(r24)
|
||||
cmpw r26, r0
|
||||
bne GetNextPageIdx_L5
|
||||
li r3, -1
|
||||
b GetNextPageIdx_L6
|
||||
GetNextPageIdx_L5:
|
||||
lwz r0, 0x204(r24)
|
||||
add r0, r0, r28
|
||||
addic. r30, r0, 4
|
||||
bne GetNextPageIdx_L7
|
||||
lfs f0, lbl_81694D90(r2)
|
||||
b GetNextPageIdx_L8
|
||||
GetNextPageIdx_L7:
|
||||
mr r3, r27
|
||||
bl GetFont__Q34nw4r3lyt8TextBoxCFv
|
||||
lfs f26, 0xe4(r27)
|
||||
mr r29, r3
|
||||
lfs f24, 0xf0(r27)
|
||||
lfs f27, lbl_81694D90(r2)
|
||||
b GetNextPageIdx_L9
|
||||
GetNextPageIdx_L10:
|
||||
lwz r12, 0(r29)
|
||||
fadds f27, f27, f24
|
||||
mr r3, r29
|
||||
lwz r12, 0x48(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
xoris r0, r3, 0x8000
|
||||
stw r31, 8(r1)
|
||||
addi r30, r30, 2
|
||||
stw r0, 0xc(r1)
|
||||
lfd f0, 8(r1)
|
||||
fsubs f0, f0, f29
|
||||
fadds f27, f27, f0
|
||||
GetNextPageIdx_L9:
|
||||
lhz r4, 0(r30)
|
||||
cmpwi r4, 0
|
||||
bne GetNextPageIdx_L10
|
||||
lwz r12, 0(r29)
|
||||
mr r3, r29
|
||||
lwz r12, 0xc(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
xoris r0, r3, 0x8000
|
||||
stw r31, 8(r1)
|
||||
stw r0, 0xc(r1)
|
||||
lfd f0, 8(r1)
|
||||
fsubs f0, f0, f29
|
||||
fdivs f0, f26, f0
|
||||
fmuls f0, f27, f0
|
||||
fadds f0, f30, f0
|
||||
GetNextPageIdx_L8:
|
||||
fmuls f0, f0, f25
|
||||
addi r28, r28, 0x80
|
||||
addi r26, r26, 1
|
||||
fadds f0, f28, f0
|
||||
fadds f23, f23, f0
|
||||
GetNextPageIdx_L3:
|
||||
fcmpo cr0, f23, f31
|
||||
cror 2, 0, 2
|
||||
beq GetNextPageIdx_L4
|
||||
addi r0, r26, -1
|
||||
cmpw r0, r25
|
||||
bne GetNextPageIdx_L11
|
||||
addi r26, r26, 1
|
||||
GetNextPageIdx_L11:
|
||||
addi r3, r26, -1
|
||||
GetNextPageIdx_L6:
|
||||
psq_l f31, 0xb8(r1), 0, 0
|
||||
lfd f31, 0xb0(r1)
|
||||
psq_l f30, 0xa8(r1), 0, 0
|
||||
lfd f30, 0xa0(r1)
|
||||
psq_l f29, 0x98(r1), 0, 0
|
||||
lfd f29, 0x90(r1)
|
||||
psq_l f28, 0x88(r1), 0, 0
|
||||
lfd f28, 0x80(r1)
|
||||
psq_l f27, 0x78(r1), 0, 0
|
||||
lfd f27, 0x70(r1)
|
||||
psq_l f26, 0x68(r1), 0, 0
|
||||
lfd f26, 0x60(r1)
|
||||
psq_l f25, 0x58(r1), 0, 0
|
||||
lfd f25, 0x50(r1)
|
||||
psq_l f24, 0x48(r1), 0, 0
|
||||
lfd f24, 0x40(r1)
|
||||
psq_l f23, 0x38(r1), 0, 0
|
||||
addi r11, r1, 0x30
|
||||
lfd f23, 0x30(r1)
|
||||
bl _restgpr_24
|
||||
lwz r0, 0xc4(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0xc0
|
||||
blr
|
||||
s32 UITextArea::GetNextPageIdx_(s32 idx) const {
|
||||
f32 areaPaneWidth = mpTextAreaPane->getPane()->GetSize().width;
|
||||
nw4r::lyt::TextBox* textBox = mpTextBoxPane[0]->getTextPane();
|
||||
f32 widthScale = GetWidthScale_();
|
||||
f32 margin = GetMargin_();
|
||||
f32 xOffset = -margin;
|
||||
s32 candidateIndex = idx;
|
||||
while (xOffset <= areaPaneWidth) {
|
||||
if (candidateIndex == mnCandidateNum) {
|
||||
return -1;
|
||||
}
|
||||
f32 textWidth = calcStringWidth(mpCandidates->szwcPredicted[candidateIndex], textBox);
|
||||
xOffset += margin + textWidth * widthScale;
|
||||
++candidateIndex;
|
||||
}
|
||||
if (candidateIndex - 1 == idx) {
|
||||
++candidateIndex;
|
||||
}
|
||||
return candidateIndex - 1;
|
||||
}
|
||||
|
||||
s32 UITextArea::GetPrevPageIdx_(s32 idx) const {
|
||||
// NONMATCHING - only regswaps, hopefully
|
||||
f32 areaPaneWidth = mpTextAreaPane->getPane()->GetSize().width;
|
||||
|
||||
nw4r::lyt::TextBox* textBox = mpTextBoxPane[0]->getTextPane();
|
||||
@@ -1452,7 +1326,6 @@ namespace textinput {
|
||||
}
|
||||
|
||||
void UITextArea::StartScroll(s32 steps) {
|
||||
// NONMATCHING - only regswaps, hopefully
|
||||
f32 acc = 0.0f;
|
||||
f32 widthScale = GetWidthScale_();
|
||||
f32 margin = GetMargin_();
|
||||
@@ -1470,7 +1343,7 @@ namespace textinput {
|
||||
}
|
||||
}
|
||||
|
||||
mScrollAnimation.startAnm(this, 0.0f, -acc, 15.0f, this);
|
||||
mScrollAnimation.startAnm(this, 0.0f, -acc, 15.0f, reinterpret_cast<void*>(steps));
|
||||
}
|
||||
|
||||
void UITextArea::StartScrollToIdx(s32 idx) {
|
||||
|
||||
@@ -606,8 +606,9 @@ namespace textinput {
|
||||
CellPhoneAnmPane* pane = new (MEMAllocFromAllocator(allocator, sizeof(CellPhoneAnmPane)))
|
||||
CellPhoneAnmPane(getPane(csPaneNameNormalAnimationKey[i].name), NULL);
|
||||
nw4r::ut::List_Append(&mAnmPanes, pane);
|
||||
const char* animationKey;
|
||||
const PaneNameToAnimationKey& paneName = csPaneNameNormalAnimationKey[i];
|
||||
const char* animationKey = paneName.animationKey;
|
||||
animationKey = paneName.animationKey;
|
||||
|
||||
for (u16 j = 0; j < 5; ++j) {
|
||||
void* resource = mpMultiArcResourceAccessor->GetResource(0, csAninationFileForControlKey[j].filename);
|
||||
|
||||
@@ -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,6 +526,9 @@ extern const u8 controlKeys[];
|
||||
return false;
|
||||
}
|
||||
|
||||
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,
|
||||
@@ -639,16 +640,16 @@ const u8 controlKeys[] = {
|
||||
nofralloc
|
||||
cmpwi r4, 2
|
||||
bne setLanguage_L1
|
||||
lis r4, lbl_81616BD8@ha
|
||||
lis r4, scCountryMap_EU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, lbl_81616BD8@l
|
||||
addi r4, r4, scCountryMap_EU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
setLanguage_L1:
|
||||
lis r4, lbl_81616BE4@ha
|
||||
lis r4, scCountryMap_NonEU@ha
|
||||
lis r3, sInstance__Q39textinput5input10HKBManager@ha
|
||||
addi r4, r4, lbl_81616BE4@l
|
||||
addi r4, r4, scCountryMap_NonEU@l
|
||||
lbzx r4, r4, r5
|
||||
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
|
||||
b SetCountry__Q39textinput5input10HKBManagerFUc
|
||||
|
||||
@@ -284,122 +284,12 @@ void Base::inputCharDefault_(wchar_t character, u32 modifiers) {
|
||||
meScrollFlag = SF_ScrollOn;
|
||||
}
|
||||
|
||||
extern "C" asm void draw__Q39textinput9inputform12LayoutByNW4RFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x50(r1)
|
||||
mflr r0
|
||||
stw r0, 0x54(r1)
|
||||
stw r31, 0x4c(r1)
|
||||
stw r30, 0x48(r1)
|
||||
mr r30, r3
|
||||
addi r3, r3, 0x218
|
||||
bl draw__Q39textinput11nw4rmanager6LayoutFv
|
||||
lwz r12, 0x218(r30)
|
||||
addi r3, r30, 0x218
|
||||
lwz r12, 0x28(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r4, 0x10(r3)
|
||||
li r5, 1
|
||||
lwz r3, 0x21c(r30)
|
||||
lbz r0, 0xcd(r4)
|
||||
lwz r4, 0x2c0(r30)
|
||||
stb r0, 0x1c8(r30)
|
||||
lwz r3, 0x10(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x3c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0x218(r30)
|
||||
mr r6, r3
|
||||
addi r3, r30, 0x218
|
||||
addi r4, r30, 0x130
|
||||
lwz r12, 0x70(r12)
|
||||
addi r5, r30, 0x230
|
||||
addi r6, r6, 0x84
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0x188(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
stw r3, 0x18(r1)
|
||||
addi r3, r30, 0x10
|
||||
lfs f2, 0x188(r30)
|
||||
stw r4, 0x1c(r1)
|
||||
lfs f1, 0x18(r1)
|
||||
bl SetCursor__Q34nw4r2ut10CharWriterFff
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0x188(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lfs f0, lbl_81694D28(r0)
|
||||
stw r3, 0x20(r1)
|
||||
stfs f0, 0x30(r1)
|
||||
stfs f0, 0x34(r1)
|
||||
stfs f0, 0x38(r1)
|
||||
stfs f0, 0x3c(r1)
|
||||
lwz r12, 0(r30)
|
||||
stw r3, 8(r1)
|
||||
mr r3, r30
|
||||
lwz r12, 0x184(r12)
|
||||
stw r4, 0x24(r1)
|
||||
stw r4, 0xc(r1)
|
||||
mtctr r12
|
||||
bctrl
|
||||
stw r3, 0x10(r1)
|
||||
lfs f1, 8(r1)
|
||||
stw r4, 0x14(r1)
|
||||
lfs f5, 0x10(r1)
|
||||
lfs f4, 0x14(r1)
|
||||
stfs f5, 0x30(r1)
|
||||
lfs f0, 0xc(r1)
|
||||
stfs f4, 0x3c(r1)
|
||||
lfs f3, 0x128(r30)
|
||||
lfs f2, 0x120(r30)
|
||||
stw r3, 0x28(r1)
|
||||
fsubs f2, f3, f2
|
||||
stw r4, 0x2c(r1)
|
||||
fmuls f1, f1, f2
|
||||
fadds f1, f5, f1
|
||||
stfs f1, 0x38(r1)
|
||||
lfs f2, 0x124(r30)
|
||||
lfs f1, 0x12c(r30)
|
||||
fsubs f1, f2, f1
|
||||
fmuls f0, f0, f1
|
||||
fadds f0, f4, f0
|
||||
stfs f0, 0x34(r1)
|
||||
lwz r3, 0x164(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x7c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0x5c(r30)
|
||||
mr r31, r3
|
||||
addi r3, r30, 0x10
|
||||
addi r4, r1, 0x30
|
||||
lwz r12, 0x20(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
mr r4, r31
|
||||
lwz r12, 0x174(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0x5c(r30)
|
||||
addi r3, r30, 0x10
|
||||
lwz r12, 0x24(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r0, 0x54(r1)
|
||||
lwz r31, 0x4c(r1)
|
||||
lwz r30, 0x48(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x50
|
||||
blr
|
||||
void LayoutByNW4R::draw() {
|
||||
nw4rmanager::Layout::draw();
|
||||
muGlobalAlpha = getLayout()->GetRootPane()->GetAlpha();
|
||||
nw4r::lyt::Pane* textBox = mpLayout->GetRootPane()->FindPaneByName(static_cast<const char*>(mpLayoutData), true);
|
||||
AdjustPaneMtx(mMtx.m, mDrawInfo, textBox->GetGlobalMtx());
|
||||
Base::draw();
|
||||
}
|
||||
void Base::calcCursorTimer() {
|
||||
muCursorTimer += 8;
|
||||
@@ -494,7 +384,6 @@ extern "C" const LanguagePaneData csLanguageDependencyDataCHN__Q29textinput9inpu
|
||||
|
||||
extern "C" const wchar_t pppURLCheck[2][10] = {L"http://", L"https://"};
|
||||
|
||||
extern "C" const u32 lbl_816152D0[4] = {0x00200000, 0, 0, 0};
|
||||
#pragma pop
|
||||
|
||||
extern "C" const f32 lbl_81694D28 = 0.0f;
|
||||
@@ -659,6 +548,7 @@ struct CharacterInput {
|
||||
u32 modifiers;
|
||||
bool keyboardMode;
|
||||
bool deadKey;
|
||||
u32 data;
|
||||
};
|
||||
|
||||
struct ConfirmInput {
|
||||
@@ -1046,17 +936,17 @@ void Base::onCommand(INPUT_COMMAND command, void* data) {
|
||||
mbPredictOn = enabled;
|
||||
if (meLanguage == KR) mpManager->getPCKeyboard()->refreshState();
|
||||
}
|
||||
tistring::Decolated::TranslateMode predictionFixedMode = mpString->getTranslateMode();
|
||||
const tistring::Decolated::TranslateMode predictionUnfixMode = mpUnfixString->getTranslateMode();
|
||||
s32 predictionFixedMode = mpString->getTranslateMode();
|
||||
s32 predictionUnfixMode = mpUnfixString->getTranslateMode();
|
||||
mpString->initKanaConverter();
|
||||
mpUnfixString->initKanaConverter();
|
||||
if (meLanguage == KR) {
|
||||
if (predictionFixedMode != tistring::Decolated::TM_Direct) predictionFixedMode = tistring::Decolated::TM_Hangul;
|
||||
} else if (meLanguage == CN) predictionFixedMode = tistring::Decolated::TM_Direct;
|
||||
mpString->getCursorPos();
|
||||
mpString->setTranslateMode(predictionFixedMode);
|
||||
mpString->setTranslateMode(static_cast<tistring::Decolated::TranslateMode>(predictionFixedMode));
|
||||
mpString->getCursorPos();
|
||||
mpUnfixString->setTranslateMode(predictionUnfixMode);
|
||||
mpUnfixString->setTranslateMode(static_cast<tistring::Decolated::TranslateMode>(predictionUnfixMode));
|
||||
switch (mePredictMode) {
|
||||
case PM_Atok:
|
||||
if (!mbPredictOn) {
|
||||
@@ -2220,15 +2110,13 @@ void Base::onPressUp() {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!current->hasCandidate()) {
|
||||
if (!current->isKanaFix()) return;
|
||||
mpManager->getHWKeyboard()->resetQuoteState();
|
||||
mpUnfixString->resetRelation();
|
||||
updateCandidateState_();
|
||||
if (mpUnfixString->getCandidate() != L' ') {
|
||||
moveCursorUp();
|
||||
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
|
||||
}
|
||||
if (current->hasCandidate() || !current->isKanaFix()) return;
|
||||
mpManager->getHWKeyboard()->resetQuoteState();
|
||||
mpUnfixString->resetRelation();
|
||||
updateCandidateState_();
|
||||
if (mpUnfixString->getCandidate() != L' ') {
|
||||
moveCursorUp();
|
||||
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2273,22 +2161,20 @@ void Base::onPressDown() {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!current->hasCandidate()) {
|
||||
if (!current->isKanaFix()) return;
|
||||
mpManager->getHWKeyboard()->resetQuoteState();
|
||||
mpUnfixString->resetRelation();
|
||||
updateCandidateState_();
|
||||
if (mpUnfixString->getCandidate() != L' ') {
|
||||
moveCursorDown();
|
||||
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
|
||||
}
|
||||
if (current->hasCandidate() || !current->isKanaFix()) return;
|
||||
mpManager->getHWKeyboard()->resetQuoteState();
|
||||
mpUnfixString->resetRelation();
|
||||
updateCandidateState_();
|
||||
if (mpUnfixString->getCandidate() != L' ') {
|
||||
moveCursorDown();
|
||||
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Base::onPressDownHWKB() {
|
||||
tistring::Decolated* current = getCurrentString(false);
|
||||
s32 selected;
|
||||
tistring::Decolated* current = getCurrentString(false);
|
||||
u32 modifiers = input::HKBManager::getInstance().GetModifierState();
|
||||
if (current == mpString) {
|
||||
mpManager->getHWKeyboard()->resetQuoteState();
|
||||
@@ -2309,12 +2195,11 @@ void Base::onPressDownHWKB() {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!current->hasCandidate()) {
|
||||
if (!current->isKanaFix()) return;
|
||||
if (current->hasCandidate() || !current->isKanaFix()) return;
|
||||
if (mpUnfixString->getCandidate() == L' ') return;
|
||||
moveCursorDown();
|
||||
onCommand(static_cast<INPUT_COMMAND>(47), NULL);
|
||||
}
|
||||
|
||||
} else if (mpUnfixString == current) {
|
||||
if (!mpUnfixString->isKanaFix()) mpUnfixString->confirmKana();
|
||||
if (mpUnfixString->isConverting()) {
|
||||
@@ -2344,6 +2229,9 @@ void Base::onPressDownHWKB() {
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (mpZiString == current) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void Base::onPressLeftHWKB() {
|
||||
@@ -2369,11 +2257,7 @@ void Base::onPressLeftHWKB() {
|
||||
}
|
||||
current->getCursorPos();
|
||||
}
|
||||
if (current->hasCandidate()) return;
|
||||
switch (current->isKanaFix()) {
|
||||
case true: break;
|
||||
default: return;
|
||||
}
|
||||
if (current->hasCandidate() || !current->isKanaFix()) return;
|
||||
mpManager->getHWKeyboard()->resetQuoteState();
|
||||
mpUnfixString->resetRelation();
|
||||
updateCandidateState_();
|
||||
@@ -2430,11 +2314,7 @@ void Base::onPressRightHWKB() {
|
||||
}
|
||||
current->getCursorPos();
|
||||
}
|
||||
if (current->hasCandidate()) return;
|
||||
switch (current->isKanaFix()) {
|
||||
case true: break;
|
||||
default: return;
|
||||
}
|
||||
if (current->hasCandidate() || !current->isKanaFix()) return;
|
||||
mpManager->getHWKeyboard()->resetQuoteState();
|
||||
mpUnfixString->resetRelation();
|
||||
updateCandidateState_();
|
||||
@@ -2470,375 +2350,73 @@ void Base::onPressRightHWKB() {
|
||||
meScrollFlag = SF_ScrollOn;
|
||||
}
|
||||
|
||||
extern "C" asm void onPressLeft__Q39textinput9inputform4BaseFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
li r4, 0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
stw r30, 8(r1)
|
||||
mr r30, r3
|
||||
bl getCurrentString__Q39textinput9inputform4BaseFb
|
||||
lwz r12, 0(r3)
|
||||
mr r31, r3
|
||||
lwz r12, 0x7c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r0, 0x164(r30)
|
||||
cmplw r31, r0
|
||||
bne onPressLeft_L1
|
||||
lwz r0, 0x1f0(r30)
|
||||
cmpwi r0, 9
|
||||
bne onPressLeft_L2
|
||||
mr r3, r30
|
||||
li r4, 0
|
||||
bl getCurrentString__Q39textinput9inputform4BaseFb
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0xc0(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne onPressLeft_L3
|
||||
lwz r3, 0x164(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x7c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r3, 0x164(r30)
|
||||
li r4, 0xa
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x50(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r3, 0x164(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x7c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r0, 0x1f0(r30)
|
||||
cmpwi r0, 8
|
||||
bne onPressLeft_L3
|
||||
lbz r0, 0x178(r30)
|
||||
cmpwi r0, 0
|
||||
bne onPressLeft_L4
|
||||
li r0, 0
|
||||
b onPressLeft_L5
|
||||
onPressLeft_L4:
|
||||
lwz r0, 0x174(r30)
|
||||
cmpwi r0, 1
|
||||
beq onPressLeft_L6
|
||||
lwz r3, 0x16c(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0xd8(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
ble onPressLeft_L6
|
||||
li r0, 1
|
||||
b onPressLeft_L5
|
||||
onPressLeft_L6:
|
||||
li r0, 0
|
||||
onPressLeft_L5:
|
||||
cmpwi r0, 0
|
||||
beq onPressLeft_L3
|
||||
lwz r3, 0x16c(r30)
|
||||
li r4, 0
|
||||
bl setCurrentWord__Q39textinput8tistring6WithZiFPCw
|
||||
lwz r3, 0x16c(r30)
|
||||
bl update__Q39textinput8tistring6WithZiFv
|
||||
onPressLeft_L3:
|
||||
lwz r12, 0(r31)
|
||||
mr r3, r31
|
||||
lwz r12, 0x7c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
onPressLeft_L2:
|
||||
lwz r12, 0(r31)
|
||||
mr r3, r31
|
||||
lwz r12, 0x48(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne onPressLeft_Lend
|
||||
lwz r12, 0(r31)
|
||||
mr r3, r31
|
||||
lwz r12, 0xc0(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne onPressLeft_L13
|
||||
b onPressLeft_Lend
|
||||
onPressLeft_L13:
|
||||
lwz r3, 0x1d4(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x6c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
li r0, 0
|
||||
stb r0, 0x15(r3)
|
||||
stb r0, 0x16(r3)
|
||||
lwz r3, 0x168(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x128(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0xd8(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r3, 0x168(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x44(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
clrlwi r0, r3, 16
|
||||
cmplwi r0, 0x20
|
||||
beq onPressLeft_Lend
|
||||
onPressLeft_L1:
|
||||
lwz r12, 0(r31)
|
||||
mr r3, r31
|
||||
lwz r12, 0x68(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
beq onPressLeft_L10
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
li r4, 5
|
||||
lwz r12, 0x178(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
b onPressLeft_L11
|
||||
onPressLeft_L10:
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
li r4, 6
|
||||
lwz r12, 0x178(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
onPressLeft_L11:
|
||||
lwz r0, 0x168(r30)
|
||||
cmplw r31, r0
|
||||
bne onPressLeft_L12
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0xd8(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
onPressLeft_L12:
|
||||
li r0, 1
|
||||
stw r0, 0x1b0(r30)
|
||||
onPressLeft_Lend:
|
||||
lwz r0, 0x14(r1)
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 8(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
void Base::onPressLeft() {
|
||||
tistring::Decolated* current = getCurrentString(false);
|
||||
current->getCursorPos();
|
||||
if (current == mpString) {
|
||||
if (meLanguage == KR) {
|
||||
if (!getCurrentString(false)->isKanaFix()) {
|
||||
mpString->getCursorPos();
|
||||
mpString->inputChar(L'\n');
|
||||
mpString->getCursorPos();
|
||||
if (meLanguage == CN) {
|
||||
bool predictions;
|
||||
if (!mbPredictOn) predictions = false;
|
||||
else if (mePredictMode != PM_Atok && mpZiString->getCurrentNumPredicted() > 0) predictions = true;
|
||||
else predictions = false;
|
||||
if (predictions) {
|
||||
mpZiString->setCurrentWord(NULL);
|
||||
mpZiString->update();
|
||||
}
|
||||
}
|
||||
}
|
||||
current->getCursorPos();
|
||||
}
|
||||
if (current->hasCandidate() || !current->isKanaFix()) return;
|
||||
resetInputRelation();
|
||||
if (mpUnfixString->getCandidate() == L' ') return;
|
||||
}
|
||||
if (current->moveCursorLeft()) onSE(static_cast<sound::SE>(5));
|
||||
else onSE(static_cast<sound::SE>(6));
|
||||
if (current == mpUnfixString) updateCandidateState_();
|
||||
meScrollFlag = SF_ScrollOn;
|
||||
}
|
||||
|
||||
extern "C" asm void onPressRight__Q39textinput9inputform4BaseFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
li r4, 0
|
||||
stw r0, 0x24(r1)
|
||||
stw r31, 0x1c(r1)
|
||||
stw r30, 0x18(r1)
|
||||
mr r30, r3
|
||||
bl getCurrentString__Q39textinput9inputform4BaseFb
|
||||
lwz r12, 0(r3)
|
||||
mr r31, r3
|
||||
lwz r12, 0x7c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r0, 0x164(r30)
|
||||
cmplw r31, r0
|
||||
bne onPressRight_L1
|
||||
lwz r0, 0x1f0(r30)
|
||||
cmpwi r0, 9
|
||||
bne onPressRight_L2
|
||||
mr r3, r30
|
||||
li r4, 0
|
||||
bl getCurrentString__Q39textinput9inputform4BaseFb
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0xc0(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne onPressRight_L3
|
||||
lwz r3, 0x164(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x7c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r3, 0x164(r30)
|
||||
li r4, 0xa
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x50(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r3, 0x164(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x7c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r0, 0x1f0(r30)
|
||||
cmpwi r0, 8
|
||||
bne onPressRight_L3
|
||||
lbz r0, 0x178(r30)
|
||||
cmpwi r0, 0
|
||||
bne onPressRight_L4
|
||||
li r0, 0
|
||||
b onPressRight_L5
|
||||
onPressRight_L4:
|
||||
lwz r0, 0x174(r30)
|
||||
cmpwi r0, 1
|
||||
beq onPressRight_L6
|
||||
lwz r3, 0x16c(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0xd8(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
ble onPressRight_L6
|
||||
li r0, 1
|
||||
b onPressRight_L5
|
||||
onPressRight_L6:
|
||||
li r0, 0
|
||||
onPressRight_L5:
|
||||
cmpwi r0, 0
|
||||
beq onPressRight_L3
|
||||
lwz r3, 0x16c(r30)
|
||||
li r4, 0
|
||||
bl setCurrentWord__Q39textinput8tistring6WithZiFPCw
|
||||
lwz r3, 0x16c(r30)
|
||||
bl update__Q39textinput8tistring6WithZiFv
|
||||
onPressRight_L3:
|
||||
lwz r12, 0(r31)
|
||||
mr r3, r31
|
||||
lwz r12, 0x7c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
onPressRight_L2:
|
||||
lwz r12, 0(r31)
|
||||
mr r3, r31
|
||||
lwz r12, 0x48(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne onPressRight_Lend
|
||||
lwz r12, 0(r31)
|
||||
mr r3, r31
|
||||
lwz r12, 0xc0(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
bne onPressRight_L13
|
||||
b onPressRight_Lend
|
||||
onPressRight_L13:
|
||||
lwz r3, 0x1d4(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x6c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
li r0, 0
|
||||
stb r0, 0x15(r3)
|
||||
stb r0, 0x16(r3)
|
||||
lwz r3, 0x168(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x128(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0xd8(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r3, 0x168(r30)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x44(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
clrlwi r0, r3, 16
|
||||
cmplwi r0, 0x20
|
||||
beq onPressRight_Lend
|
||||
onPressRight_L1:
|
||||
lwz r12, 0(r31)
|
||||
mr r3, r31
|
||||
lwz r12, 0x64(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
cmpwi r3, 0
|
||||
beq onPressRight_L8
|
||||
lbz r0, 0x17a(r30)
|
||||
cmpwi r0, 0
|
||||
beq onPressRight_L8
|
||||
lis r9, lbl_816152D0@ha
|
||||
lwzu r8, lbl_816152D0@l(r9)
|
||||
mr r3, r30
|
||||
addi r5, r1, 8
|
||||
lwz r7, 4(r9)
|
||||
li r4, 0
|
||||
lwz r6, 8(r9)
|
||||
lwz r0, 0xc(r9)
|
||||
stw r8, 8(r1)
|
||||
stw r7, 0xc(r1)
|
||||
stw r6, 0x10(r1)
|
||||
stw r0, 0x14(r1)
|
||||
lwz r12, 0(r30)
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
li r4, 5
|
||||
lwz r12, 0x178(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
onPressRight_L8:
|
||||
lwz r0, 0x16c(r30)
|
||||
cmplw r31, r0
|
||||
beq onPressRight_L9
|
||||
lwz r0, 0x168(r30)
|
||||
cmplw r31, r0
|
||||
bne onPressRight_L10
|
||||
onPressRight_L9:
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
li r4, 6
|
||||
lwz r12, 0x178(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
b onPressRight_L11
|
||||
onPressRight_L10:
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
li r4, 5
|
||||
lwz r12, 0x178(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
onPressRight_L11:
|
||||
lwz r0, 0x168(r30)
|
||||
cmplw r31, r0
|
||||
bne onPressRight_L12
|
||||
lwz r12, 0(r30)
|
||||
mr r3, r30
|
||||
lwz r12, 0xd8(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
onPressRight_L12:
|
||||
li r0, 1
|
||||
stw r0, 0x1b0(r30)
|
||||
onPressRight_Lend:
|
||||
lwz r0, 0x24(r1)
|
||||
lwz r31, 0x1c(r1)
|
||||
lwz r30, 0x18(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
void Base::onPressRight() {
|
||||
tistring::Decolated* current = getCurrentString(false);
|
||||
current->getCursorPos();
|
||||
if (current == mpString) {
|
||||
if (meLanguage == KR) {
|
||||
if (!getCurrentString(false)->isKanaFix()) {
|
||||
mpString->getCursorPos();
|
||||
mpString->inputChar(L'\n');
|
||||
mpString->getCursorPos();
|
||||
if (meLanguage == CN) {
|
||||
bool predictions;
|
||||
if (!mbPredictOn) predictions = false;
|
||||
else if (mePredictMode != PM_Atok && mpZiString->getCurrentNumPredicted() > 0) predictions = true;
|
||||
else predictions = false;
|
||||
if (predictions) {
|
||||
mpZiString->setCurrentWord(NULL);
|
||||
mpZiString->update();
|
||||
}
|
||||
}
|
||||
}
|
||||
current->getCursorPos();
|
||||
}
|
||||
if (current->hasCandidate() || !current->isKanaFix()) return;
|
||||
resetInputRelation();
|
||||
if (mpUnfixString->getCandidate() == L' ') return;
|
||||
}
|
||||
if (current->moveCursorRight() && mbRightWithSpace) {
|
||||
CharacterInput space = {L' ', 0, false, false, 0};
|
||||
onCommand(static_cast<INPUT_COMMAND>(0), &space);
|
||||
onSE(static_cast<sound::SE>(5));
|
||||
}
|
||||
if (current == mpZiString || current == mpUnfixString) onSE(static_cast<sound::SE>(6));
|
||||
else onSE(static_cast<sound::SE>(5));
|
||||
if (current == mpUnfixString) updateCandidateState_();
|
||||
meScrollFlag = SF_ScrollOn;
|
||||
}
|
||||
|
||||
extern "C" asm void calc__Q39textinput9inputform4BaseFv() {
|
||||
@@ -3509,27 +3087,32 @@ void Base::clear() {
|
||||
}
|
||||
|
||||
u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
|
||||
const wchar_t* current = string;
|
||||
const wchar_t* current;
|
||||
u32 rows;
|
||||
bool kanaHandled;
|
||||
bool kana;
|
||||
const wchar_t* character;
|
||||
u32 pos;
|
||||
f32 cursorX;
|
||||
u32 cursorStart;
|
||||
u32 cursorEnd;
|
||||
current = string;
|
||||
if (!*string) return 0;
|
||||
f32 scaleX;
|
||||
f32 cursorX = getScale().x;
|
||||
cursorX = getScale().x;
|
||||
nw4r::math::VEC2 scale = getScale();
|
||||
u32 pos = 0;
|
||||
u32 rows = 0;
|
||||
pos = 0;
|
||||
rows = 0;
|
||||
muWordWrapCounter = 0;
|
||||
bool kanaHandled = false;
|
||||
kanaHandled = false;
|
||||
mbHyphen = false;
|
||||
u32 cursorStart, cursorEnd;
|
||||
mpString->getCursorPos(&cursorStart, &cursorEnd);
|
||||
scaleX = scale.x;
|
||||
for (;;) {
|
||||
DrawInfo info;
|
||||
info.rect.left = 0.0f;
|
||||
info.rect.top = 0.0f;
|
||||
info.rect.right = 0.0f;
|
||||
info.rect.bottom = 0.0f;
|
||||
bool kana = false;
|
||||
const wchar_t* character;
|
||||
kana = false;
|
||||
if (meLanguage == KR && !kanaHandled && cursorStart == pos) {
|
||||
kanaHandled = true;
|
||||
character = mpString->getKanaBuffer();
|
||||
@@ -3541,9 +3124,9 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
|
||||
}
|
||||
info.character = *character;
|
||||
calcRect(info);
|
||||
f32 right = cursorX + scaleX * (info.rect.right - info.rect.left);
|
||||
f32 right = cursorX + scale.x * info.rect.GetWidth();
|
||||
if (kana) {
|
||||
if (right >= scaleX * (mRect.right - mRect.left)) {
|
||||
if (right >= scale.x * mRect.GetWidth()) {
|
||||
cursorX = getScale().x;
|
||||
++rows;
|
||||
if (rows >= limit) return pos;
|
||||
@@ -3556,8 +3139,11 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
|
||||
++rows;
|
||||
if (rows >= limit) {
|
||||
while (pos < muWordWrapCounter) {
|
||||
f32 advance = scaleX * (info.rect.right - info.rect.left);
|
||||
if (cursorX + advance >= scaleX * (mRect.right - mRect.left)) return pos;
|
||||
f32 advance;
|
||||
f32 nextCursorX;
|
||||
advance = scale.x * info.rect.GetWidth();
|
||||
nextCursorX = cursorX + advance;
|
||||
if (nextCursorX >= scale.x * mRect.GetWidth()) return pos;
|
||||
++current;
|
||||
cursorX += advance;
|
||||
info.character = *current;
|
||||
@@ -3567,7 +3153,7 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
|
||||
return muWordWrapCounter - 1;
|
||||
}
|
||||
cursorX = getScale().x;
|
||||
} else if (right >= scaleX * (mRect.right - mRect.left)) {
|
||||
} else if (right >= scale.x * mRect.GetWidth()) {
|
||||
cursorX = getScale().x;
|
||||
++rows;
|
||||
if (rows >= limit) return pos;
|
||||
@@ -3578,7 +3164,7 @@ u32 Base::isOverRowLimit(u32 limit, const wchar_t* string) {
|
||||
if (rows >= limit) return pos;
|
||||
if (!current[1]) return 0;
|
||||
} else {
|
||||
cursorX += scaleX * (info.rect.right - info.rect.left);
|
||||
cursorX += scale.x * info.rect.GetWidth();
|
||||
}
|
||||
++pos;
|
||||
++current;
|
||||
|
||||
@@ -274,7 +274,7 @@ namespace textinput {
|
||||
xOffset *= scale - 1.0f;
|
||||
viewport[0] = left + xOffset;
|
||||
f32 height = (mProjectionRect.bottom -
|
||||
mProjectionRect.top) * 0.5f;
|
||||
mProjectionRect.top) / 2.0f;
|
||||
viewport[1] = rect.bottom + height;
|
||||
viewport[2] = scale * (100.0f + (rect.right - rect.left));
|
||||
viewport[3] = rect.top - rect.bottom;
|
||||
|
||||
@@ -557,10 +557,11 @@ void WithZi::setCurrentWord(const wchar_t* word) {
|
||||
LatestWord[1] = 0;
|
||||
return;
|
||||
}
|
||||
mbContextChanged = 1;
|
||||
wchar_t* currentWord;
|
||||
const wchar_t* source;
|
||||
u32 length;
|
||||
s32 copied;
|
||||
mbContextChanged = 1;
|
||||
length = 0;
|
||||
currentWord = reinterpret_cast<wchar_t*>(LatestWord);
|
||||
for (; *currentWord != 0 && *currentWord != 0x20;
|
||||
@@ -571,14 +572,10 @@ void WithZi::setCurrentWord(const wchar_t* word) {
|
||||
}
|
||||
}
|
||||
copied = 0;
|
||||
const wchar_t* source = word;
|
||||
u32 destinationOffset = length;
|
||||
source = word;
|
||||
for (; *source != 0 && length < 0x3f;) {
|
||||
wchar_t character = word[copied];
|
||||
++length;
|
||||
LatestWord[length++] = word[copied++];
|
||||
++source;
|
||||
++copied;
|
||||
LatestWord[destinationOffset++] = character;
|
||||
}
|
||||
LatestWord[length] = 0;
|
||||
mCurrentWordLength = copied;
|
||||
|
||||
@@ -327,15 +327,20 @@ namespace ipl {
|
||||
mpDialogLayout->calc();
|
||||
}
|
||||
|
||||
static inline math::VEC2 scaledPageOffset(f32 scale) {
|
||||
math::VEC2 result;
|
||||
result.y = sPageOffset.y * scale;
|
||||
result.x = sPageOffset.x * scale;
|
||||
return result;
|
||||
}
|
||||
|
||||
void Address::draw() {
|
||||
if (System::getSceneManager()->onDrawLayer(DRAW_LAYER_2)) {
|
||||
utility::Graphics::setOrtho(0);
|
||||
|
||||
nw4r::lyt::Pane* pane = mpLayout->FindPaneByName("N_note_a");
|
||||
for (int i = mNextPageNum; i >= 1; i--) {
|
||||
math::VEC2 trans;
|
||||
trans.y = sPageOffset.y * i;
|
||||
trans.x = sPageOffset.x * i;
|
||||
math::VEC2 trans = scaledPageOffset(i);
|
||||
pane->SetTranslate(trans);
|
||||
pane->CalculateMtx(*mpLayout->getDrawInfo());
|
||||
mpLayout->draw(pane);
|
||||
@@ -536,11 +541,16 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline nw4r::math::_VEC2 negativeOffset(const nw4r::math::_VEC2& value) {
|
||||
f32 negativeY = -value.y;
|
||||
f32 negativeX = -value.x;
|
||||
nw4r::math::_VEC2 result = {negativeX, negativeY};
|
||||
return result;
|
||||
}
|
||||
|
||||
void Address::stt_cover_backward() {
|
||||
if (!mpLayout->getAnim(4)->isPlaying()) {
|
||||
math::VEC2 offset;
|
||||
offset.x = -sPageOffset.x;
|
||||
offset.y = -sPageOffset.y;
|
||||
math::VEC2 offset = negativeOffset(sPageOffset);
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
|
||||
mbCover = true;
|
||||
mNextPageNum++;
|
||||
@@ -582,10 +592,20 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline nw4r::math::_VEC2 previousPageOffset() {
|
||||
f32 negativeY = -sPageOffset.y;
|
||||
f32 negativeX = -sPageOffset.x;
|
||||
nw4r::math::_VEC2 result;
|
||||
result.y = negativeY;
|
||||
result.x = negativeX;
|
||||
return result;
|
||||
}
|
||||
|
||||
void Address::stt_backward() {
|
||||
if (!mpLayout->getAnim(5)->isPlaying()) {
|
||||
mNextPageNum++;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), -sPageOffset);
|
||||
math::VEC2 offset = previousPageOffset();
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
|
||||
set_page_text("T_nmbr_b", mPage + 1);
|
||||
|
||||
for (u32 i = 0; i < BTN_MAX; i++) {
|
||||
@@ -602,9 +622,17 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline nw4r::math::VEC2 loopPageOffset() {
|
||||
nw4r::math::VEC2 result;
|
||||
result.y = -sPageOffset.y;
|
||||
result.x = -sPageOffset.x;
|
||||
return result;
|
||||
}
|
||||
|
||||
void Address::stt_loop_forward() {
|
||||
if (!mpLayout->getAnim(4)->isPlaying()) {
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), -sPageOffset * PAGE_MAX);
|
||||
math::VEC2 offset = loopPageOffset() * PAGE_MAX;
|
||||
add_translate(mpLayout->FindPaneByName("N_note_base"), offset);
|
||||
set_page_text("T_nmbr_b", mPage + 1);
|
||||
reset_gui(false);
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -2390,7 +2390,7 @@ namespace ipl {
|
||||
|
||||
if (sceneID == SCENE_UNLOCKED_TITLE || sceneID == SCENE_LOCKED_TITLE) {
|
||||
System::getSaveData()->setPrevPage(mChanPage);
|
||||
System::getSaveData()->iplSavedata_813596B8(System::getChannelManager()->getTitleID(mChanPage, mChanIndex));
|
||||
System::getSaveData()->pushTitleCache(System::getChannelManager()->getTitleID(mChanPage, mChanIndex));
|
||||
mpSaveDataFile = System::getSaveData()->flushAsync(System::getMem2App());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#define IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#define IPL_GC_SAVEDATA_NOVTABLE
|
||||
#include "scene/memoryCard/iplGCSaveData.h"
|
||||
|
||||
#include "scene/memoryCard/iplMemoryCard.h"
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
#include "iplSound.h"
|
||||
#include "iplSystem.h"
|
||||
#undef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#define IPL_MEMORYCARD_BASE_CTOR_OUT_OF_LINE
|
||||
#define IPL_MEMORYCARD_BASE_EVENT_OUT_OF_LINE
|
||||
#define IPL_GCW_PANEMANAGER_CTOR_OUT_OF_LINE
|
||||
#define IPL_GCW_INTP_CTOR_OUT_OF_LINE
|
||||
#define IPL_GC_WINDOW_NOVTABLE
|
||||
#define IPL_GC_WINDOW_CPP
|
||||
#include "scene/memoryCard/iplGCWindow.h"
|
||||
#include "scene/memoryCard/iplMemoryCard.h"
|
||||
@@ -14,10 +14,6 @@
|
||||
#include <cstring>
|
||||
|
||||
namespace ipl {
|
||||
namespace math {
|
||||
template <typename T>
|
||||
LinearIntp<T>::LinearIntp() {}
|
||||
}
|
||||
namespace scene {
|
||||
struct TextboxToMessageID {
|
||||
const char* name;
|
||||
@@ -50,8 +46,15 @@ static const TextboxToMessageID scTextboxToMessageID[3] = {
|
||||
};
|
||||
|
||||
static const char* scButtonName[3] = {"B_Move_00", "B_Copy_00", "B_Del_00"};
|
||||
|
||||
struct DigitTable {
|
||||
wchar_t w[10];
|
||||
};
|
||||
|
||||
static const DigitTable scNumber = {{L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}};
|
||||
|
||||
GCWindow::GCWindow(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName)
|
||||
: MemoryBase(), MemCardEventHandler(), mState(0), mLinearInterp(), mCardState(0), mCardIndex(0), mOperation(0), mActive(false),
|
||||
: MemoryBase(), MemCardEventListener(), mState(0), mLinearInterp(), mCardState(0), mCardIndex(0), mOperation(0), mActive(false),
|
||||
mWaiting(false) {
|
||||
mpLayout = new layout::Object(heap, layoutFile, directory, fileName);
|
||||
add_animation(scAnmName, 0x10);
|
||||
@@ -102,15 +105,15 @@ void GCWindow::init(const math::VEC3& translate, MemoryCardManager* manager, u8
|
||||
mpPaneManager->initPane(mpLayout->getNW4RLyt()->GetRootPane()->FindPaneByName(scButtonName[i], true));
|
||||
}
|
||||
int blocks = mpMemoryCardManager->getBlocks(cardState, cardIndex);
|
||||
wchar_t digits[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'};
|
||||
DigitTable digitTable = scNumber;
|
||||
int blockCount = static_cast<u16>(blocks);
|
||||
wchar_t decimal[5] = {0};
|
||||
int skipCount = 0;
|
||||
wchar_t blockText[5] = {0};
|
||||
decimal[0] = digits[blockCount / 1000];
|
||||
decimal[1] = digits[(blockCount / 100) % 10];
|
||||
decimal[2] = digits[(blockCount / 10) % 10];
|
||||
decimal[3] = digits[blockCount % 10];
|
||||
decimal[0] = digitTable.w[blockCount / 1000];
|
||||
decimal[1] = digitTable.w[(blockCount / 100) % 10];
|
||||
decimal[2] = digitTable.w[(blockCount / 10) % 10];
|
||||
decimal[3] = digitTable.w[blockCount % 10];
|
||||
for (i = 0; i < 3; i++) {
|
||||
if (decimal[i] != L'0') {
|
||||
break;
|
||||
@@ -785,7 +788,6 @@ SavedataEditWindow::SavedataEditWindow(EGG::Heap* heap, nand::LayoutFile* layout
|
||||
add_animation("it_DataDetail_a_SeenOutNo.brlan", scAnmName[0].groupName);
|
||||
add_animation("it_DataDetail_a_Wait.brlan", scAnmName[15].groupName);
|
||||
mpLayout->finishBinding();
|
||||
set_visible("N_Wait", false);
|
||||
set_visible("T_Block_01", false);
|
||||
mpEvent = new MemoryBaseEvent(this);
|
||||
mpPaneManager = new gui::PaneManager(mpEvent, mpLayout->getDrawInfo(), NULL, NULL, true);
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
#define IPL_MEMORY_CARD_CPP
|
||||
#define IPL_MEMORYCARD_BASE_OUT_OF_LINE
|
||||
#define IPL_CHANNEL_TITLE_NOVTABLE
|
||||
#define IPL_MEMORY_CARD_NOVTABLE
|
||||
#include "scene/memoryCard/iplMemoryCard.h"
|
||||
#undef IPL_CHANNEL_TITLE_NOVTABLE
|
||||
|
||||
#include "scene/memoryCard/iplGCWindow.h"
|
||||
#include "scene/memoryCard/iplGCSaveData.h"
|
||||
@@ -82,6 +80,53 @@ namespace ipl {
|
||||
"B_ArwR", "B_ArwL", "B_SelectWii_00", "B_SelectSd_00",
|
||||
};
|
||||
|
||||
struct DigitTable {
|
||||
wchar_t w[10];
|
||||
};
|
||||
|
||||
static const DigitTable scNumber = {{L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'}};
|
||||
|
||||
class __declspec(novtable) MemoryCardManagerImpl : public MemoryCardManager {
|
||||
public:
|
||||
virtual void onMount(u8) {}
|
||||
virtual void onUnmount(u8) {}
|
||||
virtual void onAttach(u8) {}
|
||||
virtual void onDetach(u8) {}
|
||||
virtual void onCheck(u8) {}
|
||||
virtual void onFormat(u8) {}
|
||||
virtual void onRepair(u8) {}
|
||||
virtual void onRead(u8) {}
|
||||
virtual void onWrite(u8) {}
|
||||
virtual void onOpen(u8) {}
|
||||
virtual void onClose(u8) {}
|
||||
virtual void onCreate(u8) {}
|
||||
virtual void onDelete(u8) {}
|
||||
virtual void onCopy(u8) {}
|
||||
virtual void onMove(u8) {}
|
||||
virtual void onRename(u8) {}
|
||||
virtual void onVerify(u8) {}
|
||||
virtual void onCommit(u8) {}
|
||||
virtual void onProbe(u8) {}
|
||||
virtual void onMountAsync(u8) {}
|
||||
virtual void onUnmountAsync(u8) {}
|
||||
virtual void onCheckAsync(u8) {}
|
||||
virtual void onFormatAsync(u8) {}
|
||||
virtual void onReadAsync(u8) {}
|
||||
virtual void onWriteAsync(u8) {}
|
||||
virtual void onCreateAsync(u8) {}
|
||||
virtual void onDeleteAsync(u8) {}
|
||||
virtual void onCopyAsync(u8) {}
|
||||
virtual void onMoveAsync(u8) {}
|
||||
virtual void onRenameAsync(u8) {}
|
||||
virtual void onVerifyAsync(u8) {}
|
||||
virtual void onCommitAsync(u8) {}
|
||||
virtual void onProbeAsync(u8) {}
|
||||
virtual void onFreeBlocks(u8) {}
|
||||
virtual void onGetLength(u8) {}
|
||||
virtual void onSetAttrib(u8) {}
|
||||
virtual void onGetAttrib(u8) {}
|
||||
};
|
||||
|
||||
MemoryCard::MemoryCard(EGG::Heap* heap)
|
||||
: Base(heap), MemoryBase(), mState(2), mPrevState(2), mSlot(0), mIconIndex(-15), mIconCount(0),
|
||||
mShowArwR(0), mShowArwL(0), mpEvent(NULL), mpFocusSaveData(NULL) {
|
||||
@@ -90,7 +135,6 @@ namespace ipl {
|
||||
nw4r::ut::List_Init(&mBalloonList, 0);
|
||||
}
|
||||
|
||||
MemoryBase::~MemoryBase() {}
|
||||
|
||||
void MemoryCard::prepare() {
|
||||
System::getBS2Manager()->abort();
|
||||
@@ -146,7 +190,7 @@ namespace ipl {
|
||||
mpGCWindow = new GCWindow(getSceneHeap(), unk_0x08, "arc", "it_CubeDetail_a.brlyt");
|
||||
mpGCWindow->do_animation(0);
|
||||
|
||||
MemoryCardManager* manager = new MemoryCardManager();
|
||||
MemoryCardManager* manager = new MemoryCardManagerImpl();
|
||||
mpManager = manager;
|
||||
mpManager->setEventHandler(mpGCWindow);
|
||||
mpGCWindow->mpMemoryCardManager = mpManager;
|
||||
@@ -495,19 +539,14 @@ namespace ipl {
|
||||
return;
|
||||
}
|
||||
u32 freeBlocks = mpManager->getFreeBlocks(slot);
|
||||
wchar_t digits[5];
|
||||
wchar_t digitTable[10] = {L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9'};
|
||||
digits[0] = L'\0';
|
||||
digits[1] = L'\0';
|
||||
digits[2] = L'\0';
|
||||
digits[3] = L'\0';
|
||||
digits[4] = L'\0';
|
||||
DigitTable digitTable = scNumber;
|
||||
wchar_t digits[5] = {0};
|
||||
wchar_t text[0x40] = L"";
|
||||
int blocks = static_cast<u16>(freeBlocks);
|
||||
digits[0] = digitTable[blocks / 1000];
|
||||
digits[1] = digitTable[blocks / 100 % 10];
|
||||
digits[2] = digitTable[blocks / 10 % 10];
|
||||
digits[3] = digitTable[blocks % 10];
|
||||
digits[0] = digitTable.w[blocks / 1000];
|
||||
digits[1] = digitTable.w[blocks / 100 % 10];
|
||||
digits[2] = digitTable.w[blocks / 10 % 10];
|
||||
digits[3] = digitTable.w[blocks % 10];
|
||||
|
||||
int zeroOffset;
|
||||
for (zeroOffset = 0; zeroOffset < 3; zeroOffset++) {
|
||||
@@ -704,3 +743,4 @@ namespace ipl {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#define IPL_MEMORYCARD_BASE_IMPLEMENTATION
|
||||
#define IPL_MEMORYCARD_BASE_CPP
|
||||
#include "scene/memoryCard/iplMemoryCardBase.h"
|
||||
#include "scene/settingSelect/iplSettingSelect.h"
|
||||
#include "scene/settingSelect/iplSettingButton.h"
|
||||
@@ -130,7 +131,7 @@ void MemoryBase::set_textbox(const char* paneName, u32 message) {
|
||||
|
||||
void MemoryBase::set_textbox(const char* paneName, u32 message, int animationIndex, int frame) {
|
||||
Anm* animation = get_animation(animationIndex);
|
||||
if (animation->mAnim->getCurrentFrame() >= frame) {
|
||||
if (animation->mAnim->getCurrentFrame() >= (f32)frame) {
|
||||
set_textbox(paneName, message);
|
||||
}
|
||||
}
|
||||
@@ -141,7 +142,7 @@ void MemoryBase::set_textbox(const char* paneName, const wchar_t* text, f32 widt
|
||||
while (length != 0) {
|
||||
textBox->SetString(text, 0, length);
|
||||
textBox->CalculateMtx(*mpLayout->getDrawInfo());
|
||||
nw4r::ut::Rect bounds = textBox->GetTextDrawRect(*mpLayout->getDrawInfo());
|
||||
const nw4r::ut::Rect& bounds = textBox->GetTextDrawRect(*mpLayout->getDrawInfo());
|
||||
if (bounds.right - bounds.left < width &&
|
||||
-1.0f * (bounds.bottom - bounds.top) < height) {
|
||||
break;
|
||||
|
||||
@@ -145,15 +145,14 @@ bool MemoryCardManager::isDistSlot(u8 slot, long* state) {
|
||||
bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
|
||||
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
|
||||
memorycard::CardState* states = memorycard::getCardSlotState();
|
||||
bool enabled = false;
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
memorycard::FileInfo* dir = NULL;
|
||||
memorycard::CardState* destination = NULL;
|
||||
long result = file;
|
||||
long result;
|
||||
bool enabled = false;
|
||||
if (isDistSlot(slot, NULL) &&
|
||||
((dir = &dirs[slot][file])->canMove != 0) &&
|
||||
states[slot].key == (destination = &states[slot ^ 1])->key &&
|
||||
destination->freeBlocks >= dir->size && destination->unk_0x0E != 0 &&
|
||||
states[slot].key == states[slot ^ 1].key &&
|
||||
states[slot ^ 1].freeBlocks >= dir->size && states[slot ^ 1].unk_0x0E != 0 &&
|
||||
dir->unk_0x06 == 0) {
|
||||
result = -0x15;
|
||||
enabled = true;
|
||||
@@ -169,9 +168,9 @@ bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
|
||||
}
|
||||
} else if ((dir = &dirs[slot][file])->canMove == 0) {
|
||||
result = -0x1a;
|
||||
} else if (states[slot].key != (destination = &states[slot ^ 1])->key) {
|
||||
} else if (states[slot].key != states[slot ^ 1].key) {
|
||||
result = -0x1b;
|
||||
} else if (destination->freeBlocks < dir->size || destination->unk_0x0E == 0) {
|
||||
} else if (states[slot ^ 1].freeBlocks < dir->size || states[slot ^ 1].unk_0x0E == 0) {
|
||||
result = -0x19;
|
||||
} else if (dir->unk_0x06 != 0) {
|
||||
result = -0x18;
|
||||
@@ -186,15 +185,14 @@ bool MemoryCardManager::isMoveEnable(u8 slot, u32 index, long* code) {
|
||||
bool MemoryCardManager::isCopyEnable(u8 slot, u32 index, long* code) {
|
||||
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
|
||||
memorycard::CardState* states = memorycard::getCardSlotState();
|
||||
bool enabled = false;
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
memorycard::FileInfo* dir = NULL;
|
||||
memorycard::CardState* destination = NULL;
|
||||
long result = file;
|
||||
long result;
|
||||
bool enabled = false;
|
||||
if (isDistSlot(slot, NULL) &&
|
||||
((dir = &dirs[slot][file])->canCopy != 0) &&
|
||||
states[slot].key == (destination = &states[slot ^ 1])->key &&
|
||||
destination->freeBlocks >= dir->size && destination->unk_0x0E != 0 &&
|
||||
states[slot].key == states[slot ^ 1].key &&
|
||||
states[slot ^ 1].freeBlocks >= dir->size && states[slot ^ 1].unk_0x0E != 0 &&
|
||||
dir->unk_0x06 == 0) {
|
||||
result = -0x15;
|
||||
enabled = true;
|
||||
@@ -210,9 +208,9 @@ bool MemoryCardManager::isCopyEnable(u8 slot, u32 index, long* code) {
|
||||
}
|
||||
} else if ((dir = &dirs[slot][file])->canCopy == 0) {
|
||||
result = -0x1a;
|
||||
} else if (states[slot].key != (destination = &states[slot ^ 1])->key) {
|
||||
} else if (states[slot].key != states[slot ^ 1].key) {
|
||||
result = -0x1b;
|
||||
} else if (destination->freeBlocks < dir->size || destination->unk_0x0E == 0) {
|
||||
} else if (states[slot ^ 1].freeBlocks < dir->size || states[slot ^ 1].unk_0x0E == 0) {
|
||||
result = -0x19;
|
||||
} else if (dir->unk_0x06 != 0) {
|
||||
result = -0x18;
|
||||
@@ -253,10 +251,10 @@ void MemoryCardManager::update_icon_anm() {
|
||||
for (int remaining = 0x7f; remaining > 0; remaining--, index++) {
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
if (file < 0x7f && dirs[slot][file].fileNo != 0) {
|
||||
memorycard::IconState* icon = &icons[slot][file];
|
||||
memorycard::IconState* icon = icons[slot] + file;
|
||||
s32 frame = mFileCell[slot][file].iconAnmCounter + icon->anmDelta;
|
||||
mFileCell[slot][file].iconAnmCounter = frame;
|
||||
if ((s16)frame >= icon->anmMax) {
|
||||
if ((s16)frame >= icons[slot][file].anmMax) {
|
||||
if (icon->anmType == 4) {
|
||||
mFileCell[slot][file].iconAnmCounter = icons[slot][file].anmMax - icon->unk_0x07 - 1;
|
||||
icon->anmDelta = -1;
|
||||
@@ -342,24 +340,24 @@ void MemoryCardManager::update_change_cardstate(u8 slot) {
|
||||
}
|
||||
|
||||
GXTexObj* MemoryCardManager::create_icon(u8 slot, s16 index) {
|
||||
CardIcons* icons = reinterpret_cast<CardIcons*>(memorycard::getIconStateArray());
|
||||
memorycard::IconState (*icons)[0x7f] = reinterpret_cast<memorycard::IconState(*)[0x7f]>(memorycard::getIconStateArray());
|
||||
int total = 0;
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
s16 frame = 0;
|
||||
do {
|
||||
u32 shift = frame;
|
||||
u32 shift = frame << 1;
|
||||
frame++;
|
||||
total += ((icons[slot][file].anmFrameBits >> ((shift & 0x1f) << 1)) & 3) * 4;
|
||||
total += ((icons[slot][file].anmFrameBits >> shift) & 3) * 4;
|
||||
if (mFileCell[slot][file].iconAnmCounter <= total) {
|
||||
break;
|
||||
}
|
||||
} while (frame < 9);
|
||||
} while (frame <= 8);
|
||||
return _create_icon(slot, file, frame - 1);
|
||||
}
|
||||
|
||||
GXTexObj* MemoryCardManager::create_icon(u8 slot, s16 index, long start) {
|
||||
memorycard::getIconStateArray();
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
return _create_icon(slot, file, 0);
|
||||
}
|
||||
|
||||
@@ -385,7 +383,7 @@ GXTexObj* MemoryCardManager::_create_icon(u8 slot, s16 file, long start) {
|
||||
}
|
||||
|
||||
const wchar_t* MemoryCardManager::getComment(u8 slot, s16 index, int which) {
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
wmemset(mFileCell[slot][file].comment[which], 0, 0x40);
|
||||
char comment[33] = {0};
|
||||
const char* comments = memorycard::getIconComment(slot, file);
|
||||
@@ -427,7 +425,7 @@ const wchar_t* MemoryCardManager::getComment(u8 slot, s16 index, int which) {
|
||||
GXTexObj* MemoryCardManager::create_banner(u8 slot, s16 index) {
|
||||
CardDirectory* dirs = reinterpret_cast<CardDirectory*>(memorycard::getCardDirState());
|
||||
CardIcons* icons = reinterpret_cast<CardIcons*>(memorycard::getIconStateArray());
|
||||
int file = mFile[slot][index].fileNo;
|
||||
u32 file = mFile[slot][index].fileNo;
|
||||
if (dirs[slot][file].fileNo == 0 || !icons[slot][file].bannerEnable) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -54,7 +54,7 @@ namespace ipl {
|
||||
void writeFourFlagBytes(u8* flags, u8 first, u8 second, u8 third, u8 fourth);
|
||||
|
||||
void setTitleRowColors(nw4r::lyt::TextBox* textBox, const nw4r::ut::Color& first,
|
||||
const nw4r::ut::Color& second);
|
||||
const nw4r::ut::Color& second) NO_INLINE;
|
||||
|
||||
static const char* sControlPaneNames[] = {
|
||||
"A", "B", "B_BtnA",
|
||||
@@ -1141,13 +1141,15 @@ namespace ipl {
|
||||
|
||||
void SDMemory::onDialogState21() {
|
||||
const wchar_t* message = System::getMessage(mMessageId);
|
||||
const wchar_t* blockCountMarker = wcsstr(message, L"***\n");
|
||||
const wchar_t* blockCountMarker = wcsstr(message, L"****");
|
||||
wchar_t* format = new (System::getMem2App(), -32) wchar_t[0x400];
|
||||
wchar_t* dialogMessage = new (System::getMem2App(), -32) wchar_t[0x400];
|
||||
|
||||
if (blockCountMarker != NULL && message != NULL) {
|
||||
format[0] = L'\0';
|
||||
wcsncat(format, message, static_cast<u32>(blockCountMarker - message));
|
||||
memset(format + 1, 1, 0);
|
||||
wcsncat(format, message,
|
||||
(reinterpret_cast<u32>(blockCountMarker) - reinterpret_cast<u32>(message)) >> 1);
|
||||
wcscat(format, L"%d");
|
||||
wcscat(format, blockCountMarker + 4);
|
||||
|
||||
@@ -1251,7 +1253,10 @@ namespace ipl {
|
||||
|
||||
void SDMemory::drawTransferTitles() {
|
||||
const nw4r::math::VEC3& translation = mpDialogLayout->FindPaneByName("N_Memo")->GetTranslate();
|
||||
nw4r::math::VEC3 memoPosition(translation.x, translation.y, translation.z);
|
||||
nw4r::math::VEC3 memoPosition;
|
||||
memoPosition.x = translation.x;
|
||||
memoPosition.y = translation.y;
|
||||
memoPosition.z = translation.z;
|
||||
mpDialogLayout->FindPaneByName("header_header");
|
||||
nw4r::lyt::Pane* bodyPane = mpDialogLayout->FindPaneByName("header_body");
|
||||
|
||||
@@ -1284,7 +1289,8 @@ namespace ipl {
|
||||
mpDialogLayout->FindPaneByName("T_Header_body"));
|
||||
s32 totalLines = lineCount + 1;
|
||||
s32 lineIndex = 0;
|
||||
while (lineIndex < totalLines) {
|
||||
if (lineIndex < totalLines) {
|
||||
do {
|
||||
const wchar_t* lineEnd = wcsstr(messageLine, L"\n");
|
||||
if (lineEnd == NULL) {
|
||||
utility::layout::set_string(messageText, messageLine);
|
||||
@@ -1305,6 +1311,7 @@ namespace ipl {
|
||||
|
||||
messageOffset -= bodyHeight;
|
||||
++lineIndex;
|
||||
} while (lineIndex < totalLines);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1328,14 +1335,20 @@ namespace ipl {
|
||||
for (u32 titleIndex = 0; titleIndex < mTitleCount; ++titleIndex) {
|
||||
utility::layout::set_string(titleText, mTitleNames[titleIndex]);
|
||||
if (nandTitleIndex < mNandTitleCount && mTitleIds[titleIndex] == mNandTitleIds[nandTitleIndex]) {
|
||||
nw4r::ut::Color activeTitleColor;
|
||||
writeFourFlagBytes(&activeTitleColor.r, 0x34, 0xBE, 0xED, 0xFF);
|
||||
GXColor gxActive;
|
||||
writeFourFlagBytes(&gxActive.r, 0x34, 0xBE, 0xED, 0xFF);
|
||||
++nandTitleIndex;
|
||||
setTitleRowColors(titleText, activeTitleColor, activeTitleColor);
|
||||
nw4r::ut::Color active0 = *reinterpret_cast<const nw4r::ut::Color*>(&gxActive);
|
||||
setTitleRowColors(titleText,
|
||||
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxActive)),
|
||||
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxActive)));
|
||||
} else {
|
||||
nw4r::ut::Color inactiveTitleColor;
|
||||
writeFourFlagBytes(&inactiveTitleColor.r, 0x64, 0x64, 0x64, 0xFF);
|
||||
setTitleRowColors(titleText, inactiveTitleColor, inactiveTitleColor);
|
||||
GXColor gxInactive;
|
||||
writeFourFlagBytes(&gxInactive.r, 0x64, 0x64, 0x64, 0xFF);
|
||||
nw4r::ut::Color inactive0 = *reinterpret_cast<const nw4r::ut::Color*>(&gxInactive);
|
||||
setTitleRowColors(titleText,
|
||||
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxInactive)),
|
||||
nw4r::ut::Color(*reinterpret_cast<const nw4r::ut::Color*>(&gxInactive)));
|
||||
}
|
||||
|
||||
nw4r::ut::Rect textRect = mpDialogLayout->getTextDrawRect("T_Letter");
|
||||
@@ -1343,7 +1356,7 @@ namespace ipl {
|
||||
s32 visibleRows = static_cast<s32>(static_cast<f32>(ceil(-rowTop / titleSizePane->GetSize().height)));
|
||||
for (s32 row = 0; row < visibleRows; ++row) {
|
||||
f32 rowY = bodyY + backgroundOffset;
|
||||
if (rowY > -500.0f && rowY < 500.0f) {
|
||||
if (-500.0f < rowY && rowY < 500.0f) {
|
||||
nw4r::math::VEC2 translation(0.0f, backgroundOffset);
|
||||
titleSizePane->SetTranslate(translation);
|
||||
titleSizePane->CalculateMtx(*mpDialogLayout->getDrawInfo());
|
||||
@@ -1351,7 +1364,7 @@ namespace ipl {
|
||||
}
|
||||
backgroundOffset -= rowHeight;
|
||||
}
|
||||
if (bodyY + titleOffset > -500.0f && bodyY + titleOffset < 500.0f) {
|
||||
if (-500.0f < bodyY + titleOffset && bodyY + titleOffset < 500.0f) {
|
||||
nw4r::math::VEC2 translation(0.0f, titleOffset);
|
||||
titleText->SetTranslate(translation);
|
||||
titleText->CalculateMtx(*mpDialogLayout->getDrawInfo());
|
||||
@@ -1368,7 +1381,7 @@ namespace ipl {
|
||||
++footerChild;
|
||||
}
|
||||
|
||||
if (bodyY + backgroundOffset > -500.0f) {
|
||||
if (-500.0f < bodyY + backgroundOffset) {
|
||||
nw4r::math::VEC2 translation(0.0f, backgroundOffset);
|
||||
footerPane->SetTranslate(translation);
|
||||
footerPane->CalculateMtx(*mpDialogLayout->getDrawInfo());
|
||||
@@ -1388,7 +1401,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void setTitleRowColors(nw4r::lyt::TextBox* textBox, const nw4r::ut::Color& first,
|
||||
const nw4r::ut::Color& second) {
|
||||
const nw4r::ut::Color& second) NO_INLINE {
|
||||
textBox->SetTextColors(first, second);
|
||||
}
|
||||
|
||||
|
||||
@@ -220,8 +220,8 @@ namespace ipl {
|
||||
void SDChannelSelect::create() {
|
||||
mpSDWorker = new (System::getMem2App(), 4) NandSDWorker();
|
||||
mpWorkerHeap = (EGG::Heap*)System::getMem2App()->alloc(0x3EA60, 0x40);
|
||||
mpThumbnailWorkHeap = (EGG::Heap*)System::getMem2App()->alloc(
|
||||
MEMCalcHeapSizeForUnitHeap(0x19620, 0x60, 0x20) + 0x40000, 0x40);
|
||||
u32 thumbnailHeapSize = MEMCalcHeapSizeForUnitHeap(0x19620, 0x60, 0x20) + 0x40000;
|
||||
mpThumbnailWorkHeap = (EGG::Heap*)System::getMem2App()->alloc(thumbnailHeapSize, 0x40);
|
||||
mpSDWorker->create(mpWorkerHeap, NULL, mpThumbnailWorkHeap, 0x12);
|
||||
|
||||
if (System::getSaveData()->didntGotoSDMenu() == FALSE) {
|
||||
@@ -264,7 +264,6 @@ namespace ipl {
|
||||
command.arguments.values[0] = 0;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = 0;
|
||||
command.arguments.values[2] = 0;
|
||||
mCommandQueue.push(command);
|
||||
}
|
||||
|
||||
@@ -274,7 +273,6 @@ namespace ipl {
|
||||
command.arguments.values[0] = 0;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = 0;
|
||||
command.arguments.values[2] = 0;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -289,7 +287,6 @@ namespace ipl {
|
||||
notice.arguments.values[0] = argument0;
|
||||
notice.arguments.values[1] = argument1;
|
||||
notice.titleId = titleId;
|
||||
notice.arguments.values[2] = 0;
|
||||
if (mNoticeQueue.capacity != mNoticeQueue.count) {
|
||||
mNoticeQueue.notices[mNoticeQueue.writeIndex].copyFrom(notice);
|
||||
++mNoticeQueue.writeIndex;
|
||||
@@ -311,7 +308,6 @@ namespace ipl {
|
||||
command.arguments.values[0] = 0;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = 0;
|
||||
command.arguments.values[2] = 0;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -326,7 +322,6 @@ namespace ipl {
|
||||
command.arguments.values[0] = 0;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = 0;
|
||||
command.arguments.values[2] = 0;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -341,7 +336,6 @@ namespace ipl {
|
||||
command.arguments.values[0] = 0;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = result;
|
||||
command.arguments.values[2] = 0;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -356,7 +350,6 @@ namespace ipl {
|
||||
command.arguments.values[0] = value;
|
||||
command.arguments.values[1] = (u32)&mFirstTitleCount;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
command.arguments.values[2] = 0;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -371,7 +364,6 @@ namespace ipl {
|
||||
command.arguments.values[0] = 0;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
command.arguments.values[2] = 0;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -386,7 +378,6 @@ namespace ipl {
|
||||
command.arguments.values[0] = state;
|
||||
command.arguments.values[1] = 0;
|
||||
command.titleId = ((u64)page << 32) | index;
|
||||
command.arguments.values[2] = 0;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -401,7 +392,6 @@ namespace ipl {
|
||||
command.arguments.values[0] = page;
|
||||
command.arguments.values[1] = index;
|
||||
command.titleId = 0;
|
||||
command.arguments.values[2] = 0;
|
||||
mCommandQueue.push(command);
|
||||
return true;
|
||||
}
|
||||
@@ -1285,12 +1275,17 @@ namespace ipl {
|
||||
}
|
||||
|
||||
bool SDChannelSelect::isCurrentTitleUsageEnough(const s32* usage) const {
|
||||
s32 blocks = mSecondTitleCount;
|
||||
s32 bytes = mFirstTitleCount;
|
||||
ESTitleId currentTitleId = SCGetTmpTitleID();
|
||||
|
||||
u32 titleCount = mNandTitleCount;
|
||||
s32 bytes;
|
||||
u32 titleCount;
|
||||
s32 blocks;
|
||||
ESTitleId currentTitleId;
|
||||
u32 index;
|
||||
|
||||
bytes = mFirstTitleCount;
|
||||
blocks = mSecondTitleCount;
|
||||
currentTitleId = SCGetTmpTitleID();
|
||||
|
||||
titleCount = mNandTitleCount;
|
||||
for (index = 0; index < titleCount; ++index) {
|
||||
if (mpNandTitleInfo[index].curTitleId == currentTitleId) {
|
||||
break;
|
||||
@@ -1301,9 +1296,11 @@ namespace ipl {
|
||||
blocks += mpNandTitleInfo[index].inode;
|
||||
}
|
||||
|
||||
return bytes >= usage[0] && blocks >= usage[1];
|
||||
if (bytes >= usage[0] && blocks >= usage[1]) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void SDChannelSelect::getCurrentTitleUsage(s32* bytes, s32* blocks) const {
|
||||
*bytes = mFirstTitleCount;
|
||||
*blocks = mSecondTitleCount;
|
||||
@@ -1456,6 +1453,7 @@ namespace ipl {
|
||||
s32 bytes;
|
||||
s32 blocks;
|
||||
getCurrentTitleUsage(&bytes, &blocks);
|
||||
|
||||
int hateUsageIndex = -1;
|
||||
int hatePage = -1;
|
||||
int hateChannelIndex = -1;
|
||||
@@ -1464,45 +1462,48 @@ namespace ipl {
|
||||
int hadeChannelIndex = -1;
|
||||
|
||||
for (u32 usageIndex = 0; usageIndex < mNandTitleCount; ++usageIndex) {
|
||||
const ESTitleId titleId = mpNandTitleInfo[usageIndex].curTitleId;
|
||||
ESTitleId titleId = mpNandTitleInfo[usageIndex].curTitleId;
|
||||
if (titleId == ES_TITLE_ID(0x00010001, 0x48415445)) {
|
||||
int page;
|
||||
int channelIndex;
|
||||
hateUsageIndex = usageIndex;
|
||||
int foundPage = -1;
|
||||
int foundIndex = -1;
|
||||
System::getChannelManager()->hasChannel(
|
||||
ES_TITLE_ID(0x00010001, 0x48415445), &foundPage, &foundIndex);
|
||||
hatePage = foundPage;
|
||||
hateChannelIndex = foundIndex;
|
||||
ES_TITLE_ID(0x00010001, 0x48415445), &page, &channelIndex);
|
||||
hatePage = page;
|
||||
hateChannelIndex = channelIndex;
|
||||
} else if (titleId == ES_TITLE_ID(0x00010001, 0x48414445)) {
|
||||
int page;
|
||||
int channelIndex;
|
||||
hadeUsageIndex = usageIndex;
|
||||
int foundPage = -1;
|
||||
int foundIndex = -1;
|
||||
System::getChannelManager()->hasChannel(
|
||||
ES_TITLE_ID(0x00010001, 0x48414445), &foundPage, &foundIndex);
|
||||
hadePage = foundPage;
|
||||
hadeChannelIndex = foundIndex;
|
||||
ES_TITLE_ID(0x00010001, 0x48414445), &page, &channelIndex);
|
||||
hadePage = page;
|
||||
hadeChannelIndex = channelIndex;
|
||||
}
|
||||
}
|
||||
|
||||
*titleCount = 0;
|
||||
for (int usageIndex = mNandTitleCount - 1; usageIndex >= 0; --usageIndex) {
|
||||
const ESTitleId titleId = mpNandTitleInfo[usageIndex].curTitleId;
|
||||
if (titleId == 0x48415A41 || titleId == ES_TITLE_ID(0x00010001, 0x48415445) || titleId == ES_TITLE_ID(0x00010001, 0x48414445)) {
|
||||
if (mpNandTitleInfo[usageIndex].curTitleId == 0x48415A41 ||
|
||||
mpNandTitleInfo[usageIndex].curTitleId == ES_TITLE_ID(0x00010001, 0x48415445) ||
|
||||
mpNandTitleInfo[usageIndex].curTitleId == ES_TITLE_ID(0x00010001, 0x48414445)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
int page;
|
||||
int channelIndex;
|
||||
if (System::getChannelManager()->hasChannel(titleId, &page, &channelIndex) == 0) {
|
||||
if (System::getChannelManager()->hasChannel(
|
||||
mpNandTitleInfo[usageIndex].curTitleId, &page, &channelIndex) == 0) {
|
||||
continue;
|
||||
}
|
||||
if (iplSavedata_813597A0(System::getSaveData(), titleId) != FALSE) {
|
||||
if (isTitleCached(System::getSaveData(),
|
||||
mpNandTitleInfo[usageIndex].curTitleId) != FALSE) {
|
||||
continue;
|
||||
}
|
||||
|
||||
bytes += mpNandTitleInfo[usageIndex].size;
|
||||
blocks += mpNandTitleInfo[usageIndex].inode;
|
||||
titleIds[*titleCount] = titleId;
|
||||
titleIds[*titleCount] = mpNandTitleInfo[usageIndex].curTitleId;
|
||||
wchar_t* titleName = System::getChannelManager()->getTitleName(
|
||||
page, channelIndex, 0);
|
||||
memcpy(titleNames + *titleCount * 0x2a, titleName, 0x2a);
|
||||
@@ -1543,7 +1544,7 @@ namespace ipl {
|
||||
if (hadeUsageIndex >= 0) {
|
||||
bytes += mpNandTitleInfo[hadeUsageIndex].size;
|
||||
blocks += mpNandTitleInfo[hadeUsageIndex].inode;
|
||||
titleIds[*titleCount] = ES_TITLE_ID(0x00010001, 0x48414445);
|
||||
titleIds[*titleCount] = mpNandTitleInfo[hadeUsageIndex].curTitleId;
|
||||
wchar_t* titleName =
|
||||
System::getChannelManager()->getTitleName(
|
||||
hadePage, hadeChannelIndex, 0);
|
||||
@@ -1558,7 +1559,7 @@ namespace ipl {
|
||||
if (hateUsageIndex >= 0) {
|
||||
bytes += mpNandTitleInfo[hateUsageIndex].size;
|
||||
blocks += mpNandTitleInfo[hateUsageIndex].inode;
|
||||
titleIds[*titleCount] = ES_TITLE_ID(0x00010001, 0x48415445);
|
||||
titleIds[*titleCount] = mpNandTitleInfo[hateUsageIndex].curTitleId;
|
||||
wchar_t* titleName =
|
||||
System::getChannelManager()->getTitleName(
|
||||
hatePage, hateChannelIndex, 0);
|
||||
@@ -1570,7 +1571,10 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
return bytes >= firstUsage[0] && blocks >= firstUsage[1];
|
||||
if (bytes >= firstUsage[0] && blocks >= firstUsage[1]) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool SDChannelSelect::collectTitlesForMode(
|
||||
@@ -1595,8 +1599,8 @@ namespace ipl {
|
||||
}
|
||||
|
||||
bool SDChannelSelect::findAdjacentChannel(int direction, int* page, int* index) const {
|
||||
int currentPage;
|
||||
int slotCount;
|
||||
int currentPage;
|
||||
int currentSlot;
|
||||
currentPage = mCurrentPage;
|
||||
currentSlot = currentPage * MAX_CHANNEL_INDEX + mCurrentChannelIndex;
|
||||
@@ -1696,7 +1700,7 @@ namespace ipl {
|
||||
if (mState == 2 && !mpLayout->isPlaying(0)) {
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
if (button != NULL) {
|
||||
button->setEventHandler(mpButtonEventHandler, NULL);
|
||||
button->setEventHandler(mpButtonEventHandler);
|
||||
mState = 3;
|
||||
if (mCurrentPage > 0) {
|
||||
button->initArrowAppearance(1, true);
|
||||
@@ -1929,10 +1933,11 @@ namespace ipl {
|
||||
SDChannelObj* channel = NULL;
|
||||
System::getSaveData()->setLastSDPrevPage(mCurrentPage);
|
||||
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, NULL)),
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
nw4r::ut::List_Remove(&mChannelObjects, channel);
|
||||
destroyChannelObject(channel);
|
||||
channel = NULL;
|
||||
}
|
||||
|
||||
mpLayoutHeap->destroy();
|
||||
@@ -1948,8 +1953,8 @@ namespace ipl {
|
||||
OSSleepTicks(OSMicrosecondsToTicks((OSTime)100));
|
||||
}
|
||||
delete mpSaveDataFile;
|
||||
mpSaveDataFile = NULL;
|
||||
}
|
||||
mpSaveDataFile = NULL;
|
||||
|
||||
if (mpSDWorker != NULL) {
|
||||
if (!mpSDWorker->is_terminated()) {
|
||||
@@ -2071,13 +2076,11 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDChannelSelect::drawChannelTransitionObjects() {
|
||||
int index;
|
||||
int page;
|
||||
SDChannelObj* channel = NULL;
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
page = channel->getPage();
|
||||
index = channel->getIndex();
|
||||
int page = channel->mPage;
|
||||
int index = channel->mIndex;
|
||||
if (!hasChannelObject(page, index) || !isChannelReady(channel)) {
|
||||
continue;
|
||||
}
|
||||
@@ -2086,14 +2089,25 @@ namespace ipl {
|
||||
iplSDChannelObj_813E32C8(channel);
|
||||
|
||||
if (iplSDChannelObj_813E3330(channel)) {
|
||||
if (mState < 24 && mState >= 15 &&
|
||||
(page != mSourcePage || index != mSourceIndex)) {
|
||||
nw4r::math::VEC3 position(channel->getTranslate());
|
||||
mpPageLayouts[0]->GetRootPane()->SetTranslate(position);
|
||||
mpPageLayouts[0]->calcMtx();
|
||||
mpPageLayouts[0]->draw();
|
||||
switch (mState) {
|
||||
case 15:
|
||||
case 16:
|
||||
case 17:
|
||||
case 18:
|
||||
case 19:
|
||||
case 20:
|
||||
case 21:
|
||||
case 22:
|
||||
case 23:
|
||||
if (page != mSourcePage || index != mSourceIndex) {
|
||||
nw4r::math::VEC3 position(channel->getTranslate());
|
||||
mpPageLayouts[0]->GetRootPane()->SetTranslate(position);
|
||||
mpPageLayouts[0]->calcMtx();
|
||||
mpPageLayouts[0]->draw();
|
||||
}
|
||||
break;
|
||||
}
|
||||
} else if (channel->mState == 2) {
|
||||
} else if (channel->mStateFlags == 2) {
|
||||
nw4r::math::VEC3 position(channel->getTranslate());
|
||||
mpErrorLayout->GetRootPane()->SetTranslate(position);
|
||||
mpErrorLayout->calcMtx();
|
||||
@@ -2105,7 +2119,6 @@ namespace ipl {
|
||||
case 16:
|
||||
case 19:
|
||||
case 20:
|
||||
case 21:
|
||||
case 22:
|
||||
case 23:
|
||||
if (page == mSourcePage && index == mSourceIndex) {
|
||||
@@ -2117,10 +2130,15 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
|
||||
if (mState < 22 && mState >= 19 &&
|
||||
page == mDestinationPage && index == mDestinationIndex) {
|
||||
mpPageLayouts[2]->draw();
|
||||
mpPointerLayout->draw();
|
||||
switch (mState) {
|
||||
case 19:
|
||||
case 20:
|
||||
case 21:
|
||||
if (page == mDestinationPage && index == mDestinationIndex) {
|
||||
mpPageLayouts[2]->draw();
|
||||
mpPointerLayout->draw();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2244,7 +2262,7 @@ namespace ipl {
|
||||
mbRightArrowVisible = false;
|
||||
}
|
||||
|
||||
button->setEventHandler(mpButtonEventHandler, NULL);
|
||||
button->setEventHandler(mpButtonEventHandler);
|
||||
TVRCManager::getHandle()->setEnable(TRUE);
|
||||
snd::getSystem()->startBGM("WIPL_BGM_MENU");
|
||||
clearNoticeQueue();
|
||||
@@ -2703,8 +2721,8 @@ namespace ipl {
|
||||
nw4r::math::MTX44 matrix;
|
||||
f32 rightScale = projection.right / mScale.x;
|
||||
f32 leftScale = projection.left / mScale.x;
|
||||
f32 topScale = projection.top / mScale.y;
|
||||
f32 bottomScale = projection.bottom / mScale.y;
|
||||
f32 topScale = projection.top / mScale.y;
|
||||
f32 bottom = mPosition.y - bottomScale;
|
||||
f32 right = mPosition.x + rightScale;
|
||||
f32 left = mPosition.x + leftScale;
|
||||
@@ -3463,7 +3481,7 @@ namespace ipl {
|
||||
|
||||
if (strcmp(paneName,
|
||||
SDButton::smButtonName[SDButton::BTN_WII_MENU]) == 0) {
|
||||
button->setEventHandler(NULL, NULL);
|
||||
button->setEventHandler(NULL);
|
||||
mpScene->mState = 4;
|
||||
snd::getSystem()->startSE("WIPL_SE_DECIDE");
|
||||
return;
|
||||
|
||||
@@ -86,8 +86,15 @@ 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 int sCaptureSizes[2][2] = {{128, 96}, {176, 96}};
|
||||
|
||||
static const wchar_t sMissingTitle[] = L"???";
|
||||
|
||||
static const char* sButtonGroups[7] = {
|
||||
"G_FocusBtnA", "G_FocusBtnB", "G_SelectBtnA", "G_SelectBtnB",
|
||||
"G_OnOffBtnA", "G_OnOffBtnB", "G_OutBtn"
|
||||
@@ -103,28 +110,27 @@ static const char* sButtonAnimationNames[6] = {
|
||||
static const char* sBannerAnimationNames[3] = {
|
||||
"banner.brlan", "banner_Start.brlan", "banner_Loop.brlan"
|
||||
};
|
||||
static const char* sTextNames[2] = {"T_BtnA", "T_BtnB"};
|
||||
static const char* sButtonNames[2] = {"B_BtnA", "B_BtnB"};
|
||||
static const char* sTexturePaneNames[3][4] = {
|
||||
{"Fre_a", "Fre_d", "Fre_i", "Fre_l"},
|
||||
{"Fre_e", "Fre_f", "Fre_g", "Fre_h"},
|
||||
{"Fre_b", "Fre_c", "Fre_j", "Fre_k"}
|
||||
};
|
||||
static const char* sTextNames[2] = {"T_BtnA", "T_BtnB"};
|
||||
|
||||
class SDTitleButtonEventHandler : public SDButtonEventHandlerBase {
|
||||
class SDTitlePaneEventHandler : public ::gui::EventHandler {
|
||||
public:
|
||||
SDTitleButtonEventHandler(SDChannelTitle* scene) : mpScene(scene) {}
|
||||
virtual void onEventDerived(u32 component, u32 event, const controller::Interface* controller);
|
||||
SDTitlePaneEventHandler(SDChannelTitle* scene) : mpScene(scene) {}
|
||||
virtual void onEvent(u32 component, u32 event, void* data);
|
||||
nw4r::lyt::Pane* getPane(u32 component) {
|
||||
return static_cast< ::gui::PaneComponent*>(mpManager->getComponent(component))->getPane();
|
||||
}
|
||||
SDChannelTitle* mpScene;
|
||||
};
|
||||
|
||||
class SDTitlePaneEventHandler : public ::gui::EventHandler {
|
||||
class SDTitleButtonEventHandler : public SDButtonEventHandlerBase {
|
||||
public:
|
||||
SDTitlePaneEventHandler(SDChannelTitle* scene) : mpScene(scene) {}
|
||||
virtual void onEvent(u32 component, u32 event, void* data);
|
||||
SDTitleButtonEventHandler(SDChannelTitle* scene) : mpScene(scene) {}
|
||||
virtual void onEventDerived(u32 component, u32 event, const controller::Interface* controller);
|
||||
nw4r::lyt::Pane* getPane(u32 component) {
|
||||
return static_cast< ::gui::PaneComponent*>(mpManager->getComponent(component))->getPane();
|
||||
}
|
||||
@@ -222,9 +228,8 @@ void SDChannelTitle::create() {
|
||||
comment->SetString(System::getMessage(0xad));
|
||||
iplSDChannelTitle_813E630C(this);
|
||||
mpFade = new math::HermiteIntp<f32>();
|
||||
const f32 fadeStart = 0.0f;
|
||||
const f32 fadeEnd = 255.0f;
|
||||
mpFade->init(fadeStart, fadeEnd, 10.0f, 0.0f, 0.0f);
|
||||
static f32 fadeRange[2] = {0.0f, 255.0f};
|
||||
mpFade->init(fadeRange[0], fadeRange[1], 28.0f, 0.0f, 0.0f);
|
||||
mpFade->setAnmType(ANIM_TYPE_FORWARD);
|
||||
mpScreenCapture = new (System::getTreasureHeap(), 32) utility::Capture(System::getTreasureHeap(), 0, 0,
|
||||
System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight, GX_TF_RGB565);
|
||||
@@ -560,7 +565,7 @@ extern "C" void iplSDChannelTitle_813E6424(SDChannelTitle* scene) {
|
||||
if (channel->mStateFlags == 0) {
|
||||
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(iplSDChannelObj_813E4060(channel, 0));
|
||||
} else {
|
||||
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(L"");
|
||||
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(sMissingTitle);
|
||||
}
|
||||
scene->mpProgressLayout->getAnim(0)->stop();
|
||||
scene->mpProgressLayout->getAnim(0)->initAnmFrame();
|
||||
@@ -1014,9 +1019,8 @@ extern "C" void iplSDChannelTitle_813E7A18(SDChannelTitle* scene) {
|
||||
if (!scene->mScriptEnabled || scene->mScriptState == 4) {
|
||||
if (scene->mpChannelSelect->prepareRestarting(scene->mPage)) {
|
||||
scene->mpChannelSelect->startPageTransition(scene->mPage, scene->mIndex);
|
||||
const f32 fadeStart = 255.0f;
|
||||
const f32 fadeEnd = 0.0f;
|
||||
scene->mpFade->init(fadeStart, fadeEnd, 10.0f, 0.0f, 0.0f);
|
||||
static f32 fadeRange[2] = {0.0f, 255.0f};
|
||||
scene->mpFade->init(fadeRange[0], fadeRange[1], 28.0f, 0.0f, 0.0f);
|
||||
scene->mpFade->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
scene->mpFade->play();
|
||||
scene->mState = 6;
|
||||
@@ -1354,7 +1358,7 @@ extern "C" void iplSDChannelTitle_813E8A20(SDChannelTitle* scene, int nextScene)
|
||||
int page;
|
||||
int index;
|
||||
if (System::getChannelManager()->hasChannel(scene->mTitleId, &page, &index)) {
|
||||
System::getSaveData()->iplSavedata_813596B8(scene->mTitleId);
|
||||
System::getSaveData()->pushTitleCache(scene->mTitleId);
|
||||
}
|
||||
System::getSaveData()->getSDPrevPage() = scene->mPage;
|
||||
EGG::Heap* saveHeap = System::getMem2App();
|
||||
@@ -1556,13 +1560,13 @@ void SDChannelTitle::startResetting() {
|
||||
snd::getSystem()->resetAllSound();
|
||||
}
|
||||
|
||||
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
|
||||
iplSDChannelTitle_813E9004(this, component, event, static_cast<const controller::Interface*>(data));
|
||||
}
|
||||
|
||||
void SDTitleButtonEventHandler::onEventDerived(u32 component, u32 event, const controller::Interface* controller) {
|
||||
iplSDChannelTitle_813E92EC(this, component, event, controller);
|
||||
}
|
||||
|
||||
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
|
||||
iplSDChannelTitle_813E9004(this, component, event, static_cast<const controller::Interface*>(data));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -762,8 +762,7 @@ unlock_driver:
|
||||
|
||||
int ATERM_8140276C(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
|
||||
u32* changedIndex) {
|
||||
AtermApRecord* currentRecord = currentRecords->entries;
|
||||
AtermApRecord* previousRecord = previousRecords->entries;
|
||||
u32 previousIndex;
|
||||
u32 currentIndex = 0;
|
||||
int found = 0;
|
||||
int result = 0;
|
||||
@@ -771,7 +770,8 @@ int ATERM_8140276C(AtermApRecordSet* currentRecords, AtermApRecordSet* previousR
|
||||
size_t compareLength;
|
||||
size_t aossLength;
|
||||
size_t formattedSsidLength;
|
||||
u32 previousIndex;
|
||||
AtermApRecord* currentRecord = currentRecords->entries;
|
||||
AtermApRecord* previousRecord = previousRecords->entries;
|
||||
|
||||
|
||||
for (; currentIndex < currentRecords->count; currentIndex++) {
|
||||
@@ -813,9 +813,11 @@ int ATERM_8140276C(AtermApRecordSet* currentRecords, AtermApRecordSet* previousR
|
||||
|
||||
if (!found) {
|
||||
AtermSsidBuffer aossSsidName;
|
||||
int currentHasAoss = 0;
|
||||
int previousHasAoss = 0;
|
||||
int currentHasAoss;
|
||||
int previousHasAoss;
|
||||
|
||||
previousHasAoss = 0;
|
||||
currentHasAoss = 0;
|
||||
aossSsidName.clear.word0 = 0;
|
||||
aossSsidName.clear.word1 = 0;
|
||||
aossSsidName.clear.word2 = 0;
|
||||
@@ -869,17 +871,17 @@ int ATERM_8140276C(AtermApRecordSet* currentRecords, AtermApRecordSet* previousR
|
||||
|
||||
int ATERM_81402A24(void) {
|
||||
s32 result = -1;
|
||||
s32 progressInfo[4];
|
||||
AtermApRecordSet* currentRecords = NULL;
|
||||
AtermApRecordSet* previousRecords = NULL;
|
||||
u32 scanBufferBytes;
|
||||
u32 recordIndex;
|
||||
s32 iteration = 0;
|
||||
u8* rawScanBuffer = NULL;
|
||||
u8* scanBuffer;
|
||||
u16* firstDescriptor;
|
||||
u32 recordBytes = gAtermScanLimit * sizeof(AtermApRecord) + sizeof(AtermApRecord) + sizeof(u32);
|
||||
u32 scanBufferBytes;
|
||||
s32 progressInfo[4];
|
||||
u32 scanCount;
|
||||
u32 recordIndex;
|
||||
s32 iteration = 0;
|
||||
AtermApRecordSet* currentRecords = NULL;
|
||||
AtermApRecordSet* previousRecords = NULL;
|
||||
u32 now;
|
||||
char selectedMacText[32];
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -1419,8 +1419,8 @@ namespace ipl {
|
||||
mpChangeLayout->FindPaneByName("N_Tra0")->SetVisible(true);
|
||||
}
|
||||
|
||||
WWWRect* wideRect = NULL;
|
||||
WWWRect* standardRect = NULL;
|
||||
WWWRect* standardRect;
|
||||
WWWRect* wideRect;
|
||||
void* wideBuffer = browser->GetTextureBuffer(1, &wideRect);
|
||||
void* standardBuffer = browser->GetTextureBuffer(0, &standardRect);
|
||||
nw4r::ut::Rect projection4x3;
|
||||
@@ -1434,8 +1434,8 @@ namespace ipl {
|
||||
screenRect.bottom = -screenHeight / 2;
|
||||
|
||||
if (wideBuffer != NULL && standardBuffer != NULL) {
|
||||
GXTexObj wideTexture;
|
||||
GXTexObj standardTexture;
|
||||
GXTexObj wideTexture;
|
||||
GXInitTexObj(&wideTexture, wideBuffer, wideRect->w, wideRect->h, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
GXInitTexObj(&standardTexture, standardBuffer, standardRect->w, standardRect->h, GX_TF_RGB565, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||
GXInitTexObjLOD(&wideTexture, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1);
|
||||
@@ -1715,9 +1715,8 @@ namespace ipl {
|
||||
memset(unk_0x938, 0, sizeof(unk_0x938));
|
||||
}
|
||||
|
||||
keyboard::Manager* keyboardManager = System::getKeyboard();
|
||||
if (productArea == 11) {
|
||||
keyboardManager->memoFrm()->setZiDictionary(keyboardManager->getZiOemDic(), keyboardManager->getZiSystemDic());
|
||||
System::getKeyboard()->memoFrm()->setZiDictionary(System::getKeyboard()->getZiOemDic(), System::getKeyboard()->getZiSystemDic());
|
||||
}
|
||||
|
||||
keyboard::Manager::KeyboardSetting setting;
|
||||
@@ -1725,12 +1724,12 @@ namespace ipl {
|
||||
setting.wcString = reinterpret_cast<const wchar_t*>(unk_0x938);
|
||||
setting.stringLimit = stringLimit;
|
||||
setting.rowLimit = rowLimit;
|
||||
keyboardManager->start(0, setting);
|
||||
System::getKeyboard()->start(0, setting);
|
||||
|
||||
if (invalidInput != 0) {
|
||||
setDefaultBackString();
|
||||
} else {
|
||||
keyboardManager->baseMgr()->setTitleText(L"");
|
||||
System::getKeyboard()->baseMgr()->setTitleText(L"");
|
||||
}
|
||||
if (mpWiiSettingData->data[0x11] == 17) {
|
||||
System::getKeyboard()->baseMgr()->setSecretInputMode(true);
|
||||
@@ -1811,9 +1810,9 @@ namespace ipl {
|
||||
ext_ead::www::SurfaceManager::GetInstance()->GetBrowserThread()->CommitIme(mpBrowserData, formText);
|
||||
memset(mpStringBuffer->asterisks, 0, sizeof(mpStringBuffer->asterisks));
|
||||
} else if (mpWiiSettingData->data[0x11] == 2 || mpWiiSettingData->data[0x11] == 22) {
|
||||
s32 index = 0;
|
||||
memcpy(mpStringBuffer->asterisks, mpStringBuffer->securityKey, sizeof(mpStringBuffer->securityKey));
|
||||
mpStringBuffer->asterisks[0x41] = 0;
|
||||
s32 index = 0;
|
||||
while (mpStringBuffer->asterisks[index] != 0) {
|
||||
mpStringBuffer->asterisks[index++] = '*';
|
||||
}
|
||||
@@ -1905,12 +1904,16 @@ namespace ipl {
|
||||
case keyboard::Manager::STATE_HIDDEN:
|
||||
case keyboard::Manager::STATE_APPEARING: {
|
||||
u8 formId = mpWiiSettingData->data[0x11];
|
||||
if (formId >= 1 && formId <= 22 && formId != 9 && formId != 21) {
|
||||
if (!System::getKeyboard()->memoMgr()->isVacancy()) {
|
||||
System::getKeyboard()->baseMgr()->setTitleText(L"");
|
||||
} else {
|
||||
switch (formId) {
|
||||
case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8:
|
||||
case 10: case 11: case 12: case 13: case 14: case 15: case 16:
|
||||
case 17: case 18: case 19: case 20: case 22:
|
||||
if (System::getKeyboard()->memoMgr()->isVacancy()) {
|
||||
setDefaultBackString();
|
||||
} else {
|
||||
System::getKeyboard()->baseMgr()->setTitleText(L"");
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -2448,11 +2451,12 @@ namespace ipl {
|
||||
void Setting::convertRevIP(u8* destination, const char* address) {
|
||||
char ascii[20];
|
||||
int count = 0;
|
||||
int index;
|
||||
memset(ascii, 0, sizeof(ascii));
|
||||
utility::CharacterCode::UTF8ToANSI(reinterpret_cast<u8*>(ascii), address);
|
||||
int componentStart = 0;
|
||||
u8* output = destination;
|
||||
for (int index = 0; index < 0x10; ++index) {
|
||||
for (index = 0; index < 0x10; ++index) {
|
||||
u8 character = static_cast<u8>(ascii[index]);
|
||||
if (character == '.' || character == 0) {
|
||||
if (character == 0) {
|
||||
@@ -2714,9 +2718,10 @@ namespace ipl {
|
||||
case 5:
|
||||
mpPaneManager->update();
|
||||
break;
|
||||
case 6:
|
||||
case 6: {
|
||||
int animationIndex = unk_0x918;
|
||||
unk_0xB9C = 1;
|
||||
if (!mpMainLayout->getAnim(unk_0x918)->isPlaying()) {
|
||||
if (!mpMainLayout->getAnim(animationIndex)->isPlaying()) {
|
||||
unk_0x78 = 5;
|
||||
setAPDraw();
|
||||
if (unk_0x91C[0] != 0) {
|
||||
@@ -2738,6 +2743,7 @@ namespace ipl {
|
||||
mpMainLayout->FindPaneByName("N_AP7")->SetVisible(true);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 7:
|
||||
unk_0xB9C = 1;
|
||||
if (!mpMainLayout->getAnim(unk_0x918)->isPlaying()) {
|
||||
@@ -3553,6 +3559,10 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
static inline bool HasUSBAPResult(const u8* result) {
|
||||
return *result != 0;
|
||||
}
|
||||
|
||||
void Setting::setUSBAP() {
|
||||
switch (unk_0x84) {
|
||||
case 1:
|
||||
@@ -3573,7 +3583,7 @@ namespace ipl {
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (unk_0x91C[1] != 0) {
|
||||
if (HasUSBAPResult(&unk_0x91C[1])) {
|
||||
www::wiisetting::setFuncResult(unk_0x91C[1]);
|
||||
unk_0x84 = 1;
|
||||
unk_0x91C[1] = 0;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -13,7 +13,10 @@
|
||||
extern "C" void __ct__Q23EGG20SimpleAudioMgrWithFxFv();
|
||||
extern "C" void __dt__Q34nw4r3snd11SoundHandleFv();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void __destroy_arr();
|
||||
extern "C" {
|
||||
void __destroy_arr();
|
||||
void __dt__Q33ipl3snd10tagSSeInfoFv();
|
||||
}
|
||||
extern "C" void _seBlk__Q23ipl3snd();
|
||||
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
|
||||
extern "C" const f32 lbl_816946A4;
|
||||
@@ -21,7 +24,11 @@ extern "C" const f32 lbl_816946AC;
|
||||
extern "C" const f32 lbl_816946A8;
|
||||
extern "C" const f32 lbl_816946B0;
|
||||
extern "C" const f32 lbl_816946B4;
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" {
|
||||
void _savegpr_29();
|
||||
void pauseOffSE__Q33ipl3snd6SystemFv();
|
||||
void pauseOnSE__Q33ipl3snd6SystemFv();
|
||||
}
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" void _savegpr_24();
|
||||
extern "C" void _restgpr_24();
|
||||
@@ -40,31 +47,12 @@ namespace ipl {
|
||||
namespace snd {
|
||||
extern "C" void __vt__Q33ipl3snd6System();
|
||||
|
||||
extern "C" asm void __ct__Q33ipl3snd6SystemFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
mr r31, r3
|
||||
bl __ct__Q23EGG20SimpleAudioMgrWithFxFv
|
||||
lis r5, __vt__Q33ipl3snd6System@ha
|
||||
mr r3, r31
|
||||
addi r5, r5, __vt__Q33ipl3snd6System@l
|
||||
addi r4, r5, 0x10
|
||||
stw r5, 0x0(r31)
|
||||
addi r0, r5, 0x20
|
||||
stw r4, 0x4(r31)
|
||||
stw r0, 0x34(r31)
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r0, 0x14(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
System::System() {
|
||||
}
|
||||
|
||||
struct tagSSeInfo {
|
||||
tagSSeInfo();
|
||||
~tagSSeInfo();
|
||||
|
||||
nw4r::snd::SoundHandle handle;
|
||||
const char* name;
|
||||
@@ -78,63 +66,16 @@ namespace ipl {
|
||||
struct tagSBgmInfo {
|
||||
nw4r::snd::SoundHandle handle;
|
||||
tagSBgmInfo();
|
||||
~tagSBgmInfo();
|
||||
};
|
||||
|
||||
tagSBgmInfo::tagSBgmInfo() {
|
||||
}
|
||||
|
||||
extern "C" asm void __dt__Q33ipl3snd10tagSSeInfoFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
cmpwi r3, 0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
mr r31, r4
|
||||
stw r30, 0x8(r1)
|
||||
mr r30, r3
|
||||
beq se_dtor_done
|
||||
li r4, -1
|
||||
bl __dt__Q34nw4r3snd11SoundHandleFv
|
||||
cmpwi r31, 0
|
||||
ble se_dtor_done
|
||||
mr r3, r30
|
||||
bl __dl__FPv
|
||||
se_dtor_done:
|
||||
mr r3, r30
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 0x8(r1)
|
||||
lwz r0, 0x14(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
tagSSeInfo::~tagSSeInfo() {
|
||||
}
|
||||
|
||||
extern "C" asm void __dt__Q33ipl3snd11tagSBgmInfoFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
cmpwi r3, 0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
mr r31, r4
|
||||
stw r30, 0x8(r1)
|
||||
mr r30, r3
|
||||
beq bgm_dtor_done
|
||||
li r4, -1
|
||||
bl __dt__Q34nw4r3snd11SoundHandleFv
|
||||
cmpwi r31, 0
|
||||
ble bgm_dtor_done
|
||||
mr r3, r30
|
||||
bl __dl__FPv
|
||||
bgm_dtor_done:
|
||||
mr r3, r30
|
||||
lwz r31, 0xc(r1)
|
||||
lwz r30, 0x8(r1)
|
||||
lwz r0, 0x14(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
tagSBgmInfo::~tagSBgmInfo() {
|
||||
}
|
||||
|
||||
extern nw4r::snd::SoundHandle _bgmBlk;
|
||||
@@ -161,211 +102,56 @@ namespace ipl {
|
||||
1.0f,
|
||||
};
|
||||
|
||||
extern "C" asm void stopBGM__Q33ipl3snd6SystemFi() {
|
||||
nofralloc
|
||||
lwz r3, _mainBGMHandle__Q23ipl3snd
|
||||
cmpwi r3, 0
|
||||
beqlr
|
||||
lwz r0, 0(r3)
|
||||
cmpwi r0, 0
|
||||
beqlr
|
||||
beqlr
|
||||
lwz r3, 0(r3)
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x18(r12)
|
||||
mtctr r12
|
||||
bctr
|
||||
blr
|
||||
void System::stopBGM(int frames) {
|
||||
if (_mainBGMHandle && _mainBGMHandle->IsAttachedSound()) {
|
||||
_mainBGMHandle->Stop(frames);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" asm void muteOnBGM__Q33ipl3snd6SystemFi() {
|
||||
nofralloc
|
||||
lwz r3, _mainBGMHandle__Q23ipl3snd
|
||||
cmpwi r3, 0
|
||||
beqlr
|
||||
lwz r3, 0(r3)
|
||||
cmpwi r3, 0
|
||||
beqlr
|
||||
beqlr
|
||||
lwz r12, 0(r3)
|
||||
lfs f1, lbl_816946A4
|
||||
lwz r12, 0x38(r12)
|
||||
mtctr r12
|
||||
bctr
|
||||
blr
|
||||
void System::muteOnBGM(int frames) {
|
||||
nw4r::snd::SoundHandle* handle = _mainBGMHandle;
|
||||
if (handle && handle->IsAttachedSound()) handle->SetVolume(0.0f, frames);
|
||||
}
|
||||
|
||||
extern "C" asm void muteOffBGM__Q33ipl3snd6SystemFi() {
|
||||
nofralloc
|
||||
lwz r3, _mainBGMHandle__Q23ipl3snd
|
||||
cmpwi r3, 0
|
||||
beqlr
|
||||
lwz r3, 0(r3)
|
||||
cmpwi r3, 0
|
||||
beqlr
|
||||
beqlr
|
||||
lwz r12, 0(r3)
|
||||
lfs f1, lbl_816946AC
|
||||
lwz r12, 0x38(r12)
|
||||
mtctr r12
|
||||
bctr
|
||||
blr
|
||||
void System::muteOffBGM(int frames) {
|
||||
nw4r::snd::SoundHandle* handle = _mainBGMHandle;
|
||||
if (handle && handle->IsAttachedSound()) handle->SetVolume(1.0f, frames);
|
||||
}
|
||||
|
||||
extern "C" asm void pauseOnSE__Q33ipl3snd6SystemFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
stw r0, 0x24(r1)
|
||||
addi r11, r1, 0x20
|
||||
bl _savegpr_29
|
||||
lis r30, _seBlk__Q23ipl3snd@ha
|
||||
li r29, 0
|
||||
addi r30, r30, _seBlk__Q23ipl3snd@l
|
||||
li r31, 0
|
||||
pauseOnSE_loop:
|
||||
lwzx r3, r30, r31
|
||||
cmpwi r3, 0
|
||||
beq pauseOnSE_next
|
||||
beq pauseOnSE_next
|
||||
lwz r12, 0(r3)
|
||||
li r4, 1
|
||||
li r5, 5
|
||||
lwz r12, 0x1c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
pauseOnSE_next:
|
||||
addi r29, r29, 1
|
||||
addi r31, r31, 0xc
|
||||
cmpwi r29, 0x10
|
||||
blt pauseOnSE_loop
|
||||
addi r11, r1, 0x20
|
||||
bl _restgpr_29
|
||||
lwz r0, 0x24(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
void System::pauseOnSE() {
|
||||
for (int index = 0; index < 16; ++index) {
|
||||
if (_seBlk[index].handle.IsAttachedSound()) {
|
||||
_seBlk[index].handle.Pause(true, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" asm void pauseOffSE__Q33ipl3snd6SystemFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
stw r0, 0x24(r1)
|
||||
addi r11, r1, 0x20
|
||||
bl _savegpr_29
|
||||
lis r30, _seBlk__Q23ipl3snd@ha
|
||||
li r29, 0
|
||||
addi r30, r30, _seBlk__Q23ipl3snd@l
|
||||
li r31, 0
|
||||
pauseOffSE_loop:
|
||||
lwzx r3, r30, r31
|
||||
cmpwi r3, 0
|
||||
beq pauseOffSE_next
|
||||
beq pauseOffSE_next
|
||||
lwz r12, 0(r3)
|
||||
li r4, 0
|
||||
li r5, 5
|
||||
lwz r12, 0x1c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
pauseOffSE_next:
|
||||
addi r29, r29, 1
|
||||
addi r31, r31, 0xc
|
||||
cmpwi r29, 0x10
|
||||
blt pauseOffSE_loop
|
||||
addi r11, r1, 0x20
|
||||
bl _restgpr_29
|
||||
lwz r0, 0x24(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
void System::pauseOffSE() {
|
||||
for (int index = 0; index < 16; ++index) {
|
||||
if (_seBlk[index].handle.IsAttachedSound()) {
|
||||
_seBlk[index].handle.Pause(false, 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" asm void pauseOnBGM__Q33ipl3snd6SystemFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
mr r31, r3
|
||||
lwz r4, _mainBGMHandle__Q23ipl3snd
|
||||
cmpwi r4, 0
|
||||
beq pauseOnBGM_done
|
||||
lwz r0, 0(r4)
|
||||
cmpwi r0, 0
|
||||
beq pauseOnBGM_resume
|
||||
beq pauseOnBGM_resume
|
||||
lwz r3, 0(r4)
|
||||
li r4, 1
|
||||
li r5, 5
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x1c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
pauseOnBGM_resume:
|
||||
mr r3, r31
|
||||
bl pauseOnSE__Q33ipl3snd6SystemFv
|
||||
lis r3, sBannerSoundPlayer__Q23ipl3snd@ha
|
||||
li r4, 1
|
||||
addi r3, r3, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl pause__17BannerSoundPlayerFb
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 0
|
||||
li r5, 0xfa
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 1
|
||||
li r5, 0xfa
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
|
||||
li r4, 2
|
||||
li r5, 0xfa
|
||||
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
|
||||
pauseOnBGM_done:
|
||||
lwz r0, 0x14(r1)
|
||||
lwz r31, 0xc(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
void System::pauseOnBGM() {
|
||||
if (_mainBGMHandle) {
|
||||
if (_mainBGMHandle->IsAttachedSound()) _mainBGMHandle->Pause(true, 5);
|
||||
pauseOnSE();
|
||||
sBannerSoundPlayer.pause(true);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_A, 250);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_B, 250);
|
||||
nw4r::snd::detail::AxManager::GetInstance().ClearEffect(nw4r::snd::AUX_C, 250);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" asm void pauseOffBGM__Q33ipl3snd6SystemFv() {
|
||||
nofralloc
|
||||
stwu r1, -0x10(r1)
|
||||
mflr r0
|
||||
stw r0, 0x14(r1)
|
||||
stw r31, 0xc(r1)
|
||||
mr r31, r3
|
||||
lwz r0, _mainBGMHandle__Q23ipl3snd
|
||||
cmpwi r0, 0
|
||||
beq pauseOffBGM_done
|
||||
bl initFx__Q33ipl3snd6SystemFv
|
||||
lwz r3, _mainBGMHandle__Q23ipl3snd
|
||||
lwz r0, 0(r3)
|
||||
cmpwi r0, 0
|
||||
beq pauseOffBGM_resume
|
||||
beq pauseOffBGM_resume
|
||||
lwz r3, 0(r3)
|
||||
li r4, 0
|
||||
li r5, 5
|
||||
lwz r12, 0(r3)
|
||||
lwz r12, 0x1c(r12)
|
||||
mtctr r12
|
||||
bctrl
|
||||
pauseOffBGM_resume:
|
||||
mr r3, r31
|
||||
bl pauseOffSE__Q33ipl3snd6SystemFv
|
||||
lis r3, sBannerSoundPlayer__Q23ipl3snd@ha
|
||||
li r4, 0
|
||||
addi r3, r3, sBannerSoundPlayer__Q23ipl3snd@l
|
||||
bl pause__17BannerSoundPlayerFb
|
||||
pauseOffBGM_done:
|
||||
lwz r0, 0x14(r1)
|
||||
lwz r31, 0xc(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
void System::pauseOffBGM() {
|
||||
if (_mainBGMHandle) {
|
||||
initFx();
|
||||
if (_mainBGMHandle->IsAttachedSound()) _mainBGMHandle->Pause(false, 5);
|
||||
pauseOffSE();
|
||||
sBannerSoundPlayer.pause(false);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" asm void stopSE__Q33ipl3snd6SystemFPQ34nw4r3snd11SoundHandlei() {
|
||||
@@ -545,12 +331,15 @@ namespace ipl {
|
||||
|
||||
#pragma force_active on
|
||||
|
||||
extern "C" asm void __ct__Q34nw4r3snd11SoundHandleFv() {
|
||||
nofralloc
|
||||
li r0, 0
|
||||
stw r0, 0(r3)
|
||||
blr
|
||||
}
|
||||
}
|
||||
}
|
||||
namespace nw4r {
|
||||
namespace snd {
|
||||
SoundHandle::SoundHandle() : mSound(NULL) {}
|
||||
}
|
||||
}
|
||||
namespace ipl {
|
||||
namespace snd {
|
||||
|
||||
void System::calc() {
|
||||
EGG::SimpleAudioMgr::calc();
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -1132,7 +1132,7 @@ namespace ipl {
|
||||
}
|
||||
|
||||
#ifdef __MWERKS__
|
||||
asm void Manager::iplSavedata_813596B8(register ESTitleId titleId) {
|
||||
asm void Manager::pushTitleCache(register ESTitleId titleId) {
|
||||
nofralloc
|
||||
lis r7, 0x4841
|
||||
lis r4, 1
|
||||
@@ -1146,44 +1146,44 @@ namespace ipl {
|
||||
xor r0, r5, r8
|
||||
xor r4, r6, r4
|
||||
or. r0, r4, r0
|
||||
bne iplSavedata_813596B8_L1
|
||||
bne pushTitleCache_L1
|
||||
blr
|
||||
iplSavedata_813596B8_L1:
|
||||
pushTitleCache_L1:
|
||||
addis r0, r5, -1
|
||||
cmplwi r0, 1
|
||||
beq iplSavedata_813596B8_L2
|
||||
beq pushTitleCache_L2
|
||||
cmplwi r0, 3
|
||||
beq iplSavedata_813596B8_L2
|
||||
beq pushTitleCache_L2
|
||||
cmplwi r0, 4
|
||||
beq iplSavedata_813596B8_L2
|
||||
beq pushTitleCache_L2
|
||||
cmplwi r0, 6
|
||||
bnelr
|
||||
iplSavedata_813596B8_L2:
|
||||
pushTitleCache_L2:
|
||||
li r0, 0x30
|
||||
li r9, 0
|
||||
li r4, 0
|
||||
mtctr r0
|
||||
iplSavedata_813596B8_L3:
|
||||
pushTitleCache_L3:
|
||||
add r7, r3, r4
|
||||
lwz r0, 0x340(r7)
|
||||
lwz r7, 0x344(r7)
|
||||
xor r0, r5, r0
|
||||
xor r7, r6, r7
|
||||
or. r0, r7, r0
|
||||
beq iplSavedata_813596B8_L4
|
||||
beq pushTitleCache_L4
|
||||
addi r9, r9, 1
|
||||
addi r4, r4, 8
|
||||
bdnz iplSavedata_813596B8_L3
|
||||
iplSavedata_813596B8_L4:
|
||||
bdnz pushTitleCache_L3
|
||||
pushTitleCache_L4:
|
||||
cmpwi r9, 0x30
|
||||
bne iplSavedata_813596B8_L5
|
||||
bne pushTitleCache_L5
|
||||
li r9, 0x2f
|
||||
iplSavedata_813596B8_L5:
|
||||
pushTitleCache_L5:
|
||||
slwi r4, r9, 3
|
||||
mtctr r9
|
||||
cmpwi r9, 0
|
||||
ble iplSavedata_813596B8_L6
|
||||
iplSavedata_813596B8_L7:
|
||||
ble pushTitleCache_L6
|
||||
pushTitleCache_L7:
|
||||
addi r0, r9, -1
|
||||
add r7, r3, r4
|
||||
slwi r0, r0, 3
|
||||
@@ -1194,14 +1194,14 @@ namespace ipl {
|
||||
lwz r8, 0x344(r8)
|
||||
stw r8, 0x344(r7)
|
||||
stw r0, 0x340(r7)
|
||||
bdnz iplSavedata_813596B8_L7
|
||||
iplSavedata_813596B8_L6:
|
||||
bdnz pushTitleCache_L7
|
||||
pushTitleCache_L6:
|
||||
stw r6, 0x344(r3)
|
||||
stw r5, 0x340(r3)
|
||||
blr
|
||||
}
|
||||
|
||||
extern "C" BOOL iplSavedata_813597A0(void* manager, ESTitleId titleId) {
|
||||
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId) {
|
||||
Manager* savedataManager = static_cast<Manager*>(manager);
|
||||
for (int index = 0; index < MAX_CHANNEL_TOTAL; index++) {
|
||||
if (savedataManager->mData.titleCache[0][index] == titleId) {
|
||||
|
||||
@@ -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));
|
||||
|
||||
1065
src/system/odh.cpp
1065
src/system/odh.cpp
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user