Compare commits

...

88 Commits

Author SHA1 Message Date
coah
1c42679f0e cleanup(SDChannelObj): name address-suffixed C helpers
Rename iplSDChannelObj_813E* helpers to semantic names (setHeaps,
createBaseLayout, getLocalizedName, etc.) across the unit, callers,
header, and symbols.txt. Byte-identical: ok + sha1
26116613f624061ba99c8d1a299aaa6efa85670d; unit still ~90% code /
~99.99% fuzzy.
2026-10-01 18:29:30 -05:00
coah
f7ec594202 cleanup(tiInputForm): name float/color sdata constants (#626)
* cleanup(tiInputForm): name float/color sdata constants

Prefix scInputForm* to avoid colliding with other units'
scHalfF/scTwoF globals. Leave unused N_KOR/N_CHN decls.

* cleanup(tiInputForm): keep ChanAppBox scHalfF/scTwoF

0x81694900/0x81694904 belong to iplChanAppBox; restore those symbol
names and leave only tiInputForm-owned scInputForm* at 0x81694D28+.
2026-10-01 18:25:29 -05:00
github-actions[bot]
ceefb50e42 docs: update progress [skip ci] 2026-10-01 23:25:22 +00:00
coah
5d1a8bd697 Revert "Link iqdec_b65_frv32 via retail .s (#615)" (#640)
This reverts commit 40653c3c02.
2026-10-01 18:24:26 -05:00
coah
c42fb1fe71 cleanup(SDChannelTitle): name address-suffixed C helpers (#639)
Rename iplSDChannelTitle_813E* helpers to semantic names across the
unit and symbols.txt. Byte-identical: ok + sha1
26116613f624061ba99c8d1a299aaa6efa85670d; unit still ~80.9% code /
~99.76% fuzzy.
2026-10-01 18:23:38 -05:00
coah
8e96e8a722 match(SaveDataManager): decompile getNumValidChannel (#622)
Exact match (23/23, diffs 0). DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.

Adds ChannelSlot/ChannelPage overlays (slots at +0x30, page stride 0xC0)
so the loop uses typed .valid/.titleId instead of raw byte loads.
2026-10-01 18:22:58 -05:00
coah
854cc579df Fix keyboard prediction and animation jump tables (#638) 2026-10-01 18:22:03 -05:00
coah
26a36e2964 Restore SD memory dialog-state dispatch mapping (#637) 2026-10-01 18:21:37 -05:00
coah
8729671a43 Match GC card-removal no-op jump target (#635) 2026-10-01 18:21:10 -05:00
coah
08f5f08a13 match(CDBDatabase): decompile CDBDatabaseCreateRecordAtOnce (#558)
Exact match (37/37, diffs 0). DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
Rebased onto latest main.
2026-10-01 18:20:54 -05:00
coah
893afc25b4 cleanup(tiHwKeyboard): name convertWCCode jumptable (#634)
Rename jumptable_81668EF8 to scHwKeyboardConvertWCCodeJumpTable.
2026-10-01 18:20:44 -05:00
coah
dee9f9d8ea cleanup(zikorean): name Korean lookup/match helpers (#633)
Rename Zi8_814813FC/81481E6C to Zi8LookupKoreanChar and
Zi8MatchKoreanSequence.
2026-10-01 18:20:39 -05:00
coah
728bfa984b cleanup(TMCJPEG): name decode-buffer refill helpers (#632)
Rename TMCJPEG_814EAF50/814EB108 to refillJpegBufferAfterFF
and refillJpegBuffer.
2026-10-01 18:15:59 -05:00
coah
921234fdac cleanup(rvl_dec): name literal-copy goto label (#631)
Rename LAB_813325b8 to copy_lit_tail.
2026-10-01 18:15:23 -05:00
coah
9d6f9dce74 cleanup(Contest): name NAT detection callback (#629)
Rename iplContest_813D54F8 to onNatDetectionDone.
2026-10-01 18:15:18 -05:00
coah
f1bcb9d78c cleanup(ChannelTitle): name disk TMD/tmp-title task callbacks (#628)
Rename address-suffixed static tasks to markTmdReadyTask and
deleteTmpTitleContentTask.
2026-10-01 18:14:53 -05:00
coah
efda1f0093 Restore SD state-machine switch case mappings (#623) 2026-10-01 18:14:28 -05:00
github-actions[bot]
115bc95101 docs: update progress [skip ci] 2026-10-01 23:12:57 +00:00
coah
cbac1eda5a match(KPAD): sensor interval constant pool data (worker 93817b04) (#630) 2026-10-01 18:12:12 -05:00
github-actions[bot]
f0de86aa16 docs: update progress [skip ci] 2026-10-01 23:11:14 +00:00
github-actions[bot]
215f40f835 docs: update progress [skip ci] 2026-10-01 23:10:30 +00:00
coah
5b364355cd match(NWC24Download 25/30, nup 19/23) (worker da66e510) (#627) 2026-10-01 18:10:29 -05:00
coah
ea8e69528f match(wad): _WADHash, 35/40 (worker ae91d0cb) (#625) 2026-10-01 18:09:19 -05:00
coah
2a5fbdb4b9 cleanup(tiInputForm): name pane/string labels (#620)
Rename known layout pane name placeholders; leave float
constants and unused N_KOR/N_CHN sdata decls for follow-ups.
2026-10-01 18:08:19 -05:00
coah
dd3cd80d9b match(CDBDatabase): decompile CDBDatabasePrivateCreateRecordAtOnceEx_ (#619)
Exact match (73/73, diffs 0). DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.

Co-authored-by: asm2c <asm2c@local>
2026-10-01 18:08:05 -05:00
github-actions[bot]
3cbe527d23 docs: update progress [skip ci] 2026-10-01 23:07:39 +00:00
coah
3ab6d87c3d cleanup(CHANSVm): name string labels and VmCmpEq bVar (#618)
Rename UTF-16 / class-name / printf / hex placeholders and
CHANSVmConstStringObject* companions; bVar1 → stringsMatch.
2026-10-01 18:07:38 -05:00
coah
40653c3c02 Link iqdec_b65_frv32 via retail .s (#615)
NonMatching/Equivalent source does not keep DOL SHA1. Assemble extracted unit and mark Matching.

Also fix --defsym VERSION_* for gas (needs =1).

Linked code: 62.047% -> 62.084% / 919 units
DOL SHA1: 26116613f624061ba99c8d1a299aaa6efa85670d

Co-authored-by: linker <linker@local>
2026-10-01 18:06:29 -05:00
github-actions[bot]
f0829ff810 docs: update progress [skip ci] 2026-10-01 23:06:06 +00:00
coah
ffdd7b58e0 cleanup(tiCandidateBox): name pane/string labels (#608)
Rename address placeholders for known pane names and related
sdata aliases; leave float constants for a follow-up.
2026-10-01 18:05:58 -05:00
coah
1a0f83a156 match(CDBDatabase): decompile CDBDatabaseCreateRecordAtOnceEx (#607)
Exact match (51/51, diffs 0). DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.

Co-authored-by: asm2c <asm2c@local>
2026-10-01 18:05:17 -05:00
coah
a3d088e4d3 match(d_nhttp_private): NHTTPDeleteConnection (#606)
Rewrite ConnectionStarted's null check as if/else so the inlined
WaitConnection path matches beq/bne block order (null → -1 first).

Before: 6/7 funcs, 908/1320 code bytes
After:  7/7 funcs, 1320/1320 code bytes
DOL sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
2026-10-01 18:04:32 -05:00
coah
3b90bd66c6 cleanup(iplSound): name zero float constant (#599)
Rename lbl_816946A4 → scSoundZeroF (defined 0.0f). Leave other pitch
floats alone until they have Matching definitions.
2026-10-01 18:04:18 -05:00
coah
b395269be6 cleanup(iplChannelObj): rename leftover bVar locals (#605)
- bVar4 → foundLangGroup
- bVar3 → isNonRsoGroup
- bVar1 → shouldAdjustHeap
2026-10-01 18:04:05 -05:00
github-actions[bot]
60bc67e097 docs: update progress [skip ci] 2026-10-01 23:04:00 +00:00
coah
4e8223f3d4 cleanup(wad): sync WAD*Ex header params with .c (#592)
Match wad.h to wad.c (flags/offset/fileListOut/processCallback).
2026-10-01 18:03:49 -05:00
github-actions[bot]
3f36d5f4cc docs: update progress [skip ci] 2026-10-01 23:03:03 +00:00
coah
1f0dc64062 cleanup(kpad): sync KPADGetProjectionPos param names (#589)
Match the header to the .c (param_3/param_4 → rect/scale).
2026-10-01 18:02:56 -05:00
coah
5db0cd6086 cleanup(CDBDatabase): name error message string labels (#581)
Rename Matching lbl_* CDBReportError messages to scCdbMsg_*.
2026-10-01 18:02:31 -05:00
coah
54b44a3534 Restore keyboard unit filename and getter emission order, then link (#572) 2026-10-01 18:02:26 -05:00
coah
1493baaba0 match(pf_fat12): PFFAT12_WriteFATEntryWithBuf (#573)
Reorder locals and rewrite cross-byte stores as p_buf[offset+1].

Co-authored-by: matcher <matcher@local>
2026-10-01 18:02:05 -05:00
coah
22dd088277 match(SOBasic): SOPoll (#571)
Reorder locals (size, bytes, result, rm) for register allocation.

Co-authored-by: matcher <matcher@local>
2026-10-01 18:00:59 -05:00
coah
1bbc40cb3b cleanup(iplChannelObj): name layout/export/SE string labels (#556)
Replace Equivalent-unit lbl_* placeholders with scPaneName_/scBrlyt_/
scBrlan_/scExport_/scSE_ names; rename local_50 to langCodeBuf.
Update symbols.txt. Byte-identical; DOL sha1 unchanged.
2026-10-01 17:59:14 -05:00
coah
e6bf9cc669 cleanup(NWC24FriendList): rename friend-list path string (#533)
Rename lbl_8166E160 to scNwc24FlPath using a plain non-const char[]
declaration (no section attributes or pad objects).
2026-10-01 17:58:48 -05:00
coah
ffd9cc4a69 cleanup(iplDate): name zero float constant (#514)
String pane/brlan/SE labels already landed via #518. Rename the remaining
Matching .sdata2 zero float lbl_816948EC -> scDateZeroF.
2026-10-01 17:58:21 -05:00
coah
eb8f78788d cleanup(RsoSystem): name fatal OSFatal color/msg and zero float (#510)
lbl_8169622C..F → scRsoFatalColorR/G/B/A, lbl_81639230 → scRsoFatalMsg,
lbl_81694598 → scRsoZeroF.
2026-10-01 17:57:55 -05:00
github-actions[bot]
889823ed67 docs: update progress [skip ci] 2026-10-01 22:57:28 +00:00
coah
7dea4122fc match(tiInputForm): 217/221, replace two asm bodies with C++ (worker ec292914) (#621) 2026-10-01 17:56:40 -05:00
github-actions[bot]
1802d45758 docs: update progress [skip ci] 2026-10-01 22:48:56 +00:00
coah
130cc9e88e match(pf_fat): PFFAT_GetClusterAllocated (#570)
Reorder locals so p_start_cluster lands in r7 and p_vol in r8.

Co-authored-by: matcher <matcher@local>
2026-10-01 17:47:34 -05:00
coah
a801d1c5d6 cleanup(CXStreamingUncompression): rename Huffman init dest param (#568)
Match the Huffman prototype to the .c and the RL/LZ decls (param_2 → data).
2026-10-01 17:47:08 -05:00
coah
8ab07fbb20 Restore SD title button-string ownership (#567) 2026-10-01 17:46:43 -05:00
coah
f68fcc0f9b cleanup(lyt_window): name OSFatal color/msg constants (#566)
Rename assert-path sdata2 color bytes and Error#004 string labels.
2026-10-01 17:46:18 -05:00
coah
5ad481ae40 match(iplSaveDataManager): convert getAvailableInList to C (#563)
Exact match (28/28, diffs 0). Finds first zero titleId whose
chanInfo primaryType is not 1, using dens=12 for page/slot.
2026-10-01 17:45:53 -05:00
coah
713951c551 cleanup(ChannelTitle): rename play-limit hour/minute locals (#562)
Rename Ghidra local_38/local_58 to hourStr/minuteStr in the play-time
limit formatting path.
2026-10-01 17:45:28 -05:00
coah
b47507aa3f cleanup(sdi_api): rename leftover Ghidra param_* names (#560)
Rename ISD_GetHCRegister/GetDeviceStatus/GetCardSize and
sduCommand(v)/MultiBlockAsync parameters to descriptive names.
2026-10-01 17:44:43 -05:00
coah
01a73b600f cleanup(ChannelSelect): rename pane/SE string labels (#557)
Rename lbl_* pane and sound-effect string symbols to scPaneName_/scSE_
names; add missing WSD_SELECT definition. Build stays byte-identical.
2026-10-01 17:43:38 -05:00
coah
83b577cf62 match(CDBDatabase): convert CreateRecordImAtOnce_ to C (#555)
Exact match (84/84, diffs 0). Closed/readonly checks via instance flags,
OSTime to CDBDate via OS_BUS_CLOCK/4, then CDBRecordCreateAtOnce.
2026-10-01 17:42:32 -05:00
coah
f67990d237 cleanup(bta_dm_act): name compress check/callback params (#553)
Rename unused id on check_compress; align L2CAP compress callback
formals with pe_type/mem_level/wbits/direction/config/enable.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:41:10 -05:00
coah
ad85ad1537 cleanup(l2c_api): name compression API params (#552)
Rename SetCompression param_6 to config; RegisterCompression to p_callback/unused.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:41:02 -05:00
coah
f32665703f cleanup(AxAdpcmPlayer): rename iVar4 to pb (#551)
Rename Ghidra iVar4 to pb in getCurrAddr.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:40:35 -05:00
coah
e062e1c669 cleanup(uusb_ppc): name UUSB_Read/Write params (#550)
Rename pipe/buf/len on Read; pipe/unused on Write; fix debug print to use len.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:40:09 -05:00
coah
76a60f8c1a CDBDatabase: convert Search_ to matching C (#548)
Exact match (53/53, diffs 0). Builds CDBSearchConditions and calls
SearchYearLayer. DOL SHA1 unchanged.

Co-authored-by: asm2c <asm2c@local>
2026-10-01 17:40:03 -05:00
github-actions[bot]
63579601e2 docs: update progress [skip ci] 2026-10-01 22:39:45 +00:00
coah
e46bac9a1b cleanup(hcisu_h2): name USB callback, receive, and init params (#549)
Rename Ghidra param_* on Matching hcisu_h2 helpers:
usb_cback event/status, receive_msg pipe, init taskId/mbox/bufSize.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:39:42 -05:00
coah
1f224c53c1 cleanup(usbkbd): name SetLED device and ledBits params (#547)
Rename USBKBDSetLED/Async param_1/param_2 to device/ledBits.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:38:34 -05:00
coah
30e2147479 match(sd_drv): pfd_st_removal_callback (#546)
Force store-before-load of media_inserted by reading it back
in the device check so MWCC emits li r0 / stw / lwz order.
2026-10-01 17:38:28 -05:00
coah
6ffcbf8f46 cleanup(bte_main): name usb close status param (#545)
Rename bta_usb_close_evt param_1 to status.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:38:01 -05:00
coah
47add32987 cleanup(bte_hcisu): name unused task param (#544)
Rename bte_hcisu_task param_1 to unused (never read).
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:37:34 -05:00
coah
e0ea552982 data(tiHwKeyboard): fix .rodata order for country maps (#543)
Move scCountryMap_* and controlKeys after the HWKeyboard methods that
emit the KeyInputData aggregate constant, so .rodata matches original
order (@6525, EU, NonEU, controlKeys). Leaves .sdata2 symbol-size /
.sdata section pad below 100%.

objdiff: .rodata 90.9% -> 100%; matched_data ~40% -> ~93.7%.
DOL sha1 unchanged (26116613f624061ba99c8d1a299aaa6efa85670d).

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 17:37:04 -05:00
coah
c7949ac4f0 cleanup(puh_ker_sem): name create_sem params (#542)
Rename uhf_ker_create_sem param_1/param_2 to initCount/flags.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:36:35 -05:00
coah
e697514b7b cleanup(CXSecureUncompression): name Huffman table verify params (#541)
Rename CXiVerifyHuffmanTable_ param_1/param_2 to table/bitSize.
Byte-identical; DOL sha1 unchanged.
2026-10-01 17:36:08 -05:00
coah
32c3f7f2cd cleanup(CXStreamingUncompression): name init/header params (#540)
Align RL/LZ init dest param with Huffman (data) and name
CXiReadHeader maxOutLen.
2026-10-01 17:36:01 -05:00
coah
1618565c1d Update SD title-check caller after NandSDWorker rename (#539) 2026-10-01 17:35:35 -05:00
coah
6040414eec cleanup(jdec_main): name JPEG AAN scale table (#538)
Rename lbl_8161E080 to scJpegAanScale for the 64-word IDCT scale
rodata copied into decode work.
2026-10-01 17:35:07 -05:00
coah
08acc800f1 cleanup(cntcache): name version and path string data (#537)
Rename packed string blob, title/data path format, and \" \\n\" sdata.
2026-10-01 17:34:41 -05:00
coah
0703b62968 cleanup(WPAD): name version and manage string data (#536)
Rename SDK version banner and WPADiManageHandler message blob.
2026-10-01 17:34:14 -05:00
github-actions[bot]
86c3cacc2d docs: update progress [skip ci] 2026-10-01 22:34:09 +00:00
coah
f7e6fc5387 cleanup(db_exception): name FPCSR flag local (#535)
Replace Ghidra uVar1 with fpcsr in ShowMainInfo_ FPE reporting.
2026-10-01 17:33:47 -05:00
coah
dfbb774ce4 Link fully matched tiTextDrawer (#532)
Promote keyboard/tiTextDrawer.cpp from NonMatching to Matching. All 24
functions are exact (3,476/3,476 code bytes) and the linked DOL stays
byte-identical, SHA-1 26116613f624061ba99c8d1a299aaa6efa85670d.

The unit's .sdata2 reports 44/48 bytes only because dtk folded the
section's 4-byte alignment pad into the last float symbol; the linker
restores the same pad, so no padding array or metadata change is needed.

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 17:33:23 -05:00
coah
9b69048f06 cleanup(WDScan): name RSN/WPA OUI byte constants (#531)
Rename privacy-mode OUI sdata/sdata2 bytes used by WDGetPrivacyMode.
Leave unused pad bytes as address labels so section layout stays fixed.
2026-10-01 17:32:44 -05:00
coah
602b10ed43 data(CDBFileSystemUtils): match .sdata path separator (#530)
Replace lbl_816979E8 + .sdata section pragma with a plain
char CDBFSPathSeparator = '/' so the .sdata symbol size matches
the original (1 byte). Rename the symbol in symbols.txt to match.

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 17:32:14 -05:00
github-actions[bot]
f0a91338f4 docs: update progress [skip ci] 2026-10-01 22:31:51 +00:00
coah
ff568a273c cleanup(rvl_dec): name Rvl_decode_ash C locals (#528)
Replace Ghidra locals in the non-asm ASH decoder path with
bitstream/huffman-oriented names.
2026-10-01 17:31:22 -05:00
coah
9f6ef656fd cleanup(rvl_dec): name Rvl_decode_szs C locals (#526)
Replace Ghidra locals in the non-asm SZS decoder path with
readable names (decodedSize, bitMask, copyLen, etc.).
2026-10-01 17:31:13 -05:00
coah
9d2f607b3f data(NHTTP_request): match multipart boundary .rodata size (#529)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 17:31:00 -05:00
coah
c836ab8bae cleanup(iplChannelManager): name title lookup and meta helpers (#520)
Rename Matching-only fn_8133A* APIs and update SD call sites plus
mangled symbols.txt entries.
2026-10-01 17:30:44 -05:00
coah
b889c52efc CDBDatabase: convert CleanUpEmptyDirectories to matching C (#527)
Exact match (133/133, diffs 0). Uses labeled error strings so the
DOL string pool stays identical to baserom.

Co-authored-by: asm2c <asm2c@local>
2026-10-01 17:30:33 -05:00
76 changed files with 2676 additions and 2347 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.71% | 61.93% | 92.05% |
| 99.38% | 87.96% | 62.33% | 92.07% |
units 917/1027 complete, functions 12213/12563 matched.
units 919/1027 complete, functions 12224/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 -->

View File

@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
.rodata start:0x81610608 end:0x81610918
.data start:0x81654B38 end:0x81654F98
.sdata2 start:0x81694B18 end:0x81694B60
.sdata start:0x81696DD0 end:0x81696E40
.sdata start:0x81696DD0 end:0x81696E30
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
.text start:0x813E4BBC end:0x813E947C
.rodata start:0x81610918 end:0x81610948
.data start:0x81654F98 end:0x81655638
.sdata2 start:0x81694B60 end:0x81694B88
.sdata start:0x81696E40 end:0x81696EF0
.sdata start:0x81696E30 end:0x81696EF0
src/scene/sdButton/iplSDButton.cpp:
.text start:0x813E947C end:0x813EA88C
@@ -1054,7 +1054,7 @@ src/keyboard/tiNw4rManager.cpp:
.data start:0x8165F818 end:0x8165F8F0
.sdata2 start:0x81694E10 end:0x81694E28
src/keyboard/tiManager.cpp:
src/keyboard/tiKeyboard.cpp:
.text start:0x81437558 end:0x81439608
.ctors start:0x8160D208 end:0x8160D20C
.data start:0x8165F8F0 end:0x81660378

View File

@@ -1385,19 +1385,19 @@ getDiskBannerData__Q33ipl7channel7ManagerFib = .text:0x81339FB0; // type:functio
titleIDtoPageIndex__Q33ipl7channel7ManagerCFUxPiPi = .text:0x8133A2BC; // type:function size:0xA0
getLockedMsgFromBuf__Q33ipl7channel7ManagerCFPCQ33ipl7channel22SChanMgrDiskInMessages = .text:0x8133A35C; // type:function size:0xA8
nand_error_handling__Q33ipl7channel7ManagerFi = .text:0x8133A404; // type:function size:0xDC
fn_8133A4E0__Q33ipl7channel7ManagerFUx = .text:0x8133A4E0; // type:function size:0x9C
fn_8133A57C__Q33ipl7channel7ManagerFUx = .text:0x8133A57C; // type:function size:0x3C
fn_8133A5B8__Q33ipl7channel7ManagerFUx = .text:0x8133A5B8; // type:function size:0x38
fn_8133A5F0__Q33ipl7channel7ManagerFUx = .text:0x8133A5F0; // type:function size:0x44
fn_8133A634__Q33ipl7channel7ManagerFUx = .text:0x8133A634; // type:function size:0x44
fn_8133A678__Q33ipl7channel7ManagerFUx = .text:0x8133A678; // type:function size:0x40
fn_8133A6B8__Q33ipl7channel7ManagerFUx = .text:0x8133A6B8; // type:function size:0x84
fn_8133A73C__Q33ipl7channel7ManagerFUx = .text:0x8133A73C; // type:function size:0x68
fn_8133A7A4__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A7A4; // type:function size:0xB8
fn_8133A85C__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A85C; // type:function size:0xC8
fn_8133A924__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A924; // type:function size:0xCC
fn_8133A9F0__Q33ipl7channel7ManagerFv = .text:0x8133A9F0; // type:function size:0x60
fn_8133AA50__Q33ipl7channel7ManagerFUx = .text:0x8133AA50; // type:function size:0x30
findEntryByTitleId__Q33ipl7channel7ManagerFUx = .text:0x8133A4E0; // type:function size:0x9C
getBannerCSIdx__Q33ipl7channel7ManagerFUx = .text:0x8133A57C; // type:function size:0x3C
getSoundSize__Q33ipl7channel7ManagerFUx = .text:0x8133A5B8; // type:function size:0x38
needsNetSetting__Q33ipl7channel7ManagerFUx = .text:0x8133A5F0; // type:function size:0x44
usesAltSound__Q33ipl7channel7ManagerFUx = .text:0x8133A634; // type:function size:0x44
isMissingTicket__Q33ipl7channel7ManagerFUx = .text:0x8133A678; // type:function size:0x40
isNewsChannelV6Plus__Q33ipl7channel7ManagerFUx = .text:0x8133A6B8; // type:function size:0x84
isOperaChannel__Q33ipl7channel7ManagerFUx = .text:0x8133A73C; // type:function size:0x68
readBannerMetaAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A7A4; // type:function size:0xB8
readSoundMetaAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A85C; // type:function size:0xC8
readBannerCSAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A924; // type:function size:0xCC
clearTmpChannel__Q33ipl7channel7ManagerFv = .text:0x8133A9F0; // type:function size:0x60
unloadBanner__Q33ipl7channel7ManagerFUx = .text:0x8133AA50; // type:function size:0x30
__ct__Q33ipl7channel20ChannelScriptManagerFv = .text:0x8133AA80; // type:function size:0x10
create__Q33ipl7channel20ChannelScriptManagerFPQ23EGG7ExpHeap = .text:0x8133AA90; // type:function size:0x90
init__Q33ipl7channel20ChannelScriptManagerFPQ33ipl4nand4FilePQ33ipl7channel9RsoThread = .text:0x8133AB20; // type:function size:0x3D4
@@ -3930,9 +3930,9 @@ isLimitOutChannel__Q33ipl5scene12ChannelTitleFv = .text:0x813B9F8C; // type:func
dispTimeLimitWindow__Q33ipl5scene12ChannelTitleFv = .text:0x813B9FE0; // type:function size:0x104
getTimeLimitString__Q33ipl5scene12ChannelTitleFPwUlUl = .text:0x813BA0E4; // type:function size:0x484
getTmdTask__Q33ipl5scene12ChannelTitleFPv = .text:0x813BA568; // type:function size:0x11C
iplChannelTitle_813BA684__Q33ipl5scene12ChannelTitleFPv = .text:0x813BA684; // type:function size:0xC
markTmdReadyTask__Q33ipl5scene12ChannelTitleFPv = .text:0x813BA684; // type:function size:0xC
getTicketLimitTask__Q33ipl5scene12ChannelTitleFPv = .text:0x813BA690; // type:function size:0xF4
iplChannelTitle_813BA784__Q33ipl5scene12ChannelTitleFPv = .text:0x813BA784; // type:function size:0xE0
deleteTmpTitleContentTask__Q33ipl5scene12ChannelTitleFPv = .text:0x813BA784; // type:function size:0xE0
isTimeLimitedTicket__Q33ipl5scene12ChannelTitleFP12ESTicketViewPUl = .text:0x813BA864; // type:function size:0xF4
startGetTicketLimitTask__Q33ipl5scene12ChannelTitleFv = .text:0x813BA958; // type:function size:0x8C
updateLockedMsg__Q33ipl5scene12ChannelTitleFi = .text:0x813BA9E4; // type:function size:0x16C
@@ -4441,7 +4441,7 @@ IPLContestAlloc = .text:0x813D5240; // type:function size:0x60
IPLContestFree = .text:0x813D52A0; // type:function size:0x64
sNHTTPReqCallback = .text:0x813D5304; // type:function size:0x1E0
sNHTTPCleanupCallback = .text:0x813D54E4; // type:function size:0x14
iplContest_813D54F8 = .text:0x813D54F8; // type:function size:0x6C
onNatDetectionDone = .text:0x813D54F8; // type:function size:0x6C
AddressToString = .text:0x813D5564; // type:function size:0xE4
DiscoverReachability = .text:0x813D5648; // type:function size:0xE0
DiscoverMapping = .text:0x813D5728; // type:function size:0xE4
@@ -4685,42 +4685,42 @@ copyFrom__Q33ipl5scene22SDChannelSelectCommandFRCQ33ipl5scene22SDChannelSelectCo
@20@__dt__Q33ipl5scene15SDChannelSelectFv = .text:0x813E2F24; // type:function size:0x8
__ct__Q33ipl5scene12SDChannelObjFPQ23EGG4Heapii = .text:0x813E2F2C; // type:function size:0x130
__dt__Q33ipl5scene12SDChannelObjFv = .text:0x813E305C; // type:function size:0xA8
iplSDChannelObj_813E3104 = .text:0x813E3104; // type:function size:0x18
iplSDChannelObj_813E311C = .text:0x813E311C; // type:function size:0xC
iplSDChannelObj_813E3128 = .text:0x813E3128; // type:function size:0x50
iplSDChannelObj_813E3178 = .text:0x813E3178; // type:function size:0x8
iplSDChannelObj_813E3180 = .text:0x813E3180; // type:function size:0xAC
iplSDChannelObj_813E322C = .text:0x813E322C; // type:function size:0x9C
iplSDChannelObj_813E32C8 = .text:0x813E32C8; // type:function size:0x3C
iplSDChannelObj_813E3304 = .text:0x813E3304; // type:function size:0x8
iplSDChannelObj_813E330C = .text:0x813E330C; // type:function size:0x14
iplSDChannelObj_activateIfIdle = .text:0x813E3104; // type:function size:0x18
iplSDChannelObj_setHeaps = .text:0x813E311C; // type:function size:0xC
iplSDChannelObj_getOrAllocThumbnailData = .text:0x813E3128; // type:function size:0x50
iplSDChannelObj_setPane = .text:0x813E3178; // type:function size:0x8
iplSDChannelObj_setLayoutFile = .text:0x813E3180; // type:function size:0xAC
iplSDChannelObj_calc = .text:0x813E322C; // type:function size:0x9C
iplSDChannelObj_drawBase = .text:0x813E32C8; // type:function size:0x3C
iplSDChannelObj_drawPage = .text:0x813E3304; // type:function size:0x8
iplSDChannelObj_drawDialog = .text:0x813E330C; // type:function size:0x14
getTranslate__Q33ipl5scene12SDChannelObjCFv = .text:0x813E3320; // type:function size:0x10
iplSDChannelObj_813E3330 = .text:0x813E3330; // type:function size:0x24
iplSDChannelObj_813E3354 = .text:0x813E3354; // type:function size:0x98
iplSDChannelObj_813E33EC = .text:0x813E33EC; // type:function size:0x94
iplSDChannelObj_813E3480 = .text:0x813E3480; // type:function size:0x60
iplSDChannelObj_813E34E0 = .text:0x813E34E0; // type:function size:0x8
iplSDChannelObj_813E34E8 = .text:0x813E34E8; // type:function size:0x4C
iplSDChannelObj_813E3534 = .text:0x813E3534; // type:function size:0x4C
iplSDChannelObj_813E3580 = .text:0x813E3580; // type:function size:0x2D8
iplSDChannelObj_813E3858 = .text:0x813E3858; // type:function size:0xC8
iplSDChannelObj_813E3920 = .text:0x813E3920; // type:function size:0x164
iplSDChannelObj_813E3A84 = .text:0x813E3A84; // type:function size:0x98
iplSDChannelObj_813E3B1C = .text:0x813E3B1C; // type:function size:0x84
iplSDChannelObj_813E3BA0 = .text:0x813E3BA0; // type:function size:0xB8
iplSDChannelObj_813E3C58 = .text:0x813E3C58; // type:function size:0x44
iplSDChannelObj_813E3C9C = .text:0x813E3C9C; // type:function size:0x19C
iplSDChannelObj_813E3E38 = .text:0x813E3E38; // type:function size:0xF0
iplSDChannelObj_813E3F28 = .text:0x813E3F28; // type:function size:0x4C
iplSDChannelObj_813E3F74 = .text:0x813E3F74; // type:function size:0xEC
iplSDChannelObj_813E4060 = .text:0x813E4060; // type:function size:0xDC
iplSDChannelObj_813E413C = .text:0x813E413C; // type:function size:0x2D4
iplSDChannelObj_813E4410 = .text:0x813E4410; // type:function size:0x148
iplSDChannelObj_813E4558 = .text:0x813E4558; // type:function size:0x1AC
iplSDChannelObj_813E4704 = .text:0x813E4704; // type:function size:0x118
iplSDChannelObj_813E481C = .text:0x813E481C; // type:function size:0x18C
iplSDChannelObj_813E49A8 = .text:0x813E49A8; // type:function size:0xAC
iplSDChannelObj_813E4A54 = .text:0x813E4A54; // type:function size:0x168
iplSDChannelObj_hasAppMeta = .text:0x813E3330; // type:function size:0x24
iplSDChannelObj_startAppear = .text:0x813E3354; // type:function size:0x98
iplSDChannelObj_startDisappear = .text:0x813E33EC; // type:function size:0x94
iplSDChannelObj_setSelected = .text:0x813E3480; // type:function size:0x60
iplSDChannelObj_playPageHide = .text:0x813E34E0; // type:function size:0x8
iplSDChannelObj_resetPageAnim = .text:0x813E34E8; // type:function size:0x4C
iplSDChannelObj_resetDialogAnim = .text:0x813E3534; // type:function size:0x4C
iplSDChannelObj_applyLanguageGroups = .text:0x813E3580; // type:function size:0x2D8
iplSDChannelObj_createBaseLayout = .text:0x813E3858; // type:function size:0xC8
iplSDChannelObj_createIconLayout = .text:0x813E3920; // type:function size:0x164
iplSDChannelObj_createMenuLayout = .text:0x813E3A84; // type:function size:0x98
iplSDChannelObj_syncLayoutsToPane = .text:0x813E3B1C; // type:function size:0x84
iplSDChannelObj_createPageLayout = .text:0x813E3BA0; // type:function size:0xB8
iplSDChannelObj_setPageTranslate = .text:0x813E3C58; // type:function size:0x44
iplSDChannelObj_setPageAnim = .text:0x813E3C9C; // type:function size:0x19C
iplSDChannelObj_updatePageAnim = .text:0x813E3E38; // type:function size:0xF0
iplSDChannelObj_playPageAnimator = .text:0x813E3F28; // type:function size:0x4C
iplSDChannelObj_createDialogLayout = .text:0x813E3F74; // type:function size:0xEC
iplSDChannelObj_getLocalizedName = .text:0x813E4060; // type:function size:0xDC
iplSDChannelObj_setBalloonText = .text:0x813E413C; // type:function size:0x2D4
iplSDChannelObj_positionDialog = .text:0x813E4410; // type:function size:0x148
iplSDChannelObj_setDialogAnim = .text:0x813E4558; // type:function size:0x1AC
iplSDChannelObj_updateDialogAnim = .text:0x813E4704; // type:function size:0x118
iplSDChannelObj_findNewMessageGroup = .text:0x813E481C; // type:function size:0x18C
iplSDChannelObj_updateNewMessage = .text:0x813E49A8; // type:function size:0xAC
iplSDChannelObj_checkNewMessage = .text:0x813E4A54; // type:function size:0x168
__ct__Q33ipl5scene14SDChannelTitleFPQ23EGG4HeapPQ33ipl5scene15SDChannelSelect = .text:0x813E4BBC; // type:function size:0x1F4
__dt__Q33ipl5scene14SDChannelTitleFv = .text:0x813E4DB0; // type:function size:0x70
prepare__Q33ipl5scene14SDChannelTitleFv = .text:0x813E4E20; // type:function size:0x4C
@@ -4733,61 +4733,61 @@ calcFadeout__Q33ipl5scene14SDChannelTitleFv = .text:0x813E5B14; // type:function
draw__Q33ipl5scene14SDChannelTitleFv = .text:0x813E5F54; // type:function size:0x220
destroy__Q33ipl5scene14SDChannelTitleFv = .text:0x813E6174; // type:function size:0x17C
isResetAcceptable__Q33ipl5scene14SDChannelTitleFv = .text:0x813E62F0; // type:function size:0x1C
iplSDChannelTitle_813E630C = .text:0x813E630C; // type:function size:0x3C
iplSDChannelTitle_813E6348 = .text:0x813E6348; // type:function size:0xDC
iplSDChannelTitle_813E6424 = .text:0x813E6424; // type:function size:0x1B0
iplSDChannelTitle_813E65D4 = .text:0x813E65D4; // type:function size:0x18C
iplSDChannelTitle_813E6760 = .text:0x813E6760; // type:function size:0x20C
iplSDChannelTitle_813E696C = .text:0x813E696C; // type:function size:0x48
iplSDChannelTitle_813E69B4 = .text:0x813E69B4; // type:function size:0x1D4
iplSDChannelTitle_813E6B88 = .text:0x813E6B88; // type:function size:0x144
iplSDChannelTitle_813E6CCC = .text:0x813E6CCC; // type:function size:0x158
iplSDChannelTitle_813E6E24 = .text:0x813E6E24; // type:function size:0x17C
iplSDChannelTitle_813E6FA0 = .text:0x813E6FA0; // type:function size:0x14
iplSDChannelTitle_813E6FB4 = .text:0x813E6FB4; // type:function size:0xC0
iplSDChannelTitle_813E7074 = .text:0x813E7074; // type:function size:0x130
iplSDChannelTitle_813E71A4 = .text:0x813E71A4; // type:function size:0xA8
iplSDChannelTitle_813E724C = .text:0x813E724C; // type:function size:0x6C
iplSDChannelTitle_813E72B8 = .text:0x813E72B8; // type:function size:0x160
iplSDChannelTitle_813E7418 = .text:0x813E7418; // type:function size:0x80
iplSDChannelTitle_813E7498 = .text:0x813E7498; // type:function size:0x54
iplSDChannelTitle_813E74EC = .text:0x813E74EC; // type:function size:0x12C
iplSDChannelTitle_813E7618 = .text:0x813E7618; // type:function size:0xB0
iplSDChannelTitle_813E76C8 = .text:0x813E76C8; // type:function size:0xB8
iplSDChannelTitle_813E7780 = .text:0x813E7780; // type:function size:0x80
iplSDChannelTitle_813E7800 = .text:0x813E7800; // type:function size:0x7C
iplSDChannelTitle_813E787C = .text:0x813E787C; // type:function size:0x134
iplSDChannelTitle_813E79B0 = .text:0x813E79B0; // type:function size:0x68
iplSDChannelTitle_813E7A18 = .text:0x813E7A18; // type:function size:0x118
iplSDChannelTitle_813E7B30 = .text:0x813E7B30; // type:function size:0xDC
iplSDChannelTitle_813E7C0C = .text:0x813E7C0C; // type:function size:0x108
iplSDChannelTitle_813E7D14 = .text:0x813E7D14; // type:function size:0xBC
iplSDChannelTitle_813E7DD0 = .text:0x813E7DD0; // type:function size:0x1E0
iplSDChannelTitle_813E7FB0 = .text:0x813E7FB0; // type:function size:0x84
iplSDChannelTitle_813E8034 = .text:0x813E8034; // type:function size:0x12C
iplSDChannelTitle_813E8160 = .text:0x813E8160; // type:function size:0x9C
iplSDChannelTitle_813E81FC = .text:0x813E81FC; // type:function size:0x5C
iplSDChannelTitle_813E8258 = .text:0x813E8258; // type:function size:0x108
iplSDChannelTitle_813E8360 = .text:0x813E8360; // type:function size:0x11C
iplSDChannelTitle_813E847C = .text:0x813E847C; // type:function size:0x4C
iplSDChannelTitle_813E84C8 = .text:0x813E84C8; // type:function size:0x44
iplSDChannelTitle_813E850C = .text:0x813E850C; // type:function size:0xB4
iplSDChannelTitle_813E85C0 = .text:0x813E85C0; // type:function size:0xE0
iplSDChannelTitle_813E86A0 = .text:0x813E86A0; // type:function size:0x38
iplSDChannelTitle_813E86D8 = .text:0x813E86D8; // type:function size:0x1F4
iplSDChannelTitle_813E88CC = .text:0x813E88CC; // type:function size:0xD0
iplSDChannelTitle_813E899C = .text:0x813E899C; // type:function size:0x84
iplSDChannelTitle_813E8A20 = .text:0x813E8A20; // type:function size:0x94
iplSDChannelTitle_813E8AB4 = .text:0x813E8AB4; // type:function size:0x68
iplSDChannelTitle_813E8B1C = .text:0x813E8B1C; // type:function size:0x54
iplSDChannelTitle_813E8B70 = .text:0x813E8B70; // type:function size:0x98
iplSDChannelTitle_813E8C08 = .text:0x813E8C08; // type:function size:0x10C
iplSDChannelTitle_813E8D14 = .text:0x813E8D14; // type:function size:0xB8
iplSDChannelTitle_813E8DCC = .text:0x813E8DCC; // type:function size:0xA4
iplSDChannelTitle_813E8E70 = .text:0x813E8E70; // type:function size:0x94
iplSDChannelTitle_813E8F04 = .text:0x813E8F04; // type:function size:0x100
iplSDChannelTitle_813E9004 = .text:0x813E9004; // type:function size:0x2E8
iplSDChannelTitle_813E92EC = .text:0x813E92EC; // type:function size:0x17C
iplSDChannelTitle_rebuildBannerLayout = .text:0x813E630C; // type:function size:0x3C
iplSDChannelTitle_createBannerLayout = .text:0x813E6348; // type:function size:0xDC
iplSDChannelTitle_createIconLayout = .text:0x813E6424; // type:function size:0x1B0
iplSDChannelTitle_updateIdleState = .text:0x813E65D4; // type:function size:0x18C
iplSDChannelTitle_updateChangeState = .text:0x813E6760; // type:function size:0x20C
iplSDChannelTitle_updateChangeWait = .text:0x813E696C; // type:function size:0x48
iplSDChannelTitle_updateParentalResult = .text:0x813E69B4; // type:function size:0x1D4
iplSDChannelTitle_updateDialogResult = .text:0x813E6B88; // type:function size:0x144
iplSDChannelTitle_startCopyProgress = .text:0x813E6CCC; // type:function size:0x158
iplSDChannelTitle_updateCopyPrepare = .text:0x813E6E24; // type:function size:0x17C
iplSDChannelTitle_copyTitleRange = .text:0x813E6FA0; // type:function size:0x14
iplSDChannelTitle_updateMemoryCalc = .text:0x813E6FB4; // type:function size:0xC0
iplSDChannelTitle_updateCopyStart = .text:0x813E7074; // type:function size:0x130
iplSDChannelTitle_updateAfterClearTmp = .text:0x813E71A4; // type:function size:0xA8
iplSDChannelTitle_updateEnqueueNotice = .text:0x813E724C; // type:function size:0x6C
iplSDChannelTitle_updateCopyProgress = .text:0x813E72B8; // type:function size:0x160
iplSDChannelTitle_showCopyError = .text:0x813E7418; // type:function size:0x80
iplSDChannelTitle_updateCopyErrorDialog = .text:0x813E7498; // type:function size:0x54
iplSDChannelTitle_finishProgressHide = .text:0x813E74EC; // type:function size:0x12C
iplSDChannelTitle_returnToIdle = .text:0x813E7618; // type:function size:0xB0
iplSDChannelTitle_loadTitleBanner = .text:0x813E76C8; // type:function size:0xB8
iplSDChannelTitle_updateBannerLoad = .text:0x813E7780; // type:function size:0x80
iplSDChannelTitle_tryLaunchSelected = .text:0x813E7800; // type:function size:0x7C
iplSDChannelTitle_updateTmdReady = .text:0x813E787C; // type:function size:0x134
iplSDChannelTitle_startZoomFade = .text:0x813E79B0; // type:function size:0x68
iplSDChannelTitle_preparePageRestart = .text:0x813E7A18; // type:function size:0x118
iplSDChannelTitle_loadBannerScript = .text:0x813E7B30; // type:function size:0xDC
iplSDChannelTitle_updateScript = .text:0x813E7C0C; // type:function size:0x108
iplSDChannelTitle_updateScriptIdle = .text:0x813E7D14; // type:function size:0xBC
iplSDChannelTitle_updateScriptLoad = .text:0x813E7DD0; // type:function size:0x1E0
iplSDChannelTitle_destroyScript = .text:0x813E7FB0; // type:function size:0x84
iplSDChannelTitle_playBannerIntro = .text:0x813E8034; // type:function size:0x12C
iplSDChannelTitle_startBannerSound = .text:0x813E8160; // type:function size:0x9C
iplSDChannelTitle_bindBannerAnimations = .text:0x813E81FC; // type:function size:0x5C
iplSDChannelTitle_bindRsoAnimations = .text:0x813E8258; // type:function size:0x108
iplSDChannelTitle_bindBannerAnims = .text:0x813E8360; // type:function size:0x11C
iplSDChannelTitle_isNetworkAllowed = .text:0x813E847C; // type:function size:0x4C
iplSDChannelTitle_isParentalEnabled = .text:0x813E84C8; // type:function size:0x44
iplSDChannelTitle_openParentalDialog = .text:0x813E850C; // type:function size:0xB4
iplSDChannelTitle_setPageAndIndex = .text:0x813E85C0; // type:function size:0xE0
iplSDChannelTitle_beginLaunch = .text:0x813E86A0; // type:function size:0x38
iplSDChannelTitle_cleanupAndLeave = .text:0x813E86D8; // type:function size:0x1F4
iplSDChannelTitle_confirmLeaveToSettings = .text:0x813E88CC; // type:function size:0xD0
iplSDChannelTitle_prepareSceneExit = .text:0x813E899C; // type:function size:0x84
iplSDChannelTitle_flushSaveBeforeExit = .text:0x813E8A20; // type:function size:0x94
iplSDChannelTitle_rebootSystem = .text:0x813E8AB4; // type:function size:0x68
iplSDChannelTitle_isLaunchDelayDone = .text:0x813E8B1C; // type:function size:0x54
iplSDChannelTitle_setStartButtonPressed = .text:0x813E8B70; // type:function size:0x98
iplSDChannelTitle_drawDimOverlay = .text:0x813E8C08; // type:function size:0x10C
iplSDChannelTitle_setPaneMessage = .text:0x813E8D14; // type:function size:0xB8
iplSDChannelTitle_loadBannerMetaFiles = .text:0x813E8DCC; // type:function size:0xA4
iplSDChannelTitle_fetchTmdViewTask = .text:0x813E8E70; // type:function size:0x94
iplSDChannelTitle_passesParentalCheck = .text:0x813E8F04; // type:function size:0x100
iplSDChannelTitle_onTitlePaneEvent = .text:0x813E9004; // type:function size:0x2E8
iplSDChannelTitle_onTitleButtonEvent = .text:0x813E92EC; // type:function size:0x17C
startResetting__Q33ipl5scene14SDChannelTitleFv = .text:0x813E9468; // type:function size:0xC
@20@__dt__Q33ipl5scene14SDChannelTitleFv = .text:0x813E9474; // type:function size:0x8
__ct__Q33ipl5scene8SDButtonFPQ23EGG4Heap = .text:0x813E947C; // type:function size:0x9C
@@ -7270,9 +7270,9 @@ ZiDAWGgetEOWattribute = .text:0x81481098; // type:function size:0x30
ZiDAWGgetCHARattribute = .text:0x814810C8; // type:function size:0xF0
ZiDAWGGetGraph = .text:0x814811B8; // type:function size:0x2C
ZiDAWGGetGraphInfo = .text:0x814811E4; // type:function size:0x218
Zi8_814813FC = .text:0x814813FC; // type:function size:0xC4
Zi8LookupKoreanChar = .text:0x814813FC; // type:function size:0xC4
Zi8GetKoreanCandidates = .text:0x814814C0; // type:function size:0x9AC
Zi8_81481E6C = .text:0x81481E6C; // type:function size:0x9D4
Zi8MatchKoreanSequence = .text:0x81481E6C; // type:function size:0x9D4
Zi8IsWordW = .text:0x81482840; // type:function size:0x680
Zi8ConvertUC2UserKey = .text:0x81482EC0; // type:function size:0x16C
Zi8_8148302C = .text:0x8148302C; // type:function size:0xEC
@@ -8879,8 +8879,8 @@ TMCJPEGDEC_move_ptr = .text:0x814EAD28; // type:function size:0xE4
TMCJPEGDEC_load_buff = .text:0x814EAE0C; // type:function size:0x124
TMCJPEGDEC_get_position = .text:0x814EAF30; // type:function size:0x10
TMCJPEGDEC_chk_possible_size = .text:0x814EAF40; // type:function size:0x10
TMCJPEG_814EAF50 = .text:0x814EAF50; // type:function size:0x1B8 scope:local
TMCJPEG_814EB108 = .text:0x814EB108; // type:function size:0x198 scope:local
refillJpegBufferAfterFF = .text:0x814EAF50; // type:function size:0x1B8 scope:local
refillJpegBuffer = .text:0x814EB108; // type:function size:0x198 scope:local
TMCJPEGDEC_init_buff_thumbnail = .text:0x814EB2A0; // type:function size:0x88
TMCJPEGDEC_init_buff = .text:0x814EB328; // type:function size:0x10
TMCJPEGDEC_rewind_ptr = .text:0x814EB338; // type:function size:0xA4
@@ -13990,13 +13990,13 @@ 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
lbl_81616C98 = .rodata:0x81616C98; // type:object size:0x10
lbl_81616CA8 = .rodata:0x81616CA8; // type:object size:0x10
lbl_81616CB8 = .rodata:0x81616CB8; // type:object size:0x10 data:4byte
CHANSVmConstStringObjectNaN = .rodata:0x81616C88; // type:object size:0x10
CHANSVmConstStringObjectInfinity = .rodata:0x81616C98; // type:object size:0x10
CHANSVmConstStringObjectMinusInfinity = .rodata:0x81616CA8; // type:object size:0x10
CHANSVmConstStringObjectComma = .rodata:0x81616CB8; // type:object size:0x10 data:4byte
CHANSVmConstStringDataEmpty = .rodata:0x81616CC8; // type:object size:0x10
CHANSVmConstStringObjectUndefined_ = .rodata:0x81616CD8; // type:object size:0x50
lbl_81616D28 = .rodata:0x81616D28; // type:object size:0x20
scFloatConstantList = .rodata:0x81616D28; // type:object size:0x20
VmTypeConvertFuncTbl = .rodata:0x81616D48; // type:object size:0x90
VmResultTypeTbl = .rodata:0x81616DD8; // type:object size:0xB4
VmArrayPropertyTbl = .rodata:0x81616E8C; // type:object size:0xC data:4byte
@@ -14110,7 +14110,7 @@ hairColorTable$1737 = .rodata:0x8161DDDC; // type:object size:0xB4 scope:local
eyeColorTable$1742 = .rodata:0x8161DE90; // type:object size:0x1E scope:local
scDefaultData = .rodata:0x8161DEB0; // type:object size:0x1BC scope:local
scDayMax$1845 = .rodata:0x8161E070; // type:object size:0xD scope:local
lbl_8161E080 = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
scJpegAanScale = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
TMCJPEGDEC_SampleH_N = .rodata:0x8161E180; // type:object size:0x18 data:byte
TMCJPEGDEC_SampleV_N = .rodata:0x8161E198; // type:object size:0x18 data:byte
TMCJPEGDEC_Zigzag_data = .rodata:0x8161E1B0; // type:object size:0x40 data:byte
@@ -14736,7 +14736,7 @@ lbl_81639189 = .data:0x81639189; // type:object size:0x39 data:string
jumptable_816391C4 = .data:0x816391C4; // type:object size:0x30 scope:local
__vt__Q33ipl8savedata7Manager = .data:0x816391F4; // type:object size:0xC
__vt__Q33ipl7channel9RsoThread = .data:0x81639200; // type:object size:0x2C
lbl_81639230 = .data:0x81639230; // type:object size:0x41 data:string
scRsoFatalMsg = .data:0x81639230; // type:object size:0x41 data:string
jumptable_81639278 = .data:0x81639278; // type:object size:0x44 scope:local
lbl_816392BC = .data:0x816392BC; // type:object size:0xB data:string
lbl_816392C7 = .data:0x816392C7; // type:object size:0x11 data:string
@@ -15940,19 +15940,19 @@ lbl_8164DCDF = .data:0x8164DCDF; // type:object size:0x35
jumptable_8164DD14 = .data:0x8164DD14; // type:object size:0x6C scope:local
lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
lbl_8164DE64 = .data:0x8164DE64; // type:object size:0x9 data:string
lbl_8164DE6D = .data:0x8164DE6D; // type:object size:0x11 data:string
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local
lbl_8164DE9C = .data:0x8164DE9C; // type:object size:0xB data:string
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
lbl_8164DEA7 = .data:0x8164DEA7; // type:object size:0x10 data:string
lbl_8164DEB7 = .data:0x8164DEB7; // type:object size:0x114
lbl_8164DFCB = .data:0x8164DFCB; // type:object size:0x16 data:string
lbl_8164DFE1 = .data:0x8164DFE1; // type:object size:0x10 data:string
lbl_8164DFF1 = .data:0x8164DFF1; // type:object size:0xF data:string
lbl_8164E000 = .data:0x8164E000; // type:object size:0x14 data:string
scSE_WIPL_SE_CH_TARGETTING = .data:0x8164DFCB; // type:object size:0x16 data:string
scSE_WIPL_SE_CH_HOLD = .data:0x8164DFE1; // type:object size:0x10 data:string
scSE_WIPL_SE_CH_SET = .data:0x8164DFF1; // type:object size:0xF data:string
scSE_WIPL_SE_CH_NOT_MOVE = .data:0x8164E000; // type:object size:0x14 data:string
lbl_8164E014 = .data:0x8164E014; // type:object size:0x10 data:string
lbl_8164E024 = .data:0x8164E024; // type:object size:0x14 data:string
lbl_8164E038 = .data:0x8164E038; // type:object size:0xF data:string
scSE_WIPL_SE_GRAY_BUTTON = .data:0x8164E024; // type:object size:0x14 data:string
scSE_WIPL_SE_DECIDE = .data:0x8164E038; // type:object size:0xF data:string
__vt__Q33ipl4math29HermiteIntp<Q33ipl4math4VEC3> = .data:0x8164E048; // type:object size:0x20
__vt__Q33ipl5scene27CsChanSelSDMenuEventHandler = .data:0x8164E068; // type:object size:0x1C
__vt__Q33ipl5scene27CsChanSelButtonEventHandler = .data:0x8164E084; // type:object size:0x1C
@@ -15968,21 +15968,21 @@ s_time_num__Q23ipl5scene = .data:0x8164E1D8; // type:object size:0x28 scope:loca
@10797 = .data:0x8164E251; // type:object size:0x1A scope:local data:string
@10804 = .data:0x8164E26B; // type:object size:0x19 scope:local data:string
@10848 = .data:0x8164E284; // type:object size:0xA scope:local data:string
lbl_8164E290 = .data:0x8164E290; // type:object size:0x9 data:string
scCursur_a = .data:0x8164E290; // type:object size:0x9 data:string
lbl_8164E299 = .data:0x8164E299; // type:object size:0x1B data:string
lbl_8164E2B4 = .data:0x8164E2B4; // type:object size:0x1A data:string
lbl_8164E2CE = .data:0x8164E2CE; // type:object size:0x19 data:string
lbl_8164E2E8 = .data:0x8164E2E8; // type:object size:0xC
lbl_8164E2F4 = .data:0x8164E2F4; // type:object size:0xA data:string
lbl_8164E300 = .data:0x8164E300; // type:object size:0x28
lbl_8164E328 = .data:0x8164E328; // type:object size:0x387
lbl_8164E6AF = .data:0x8164E6AF; // type:object size:0x20
lbl_8164E6CF = .data:0x8164E6CF; // type:object size:0x12 data:string
lbl_8164E6E1 = .data:0x8164E6E1; // type:object size:0x12 data:string
lbl_8164E6F3 = .data:0x8164E6F3; // type:object size:0x12 data:string
lbl_8164E705 = .data:0x8164E705; // type:object size:0x19 data:string
lbl_8164E71E = .data:0x8164E71E; // type:object size:0x26 data:string
lbl_8164E744 = .data:0x8164E744; // type:object size:0x1F data:string
scModuleData = .data:0x8164E328; // type:object size:0x387
scBrlan_RsoFmt = .data:0x8164E6AF; // type:object size:0x20
scBrlyt_my_IplTop_b = .data:0x8164E6CF; // type:object size:0x12 data:string
scBrlan_my_IplTop_b = .data:0x8164E6E1; // type:object size:0x12 data:string
scBrlyt_my_IplTop_d = .data:0x8164E6F3; // type:object size:0x12 data:string
scBrlyt_my_IplTopBalloon_a = .data:0x8164E705; // type:object size:0x19 data:string
scBrlan_BalloonInOut = .data:0x8164E71E; // type:object size:0x26 data:string
scSE_BALLOON = .data:0x8164E744; // type:object size:0x1F data:string
scGroup_G_FocusBtnA = .data:0x8164E768; // type:object size:0xC data:string
scGroup_G_FocusBtnB = .data:0x8164E774; // type:object size:0xC data:string
scGroup_G_SelectBtnA = .data:0x8164E780; // type:object size:0xD data:string
@@ -17456,19 +17456,19 @@ __vt__Q49textinput8keyboard13cellphonetype23CellPhoneControlAnmPane = .data:0x81
__vt__Q49textinput8keyboard13cellphonetype16CellPhoneAnmPane = .data:0x8165C730; // type:object size:0x28
__vt__Q49textinput8keyboard13cellphonetype12EventHandler = .data:0x8165C758; // type:object size:0x20
__vt__Q49textinput8keyboard13cellphonetype4Base = .data:0x8165C778; // type:object size:0xA8
lbl_8165C820 = .data:0x8165C820; // type:object size:0xE data:string
lbl_8165C830 = .data:0x8165C830; // type:object size:0x10 data:string
scP_txtScrll_UP = .data:0x8165C820; // type:object size:0xE data:string
scP_txtScrll_DOWN = .data:0x8165C830; // type:object size:0x10 data:string
lbl_8165C840 = .data:0x8165C840; // type:object size:0x80
lbl_8165C8C0 = .data:0x8165C8C0; // type:object size:0xC data:string
lbl_8165C8CC = .data:0x8165C8CC; // type:object size:0x11 data:string
lbl_8165C8E0 = .data:0x8165C8E0; // type:object size:0xD data:string
lbl_8165C8F0 = .data:0x8165C8F0; // type:object size:0x10 data:string
lbl_8165C900 = .data:0x8165C900; // type:object size:0x11 data:string
lbl_8165C918 = .data:0x8165C918; // type:object size:0x10 data:string
lbl_8165C928 = .data:0x8165C928; // type:object size:0x10 data:string
lbl_8165C938 = .data:0x8165C938; // type:object size:0x11 data:string
lbl_8165C950 = .data:0x8165C950; // type:object size:0x10 data:string
lbl_8165C960 = .data:0x8165C960; // type:object size:0x10 data:string
scN_JPNUSAEUR = .data:0x8165C8C0; // type:object size:0xC data:string
scN_separateBarAll = .data:0x8165C8CC; // type:object size:0x11 data:string
scT_2l_TextBox = .data:0x8165C8E0; // type:object size:0xD data:string
scT_title_textJPN = .data:0x8165C8F0; // type:object size:0x10 data:string
scN_separateBarKOR = .data:0x8165C900; // type:object size:0x11 data:string
scT_2l_TextBoxKOR = .data:0x8165C918; // type:object size:0x10 data:string
scT_title_textKOR = .data:0x8165C928; // type:object size:0x10 data:string
scN_separateBarCHN = .data:0x8165C938; // type:object size:0x11 data:string
scT_2l_TextBoxCHN = .data:0x8165C950; // type:object size:0x10 data:string
scT_title_textCHN = .data:0x8165C960; // type:object size:0x10 data:string
lbl_8165C970 = .data:0x8165C970; // type:object size:0x20 data:2byte
jumptable_8165C990 = .data:0x8165C990; // type:object size:0xA0 scope:local
jumptable_8165CA30 = .data:0x8165CA30; // type:object size:0x28 scope:local
@@ -17491,14 +17491,14 @@ __vt__Q29textinput4Base = .data:0x8165D228; // type:object size:0x30
__vt__Q39textinput4util9Animation = .data:0x8165D258; // type:object size:0x24
lbl_8165D258 = .data:0x8165D27C; // type:object size:0xD data:string
@STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl = .data:0x8165D28C; // type:object size:0x44
lbl_8165D2D0 = .data:0x8165D2D0; // type:object size:0xF data:string
lbl_8165D2E0 = .data:0x8165D2E0; // type:object size:0x11 data:string
lbl_8165D2F8 = .data:0x8165D2F8; // type:object size:0x68C
lbl_8165D984 = .data:0x8165D984; // type:object size:0x84
lbl_8165DA08 = .data:0x8165DA08; // type:object size:0x10 data:string
lbl_8165DA18 = .data:0x8165DA18; // type:object size:0xF data:string
lbl_8165DA28 = .data:0x8165DA28; // type:object size:0xD data:string
lbl_8165DA38 = .data:0x8165DA38; // type:object size:0xD data:string
scT_prdc_Text_00 = .data:0x8165D2D0; // type:object size:0xF data:string
scP_prdc_scrl_Left = .data:0x8165D2E0; // type:object size:0x11 data:string
scCandidatePaneData = .data:0x8165D2F8; // type:object size:0x68C
scPaneNameTable = .data:0x8165D984; // type:object size:0x84
scW_predictWindow = .data:0x8165DA08; // type:object size:0x10 data:string
scN_predictInput = .data:0x8165DA18; // type:object size:0xF data:string
scW_OnOff_Area = .data:0x8165DA28; // type:object size:0xD data:string
scN_prdc_Texts = .data:0x8165DA38; // type:object size:0xD data:string
jumptable_8165DA48 = .data:0x8165DA48; // type:object size:0x1C scope:local
lbl_8165DA64 = .data:0x8165DA64; // type:object size:0xF data:string
lbl_8165DA74 = .data:0x8165DA74; // type:object size:0xF data:string
@@ -17938,20 +17938,20 @@ __vt__Q39textinput3gui11PaneManager = .data:0x81668DD4; // type:object size:0x5C
__vt__Q39textinput3gui10GUIManager = .data:0x81668E30; // type:object size:0x48
__vt__Q39textinput3gui12GUIComponent = .data:0x81668E78; // type:object size:0x68
__vt__Q49textinput5input10HKBManager14KBDListenerOwn = .data:0x81668EE0; // type:object size:0x18
jumptable_81668EF8 = .data:0x81668EF8; // type:object size:0xFC scope:local
scHwKeyboardConvertWCCodeJumpTable = .data:0x81668EF8; // type:object size:0xFC scope:local
__vt__Q49textinput8keyboard5hwkey10HWKeyboard = .data:0x81668FF4; // type:object size:0x24
__vt__Q29textinput8TiLayout = .data:0x81669018; // type:object size:0x34
__vt__Q29textinput17AnimTransformPane = .data:0x81669050; // type:object size:0x20
lbl_81669070 = .data:0x81669070; // type:object size:0x13
lbl_81669083 = .data:0x81669083; // type:object size:0x11
lbl_81669094 = .data:0x81669094; // type:object size:0x13
scUndefinedUtf16 = .data:0x81669070; // type:object size:0x13
scInfinityUtf16 = .data:0x81669083; // type:object size:0x11
scMinusInfinityUtf16 = .data:0x81669094; // type:object size:0x13
lbl_816690A7 = .data:0x816690A7; // type:object size:0x9 data:string
lbl_816690B0 = .data:0x816690B0; // type:object size:0xA data:string
lbl_816690BA = .data:0x816690BA; // type:object size:0xA data:string
lbl_816690C4 = .data:0x816690C4; // type:object size:0x1E data:string
lbl_816690E2 = .data:0x816690E2; // type:object size:0x1B data:string
jumptable_81669100 = .data:0x81669100; // type:object size:0x28 scope:local
lbl_81669128 = .data:0x81669128; // type:object size:0x10 data:string
scVmGetResultType = .data:0x81669128; // type:object size:0x10 data:string
jumptable_81669138 = .data:0x81669138; // type:object size:0x24 scope:local
jumptable_8166915C = .data:0x8166915C; // type:object size:0x24 scope:local
jumptable_81669180 = .data:0x81669180; // type:object size:0x28 scope:local
@@ -18055,7 +18055,7 @@ lbl_81669DC3 = .data:0x81669DC3; // type:object size:0xE data:string
lbl_81669DD1 = .data:0x81669DD1; // type:object size:0xC data:string
lbl_81669DDD = .data:0x81669DDD; // type:object size:0xC data:string
lbl_81669DE9 = .data:0x81669DE9; // type:object size:0xC data:string
lbl_81669DF5 = .data:0x81669DF5; // type:object size:0x11 data:string
scHexDigits = .data:0x81669DF5; // type:object size:0x11 data:string
vmBlobPackFormatList = .data:0x81669E08; // type:object size:0x190 scope:local data:4byte
lbl_81669F98 = .data:0x81669F98; // type:object size:0xA data:string
lbl_81669FA2 = .data:0x81669FA2; // type:object size:0xA data:string
@@ -18235,13 +18235,13 @@ jumptable_8166B3D0 = .data:0x8166B3D0; // type:object size:0x30 scope:local
@1137 = .data:0x8166B450; // type:object size:0x22 scope:local data:string
jumptable_8166B478 = .data:0x8166B478; // type:object size:0x30 scope:local
lbl_8166B4B8 = .data:0x8166B4B8; // type:object size:0x70
lbl_8166B528 = .data:0x8166B528; // type:object size:0x25 data:string
lbl_8166B550 = .data:0x8166B550; // type:object size:0x29 data:string
lbl_8166B57C = .data:0x8166B57C; // type:object size:0x2B data:string
lbl_8166B5A8 = .data:0x8166B5A8; // type:object size:0xD data:string
lbl_8166B5B8 = .data:0x8166B5B8; // type:object size:0x15 data:string
lbl_8166B5D0 = .data:0x8166B5D0; // type:object size:0x46 data:string
lbl_8166B618 = .data:0x8166B618; // type:object size:0x48 data:string
scCdbMsg_DatabaseClosed = .data:0x8166B528; // type:object size:0x25 data:string
scCdbMsg_CantCreateRecordClosed = .data:0x8166B550; // type:object size:0x29 data:string
scCdbMsg_CantCreateRecordReadonly = .data:0x8166B57C; // type:object size:0x2B data:string
scCdbMsg_InvalidKey = .data:0x8166B5A8; // type:object size:0xD data:string
scCdbMsg_FileNotFound = .data:0x8166B5B8; // type:object size:0x15 data:string
scCdbMsg_CantCleanupDirsClosed = .data:0x8166B5D0; // type:object size:0x46 data:string
scCdbMsg_CantCleanupDirsReadonly = .data:0x8166B618; // type:object size:0x48 data:string
@1360 = .data:0x8166B660; // type:object size:0x12 scope:local data:string
...data.0 = .data:0x8166B660; // type:label scope:local
@1362 = .data:0x8166B674; // type:object size:0x1C scope:local data:string
@@ -18453,7 +18453,7 @@ __FUNCTION__$1195 = .data:0x8166E0FC; // type:object size:0x1C scope:local data:
__FUNCTION__$1217 = .data:0x8166E118; // type:object size:0x1C scope:local data:string
__FUNCTION__$1255 = .data:0x8166E134; // type:object size:0x14 scope:local data:string
__FUNCTION__$1287 = .data:0x8166E148; // type:object size:0x18 scope:local data:string
lbl_8166E160 = .data:0x8166E160; // type:object size:0x1A data:string
scNwc24FlPath = .data:0x8166E160; // type:object size:0x1A data:string
@583 = .data:0x8166E180; // type:object size:0x1B scope:local data:string
__FUNCTION__$1123 = .data:0x8166E1A0; // type:object size:0x18 scope:local data:string
@1300 = .data:0x8166E1B8; // type:object size:0x11 scope:local data:string
@@ -18664,7 +18664,7 @@ __vt__Q34nw4r3lyt7Picture = .data:0x816717F4; // type:object size:0x6C
@5574 = .data:0x816718E8; // type:object size:0x41 scope:local data:string
__vt__Q34nw4r3lyt7TextBox = .data:0x8167192C; // type:object size:0x74
flipInfos$7849 = .data:0x816719A0; // type:object size:0x3C scope:local
lbl_816719DC = .data:0x816719DC; // type:object size:0x41 data:string
scLytFatalMsg = .data:0x816719DC; // type:object size:0x41 data:string
__vt__Q34nw4r3lyt6Window = .data:0x81671A20; // type:object size:0x7C
__vt__Q34nw4r3lyt8Bounding = .data:0x81671AA0; // type:object size:0x64
kColSels$4880 = .data:0x81671B08; // type:object size:0x20 scope:local data:4byte
@@ -19181,13 +19181,13 @@ base64_array = .data:0x816874A0; // type:object size:0x80 scope:local
@2185 = .data:0x816876A0; // type:object size:0x21 scope:local data:string
@654 = .data:0x816876C8; // type:object size:0x48 scope:local data:string
ShutdownFunctionInfo = .data:0x81687710; // type:object size:0x10 scope:local
lbl_81687720 = .data:0x81687720; // type:object size:0x49 data:string
scWpadVersionStr = .data:0x81687720; // type:object size:0x49 data:string
lbl_8168776C = .data:0x8168776C; // type:object size:0x1C data:string
lbl_81687788 = .data:0x81687788; // type:object size:0x1B data:string
lbl_816877A4 = .data:0x816877A4; // type:object size:0x2F data:string
lbl_816877D4 = .data:0x816877D4; // type:object size:0x27 data:string
ShutdownFunctionInfo = .data:0x81687800; // type:object size:0x10 scope:local
lbl_81687810 = .data:0x81687810; // type:object size:0x58
scWpadManageStrs = .data:0x81687810; // type:object size:0x58
lbl_81687868 = .data:0x81687868; // type:object size:0xC data:string
lbl_81687874 = .data:0x81687874; // type:object size:0x37 data:string
lbl_816878AC = .data:0x816878AC; // type:object size:0xB4
@@ -20050,8 +20050,8 @@ lbl_816932D0 = .data:0x816932D0; // type:object size:0x48 data:string
lbl_81693318 = .data:0x81693318; // type:object size:0xA data:string
lbl_81693324 = .data:0x81693324; // type:object size:0x15 data:string
@466 = .data:0x81693340; // type:object size:0xD scope:local data:string
lbl_81693350 = .data:0x81693350; // type:object size:0xD0
lbl_81693420 = .data:0x81693420; // type:object size:0x16 data:string
scCntCacheStrs = .data:0x81693350; // type:object size:0xD0
scCntCacheTitleDataFmt = .data:0x81693420; // type:object size:0x16 data:string
__vt__Q23EGG9Allocator = .data:0x81693438; // type:object size:0x14
__vt__Q23EGG9ArcPlayer = .data:0x81693450; // type:object size:0x54
__vt__Q23EGG20SimpleAudioMgrWithFx = .data:0x816934A8; // type:object size:0x78
@@ -20192,7 +20192,7 @@ lbl_816944EB = .sdata2:0x816944EB; // type:object size:0x1 data:byte
@23221 = .sdata2:0x81694588; // type:object size:0x8 scope:local align:8 data:double
lbl_81694590 = .sdata2:0x81694590; // type:object size:0x4 align:4 data:float
lbl_81694594 = .sdata2:0x81694594; // type:object size:0x4 align:4 data:float
lbl_81694598 = .sdata2:0x81694598; // type:object size:0x4 align:4 data:float
scRsoZeroF = .sdata2:0x81694598; // type:object size:0x4 align:4 data:float
lbl_816945A0 = .sdata2:0x816945A0; // type:object size:0x4 align:4 data:float
lbl_816945A4 = .sdata2:0x816945A4; // type:object size:0x4 align:4 data:float
lbl_816945A8 = .sdata2:0x816945A8; // type:object size:0x4 align:4 data:float
@@ -20243,7 +20243,7 @@ lbl_81694654 = .sdata2:0x81694654; // type:object size:0x4 align:4 data:float
@10043 = .sdata2:0x81694698; // type:object size:0x4 scope:local align:4 data:float
@10044 = .sdata2:0x8169469C; // type:object size:0x4 scope:local align:4 data:float
lbl_816946A0 = .sdata2:0x816946A0; // type:object size:0x4 align:4 data:float
lbl_816946A4 = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
scSoundZeroF = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
lbl_816946A8 = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
lbl_816946AC = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
lbl_816946B0 = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
@@ -20617,31 +20617,31 @@ lbl_81694D18 = .sdata2:0x81694D18; // type:object size:0x4 data:4byte
lbl_81694D1C = .sdata2:0x81694D1C; // type:object size:0x4 data:4byte
lbl_81694D20 = .sdata2:0x81694D20; // type:object size:0x1 data:byte
lbl_81694D24 = .sdata2:0x81694D24; // type:object size:0x1 data:byte
lbl_81694D28 = .sdata2:0x81694D28; // type:object size:0x4 align:4 data:float
lbl_81694D2C = .sdata2:0x81694D2C; // type:object size:0x4 align:4 data:float
lbl_81694D30 = .sdata2:0x81694D30; // type:object size:0x8 align:8 data:double
lbl_81694D38 = .sdata2:0x81694D38; // type:object size:0x4 align:4 data:float
lbl_81694D3C = .sdata2:0x81694D3C; // type:object size:0x4 align:4 data:float
lbl_81694D40 = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
lbl_81694D44 = .sdata2:0x81694D44; // type:object size:0x4 align:4 data:float
lbl_81694D48 = .sdata2:0x81694D48; // type:object size:0x4 align:4 data:float
lbl_81694D4C = .sdata2:0x81694D4C; // type:object size:0x4 align:4 data:float
lbl_81694D50 = .sdata2:0x81694D50; // type:object size:0x4 align:4 data:float
lbl_81694D54 = .sdata2:0x81694D54; // type:object size:0x4 align:4 data:float
lbl_81694D58 = .sdata2:0x81694D58; // type:object size:0x4 align:4 data:float
lbl_81694D5C = .sdata2:0x81694D5C; // type:object size:0x4 align:4 data:float
lbl_81694D60 = .sdata2:0x81694D60; // type:object size:0x4 align:4 data:float
lbl_81694D64 = .sdata2:0x81694D64; // type:object size:0x4 align:4 data:float
lbl_81694D68 = .sdata2:0x81694D68; // type:object size:0x4 align:4 data:float
lbl_81694D6C = .sdata2:0x81694D6C; // type:object size:0x1 data:byte
lbl_81694D6D = .sdata2:0x81694D6D; // type:object size:0x1 data:byte
lbl_81694D6E = .sdata2:0x81694D6E; // type:object size:0x1 data:byte
lbl_81694D6F = .sdata2:0x81694D6F; // type:object size:0x1 data:byte
lbl_81694D70 = .sdata2:0x81694D70; // type:object size:0x4 align:4 data:float
lbl_81694D74 = .sdata2:0x81694D74; // type:object size:0x4 align:4 data:float
lbl_81694D78 = .sdata2:0x81694D78; // type:object size:0x4 align:4 data:float
lbl_81694D80 = .sdata2:0x81694D80; // type:object size:0x8 align:8 data:double
lbl_81694D88 = .sdata2:0x81694D88; // type:object size:0x4 align:4 data:float
scInputFormZeroF = .sdata2:0x81694D28; // type:object size:0x4 align:4 data:float
scInputForm640F = .sdata2:0x81694D2C; // type:object size:0x4 align:4 data:float
scInputFormF32ConvertMagic = .sdata2:0x81694D30; // type:object size:0x8 align:8 data:double
scInputFormOneF = .sdata2:0x81694D38; // type:object size:0x4 align:4 data:float
scInputFormHalfF = .sdata2:0x81694D3C; // type:object size:0x4 align:4 data:float
scInputForm0_7111111F = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
scInputForm150F = .sdata2:0x81694D44; // type:object size:0x4 align:4 data:float
scInputForm30F = .sdata2:0x81694D48; // type:object size:0x4 align:4 data:float
scInputForm50F = .sdata2:0x81694D4C; // type:object size:0x4 align:4 data:float
scInputForm10F = .sdata2:0x81694D50; // type:object size:0x4 align:4 data:float
scInputForm52F = .sdata2:0x81694D54; // type:object size:0x4 align:4 data:float
scInputFormTwoF = .sdata2:0x81694D58; // type:object size:0x4 align:4 data:float
scInputForm140F = .sdata2:0x81694D5C; // type:object size:0x4 align:4 data:float
scInputForm90F = .sdata2:0x81694D60; // type:object size:0x4 align:4 data:float
scInputForm253F = .sdata2:0x81694D64; // type:object size:0x4 align:4 data:float
scInputForm20F = .sdata2:0x81694D68; // type:object size:0x4 align:4 data:float
scInputFormColorRU8 = .sdata2:0x81694D6C; // type:object size:0x1 data:byte
scInputFormColorGU8 = .sdata2:0x81694D6D; // type:object size:0x1 data:byte
scInputFormColorBU8 = .sdata2:0x81694D6E; // type:object size:0x1 data:byte
scInputFormColorAU8 = .sdata2:0x81694D6F; // type:object size:0x1 data:byte
scInputForm255F = .sdata2:0x81694D70; // type:object size:0x4 align:4 data:float
scInputForm127F = .sdata2:0x81694D74; // type:object size:0x4 align:4 data:float
scInputForm14592F = .sdata2:0x81694D78; // type:object size:0x4 align:4 data:float
scInputFormF64ConvertMagic = .sdata2:0x81694D80; // type:object size:0x8 align:8 data:double
scInputForm15F = .sdata2:0x81694D88; // type:object size:0x4 align:4 data:float
lbl_81694D90 = .sdata2:0x81694D90; // type:object size:0x4 align:4 data:float
lbl_81694D94 = .sdata2:0x81694D94; // type:object size:0x4 align:4 data:float
lbl_81694D98 = .sdata2:0x81694D98; // type:object size:0x4 align:4 data:float
@@ -20769,12 +20769,12 @@ NET_AES_BLOCK_MODE_CBC = .sdata2:0x81695040; // type:object size:0x8
@524 = .sdata2:0x81695050; // type:object size:0x2 scope:local data:byte
@1077 = .sdata2:0x81695054; // type:object size:0x2 scope:local data:byte
@1128 = .sdata2:0x81695058; // type:object size:0x2 scope:local data:byte
lbl_81695060 = .sdata2:0x81695060; // type:object size:0x1 data:byte
lbl_81695061 = .sdata2:0x81695061; // type:object size:0x1 data:byte
lbl_81695062 = .sdata2:0x81695062; // type:object size:0x1 data:byte
lbl_81695064 = .sdata2:0x81695064; // type:object size:0x1 data:byte
lbl_81695065 = .sdata2:0x81695065; // type:object size:0x1 data:byte
lbl_81695066 = .sdata2:0x81695066; // type:object size:0x1 data:byte
scRsnOui0 = .sdata2:0x81695060; // type:object size:0x1 data:byte
scRsnOui1 = .sdata2:0x81695061; // type:object size:0x1 data:byte
scRsnOui2 = .sdata2:0x81695062; // type:object size:0x1 data:byte
scWpaOui0 = .sdata2:0x81695064; // type:object size:0x1 data:byte
scWpaOui1 = .sdata2:0x81695065; // type:object size:0x1 data:byte
scWpaOui2 = .sdata2:0x81695066; // type:object size:0x1 data:byte
scFilePermissions = .sdata2:0x81695068; // type:object size:0x2 scope:local
cWhite = .sdata2:0x81695070; // type:object size:0x4 scope:local data:byte
@2829 = .sdata2:0x81695074; // type:object size:0x4 scope:local align:4 data:float
@@ -21025,10 +21025,10 @@ lbl_8169553B = .sdata2:0x8169553B; // type:object size:0x1 data:byte
lbl_8169553C = .sdata2:0x8169553C; // type:object size:0x4 align:4 data:float
lbl_81695540 = .sdata2:0x81695540; // type:object size:0x8 align:8 data:double
lbl_81695548 = .sdata2:0x81695548; // type:object size:0x8 align:8 data:double
lbl_81695550 = .sdata2:0x81695550; // type:object size:0x1 data:byte
lbl_81695551 = .sdata2:0x81695551; // type:object size:0x1 data:byte
lbl_81695552 = .sdata2:0x81695552; // type:object size:0x1 data:byte
lbl_81695553 = .sdata2:0x81695553; // type:object size:0x5 data:byte
scLytFatalColorR = .sdata2:0x81695550; // type:object size:0x1 data:byte
scLytFatalColorG = .sdata2:0x81695551; // type:object size:0x1 data:byte
scLytFatalColorB = .sdata2:0x81695552; // type:object size:0x1 data:byte
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x5 data:byte
@6184 = .sdata2:0x81695558; // type:object size:0x4 scope:local align:4 data:float
@6185 = .sdata2:0x8169555C; // type:object size:0x4 scope:local align:4 data:float
@6186 = .sdata2:0x81695560; // type:object size:0x4 scope:local align:4 data:float
@@ -21548,11 +21548,11 @@ lbl_81696220 = .sdata:0x81696220; // type:object size:0x2 data:string
lbl_81696222 = .sdata:0x81696222; // type:object size:0x2
lbl_81696224 = .sdata:0x81696224; // type:object size:0x6 data:wstring
lbl_8169622A = .sdata:0x8169622A; // type:object size:0x2
lbl_8169622C = .sdata:0x8169622C; // type:object size:0x1 data:byte
lbl_8169622D = .sdata:0x8169622D; // type:object size:0x1 data:byte
lbl_8169622E = .sdata:0x8169622E; // type:object size:0x1 data:byte
lbl_8169622F = .sdata:0x8169622F; // type:object size:0x1 data:byte
scTvrcFileHeader = .sdata:0x81696230; // type:object size:0x5 data:string
scRsoFatalColorR = .sdata:0x8169622C; // type:object size:0x1 data:byte
scRsoFatalColorG = .sdata:0x8169622D; // type:object size:0x1 data:byte
scRsoFatalColorB = .sdata:0x8169622E; // type:object size:0x1 data:byte
scRsoFatalColorA = .sdata:0x8169622F; // type:object size:0x1 data:byte
lbl_81696230 = .sdata:0x81696230; // type:object size:0x5 data:string
TVRC_FILE_HEADER__7LibTVRC = .sdata:0x81696238; // type:object size:0x4 data:4byte
__tienHoseiNsec__7LibTVRC = .sdata:0x8169623C; // type:object size:0x4 data:4byte
_limitMilli__7LibTVRC = .sdata:0x81696240; // type:object size:0x4 data:4byte
@@ -21858,11 +21858,11 @@ lbl_816968F5 = .sdata:0x816968F5; // type:object size:0x4 data:string
@10922 = .sdata:0x81696992; // type:object size:0x3 scope:local data:string
@10923 = .sdata:0x81696995; // type:object size:0x3 scope:local data:string
lbl_81696998 = .sdata:0x81696998; // type:object size:0x4 data:4byte
lbl_8169699C = .sdata:0x8169699C; // type:object size:0x4 data:4byte
scPaneName_T_Balloon = .sdata:0x8169699C; // type:object size:0x4 data:4byte
lbl_816969A0 = .sdata:0x816969A0; // type:object size:0x7 data:string
lbl_816969A8 = .sdata:0x816969A8; // type:object size:0x4 data:4byte
scPaneName_W_Base = .sdata:0x816969A8; // type:object size:0x4 data:4byte
lbl_816969AC = .sdata:0x816969AC; // type:object size:0x8 data:string
lbl_816969B4 = .sdata:0x816969B4; // type:object size:0x4 data:4byte
scPaneName_W_Shade = .sdata:0x816969B4; // type:object size:0x4 data:4byte
lbl_816969B8 = .sdata:0x816969B8; // type:object size:0x4 data:string
lbl_816969BC = .sdata:0x816969BC; // type:object size:0x4 data:string
lbl_816969C0 = .sdata:0x816969C0; // type:object size:0x4 data:string
@@ -21872,9 +21872,9 @@ lbl_816969CC = .sdata:0x816969CC; // type:object size:0x4 data:string
lbl_816969D0 = .sdata:0x816969D0; // type:object size:0x4 data:string
lbl_816969D4 = .sdata:0x816969D4; // type:object size:0x4 data:string
lbl_816969D8 = .sdata:0x816969D8; // type:object size:0x4 data:string
lbl_816969DC = .sdata:0x816969DC; // type:object size:0x5 data:string
lbl_816969E1 = .sdata:0x816969E1; // type:object size:0x7 data:string
lbl_816969E8 = .sdata:0x816969E8; // type:object size:0x4 data:string
scExport_Calc = .sdata:0x816969DC; // type:object size:0x5 data:string
scExport_Create = .sdata:0x816969E1; // type:object size:0x7 data:string
scArc = .sdata:0x816969E8; // type:object size:0x4 data:string
lbl_816969EC = .sdata:0x816969EC; // type:object size:0x6 data:string
lbl_816969F2 = .sdata:0x816969F2; // type:object size:0x5 data:string
lbl_816969F7 = .sdata:0x816969F7; // type:object size:0x4 data:string
@@ -22281,11 +22281,11 @@ sbCompatibleFilterEnabled__Q39textinput9inputform13DeadKeyStream = .sdata:0x8169
mbHyphen__Q29textinput9inputform = .sdata:0x816973B3; // type:object size:0x1 data:byte
lbl_816973B4 = .sdata:0x816973B4; // type:object size:0x4
lbl_816973B8 = .sdata:0x816973B8; // type:object size:0x8 data:string
lbl_816973C0 = .sdata:0x816973C0; // type:object size:0x4 data:4byte
lbl_816973C4 = .sdata:0x816973C4; // type:object size:0x4 data:4byte
lbl_816973C8 = .sdata:0x816973C8; // type:object size:0x8
lbl_816973D0 = .sdata:0x816973D0; // type:object size:0x8 data:string
lbl_816973D8 = .sdata:0x816973D8; // type:object size:0x8 data:string
scCommonTextAnimName = .sdata:0x816973C0; // type:object size:0x4 data:4byte
scCommonScrollAnimName = .sdata:0x816973C4; // type:object size:0x4 data:4byte
scEmptyWChars = .sdata:0x816973C8; // type:object size:0x8
scP_OnBtn = .sdata:0x816973D0; // type:object size:0x8 data:string
scB_OnBtn = .sdata:0x816973D8; // type:object size:0x8 data:string
COMMON_BUTTON_ANIM__Q29textinput7toolbar = .sdata:0x816973E0; // type:object size:0x4 scope:local data:4byte
COMMON_CHG_ANIM__Q29textinput7toolbar = .sdata:0x816973E4; // type:object size:0x4 scope:local data:4byte
@6901 = .sdata:0x816973E8; // type:object size:0x5 scope:local data:string
@@ -22347,7 +22347,7 @@ lbl_8169757F = .sdata:0x8169757F; // type:object size:0x3
lbl_81697582 = .sdata:0x81697582; // type:object size:0x1
lbl_81697583 = .sdata:0x81697583; // type:object size:0x3 data:string
lbl_81697586 = .sdata:0x81697586; // type:object size:0x4 data:string
lbl_8169758A = .sdata:0x8169758A; // type:object size:0x7 data:string
scFloatPrintfFmt = .sdata:0x8169758A; // type:object size:0x7 data:string
lbl_81697591 = .sdata:0x81697591; // type:object size:0x5 data:string
lbl_81697596 = .sdata:0x81697596; // type:object size:0x7 data:string
lbl_8169759D = .sdata:0x8169759D; // type:object size:0x5 data:string
@@ -22413,8 +22413,8 @@ lbl_816976C4 = .sdata:0x816976C4; // type:object size:0x8 data:string
lbl_816976CC = .sdata:0x816976CC; // type:object size:0x8 data:string
lbl_816976D4 = .sdata:0x816976D4; // type:object size:0x7 data:string
lbl_816976DB = .sdata:0x816976DB; // type:object size:0x6 data:string
lbl_816976E4 = .sdata:0x816976E4; // type:object size:0x4 data:4byte
lbl_816976E8 = .sdata:0x816976E8; // type:object size:0x4 data:4byte
scHexDigitsPtr = .sdata:0x816976E4; // type:object size:0x4 data:4byte
scHexDigitsPtr2 = .sdata:0x816976E8; // type:object size:0x4 data:4byte
lbl_816976EC = .sdata:0x816976EC; // type:object size:0x7 data:string
lbl_816976F3 = .sdata:0x816976F3; // type:object size:0x8 data:string
lbl_816976FB = .sdata:0x816976FB; // type:object size:0x5 data:string
@@ -22439,15 +22439,15 @@ lbl_81697770 = .sdata:0x81697770; // type:object size:0x8 data:string
lbl_81697778 = .sdata:0x81697778; // type:object size:0x8 data:string
lbl_81697780 = .sdata:0x81697780; // type:object size:0x5 data:string
lbl_81697785 = .sdata:0x81697785; // type:object size:0x7 data:string
lbl_8169778C = .sdata:0x8169778C; // type:object size:0x6 data:string
scImageClassName = .sdata:0x8169778C; // type:object size:0x6 data:string
lbl_81697792 = .sdata:0x81697792; // type:object size:0x6 data:string
lbl_81697798 = .sdata:0x81697798; // type:object size:0x7 data:string
lbl_8169779F = .sdata:0x8169779F; // type:object size:0x7 data:string
lbl_816977A6 = .sdata:0x816977A6; // type:object size:0x6 data:string
lbl_816977AC = .sdata:0x816977AC; // type:object size:0x5 data:string
lbl_816977B1 = .sdata:0x816977B1; // type:object size:0x6 data:string
lbl_816977B7 = .sdata:0x816977B7; // type:object size:0x5 data:string
lbl_816977BC = .sdata:0x816977BC; // type:object size:0x8 data:string
scDateClassName = .sdata:0x816977AC; // type:object size:0x5 data:string
scMathInternalName = .sdata:0x816977B1; // type:object size:0x6 data:string
scMathClassName = .sdata:0x816977B7; // type:object size:0x5 data:string
scWinEmuInternalName = .sdata:0x816977BC; // type:object size:0x8 data:string
lbl_816977C4 = .sdata:0x816977C4; // type:object size:0x5 data:string
lbl_816977D0 = .sdata:0x816977D0; // type:object size:0x5 data:string
lbl_816977D5 = .sdata:0x816977D5; // type:object size:0x8 data:string
@@ -22538,7 +22538,7 @@ lbl_816979C8 = .sdata:0x816979C8; // type:object size:0x5 data:string
lbl_816979D0 = .sdata:0x816979D0; // type:object size:0x5 data:string
lbl_816979D8 = .sdata:0x816979D8; // type:object size:0x4 data:string
lbl_816979E0 = .sdata:0x816979E0; // type:object size:0x8 data:string
lbl_816979E8 = .sdata:0x816979E8; // type:object size:0x1 data:byte
CDBFSPathSeparator = .sdata:0x816979E8; // type:object size:0x1 data:byte
@1433 = .sdata:0x816979F0; // type:object size:0x4 scope:local data:string
@1435 = .sdata:0x816979F4; // type:object size:0x1 scope:local
@1440 = .sdata:0x816979F8; // type:object size:0x6 scope:local data:string
@@ -22700,9 +22700,9 @@ __SSLVersion = .sdata:0x81697CE0; // type:object size:0x4 data:4byte
qErr$1631 = .sdata:0x81697D58; // type:object size:0x4 scope:local data:4byte
l_dev_nandflash_init_info = .sdata:0x81697D60; // type:object size:0x8 scope:local
l_dev_sd_direct_init_info = .sdata:0x81697D68; // type:object size:0x8 scope:local
lbl_81697D70 = .sdata:0x81697D70; // type:object size:0x1 data:byte
lbl_81697D71 = .sdata:0x81697D71; // type:object size:0x1 data:byte
lbl_81697D72 = .sdata:0x81697D72; // type:object size:0x1 data:byte
scWpaFindOui0 = .sdata:0x81697D70; // type:object size:0x1 data:byte
scWpaFindOui1 = .sdata:0x81697D71; // type:object size:0x1 data:byte
scWpaFindOui2 = .sdata:0x81697D72; // type:object size:0x1 data:byte
__RFLVersion = .sdata:0x81697D78; // type:object size:0x4 data:4byte
sRFLLastErrCode = .sdata:0x81697D7C; // type:object size:0x4 scope:local data:4byte
scResFileFullPathName = .sdata:0x81697D80; // type:object size:0x4 scope:local data:4byte
@@ -23109,7 +23109,7 @@ lbl_816983EC = .sdata:0x816983EC; // type:object size:0x6 data:string
__KBDVersion = .sdata:0x816985C8; // type:object size:0x4 data:4byte
__KPRVersion = .sdata:0x816985D0; // type:object size:0x4 data:4byte
__CNTCACHEVersion = .sdata:0x816985D8; // type:object size:0x4 data:4byte
lbl_816985DC = .sdata:0x816985DC; // type:object size:0x3 data:string
scCntCacheSpaceNl = .sdata:0x816985DC; // type:object size:0x3 data:string
@428 = .sdata:0x816985E0; // type:object size:0x4 scope:local data:string
@429 = .sdata:0x816985E4; // type:object size:0x3 scope:local data:string
@442 = .sdata:0x816985E7; // type:object size:0x8 scope:local data:string

View File

@@ -918,9 +918,9 @@ config.libs = [
Object(NonMatching, "keyboard/tiString.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiAtokString.cpp", extra_cflags=["-O4,p"]), # for 4.3J
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
Object(NonMatching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiKeyboard.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiUtil.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiCpData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
Object(Matching, "keyboard/tiSwData.cpp", extra_cflags=["-O4,p"], shift_jis=False),

View File

@@ -133,7 +133,11 @@ namespace textinput {
friend class Base;
public:
RowInfoManager(u16 maxLength) : mpInfo(NULL), mMaxLength(maxLength), mpAllocator(NULL) {}
#ifdef TIINPUTFORM_IMPLEMENTATION
void init() __attribute__((never_inline));
#else
void init();
#endif
~RowInfoManager();
#endif
private:

View File

@@ -135,8 +135,13 @@ namespace textinput {
virtual keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() { return mpCellPhoneKeyboard; }
virtual const keyboard::cellphonetype::LayoutByNW4R* getCellPhoneKeyboard() const { return mpCellPhoneKeyboard; }
#ifdef TIMANAGER_IMPLEMENTATION
virtual void* getSignKeyboard();
virtual const void* getSignKeyboard() const;
#else
virtual void* getSignKeyboard() { return mpSignWindow; }
virtual const void* getSignKeyboard() const { return mpSignWindow; }
#endif
virtual candidatebox::LayoutByNW4R* getCandidateBox() { return mpCandidateBox; }
virtual const candidatebox::LayoutByNW4R* getCandidateBox() const { return mpCandidateBox; }
@@ -144,8 +149,13 @@ namespace textinput {
virtual toolbar::LayoutByNW4R* getToolBar() { return mpToolBar; }
virtual const toolbar::LayoutByNW4R* getToolBar() const { return mpToolBar; }
#ifdef TIMANAGER_IMPLEMENTATION
virtual void* getPredictLanguageSelectDialog();
virtual const void* getPredictLanguageSelectDialog() const;
#else
virtual void* getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
virtual const void* getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
#endif
virtual inputform::EditBuffer* createEditBuffer();
virtual keyboard::hwkey::HWKeyboard* createHWKeyboard();

View File

@@ -293,8 +293,8 @@ namespace ipl {
LOCKED_DIALOG_ANIM_MAX,
};
static void iplChannelTitle_813BA684(void* work);
static void iplChannelTitle_813BA784(void* work);
static void markTmdReadyTask(void* work);
static void deleteTmpTitleContentTask(void* work);
static void getTmdTask(void* work);
static void getTicketLimitTask(void* work);
static BOOL isTimeLimitedTicket(ESTicketView * ticket, u32* remainTime = NULL);

View File

@@ -81,22 +81,22 @@ namespace ipl {
void* mpThumbnailData;
NandSDWorker::SDAppMetaEntry mAppMeta;
};
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel);
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel);
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
EGG::ExpHeap* secondHeap);
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel);
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel);
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel);
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane);
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile);
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel);
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel);
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int state);
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int state);
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool selected);
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int enabled);
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel);
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel);
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel);
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel);
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel);
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane);
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile);
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel);
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel);
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int state);
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int state);
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool selected);
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int enabled);
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel);
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel);
union SDChannelSelectCommandArguments {
u32 values[3];

View File

@@ -336,19 +336,19 @@ namespace ipl {
BOOL nand_error_handling(int code);
SEntry* fn_8133A4E0(ESTitleId titleId);
u32 fn_8133A57C(ESTitleId titleId);
u32 fn_8133A5B8(ESTitleId titleId);
BOOL fn_8133A5F0(ESTitleId titleId);
BOOL fn_8133A634(ESTitleId titleId);
BOOL fn_8133A678(ESTitleId titleId);
BOOL fn_8133A6B8(ESTitleId titleId);
BOOL fn_8133A73C(ESTitleId titleId);
nand::MetaFile* fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId);
nand::MetaFile* fn_8133A85C(EGG::Heap* heap, ESTitleId titleId);
nand::SharedFile* fn_8133A924(EGG::Heap* heap, ESTitleId titleId);
void fn_8133A9F0();
void fn_8133AA50(ESTitleId titleId);
SEntry* findEntryByTitleId(ESTitleId titleId);
u32 getBannerCSIdx(ESTitleId titleId);
u32 getSoundSize(ESTitleId titleId);
BOOL needsNetSetting(ESTitleId titleId);
BOOL usesAltSound(ESTitleId titleId);
BOOL isMissingTicket(ESTitleId titleId);
BOOL isNewsChannelV6Plus(ESTitleId titleId);
BOOL isOperaChannel(ESTitleId titleId);
nand::MetaFile* readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId);
nand::MetaFile* readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId);
nand::SharedFile* readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId);
void clearTmpChannel();
void unloadBanner(ESTitleId titleId);
BOOL isReady() { return mState == FINISH; }

View File

@@ -26,6 +26,18 @@ namespace ipl {
namespace savedata {
extern "C" BOOL isTitleCached(void* manager, ESTitleId titleId);
struct ChannelSlot {
u8 valid; // 0x00 (primaryType)
u8 pad[3]; // 0x01
s32 titleId; // 0x04 (sceneID)
u8 rest[8]; // 0x08
};
struct ChannelPage {
u8 pad[0x30];
ChannelSlot slots[MAX_CHANNEL_INDEX]; // 0x30
};
class Manager {
public:
Manager(EGG::Heap* heap);

View File

@@ -301,9 +301,9 @@ namespace nw4r {
}
if (error == OS_EXCEPTION_FLOATING_POINT_EXCEPTION) {
u32 uVar1 = sException.FPCSR_COPY;
uVar1 &= (((uVar1 & 0xf8) << 0x16) | 0x01f80700);
if ((uVar1 & 0x20000000) != 0) {
u32 fpcsr = sException.FPCSR_COPY;
fpcsr &= (((fpcsr & 0xf8) << 0x16) | 0x01f80700);
if ((fpcsr & 0x20000000) != 0) {
Exception_Printf_(" FPE: Invalid operation\n");
if ((sException.FPCSR_COPY & 0x1000000) != 0) {
Exception_Printf_(" SNaN\n");
@@ -333,16 +333,16 @@ namespace nw4r {
Exception_Printf_(" Invalid integer convert\n");
}
}
if ((uVar1 & 0x10000000) != 0) {
if ((fpcsr & 0x10000000) != 0) {
Exception_Printf_(" FPE: Overflow\n");
}
if ((uVar1 & 0x8000000) != 0) {
if ((fpcsr & 0x8000000) != 0) {
Exception_Printf_(" FPE: Underflow\n");
}
if ((uVar1 & 0x4000000) != 0) {
if ((fpcsr & 0x4000000) != 0) {
Exception_Printf_(" FPE: Zero division\n");
}
if ((uVar1 & 0x2000000) != 0) {
if ((fpcsr & 0x2000000) != 0) {
Exception_Printf_(" FPE: Inexact result\n");
}
}

View File

@@ -1,19 +1,19 @@
#include <nw4r/db/assert.h>
extern "C" const u8 lbl_81695550 = 255;
extern "C" const u8 lbl_81695551 = 255;
extern "C" const u8 lbl_81695552 = 255;
extern "C" const u8 lbl_81695553 = 0;
extern "C" char lbl_816719DC[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
extern "C" const u8 scLytFatalColorR = 255;
extern "C" const u8 scLytFatalColorG = 255;
extern "C" const u8 scLytFatalColorB = 255;
extern "C" const u8 scLytFatalColorA = 0;
extern "C" char scLytFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
#undef NW4R_ASSERT
#define NW4R_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {*((volatile const u8*)&::lbl_81695550), *((volatile const u8*)&::lbl_81695551), \
*((volatile const u8*)&::lbl_81695552), *((volatile const u8*)&::lbl_81695553)}; \
GXColor front = {*((volatile const u8*)&::scLytFatalColorR), *((volatile const u8*)&::scLytFatalColorG), \
*((volatile const u8*)&::scLytFatalColorB), *((volatile const u8*)&::scLytFatalColorA)}; \
GXColor back = {0, 0, 0, 0}; \
OSFatal((GXColor)front, (GXColor)back, ::lbl_816719DC); \
OSFatal((GXColor)front, (GXColor)back, ::scLytFatalMsg); \
} \
}

View File

@@ -1,7 +1,7 @@
#include <tmc_jpeg_internal.h>
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work);
static s32 TMCJPEG_814EB108(TMCCJPEGDecWork* work);
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work);
static s32 refillJpegBuffer(TMCCJPEGDecWork* work);
s32 TMCJPEGDEC_init_ptr_buff(TMCCJPEGDecWork* work, void* param) {
u32 readSize;
@@ -52,7 +52,7 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
if (work->pBufCur >= work->pBufEnd) {
if (work->remaining != 0) {
s32 r = TMCJPEG_814EB108(work);
s32 r = refillJpegBuffer(work);
if (r < 0) {
return r;
}
@@ -69,7 +69,7 @@ s32 TMCJPEGDEC_get_byte(u8* dst, TMCCJPEGDecWork* work) {
if (cur >= work->pBufEnd) {
if (work->remaining != 0) {
s32 r = TMCJPEG_814EB108(work);
s32 r = refillJpegBuffer(work);
if (r < 0) {
return r;
}
@@ -92,7 +92,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
if (work->pBufCur >= work->pBufEnd) {
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r < 0) {
goto br;
} else {
@@ -119,7 +119,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
}
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r >= 0) {
goto o1;
}
@@ -144,7 +144,7 @@ p2:
goto r2;
}
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r < 0)
goto ez;
else {
@@ -166,7 +166,7 @@ r2:
}
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r < 0)
goto ez;
else {
@@ -193,7 +193,7 @@ s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
for (i = 0; i < count; i++) {
if (work->pBufCur >= work->pBufEnd) {
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r < 0) {
goto copy_byte;
} else {
@@ -214,7 +214,7 @@ s32 TMCJPEGDEC_get_sbyte(u8* dst, u32 count, TMCCJPEGDecWork* work) {
goto r0;
}
if (work->remaining != 0) {
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r >= 0) {
goto r0;
}
@@ -251,7 +251,7 @@ lp:
if (work->remaining == 0) {
goto er1;
}
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r >= 0) {
goto lc;
}
@@ -271,7 +271,7 @@ lc:
if (work->remaining == 0) {
goto er2;
}
r = TMCJPEG_814EB108(work);
r = refillJpegBuffer(work);
if (r >= 0) {
goto ret0;
}
@@ -320,7 +320,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
if (work->remaining == 0) {
break;
}
r = TMCJPEG_814EAF50(work);
r = refillJpegBufferAfterFF(work);
if (r < 0) {
return r;
}
@@ -345,7 +345,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
if (work->remaining == 0) {
break;
}
r = TMCJPEG_814EAF50(work);
r = refillJpegBufferAfterFF(work);
if (r < 0) {
return r;
}
@@ -364,7 +364,7 @@ s32 TMCJPEGDEC_chk_possible_size(TMCCJPEGDecWork* work) {
return work->pBufEnd - work->pBufCur;
}
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work) {
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work) {
u8 marker;
u32 readSize;
u8* dest;
@@ -410,7 +410,7 @@ static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work) {
return 0;
}
static s32 TMCJPEG_814EB108(TMCCJPEGDecWork* work) {
static s32 refillJpegBuffer(TMCCJPEGDecWork* work) {
u8* end;
u32 i, j;
s32 readSize;

View File

@@ -2,7 +2,7 @@
extern void* memset(void* dest, s32 val, u32 count);
extern const u32 lbl_8161E080[64] = {
extern const u32 scJpegAanScale[64] = {
0x00000100, 0x000000B9, 0x000000C4, 0x000000DA, 0x00000100, 0x00000146, 0x000001D9, 0x000003A0, 0x000000B9, 0x00000085, 0x0000008D,
0x0000009D, 0x000000B9, 0x000000EB, 0x00000155, 0x0000029D, 0x000000C4, 0x0000008D, 0x00000096, 0x000000A7, 0x000000C4, 0x000000F9,
0x0000016A, 0x000002C6, 0x000000DA, 0x0000009D, 0x000000A7, 0x000000B9, 0x000000DA, 0x00000115, 0x00000192, 0x00000315, 0x00000100,
@@ -1424,7 +1424,7 @@ static s32 TMCJPEGDEC_parse_dqt(TMCCJPEGDecWork* work) {
s32 r;
d = tblCopy;
*(CopyBlock64*)d = *(CopyBlock64*)lbl_8161E080;
*(CopyBlock64*)d = *(CopyBlock64*)scJpegAanScale;
scaleInfo = (QuantizationTables*)&work->scaleFlag;

View File

@@ -4,7 +4,7 @@
ziU32 Zi8GetTableAddress(ziU8 lang, ziU8 tableIdx, ziPtr workData);
ziU16 Zi8GetTableCount(ziU8 lang, ziU8 tableIdx, ziPtr workData);
ziU8 Zi8_814813FC(ziWChar character, ziU8* result, ziU16* index, ziPtr workData) {
ziU8 Zi8LookupKoreanChar(ziWChar character, ziU8* result, ziU16* index, ziPtr workData) {
ziU16 i;
ziU8* table;
@@ -23,7 +23,7 @@ ziU8 Zi8_814813FC(ziWChar character, ziU8* result, ziU16* index, ziPtr workData)
return 0;
}
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
ziPtr workData) {
@@ -97,9 +97,9 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
result = 0;
for (currentCharacter = 0; currentCharacter < state.elementIndex; currentCharacter++) {
if (Zi8_814813FC(buffer[currentCharacter], &state.characterIndex,
if (Zi8LookupKoreanChar(buffer[currentCharacter], &state.characterIndex,
&state.inputIndex, workData) != 0) {
state.matched = Zi8_81481E6C(&state.nextIndex,
state.matched = Zi8MatchKoreanSequence(&state.nextIndex,
buffer + currentCharacter + 1,
state.characterIndex,
(state.elementIndex - currentCharacter) - 1,
@@ -235,7 +235,7 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
return result;
}
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData) {
ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData) {
ziU16 nestedScratch;
ziU16 nestedIndexStorage;
ziU16 index1;
@@ -375,8 +375,8 @@ ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPt
}
if ((index3 >= tableCount) || (firstCharacter != (table + index3 * 4)[2]) ||
(input[1] != (table + index3 * 4)[1]) || (input[0] != table[index3 * 4])) {
if ((Zi8_814813FC(input[1], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8_81481E6C(&nestedIndexStorage, input + 2, mappedCharacter, 1, workData) != 0)) {
if ((Zi8LookupKoreanChar(input[1], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 2, mappedCharacter, 1, workData) != 0)) {
*resultIndex = index1;
return 1;
}
@@ -397,8 +397,8 @@ ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPt
if ((index4 >= tableCount) || (firstCharacter != (table + index4 * 4)[3]) ||
(input[2] != (table + index4 * 4)[2]) || (input[1] != (table + index4 * 4)[1]) ||
(input[0] != table[index4 * 4])) {
if ((Zi8_814813FC(input[2], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8_81481E6C(&nestedIndexStorage, input + 3, mappedCharacter, 1, workData) != 0)) {
if ((Zi8LookupKoreanChar(input[2], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 3, mappedCharacter, 1, workData) != 0)) {
*resultIndex = index2;
return 2;
}
@@ -409,8 +409,8 @@ ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPt
*resultIndex = index4;
return 4;
}
if ((Zi8_814813FC(input[3], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8_81481E6C(&nestedIndexStorage, input + 4, mappedCharacter, 1, workData) != 0)) {
if ((Zi8LookupKoreanChar(input[3], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 4, mappedCharacter, 1, workData) != 0)) {
*resultIndex = index3;
return 3;
}

View File

@@ -457,7 +457,7 @@ void bta_dm_signal_strength(tBTA_DM_MSG *p_data);
void bta_dm_acl_change(tBTA_DM_MSG *p_data);
BOOLEAN bta_sys_check_compress(int, UINT8 app_id, BD_ADDR peer_addr);
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr);
void bta_dm_keep_acl(tBTA_DM_MSG *p_data);
void bta_dm_immediate_disable(void);

View File

@@ -151,7 +151,7 @@ UINT8 L2CA_SetTraceLevel(UINT8 new_level);
UINT8 L2CA_SetDesireRole(UINT8 new_role);
BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority);
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
UINT8 wbits, UINT8 direction, UINT8 param_6,
UINT8 wbits, UINT8 direction, UINT8 config,
UINT8 enable);
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *, signed);
UINT8 L2CA_Flush(UINT16 cid);

View File

@@ -3,7 +3,7 @@
#include <revolution/types.h>
s32 uhf_ker_create_sem(u32 param_1, int param_2);
s32 uhf_ker_create_sem(u32 initCount, int flags);
s32 uhf_ker_delete_sem(int sem);
s32 uhf_ker_get_sem(int sem);

View File

@@ -62,9 +62,9 @@ typedef struct CXUncompContextHuffman {
CXHuffmanDecodeTableEntry decodeTableData[0x200]; // 0x20
} CXUncompContextHuffman;
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2);
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2);
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* param_2);
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data);
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data);
void CXInitUncompContextHuffman(CXUncompContextHuffman* context, u8* data);
CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u32 size);
CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u32 size);

View File

@@ -68,7 +68,7 @@ void KPADInit();
s32 KPADRead(s32 chan, KPADStatus* status, u32 length);
void KPADSetSensorHeight(s32 chan, f32 sensorHeight);
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* param_3, f32 param_4);
void KPADGetProjectionPos(Vec2* dest, Vec2* src, const Rect* rect, f32 scale);
void KPADSetPosParam(s32 chan, f32 x, f32 y);
void KPADSetBtnRepeat(s32 chan, f32, f32);

View File

@@ -40,7 +40,7 @@ ISD_Error ISD_ProbeCard(u32 slot);
ISD_Error ISD_MountCard(u32 slot, SDDev** dev);
ISD_Error ISD_UnmountCard(SDDev* dev);
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) NO_INLINE;
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) NO_INLINE;
ISD_Error ISD_ReadBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);
ISD_Error ISD_WriteBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize);

View File

@@ -33,8 +33,8 @@ typedef struct USBKBDCmdLEDAsync {
USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback detachCb);
USBKBDErr USBKBDSetLED(u32, u8, USBKBDCmdLED* cmd);
USBKBDErr USBKBDSetLEDAsync(u32, u8, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd);
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg);
USBKBDErr USBKBDRegisterEventCallback(USBKBDEventCallback cb);

View File

@@ -80,11 +80,11 @@ typedef struct {
typedef void (*WADProcessCallback)(u32 completed, u32 total, BOOL done);
s32 WADGetTitleVersionEx(char* path, ESTitleId* titleId, u16* titleVersion, WADLocation location, u32 offset);
s32 WADBackupEx(u64 titleId, u32 param_2, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 param_7,
WADProcessCallback processCB);
s32 WADBackupEx(u64 titleId, u32 flags, MEMAllocator* allocator, char* path, u32* sizeOut, WADLocation location, u32 offset,
WADProcessCallback processCallback);
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 param_5, WADBlocks* blocks, u32* param_7);
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 param_4, u32 param_5, WADProcessCallback processCB);
s32 WADImportGetBlocks(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADBlocks* blocks, u32* fileListOut);
s32 WADImportEx(char* path, MEMAllocator* allocator, WADLocation location, u32 offset, u32 flags, WADProcessCallback processCallback);
s32 WADGetInstalledVersion(ESTitleId titleID, u16* version);

View File

@@ -1376,7 +1376,7 @@ static void bta_dm_link_quality_cback(tBTM_LINK_QUALITY_RESULTS *p_result)
}
}
BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
BOOLEAN bta_sys_check_compress(int id, UINT8 app_id, BD_ADDR peer_addr)
{
BOOLEAN status = FALSE;
int i;
@@ -1399,8 +1399,8 @@ BOOLEAN bta_sys_check_compress(int param_1, UINT8 app_id, BD_ADDR peer_addr)
}
static BOOLEAN bta_dm_l2cap_server_compress_cback(
BD_ADDR peer_addr, int param_2, int param_3, int param_4,
int param_5, int param_6, int param_7, UINT8 **p_mem_pool,
BD_ADDR peer_addr, int pe_type, int mem_level, int wbits,
int direction, int config, int enable, UINT8 **p_mem_pool,
UINT32 *mem_pool_size)
{
BOOLEAN status = FALSE;

View File

@@ -22,7 +22,7 @@ void bte_hcisu_send(HC_BT_HDR *p_msg, UINT16 event)
GKI_freebuf(p_msg);
}
void bte_hcisu_task(int param_1)
void bte_hcisu_task(int unused)
{
if (p_hcisu_if)
{

View File

@@ -152,11 +152,11 @@ void BTA_CleanUp(tBTA_APP_INFO_CBACK *p_cb)
GKI_shutdown();
}
void bta_usb_close_evt(INT8 param_1)
void bta_usb_close_evt(INT8 status)
{
if (_bte_app_info)
{
if (param_1 >= 0)
if (status >= 0)
(*_bte_app_info)(0);
else
(*_bte_app_info)(1);

View File

@@ -113,20 +113,20 @@ static UINT16 const hcisu_msg_evt_table[] =
MSG_HC_TO_STACK_HCI_EVT,
};
void hcisu_h2_usb_cback(UINT8 param_1, INT8 param_2)
void hcisu_h2_usb_cback(UINT8 event, INT8 status)
{
switch (param_1)
switch (event)
{
case 0:
break;
case 4:
bta_usb_close_evt(param_2);
bta_usb_close_evt(status);
break;
}
}
UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
UINT16 hcisu_h2_receive_msg(UINT16 pipe, tHCISU_H2_CB *p_cb)
{
UINT16 bytes_read = 0;
UINT8 byte;
@@ -138,7 +138,7 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
if (p_cb->at_0x1e != 2)
return 0;
r27 = param_1 + 1;
r27 = pipe + 1;
while (TRUE)
{
@@ -148,36 +148,36 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
++bytes_read;
msg_received = FALSE;
switch (p_cb->at_0x1a[param_1])
switch (p_cb->at_0x1a[pipe])
{
case 0:
if (r27 == 1)
{
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_2);
p_cb->at_0x14[param_1] = 4;
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_2);
p_cb->at_0x14[pipe] = 4;
}
else if (r27 == 2)
{
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_3);
p_cb->at_0x14[param_1] = 2;
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_3);
p_cb->at_0x14[pipe] = 2;
}
else if (r27 == 3)
{
p_cb->at_0x00[param_1] = GKI_getpoolbuf(GKI_POOL_ID_1);
p_cb->at_0x14[param_1] = 3;
p_cb->at_0x00[pipe] = GKI_getpoolbuf(GKI_POOL_ID_1);
p_cb->at_0x14[pipe] = 3;
}
else
{
break;
}
if (p_cb->at_0x00[param_1])
if (p_cb->at_0x00[pipe])
{
p_cb->at_0x00[param_1]->len = 0;
p_cb->at_0x00[param_1]->event =
hcisu_msg_evt_table[p_cb->at_0x14[param_1] - 1];
p_cb->at_0x00[param_1]->offset = 0;
p_cb->at_0x1a[param_1] = 1;
p_cb->at_0x00[pipe]->len = 0;
p_cb->at_0x00[pipe]->event =
hcisu_msg_evt_table[p_cb->at_0x14[pipe] - 1];
p_cb->at_0x00[pipe]->offset = 0;
p_cb->at_0x1a[pipe] = 1;
}
else
{
@@ -185,54 +185,54 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
"HCIS: Unable to allocate buffer for incoming HCI "
"message.");
p_cb->at_0x1a[param_1] = 2;
p_cb->at_0x1a[pipe] = 2;
}
p_cb->at_0x0c[param_1] =
hcisu_preamble_table[p_cb->at_0x14[param_1] - 1];
p_cb->at_0x0c[pipe] =
hcisu_preamble_table[p_cb->at_0x14[pipe] - 1];
/* fallthrough */
case 1:
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
+ p_cb->at_0x00[param_1]->len++) = byte;
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
+ p_cb->at_0x00[pipe]->len++) = byte;
--p_cb->at_0x0c[param_1];
--p_cb->at_0x0c[pipe];
if (p_cb->at_0x0c[param_1] == 0)
if (p_cb->at_0x0c[pipe] == 0)
{
msg_len = byte;
if (p_cb->at_0x14[param_1] == 2)
if (p_cb->at_0x14[pipe] == 2)
{
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
if ((p_cb->at_0x00[param_1] =
if ((p_cb->at_0x00[pipe] =
(HC_BT_HDR *)l2cap_link_chk_pkt_start(
(BT_HDR *)p_cb->at_0x00[param_1]))
(BT_HDR *)p_cb->at_0x00[pipe]))
== 0)
{
p_cb->at_0x0c[param_1] = msg_len;
p_cb->at_0x0c[pipe] = msg_len;
if (msg_len == 0)
p_cb->at_0x1a[param_1] = 0;
p_cb->at_0x1a[pipe] = 0;
else
p_cb->at_0x1a[param_1] = 4;
p_cb->at_0x1a[pipe] = 4;
break;
}
}
p_cb->at_0x0c[param_1] = msg_len;
p_cb->at_0x0c[pipe] = msg_len;
if (sizeof(HC_BT_HDR)
+ hcisu_preamble_table[p_cb->at_0x14[param_1] - 1]
+ hcisu_preamble_table[p_cb->at_0x14[pipe] - 1]
+ msg_len
> GKI_get_buf_size(p_cb->at_0x00[param_1]))
> GKI_get_buf_size(p_cb->at_0x00[pipe]))
{
GKI_freebuf(p_cb->at_0x00[param_1]);
p_cb->at_0x00[param_1] = NULL;
p_cb->at_0x1a[param_1] = 4;
GKI_freebuf(p_cb->at_0x00[pipe]);
p_cb->at_0x00[pipe] = NULL;
p_cb->at_0x1a[pipe] = 4;
BT_TRACE(HCI, ERROR,
"HCIS: Invalid length for incoming HCI message.");
@@ -242,85 +242,85 @@ UINT16 hcisu_h2_receive_msg(UINT16 param_1, tHCISU_H2_CB *p_cb)
if (msg_len != 0)
{
p_cb->at_0x1a[param_1] = 3;
p_cb->at_0x1a[pipe] = 3;
}
else
{
msg_received = TRUE;
p_cb->at_0x1a[param_1] = 0;
p_cb->at_0x1a[pipe] = 0;
}
}
else
{
p_cb->at_0x17[param_1] = byte;
p_cb->at_0x17[pipe] = byte;
}
break;
case 2:
--p_cb->at_0x0c[param_1];
--p_cb->at_0x0c[pipe];
if (p_cb->at_0x0c[param_1] == 0)
if (p_cb->at_0x0c[pipe] == 0)
{
msg_len = byte;
if (p_cb->at_0x14[param_1] == 2)
msg_len = (msg_len << 8) + p_cb->at_0x17[param_1];
if (p_cb->at_0x14[pipe] == 2)
msg_len = (msg_len << 8) + p_cb->at_0x17[pipe];
p_cb->at_0x0c[param_1] = msg_len;
p_cb->at_0x1a[param_1] = 4;
p_cb->at_0x0c[pipe] = msg_len;
p_cb->at_0x1a[pipe] = 4;
}
else
{
p_cb->at_0x17[param_1] = byte;
p_cb->at_0x17[pipe] = byte;
}
break;
case 3:
*((UINT8 *)(p_cb->at_0x00[param_1] + 1)
+ p_cb->at_0x00[param_1]->len++) = byte;
*((UINT8 *)(p_cb->at_0x00[pipe] + 1)
+ p_cb->at_0x00[pipe]->len++) = byte;
--p_cb->at_0x0c[param_1];
--p_cb->at_0x0c[pipe];
len = UUSB_Read(param_1 + 1,
(UINT8 *)(p_cb->at_0x00[param_1] + 1)
+ p_cb->at_0x00[param_1]->len,
p_cb->at_0x0c[param_1]);
len = UUSB_Read(pipe + 1,
(UINT8 *)(p_cb->at_0x00[pipe] + 1)
+ p_cb->at_0x00[pipe]->len,
p_cb->at_0x0c[pipe]);
p_cb->at_0x00[param_1]->len += len;
p_cb->at_0x0c[param_1] -= len;
p_cb->at_0x00[pipe]->len += len;
p_cb->at_0x0c[pipe] -= len;
bytes_read += len;
if (p_cb->at_0x0c[param_1] == 0)
if (p_cb->at_0x0c[pipe] == 0)
{
if (p_cb->at_0x14[param_1] == 2
if (p_cb->at_0x14[pipe] == 2
&& l2cap_link_chk_pkt_end() == 0)
{
p_cb->at_0x1a[param_1] = 0;
p_cb->at_0x1a[pipe] = 0;
}
else
{
msg_received = TRUE;
p_cb->at_0x1a[param_1] = 0;
p_cb->at_0x1a[pipe] = 0;
}
}
break;
case 4:
--p_cb->at_0x0c[param_1];
--p_cb->at_0x0c[pipe];
if (p_cb->at_0x0c[param_1] == 0)
p_cb->at_0x1a[param_1] = 0;
if (p_cb->at_0x0c[pipe] == 0)
p_cb->at_0x1a[pipe] = 0;
break;
}
if (msg_received)
{
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[param_1]);
p_cb->at_0x00[param_1] = NULL;
GKI_send_msg(hcisu_h2_cb.at_0x1f, 0, p_cb->at_0x00[pipe]);
p_cb->at_0x00[pipe] = NULL;
}
}
@@ -403,7 +403,7 @@ void hcisu_h2_send_msg(tHCISU_H2_CB *p_cb, HC_BT_HDR *p_msg)
hcisu_h2_send_msg_now(p_cb, p_msg);
}
void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
void hcisu_h2_init(UINT8 taskId, UINT8 mbox, UINT16 bufSize)
{
hcisu_h2_cb.at_0x1e = 0;
@@ -411,9 +411,9 @@ void hcisu_h2_init(UINT8 param_1, UINT8 param_2, UINT16 param_3)
hcisu_h2_cb.at_0x1a[1] = 0;
hcisu_h2_cb.at_0x1a[2] = 0;
hcisu_h2_cb.at_0x1f = param_1;
hcisu_h2_cb.at_0x20 = param_2;
hcisu_h2_cb.at_0x12 = param_3;
hcisu_h2_cb.at_0x1f = taskId;
hcisu_h2_cb.at_0x20 = mbox;
hcisu_h2_cb.at_0x12 = bufSize;
}
BOOLEAN hcisu_h2_open(tHCI_CFG *_p_cfg)

View File

@@ -478,7 +478,7 @@ BOOLEAN L2CA_SetAclPriority(BD_ADDR bd_addr, UINT8 priority)
}
void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
UINT8 wbits, UINT8 direction, UINT8 param_6,
UINT8 wbits, UINT8 direction, UINT8 config,
UINT8 enable)
{
tL2C_LCB *p_lcb;
@@ -506,7 +506,7 @@ void L2CA_SetCompression(UINT16 local_cid, UINT8 pe_type, UINT8 mem_level,
}
}
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *param_1, int param_2)
void L2CA_RegisterCompression(tL2CA_COMPRESS_CB *p_callback, int unused)
{
#if 0
/* ... */

View File

@@ -565,7 +565,7 @@ void UUSB_Open(tUUSB *uusb, tUUSB_CBACK *cback)
(void)uusb;
}
UINT16 UUSB_Read(UINT8 param_1, void *param_2, UINT16 param_3)
UINT16 UUSB_Read(UINT8 pipe, void *buf, UINT16 len)
{
return 0;
}
@@ -580,7 +580,7 @@ int UUSB_WriteBuf(/* ... */)
return 0;
}
UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
UINT16 UUSB_Write(UINT8 pipe, void *p_data, UINT16 len, void *unused)
{
short sp18 = 0;
IOSError ret = 0;
@@ -591,7 +591,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
if (usb.state != 2)
return 0;
switch (param_1)
switch (pipe)
{
case 0:
p_buf = GKI_getpoolbuf(usb.cmd_buffer_pool);
@@ -656,7 +656,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
memcpy(p_buffer, p_data, len);
if (len > 190)
UUSBDBG(" woah ! thats pretty Big ! :%d", param_3);
UUSBDBG(" woah ! thats pretty Big ! :%d", len);
if (usb.at_0x38 < 5 && usb.bulk_buffer_q.count == 0)
{
@@ -696,7 +696,7 @@ UINT16 UUSB_Write(UINT8 param_1, void *p_data, UINT16 len, void *param_4)
break;
}
(void)param_4;
(void)unused;
return ret;
}

View File

@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <string.h>
char lbl_81693350[0xd0] = {
char scCntCacheStrs[0xd0] = {
0x3c, 0x3c, 0x20, 0x52, 0x56, 0x4c, 0x5f, 0x53, 0x44, 0x4b, 0x20, 0x2d, 0x20, 0x43, 0x4e, 0x54,
0x43, 0x41, 0x43, 0x48, 0x45, 0x20, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x62,
0x75, 0x69, 0x6c, 0x64, 0x3a, 0x20, 0x41, 0x70, 0x72, 0x20, 0x32, 0x30, 0x20, 0x32, 0x30, 0x31,
@@ -22,12 +22,12 @@ char lbl_81693350[0xd0] = {
0x74, 0x20, 0x00, 0x00, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x00,
0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x00, 0x00, 0x00
};
char lbl_81693420[0x16] = {
char scCntCacheTitleDataFmt[0x16] = {
0x2f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x2f, 0x25, 0x30, 0x38, 0x78, 0x2f, 0x25, 0x30, 0x38, 0x78,
0x2f, 0x64, 0x61, 0x74, 0x61, 0x00,
};
const char* __CNTCACHEVersion = lbl_81693350;
char lbl_816985DC[3] = {0x20, 0x0a, 0x00};
const char* __CNTCACHEVersion = scCntCacheStrs;
char scCntCacheSpaceNl[3] = {0x20, 0x0a, 0x00};
extern void _savegpr_23();
extern void _restgpr_23();
@@ -72,9 +72,9 @@ asm void CNTCACHEClear() {
mr r11, r12
stw r0, 4(r12)
bl _savegpr_23
lis r30, lbl_81693350@ha
lis r30, scCntCacheStrs@ha
lis r3, _CNTCACHEMutex@ha
addi r30, r30, lbl_81693350@l
addi r30, r30, scCntCacheStrs@l
li r29, 0
addi r3, r3, _CNTCACHEMutex@l
bl OSLockMutex
@@ -146,7 +146,7 @@ L_184:
stb r31, 0(r4)
subf r23, r24, r4
mr r3, r24
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
bl strtok
cmpwi r3, 0
mr r29, r3
@@ -246,7 +246,7 @@ asm void _CNTCACHEDeleteTitle() {
stwu r1, -0x20(r1)
mflr r0
li r3, 0
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
stw r30, 0x18(r1)
@@ -284,7 +284,7 @@ L_350:
bl ES_DeleteTitleContent
L_364:
li r3, 0
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
bl strtok
L_370:
cmpwi r3, 0
@@ -305,10 +305,10 @@ asm int _CNTCACHEIsTitleRemovable(ESTitleId titleId) {
subfic r11, r11, -0x2100
stwux r1, r1, r11
mflr r0
lis r5, lbl_81693420@ha
lis r5, scCntCacheTitleDataFmt@ha
stw r0, 4(r12)
li r0, 1
addi r5, r5, lbl_81693420@l
addi r5, r5, scCntCacheTitleDataFmt@l
stw r31, -4(r12)
stw r30, -8(r12)
mr r30, r3
@@ -403,7 +403,7 @@ asm void _CNTCACHEDeleteContent() {
stw r0, 4(r12)
bl _savegpr_26
li r3, 0
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
bl strtok
li r31, 0
li r4, 0
@@ -441,10 +441,10 @@ asm void _CNTCACHEDeleteContent() {
rlwinm. r0, r3, 0, 0x1b, 0x1b
beq L_6f0
li r3, 0
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
bl strtok
li r26, 1
lis r27, lbl_81693420@ha
lis r27, scCntCacheTitleDataFmt@ha
b L_6e8
L_5b0:
stw r31, errno(r0)
@@ -488,7 +488,7 @@ L_5e8:
li r0, -1
stw r26, 0x20(r1)
addi r3, r1, 0x40
addi r5, r27, lbl_81693420@l
addi r5, r27, scCntCacheTitleDataFmt@l
stw r26, 0x24(r1)
and r6, r30, r0
and r7, r29, r0
@@ -529,7 +529,7 @@ L_6d4:
bdnz L_5e8
L_6dc:
li r3, 0
la r4, lbl_816985DC
la r4, scCntCacheSpaceNl
bl strtok
L_6e8:
cmpwi r3, 0

View File

@@ -221,11 +221,11 @@ CXSecureResult CXSecureUncompressLZ(const void* src, u32 length, void* dst) {
return CX_SECURE_ERR_OK;
}
BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
const u8* a = param_1;
BOOL CXiVerifyHuffmanTable_(const void* table, u8 bitSize) {
const u8* a = table;
const u8* b = a + 1;
u32 c = *a;
const u8* d = (u8*)param_1 + ((c + 1) << 1);
const u8* d = (u8*)table + ((c + 1) << 1);
u8 e[sizeof(u8) * 0x40];
u32 i;
@@ -233,7 +233,7 @@ BOOL CXiVerifyHuffmanTable_(const void* param_1, u8 param_2) {
e[i] = 0;
}
if (param_2 == 4 && c >= 16) {
if (bitSize == 4 && c >= 16) {
return FALSE;
}

View File

@@ -4,8 +4,8 @@
static inline int CXiReadHeader(u8*, int*, const u8*, int, int);
static inline CXHuffmanDecodeTableEntry* GetNextNode(CXHuffmanDecodeTableEntry*, int);
void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
context->unk_0x00 = param_2;
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
context->unk_0x00 = data;
context->unk_0x04 = 0;
context->unk_0x0e = 0;
context->unk_0x0C = 0;
@@ -13,8 +13,8 @@ void CXInitUncompContextRL(CXUncompContextRL* context, u8* param_2) {
context->size = 0;
}
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* param_2) {
context->unk_0x00 = param_2;
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
context->unk_0x00 = data;
context->unk_0x04 = 0;
context->unk_0x11 = 0;
context->unk_0x12 = 0;
@@ -125,7 +125,7 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
return CX_STREAMING_ERR_OK;
}
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int param_5) {
static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize, int maxOutLen) {
int bytesParsed = 0;
while (*pHdrLen) {
@@ -150,8 +150,8 @@ static int CXiReadHeader(u8* pHdrLen, int* pOutLen, const u8* pSrc, int srcSize,
}
}
if (param_5 > 0 && param_5 < *pOutLen) {
*pOutLen = param_5;
if (maxOutLen > 0 && maxOutLen < *pOutLen) {
*pOutLen = maxOutLen;
}
return bytesParsed;

View File

@@ -291,7 +291,7 @@ s32 pfd_st_removal_callback(s32 status, void* data) {
return 0;
}
g_pfd_sddrv_info.media_inserted = 0;
if (pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
if (g_pfd_sddrv_info.media_inserted == 0 && pfd_sddrv_device(&g_pfd_sddrv_info) != 0) {
g_event = 1;
result = ISD_RegisterDeviceIntrHandler(g_pfd_sddrv_info.device, (SDDevIntrCallback)pfd_st_inter_callback, &g_event);
if (result != 0) {

View File

@@ -1180,20 +1180,24 @@ s32 PFFAT_GetClusterSpecified(PFFAT_FFD* file, u32 chainIndex,
s32 PFFAT_GetClusterAllocated(PFFAT_FFD* file, u32 chainIndex,
u32 numClusters, u32* cluster)
{
u32* start;
PF_VOLUME* vol;
PFFAT_HINT* hint;
u32 fatType;
u32 locateStart;
u32 locateEnd;
s32 error;
fatType = file->p_vol->bpb.fat_type;
start = file->p_start_cluster;
vol = file->p_vol;
fatType = vol->bpb.fat_type;
hint = file->p_hint;
if (*file->p_start_cluster == 1) {
if (*start == 1) {
if (fatType <= FAT_16) {
*cluster = -1;
return 0;
}
*file->p_start_cluster = file->p_vol->bpb.root_dir_cluster;
*start = vol->bpb.root_dir_cluster;
}
*cluster = -1;
error = find_cluster_in_chain(file, chainIndex, 2, numClusters, 1, cluster);

View File

@@ -120,13 +120,13 @@ pf_s32 VFiPFFAT12_WriteFATEntry(PF_VOLUME* p_vol, pf_u16 cluster, pf_u16 value)
}
pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 value, PF_CACHE_PAGE* p_page) {
pf_s32 err;
pf_u32 next_sector;
pf_u32 offset_in_sector;
pf_u16 current_fat;
pf_s32 fat_offset;
pf_u32 fat_sector;
pf_s32 result;
pf_u32 next_sector;
pf_s32 err;
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);
@@ -153,7 +153,7 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
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;
*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) = value >> 4;
}
} else {
p_page->p_buf[(pf_u16)offset_in_sector] = value;
@@ -165,7 +165,7 @@ pf_s32 PFFAT12_WriteFATEntryWithBuf(PF_VOLUME* p_vol, pf_s16 cluster, pf_u16 val
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));
*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) = (*(p_page->p_buf + ((pf_u16)offset_in_sector + 1)) & 0xF0) | ((pf_u8)(value >> 8));
}
}
if (err != 0) { result = err; }

View File

@@ -267,6 +267,14 @@ void KPADSetPosParam(s32 chan, f32 x, f32 y) {
kpad->posParamY = y;
}
extern const f32 sensorIntervalConversion;
static inline f32 object_interval_distance(f32 interval) {
return interval / sensorIntervalConversion;
}
const f32 sensorIntervalConversion = 0.383864f;
static void reset_kpad(KPADInside* kpad) {
f32 upperY;
f32 distanceValue;
@@ -1570,7 +1578,7 @@ void KPADInit(void) {
objectInterval = kp_obj_interval;
enabled = OSDisableInterrupts();
kp_obj_interval = objectInterval;
distanceValue = objectInterval / 0.383864f;
distanceValue = object_interval_distance(objectInterval);
kp_err_dist_min = distanceValue;
kp_dist_vv1 = distanceValue;
OSRestoreInterrupts(enabled);

View File

@@ -1174,8 +1174,8 @@ static inline s32 __nupGetBoot2Version(u16* version) {
s32 result = ES_GetBoot2Version(&bootVersion);
if (result == 0) {
u16 checkedVersion = bootVersion;
*version = checkedVersion;
if (checkedVersion != bootVersion) { result = -0x1389; }
if (checkedVersion == bootVersion) { *version = checkedVersion; }
}
return result;
}
@@ -1229,7 +1229,7 @@ extern "C" void* __nupOp(void* argument) {
u32 needsAudit;
char* auditData = 0;
s32 result;
u16 serverBootVersion = 0;
u16 serverBootVersion;
u16 bootTitleVersion;
u16 systemMenuVersion;
ESTitleId currentTitleId;
@@ -1350,12 +1350,11 @@ extern "C" void* __nupOp(void* argument) {
OSUnlockMutex(&context->mutex);
for (i = 0; i < context->titleCount; i++) {
NUPTitleInfo* title = &context->titles[i];
ESTitleId titleId = title->titleId;
if (titleId == 0x0000000100000001ULL) {
if (context->titles[i].titleId == 0x0000000100000001ULL) {
bootTitle = title;
} else if (titleId == 0x0000000100000002ULL) {
} else if (context->titles[i].titleId == 0x0000000100000002ULL) {
menuTitle = title;
} else if (titleId == currentTitleId) {
} else if (context->titles[i].titleId == currentTitleId) {
systemTitle = title;
}
if (bootTitle != 0 && menuTitle != 0 && systemTitle != 0) {

View File

@@ -55,17 +55,17 @@ enum {
static IOSFd sduOpenFD(u32 slot);
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
void* cb, void* cbArg);
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
void* cb, void* cbArg);
static ISD_Error sduDatabuswidth(SDDev* dev, u32 buswidth);
static ISD_Error sduGetSCR(SDDev* dev, u32* data) NO_INLINE;
static ISD_Error sduGetOCR(SDDev* dev, u32* data);
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6);
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4);
extern ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
extern ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg);
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize);
IOSError __sdCb(s32 result, void* arg) {
__sdCbArg* data = (__sdCbArg*)arg;
@@ -106,33 +106,33 @@ IOSError __sdCb(s32 result, void* arg) {
return result;
}
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 param_2, u32* param_3, u32 param_4) {
ISD_Error ISD_GetHCRegister(SDDev* dev, u32 reg, u32* outValue, u32 size) {
IOSError ret;
if (__sdHeapId[0] < 0) {
return SD_ERROR_FATAL;
}
__sdReg[0] = param_2;
__sdReg[3] = param_4;
__sdReg[0] = reg;
__sdReg[3] = size;
__sdReg[4] = 0;
if (param_3 != NULL) {
if (outValue != NULL) {
ret = IOS_Ioctl(dev->SDDevFd, SD_IOCTL_2, __sdReg, 0x18, __sdCmdBuffer, 4);
if (ret != IPC_RESULT_OK) {
return SD_ERROR_FATAL;
}
*param_3 = *__sdCmdBuffer;
*outValue = *__sdCmdBuffer;
return ret;
}
return SD_ERROR_FATAL;
}
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* status) {
IOSError ret = SD_ERROR_FATAL;
if (__sdHeapId[0] >= 0 && param_2 != NULL) {
if (__sdHeapId[0] >= 0 && status != NULL) {
OSLockMutex(&__reqMutex);
if (__sdReq != 0) {
@@ -145,7 +145,7 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
if (ret != IPC_RESULT_OK) {
__sdReq = 0;
} else {
*param_2 = *__sdCmdBuffer;
*status = *__sdCmdBuffer;
__sdReq = 0;
}
}
@@ -154,13 +154,13 @@ ISD_Error ISD_GetDeviceStatus(SDDev* dev, u32* param_2) {
return ret;
}
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
void* cb, void* cbArg) {
IOSError ret;
u32 readCount, writeCount;
u32* sdCmd;
if (param_9 != 0) {
if (dma != 0) {
readCount = 2;
writeCount = 1;
} else {
@@ -216,7 +216,7 @@ static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
return ret;
}
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 param_9, u32* resp,
static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg, u32 buffer, u32 blockCount, u32 sectorSize, u32 dma, u32* resp,
void* cb, void* cbArg) {
ISD_Error ret;
u32* sdCmd;
@@ -232,7 +232,7 @@ static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
sdCmd[6] = buffer;
sdCmd[4] = blockCount;
sdCmd[5] = sectorSize;
sdCmd[7] = param_9;
sdCmd[7] = dma;
if (resp != NULL) {
if (cb != NULL) {
@@ -365,7 +365,7 @@ ISD_Error ISD_WriteMultiBlock(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSi
return ISD_WriteMultiBlockAsync(dev, offset, cmdResp, cmdRespSize, 0, 0);
}
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
ISD_Error ret;
u32 status;
@@ -435,12 +435,12 @@ ISD_Error ISD_ReadMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRe
DCInvalidateRange(cmdResp, cmdRespSize << 9);
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
ret = sduCommandv(dev->SDDevFd, 0x12, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
if (ret != IPC_RESULT_OK) {
__sdReq = 0;
}
if (param_5 == 0) {
if (callback == 0) {
__sdReq = 0;
}
}
@@ -449,7 +449,7 @@ out:
return ret;
}
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 param_5, u32 param_6) {
ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdRespSize, u32 callback, u32 callbackArg) {
ISD_Error ret;
u32 status;
@@ -519,12 +519,12 @@ ISD_Error ISD_WriteMultiBlockAsync(SDDev* dev, u32 offset, u8* cmdResp, u32 cmdR
DCFlushRange(cmdResp, cmdRespSize << 9);
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)param_5, (void*)param_6);
ret = sduCommand(dev->SDDevFd, 0x19, 3, 1, offset, (u32)cmdResp, cmdRespSize, 0x200, 1, __sdResp2, (void*)callback, (void*)callbackArg);
if (ret != IPC_RESULT_OK) {
__sdReq = 0;
}
if (param_5 == 0) {
if (callback == 0) {
__sdReq = 0;
}
}
@@ -782,7 +782,7 @@ static ISD_Error sduGetOCR(SDDev* dev, u32* data) {
}
#ifdef __MWERKS__
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* param_2, register u32* param_3, register u32* param_4) {
asm ISD_Error ISD_GetCardSize(register SDDev* dev, register u32* outSize, register u32* outSize2, register u32* outSectorSize) {
nofralloc
stwu r1, -0x30(r1)
@@ -859,13 +859,13 @@ ISD_GetCardSize_store:
stw r5, 0x18(r28)
stw r0, 0x1c(r28)
stw r3, 0x20(r28)
beq ISD_GetCardSize_no_param2
beq ISD_GetCardSize_no_outSize
stw r3, 0(r29)
ISD_GetCardSize_no_param2:
ISD_GetCardSize_no_outSize:
cmpwi r30, 0
beq ISD_GetCardSize_no_param3
beq ISD_GetCardSize_no_outSize2
stw r3, 0(r30)
ISD_GetCardSize_no_param3:
ISD_GetCardSize_no_outSize2:
cmpwi r31, 0
beq ISD_GetCardSize_success_return
li r0, 0x200
@@ -884,7 +884,7 @@ ISD_GetCardSize_return:
blr
}
#else
ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4) {
ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSectorSize) {
ISD_Error ret;
u32 out0;
u32 out1;
@@ -915,14 +915,14 @@ ISD_Error ISD_GetCardSize(SDDev* dev, u32* param_2, u32* param_3, u32* param_4)
dev->SDSectorNum = out1;
dev->SDDevSize = out2;
if (param_2 != NULL) {
*param_2 = out2;
if (outSize != NULL) {
*outSize = out2;
}
if (param_3 != NULL) {
*param_3 = out2;
if (outSize2 != NULL) {
*outSize2 = out2;
}
if (param_4 != NULL) {
*param_4 = 512;
if (outSectorSize != NULL) {
*outSectorSize = 512;
}
return SD_ERROR_SUCCESS;

View File

@@ -34,13 +34,13 @@ static void uhf_ker_sem_inline_1() {
}
}
s32 uhf_ker_create_sem(u32 param_1, int param_2) {
s32 uhf_ker_create_sem(u32 initCount, int flags) {
int i, k;
if (param_1 != 0 && param_1 != 1) {
if (initCount != 0 && initCount != 1) {
return -5;
}
if (param_2 != 0) {
if (flags != 0) {
return -5;
}
@@ -60,13 +60,13 @@ s32 uhf_ker_create_sem(u32 param_1, int param_2) {
OSInitSemaphore(&st_uhf_ker_sem[i], 1);
sem = &st_uhf_ker_sem[i];
for (k = (int)(1 - param_1); k > 0; k--) {
for (k = (int)(1 - initCount); k > 0; k--) {
OSWaitSemaphore((OSSemaphore*)sem);
}
st_uhs_ker_sem_mng.entries[i].sem = sem;
st_uhs_ker_sem_mng.entries[i].unk_0x04 = param_1;
st_uhs_ker_sem_mng.entries[i].unk_0x08 = param_2;
st_uhs_ker_sem_mng.entries[i].unk_0x04 = initCount;
st_uhs_ker_sem_mng.entries[i].unk_0x08 = flags;
st_uhs_ker_sem_mng.unk_0x90++;
uhf_ker_sem_inline_1();

View File

@@ -96,13 +96,13 @@ USBKBDErr USBKBDInitialize(USBKBDAttachCallback attachCb, USBKBDDetachCallback d
return USB_KBD_ERR_OK;
}
USBKBDErr USBKBDSetLED(u32 param_1, u8 param_2, USBKBDCmdLED* cmd) {
USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd) {
if (usbKbdFd < 0) {
return USB_KBD_ERR_NOT_INIT;
}
cmd->unk_0x04 = param_2;
cmd->unk_0x00 = param_1;
cmd->unk_0x04 = ledBits;
cmd->unk_0x00 = device;
return IOS_Write(usbKbdFd, cmd, sizeof(USBKBDCmdLED)) != IPC_RESULT_OK ? USB_KBD_ERR_FATAL : USB_KBD_ERR_OK;
}
@@ -114,12 +114,12 @@ static IOSError usbKbdSetLEDHandler(IOSError error, void* arg) {
return IPC_RESULT_OK;
}
USBKBDErr USBKBDSetLEDAsync(u32 param_1, u8 param_2, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg) {
USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBKBDCmdLEDCallback cb, void* cbArg) {
if (usbKbdFd < 0) {
return USB_KBD_ERR_NOT_INIT;
}
cmd->base.unk_0x00 = param_1;
cmd->base.unk_0x04 = param_2;
cmd->base.unk_0x00 = device;
cmd->base.unk_0x04 = ledBits;
cmd->cb = cb;
cmd->cbArg = cbArg;

View File

@@ -2947,6 +2947,7 @@ static s32 WAD_815C43E0(WADHashThreadArgs* args) {
static s32 _WADHash(WADStream* stream, u32 offset, u32 size, void* context, void* buffer,
u32 chunkSize, void* secondBuffer, void* threadStack, u32 threadStackSize) {
OSMutex* mutex;
s32 result;
u32 completed = 0;
void* readBuffer;
@@ -3005,7 +3006,6 @@ static s32 _WADHash(WADStream* stream, u32 offset, u32 size, void* context, void
OSResumeThread(&thread);
bufferIndex = 0;
while (size != 0 && transfer.error == 0) {
OSMutex* mutex;
readSize = size > chunkSize ? chunkSize : size;
mutex = &transfer.mutex[bufferIndex];
OSLockMutex(mutex);
@@ -3019,11 +3019,10 @@ static s32 _WADHash(WADStream* stream, u32 offset, u32 size, void* context, void
readBuffer = transfer.buffers[bufferIndex];
result = WADReadStream(stream, &readBuffer, readSize, offset + completed);
if ((u32)result != readSize) {
OSMutex* otherMutex = &transfer.mutex[bufferIndex ^ 1];
OSLockMutex(otherMutex);
OSLockMutex(&transfer.mutex[bufferIndex ^ 1]);
OSCancelThread(&thread);
OSJoinThread(&thread, 0);
OSUnlockMutex(otherMutex);
OSUnlockMutex(&transfer.mutex[bufferIndex ^ 1]);
OSUnlockMutex(mutex);
result = -3005;
goto done;

View File

@@ -28,8 +28,8 @@
#define DPD_CONFIG2_SIZE 2
#define SPK_CONFIG_SIZE 7
char lbl_81687720[] = "<< RVL_SDK - WPAD \trelease build: Apr 20 2010 11:20:55 (0x4199_60831) >>";
const char* __WPADVersion = lbl_81687720;
char scWpadVersionStr[] = "<< RVL_SDK - WPAD \trelease build: Apr 20 2010 11:20:55 (0x4199_60831) >>";
const char* __WPADVersion = scWpadVersionStr;
WPADStorage _wpd;
WPADCB* _wpdcb[WPAD_MAX_CONTROLLERS];
@@ -617,7 +617,7 @@ static void __reconnect(BOOL exec) {
WUDShutdown(exec);
}
#ifdef __MWERKS__
char lbl_81687810[0x58] = "Reconnect Start!!\n\0\0\0\0\0\0"
char scWpadManageStrs[0x58] = "Reconnect Start!!\n\0\0\0\0\0\0"
"Check the update of WiFi using channel\n\0"
"WiFi uses channel = %d\n";
extern void _savegpr_19();
@@ -629,8 +629,8 @@ static asm void WPADiManageHandler(OSAlarm* pAlarm, OSContext* pContext) {
stw r0, 0x164(r1)
addi r11, r1, 0x160
bl _savegpr_19
lis r28, lbl_81687720@ha
addi r28, r28, lbl_81687720@l
lis r28, scWpadVersionStr@ha
addi r28, r28, scWpadVersionStr@l
bl WUDGetStatus
cmpwi r3, 0x3
beq WPADiManageHandler_8AC8

View File

@@ -9,7 +9,7 @@ extern void CDBLock();
extern CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flags);
extern void CDBUnlock();
extern CDBErr CDBDatabaseFree(CDBDatabase* database);
extern void CDBRecordCreateAtOnce();
extern CDBErr CDBRecordCreateAtOnce(CDBRecord* record, CDBDatabase* database, const char* desc, char* fileType, CDBDate epoch, int gameCode, u16 makerCode, void* buffer, u32 size);
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
extern void CDBRecordOpenReadOnly();
@@ -79,23 +79,23 @@ typedef struct {
} CDBSearchWork;
extern CDBSearchWork* CDBDatabaseWorkBuf;
extern char lbl_8166B528[];
extern char lbl_8166B550[];
extern char lbl_8166B57C[];
extern char lbl_8166B5A8[];
extern char lbl_8166B5B8[];
extern char lbl_8166B5D0[];
extern char lbl_8166B618[];
extern char scCdbMsg_DatabaseClosed[];
extern char scCdbMsg_CantCreateRecordClosed[];
extern char scCdbMsg_CantCreateRecordReadonly[];
extern char scCdbMsg_InvalidKey[];
extern char scCdbMsg_FileNotFound[];
extern char scCdbMsg_CantCleanupDirsClosed[];
extern char scCdbMsg_CantCleanupDirsReadonly[];
extern CDBErr CDBDatabaseInit();
extern CDBErr CDBDatabaseOpen();
extern CDBErr CDBDatabaseClose();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize);
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_();
extern CDBErr CDBDatabaseCreateRecordImAtOnce_();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, int year, int month, int day, int hour, int min, int sec, u8* recordData, u32 recordDataSize, char* makerCode, char* gameCode);
extern CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize);
extern CDBErr CDBDatabaseFindByKey();
typedef struct {
CDBDate beginDate;
@@ -117,9 +117,9 @@ extern CDBErr CDBDatabaseSearchMinuteLayer();
extern CDBErr CDBDatabaseSearchHourLayer();
extern CDBErr CDBDatabaseSearchDayLayer();
extern CDBErr CDBDatabaseSearchMonthLayer();
extern CDBErr CDBDatabaseSearchYearLayer();
extern CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions* conditions, CDBRecordLocation recordLocation);
extern CDBErr CDBDatabaseSearch();
extern CDBErr CDBDatabaseSearch_();
extern CDBErr CDBDatabaseSearch_(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCodeStr, char* gameCodeStr, char* type, CDBRecordLocation recordLocation, BOOL openRecord, CDBSearchRecordCB searchRecordCB, void* searchRecordArg, u64* wiiId);
typedef struct {
u32 used;
u8 state[0xC00C];
@@ -165,7 +165,7 @@ CDBErr CDBDatabaseClose(CDBDatabase* database) {
CDBLock();
instance = database->instance;
if (instance == NULL || instance->flags == 0) {
CDBReportError(lbl_8166B528);
CDBReportError(scCdbMsg_DatabaseClosed);
result = CDB_ERROR_27;
} else {
status = CDBDatabaseFree(database);
@@ -206,104 +206,43 @@ CDBErr CDBDatabasePrivateCreateRecordAtOnce(CDBDatabase* database, CDBRecord* re
return result;
}
asm CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
addi r11, r1, 0x40
bl _savegpr_22
lhz r28, 0x0(r3)
mr r22, r3
lwz r29, 0x4(r3)
mr r23, r4
mr r24, r5
mr r25, r6
mr r26, r7
mr r27, r8
bl OSGetTime
mr r30, r4
mr r31, r3
bl CDBLock
stw r26, 0x8(r1)
mr r3, r22
mr r4, r23
mr r5, r24
stw r27, 0xc(r1)
mr r6, r25
mr r8, r30
mr r7, r31
mr r9, r29
mr r10, r28
bl CDBDatabaseCreateRecordImAtOnce_
mr r28, r3
bl CDBUnlock
addi r11, r1, 0x40
mr r3, r28
bl _restgpr_22
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
#endif
CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize) {
OSTime time;
u32 gameCode;
u16 makerCode;
CDBErr result;
makerCode = database->makerCode;
gameCode = database->gameCode;
time = OSGetTime();
CDBLock();
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCode, makerCode, recordData, recordDataSize);
CDBUnlock();
return result;
}
asm CDBErr CDBDatabaseCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, int year, int month, int day, int hour, int min, int sec) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x60(r1)
mflr r0
stw r0, 0x64(r1)
addi r11, r1, 0x60
bl _savegpr_22
lwz r28, 0x68(r1)
mr r23, r4
li r0, 0x0
lwz r12, 0x6c(r1)
lwz r11, 0x70(r1)
mr r22, r3
lwz r4, 0x74(r1)
mr r24, r5
stw r9, 0x24(r1)
mr r25, r6
mr r26, r7
mr r27, r8
stw r10, 0x20(r1)
addi r3, r1, 0x10
stw r28, 0x1c(r1)
stw r12, 0x18(r1)
stw r11, 0x14(r1)
stw r4, 0x10(r1)
stw r0, 0x30(r1)
stw r0, 0x34(r1)
bl OSCalendarTimeToTicks
lhz r30, 0x0(r22)
mr r28, r4
lwz r31, 0x4(r22)
mr r29, r3
bl CDBLock
stw r26, 0x8(r1)
mr r3, r22
mr r4, r23
mr r5, r24
stw r27, 0xc(r1)
mr r6, r25
mr r8, r28
mr r7, r29
mr r9, r31
mr r10, r30
bl CDBDatabaseCreateRecordImAtOnce_
mr r30, r3
bl CDBUnlock
addi r11, r1, 0x60
mr r3, r30
bl _restgpr_22
lwz r0, 0x64(r1)
mtlr r0
addi r1, r1, 0x60
blr
#endif
CDBErr CDBDatabaseCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, int year, int month, int day, int hour, int min, int sec) {
u32 gameCode;
u16 makerCode;
CDBErr result;
OSTime time;
OSCalendarTime cal;
cal.year = year;
cal.mon = month;
cal.mday = day;
cal.hour = hour;
cal.min = min;
cal.sec = sec;
cal.msec = 0;
cal.usec = 0;
time = OSCalendarTimeToTicks(&cal);
makerCode = database->makerCode;
gameCode = database->gameCode;
CDBLock();
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCode, makerCode, recordData, recordDataSize);
CDBUnlock();
return result;
}
CDBErr CDBDatabasePrivateCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, int year, int month, int day, int hour, int min, int sec, u8* recordData, u32 recordDataSize, char* makerCode, char* gameCode) {
@@ -314,183 +253,64 @@ CDBErr CDBDatabasePrivateCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord*
return result;
}
asm CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x80(r1)
mflr r0
stw r0, 0x84(r1)
addi r11, r1, 0x80
bl _savegpr_18
lwz r24, 0x9c(r1)
mr r28, r3
lwz r27, 0x88(r1)
mr r29, r4
lwz r26, 0x8c(r1)
mr r30, r5
lwz r22, 0x90(r1)
mr r31, r6
lwz r23, 0x94(r1)
mr r18, r7
lwz r25, 0x98(r1)
mr r19, r8
mr r20, r9
mr r21, r10
mr r3, r24
bl CDBIsGameCodeStr
cmpwi r3, 0x0
bne L_81487844
li r3, 0x4
b L_814878EC
L_81487844:
mr r3, r25
bl CDBIsMakerCodeStr
cmpwi r3, 0x0
bne L_8148785C
li r3, 0x3
b L_814878EC
L_8148785C:
mr r3, r25
addi r4, r1, 0x10
bl CDBConvMCStrToMCValue
mr r3, r24
addi r4, r1, 0x14
bl CDBConvGCStrToGCValue
li r0, 0x0
stw r18, 0x2c(r1)
addi r3, r1, 0x18
stw r19, 0x28(r1)
stw r20, 0x24(r1)
stw r21, 0x20(r1)
stw r27, 0x1c(r1)
stw r26, 0x18(r1)
stw r0, 0x38(r1)
stw r0, 0x3c(r1)
bl OSCalendarTimeToTicks
lhz r26, 0x10(r1)
mr r24, r4
lwz r27, 0x14(r1)
mr r25, r3
bl CDBLock
stw r22, 0x8(r1)
mr r3, r28
mr r4, r29
mr r5, r30
stw r23, 0xc(r1)
mr r6, r31
mr r8, r24
mr r7, r25
mr r9, r27
mr r10, r26
bl CDBDatabaseCreateRecordImAtOnce_
mr r26, r3
bl CDBUnlock
mr r3, r26
L_814878EC:
addi r11, r1, 0x80
bl _restgpr_18
lwz r0, 0x84(r1)
mtlr r0
addi r1, r1, 0x80
blr
#endif
CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, int year, int month, int day, int hour, int min, int sec, u8* recordData, u32 recordDataSize, char* makerCode, char* gameCode) {
u32 gameCodeVal;
u32 gameValue;
u16 makerCodeVal;
u16 makerValue;
CDBErr result;
OSTime time;
OSCalendarTime cal;
if (!CDBIsGameCodeStr(gameCode)) {
return CDB_ERROR_4;
}
if (!CDBIsMakerCodeStr(makerCode)) {
return CDB_ERROR_3;
}
CDBConvMCStrToMCValue(makerCode, &makerValue);
CDBConvGCStrToGCValue(gameCode, &gameValue);
cal.year = year;
cal.mon = month;
cal.mday = day;
cal.hour = hour;
cal.min = min;
cal.sec = sec;
cal.msec = 0;
cal.usec = 0;
time = OSCalendarTimeToTicks(&cal);
makerCodeVal = makerValue;
gameCodeVal = gameValue;
CDBLock();
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCodeVal, makerCodeVal, recordData, recordDataSize);
CDBUnlock();
return result;
}
asm CDBErr CDBDatabaseCreateRecordImAtOnce_() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
addi r11, r1, 0x40
bl _savegpr_24
lwz r11, 0x8(r3)
mr r24, r3
lwz r30, 0x48(r1)
mr r25, r4
cmpwi r11, 0x0
lwz r31, 0x4c(r1)
mr r26, r5
mr r27, r6
mr r28, r9
mr r29, r10
bne L_81487974
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_8148796C
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B550@ha
addi r3, r3, lbl_8166B550@l
crclr 4*cr1+eq
bl OSReport
L_8148796C:
li r3, 0x1b
b L_81487A3C
L_81487974:
addis r3, r11, 0x1
lwz r3, -0x3ff0(r3)
rlwinm. r0, r3, 0, 30, 30
bne L_814879EC
cmpwi r3, 0x0
bne L_814879BC
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_814879B4
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B550@ha
addi r3, r3, lbl_8166B550@l
crclr 4*cr1+eq
bl OSReport
L_814879B4:
li r3, 0x1b
b L_81487A3C
L_814879BC:
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_814879E4
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B57C@ha
addi r3, r3, lbl_8166B57C@l
crclr 4*cr1+eq
bl OSReport
L_814879E4:
li r3, 0x1a
b L_81487A3C
L_814879EC:
lis r4, 0x8000
mr r3, r7
lwz r0, 0xf8(r4)
mr r4, r8
li r5, 0x0
srwi r6, r0, 2
bl __div2i
stw r4, 0x10(r1)
addi r3, r1, 0x10
bl CDBClampCDBDate
stw r31, 0x8(r1)
mr r3, r25
mr r4, r24
mr r5, r26
lwz r7, 0x10(r1)
mr r6, r27
mr r8, r28
mr r9, r29
mr r10, r30
bl CDBRecordCreateAtOnce
L_81487A3C:
addi r11, r1, 0x40
bl _restgpr_24
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
#endif
CDBErr CDBDatabaseCreateRecordImAtOnce_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, OSTime time, u32 gameCode, u16 makerCode, void* recordData, u32 recordDataSize) {
CDBDatabaseState* instance;
int flags;
CDBDate date;
instance = database->instance;
if (instance == NULL) {
CDBReportError(scCdbMsg_CantCreateRecordClosed);
return CDB_ERROR_27;
}
flags = instance->flags;
if ((flags & 2) == 0) {
if (flags == 0) {
CDBReportError(scCdbMsg_CantCreateRecordClosed);
return CDB_ERROR_27;
}
CDBReportError(scCdbMsg_CantCreateRecordReadonly);
return CDB_ERROR_26;
}
date = time / (OS_BUS_CLOCK / 4);
CDBClampCDBDate(&date);
return CDBRecordCreateAtOnce(record, database, typeStr, (char*)fileTypeStr, date, gameCode, makerCode, recordData, recordDataSize);
}
CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordKey* recordKey) {
@@ -498,12 +318,12 @@ CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordK
CDBLock();
if (!CDBRecordKeyIsValid(recordKey)) {
CDBReportError(lbl_8166B5A8);
CDBReportError(scCdbMsg_InvalidKey);
result = CDB_ERROR_5;
} else {
CDBRecordInitDescriptor(record, database, recordKey);
if (!CDBRecordIsExistFile(record)) {
CDBReportError(lbl_8166B5B8, recordKey->keyString);
CDBReportError(scCdbMsg_FileNotFound, recordKey->keyString);
result = CDB_ERROR_CANNOT_OPEN_FILE;
} else {
result = CDB_ERROR_OK;
@@ -2176,7 +1996,7 @@ asm CDBErr CDBDatabaseSearchMonthLayer() {
#endif
}
asm CDBErr CDBDatabaseSearchYearLayer() {
asm CDBErr CDBDatabaseSearchYearLayer(CDBDatabase* database, CDBSearchConditions* conditions, CDBRecordLocation recordLocation) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x90(r1)
@@ -2432,74 +2252,38 @@ asm CDBErr CDBDatabaseSearchYearLayer() {
CDBErr CDBDatabaseSearch(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCode, char* gameCode, int unk7, CDBRecordLocation recordLocation, int unk9, CDBSearchRecordCB searchRecordCB, void* searchRecordArg) {
CDBErr result;
CDBLock();
result = CDBDatabaseSearch_(database, beginDate, endDate, searchDirection, makerCode, gameCode, unk7, recordLocation, unk9, searchRecordCB, searchRecordArg, NULL);
result = CDBDatabaseSearch_(database, beginDate, endDate, searchDirection, makerCode, gameCode, (char*)unk7, recordLocation, unk9, searchRecordCB, searchRecordArg, NULL);
CDBUnlock();
return result;
}
asm CDBErr CDBDatabaseSearch_() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x60(r1)
mflr r0
stw r0, 0x64(r1)
addi r11, r1, 0x60
bl _savegpr_24
cmplw r4, r5
lwz r28, 0x68(r1)
lwz r29, 0x6c(r1)
mr r24, r3
lwz r30, 0x70(r1)
mr r25, r8
lwz r31, 0x74(r1)
mr r26, r9
mr r27, r10
bge L_81489764
stw r4, 0x8(r1)
stw r5, 0xc(r1)
b L_8148976C
L_81489764:
stw r5, 0x8(r1)
stw r4, 0xc(r1)
L_8148976C:
stw r6, 0x1c(r1)
mr r3, r7
addi r4, r1, 0x10
bl CDBConvMCStrToMCValue
mr r3, r25
addi r4, r1, 0x14
bl CDBConvGCStrToGCValue
li r0, 0x1
cmpwi r31, 0x0
stw r26, 0x18(r1)
stw r29, 0x20(r1)
stw r30, 0x24(r1)
stw r0, 0x28(r1)
stw r28, 0x2c(r1)
bne L_814897B8
li r0, 0x0
stw r0, 0x34(r1)
stw r0, 0x30(r1)
b L_814897C8
L_814897B8:
lwz r0, 0x0(r31)
lwz r3, 0x4(r31)
stw r3, 0x34(r1)
stw r0, 0x30(r1)
L_814897C8:
mr r3, r24
mr r5, r27
addi r4, r1, 0x8
bl CDBDatabaseSearchYearLayer
addi r11, r1, 0x60
bl _restgpr_24
lwz r0, 0x64(r1)
mtlr r0
addi r1, r1, 0x60
blr
#endif
CDBErr CDBDatabaseSearch_(CDBDatabase* database, CDBDate beginDate, CDBDate endDate, CDBSearchDirection searchDirection, char* makerCodeStr, char* gameCodeStr, char* type, CDBRecordLocation recordLocation, BOOL openRecord, CDBSearchRecordCB searchRecordCB, void* searchRecordArg, u64* wiiId) {
CDBSearchConditions conditions;
if (beginDate < endDate) {
conditions.beginDate = beginDate;
conditions.endDate = endDate;
} else {
conditions.beginDate = endDate;
conditions.endDate = beginDate;
}
conditions.direction = searchDirection;
CDBConvMCStrToMCValue(makerCodeStr, &conditions.makerCode);
CDBConvGCStrToGCValue(gameCodeStr, &conditions.gameCode);
conditions.type = type;
conditions.callback = searchRecordCB;
conditions.callbackArg = searchRecordArg;
conditions.keepSearching = TRUE;
conditions.openRecord = openRecord;
if (wiiId == NULL) {
conditions.wiiId = 0;
} else {
conditions.wiiId = *wiiId;
}
return CDBDatabaseSearchYearLayer(database, &conditions, recordLocation);
}
void CDBDatabaseInstanceInit(CDBDatabaseState* instance, u32 flags, CDBDatabase* database) {
instance->used = 1;
instance->flags = flags;
@@ -2691,174 +2475,95 @@ CDBErr CDBDatabaseCleanUpEmptyDirectoriesMonth(char* year, CDBLocation location,
return CDB_ERROR_OK;
}
asm CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocation recordLocation) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x20(r1)
mflr r0
cmpwi r3, 0x0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
mr r31, r3
stw r30, 0x18(r1)
stw r29, 0x14(r1)
mr r29, r4
lwz r5, CDBDatabaseWorkBuf(r0)
addi r30, r5, 0x430c
bne L_8148A13C
li r3, 0x1
b L_8148A2FC
L_8148A13C:
bl CDBLock
lwz r3, 0x8(r31)
cmpwi r3, 0x0
beq L_8148A158
addis r3, r3, 0x1
lwz r31, -0x3ff0(r3)
b L_8148A15C
L_8148A158:
li r31, 0x0
L_8148A15C:
bl CDBUnlock
cmpwi r31, 0x0
bne L_8148A198
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_8148A190
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B5D0@ha
addi r3, r3, lbl_8166B5D0@l
crclr 4*cr1+eq
bl OSReport
L_8148A190:
li r3, 0x1b
b L_8148A2FC
L_8148A198:
cmpwi r31, 0x1
bne L_8148A1D0
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_8148A1C8
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B618@ha
addi r3, r3, lbl_8166B618@l
crclr 4*cr1+eq
bl OSReport
L_8148A1C8:
li r3, 0x1a
b L_8148A2FC
L_8148A1D0:
clrlwi. r0, r29, 31
beq L_8148A24C
mr r3, r30
li r4, 0x1
bl CDBFSFindFirstRoot
b L_8148A234
L_8148A1E8:
mr r3, r30
bl CDBFindDataIsDirectory
cmpwi r3, 0x0
beq L_8148A22C
mr r3, r30
bl CDBFindDataGetName
bl CDBFSIsYearDirName
cmpwi r3, 0x0
beq L_8148A22C
mr r3, r30
bl CDBFindDataGetName
li r4, 0x1
li r5, 0x0
bl CDBDatabaseCleanUpEmptyDirectoriesMonth
cmpwi r3, 0x0
beq L_8148A22C
b L_8148A2FC
L_8148A22C:
mr r3, r30
bl CDBFSFindNext
L_8148A234:
mr r3, r30
bl CDBFindDataIsEnd
cmpwi r3, 0x0
beq L_8148A1E8
mr r3, r30
bl CDBFSFindClose
L_8148A24C:
bl CDBVFSync
li r31, 0x0
bl CDBFSSDIsMounted
cmpwi r3, 0x0
beq L_8148A270
bl CDBFSSDIsEjected
cmpwi r3, 0x0
bne L_8148A270
li r31, 0x1
L_8148A270:
cmpwi r31, 0x0
beq L_8148A2F4
rlwinm. r0, r29, 0, 30, 30
beq L_8148A2F4
mr r3, r30
li r4, 0x2
bl CDBFSFindFirstRoot
b L_8148A2DC
L_8148A290:
mr r3, r30
bl CDBFindDataIsDirectory
cmpwi r3, 0x0
beq L_8148A2D4
mr r3, r30
bl CDBFindDataGetName
bl CDBFSIsYearDirName
cmpwi r3, 0x0
beq L_8148A2D4
mr r3, r30
bl CDBFindDataGetName
li r4, 0x2
li r5, 0x0
bl CDBDatabaseCleanUpEmptyDirectoriesMonth
cmpwi r3, 0x0
beq L_8148A2D4
b L_8148A2FC
L_8148A2D4:
mr r3, r30
bl CDBFSFindNext
L_8148A2DC:
mr r3, r30
bl CDBFindDataIsEnd
cmpwi r3, 0x0
beq L_8148A290
mr r3, r30
bl CDBFSFindClose
L_8148A2F4:
bl CDBVFSync
li r3, 0x0
L_8148A2FC:
lwz r0, 0x24(r1)
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
lwz r29, 0x14(r1)
mtlr r0
addi r1, r1, 0x20
blr
#endif
CDBErr CDBDatabaseCleanUpEmptyDirectories(CDBDatabase* database, CDBRecordLocation recordLocation) {
CDBDatabase* db;
CDBFindData* find;
int flags;
CDBDatabaseState* instance;
CDBErr result;
BOOL sdAvailable;
db = database;
find = &CDBDatabaseWorkBuf->year;
if (db == NULL) {
return CDB_ERROR_1;
}
CDBLock();
instance = db->instance;
if (instance != NULL) {
flags = instance->flags;
} else {
flags = 0;
}
CDBUnlock();
if (flags == 0) {
CDBReportError(scCdbMsg_CantCleanupDirsClosed);
return CDB_ERROR_27;
}
if (flags == 1) {
CDBReportError(scCdbMsg_CantCleanupDirsReadonly);
return CDB_ERROR_26;
}
if ((recordLocation & 1) != 0) {
CDBFSFindFirstRoot(find, 1);
while (CDBFindDataIsEnd(find) == 0) {
if (CDBFindDataIsDirectory(find) != 0) {
if (CDBFSIsYearDirName(CDBFindDataGetName(find)) != 0) {
result = CDBDatabaseCleanUpEmptyDirectoriesMonth(CDBFindDataGetName(find), 1, NULL);
if (result != CDB_ERROR_OK) {
return result;
}
}
}
CDBFSFindNext(find);
}
CDBFSFindClose(find);
}
CDBVFSync();
sdAvailable = 0;
if (CDBFSSDIsMounted() != 0) {
if (CDBFSSDIsEjected() == 0) {
sdAvailable = 1;
}
}
if (sdAvailable != 0) {
if ((recordLocation & 2) != 0) {
CDBFSFindFirstRoot(find, 2);
while (CDBFindDataIsEnd(find) == 0) {
if (CDBFindDataIsDirectory(find) != 0) {
if (CDBFSIsYearDirName(CDBFindDataGetName(find)) != 0) {
result = CDBDatabaseCleanUpEmptyDirectoriesMonth(CDBFindDataGetName(find), 2, NULL);
if (result != CDB_ERROR_OK) {
return result;
}
}
}
CDBFSFindNext(find);
}
CDBFSFindClose(find);
}
}
CDBVFSync();
return CDB_ERROR_OK;
}
#pragma section data_type ".data"
#pragma align 8
extern char lbl_8166B528[] = "CDBDatabaseClose database is closed\n";
extern char scCdbMsg_DatabaseClosed[] = "CDBDatabaseClose database is closed\n";
#pragma align 8
extern char lbl_8166B550[] = "can't create record; database is closed\n";
extern char scCdbMsg_CantCreateRecordClosed[] = "can't create record; database is closed\n";
#pragma align 8
extern char lbl_8166B57C[] = "can't create record; database is readonly\n";
extern char scCdbMsg_CantCreateRecordReadonly[] = "can't create record; database is readonly\n";
#pragma align 8
extern char lbl_8166B5A8[] = "invalid key\n";
extern char scCdbMsg_InvalidKey[] = "invalid key\n";
#pragma align 8
extern char lbl_8166B5B8[] = "file not found : %s\n";
extern char scCdbMsg_FileNotFound[] = "file not found : %s\n";
#pragma align 8
extern char lbl_8166B5D0[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is closed\n";
extern char scCdbMsg_CantCleanupDirsClosed[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is closed\n";
#pragma align 8
extern char lbl_8166B618[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is readonly\n";
extern char scCdbMsg_CantCleanupDirsReadonly[] = "can't execute CDBDatabaseCleanUpEmptyDirectories; database is readonly\n";

View File

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

View File

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

View File

@@ -55,7 +55,13 @@ static s32 ConnectionStarted(NHTTPConnectionInfo* handle) {
void* system=NHTTPi_GetSystemInfoP();
void* mutex=NHTTPi_GetMutexInfoP(system);
NHTTPConnectionInfo* connection=NHTTPi_GetConnection(mutex,handle);
return connection ? connection->started : -1;
s32 started;
if (connection == NULL) {
started = -1;
} else {
started = connection->started;
}
return started;
}
static s32 ConnectionState(NHTTPConnectionInfo* handle) {

View File

@@ -873,40 +873,48 @@ NWC24Err NWC24GetDlTask(NWC24DlTask* dlTask, NWC24DlId dlId) {
return operationResult;
}
static inline NWC24Err InitDlIteration(DlTaskIterationState* state, u32 sortMode) {
memset(state, 0, sizeof(*state));
state->comparisonValue = 0x7fffffff;
state->selectedValue = (s32)0x80000001;
state->sortMode = sortMode;
state->comparisonId = 0xffffffff;
state->initialized = 1;
state->valid = 1;
return NWC24_OK;
}
NWC24Err NWC24PurgeOldestDlTask() {
DlTaskIterationState state;
NWC24File file;
NWC24DlTask task;
DlTaskListHeader* header;
NWC24DlId taskId;
NWC24DlTask* taskPointer;
NWC24DlId selectedId;
NWC24DlTask* taskPointer;
NWC24Err result;
NWC24Err closeResult;
memset(&state, 0, sizeof(state));
state.sortMode = 0;
state.comparisonValue = 0x7fffffff;
state.selectedValue = (s32)0x80000001;
state.comparisonId = 0xffffffff;
state.initialized = 1;
state.valid = 1;
result = InitDlIteration(&state, 0);
if (result < NWC24_OK) { return NWC24_OK; }
while ((result = NWC24IterateDlTaskEx((NWC24DlIterateWork*)&state, &taskId)) == NWC24_OK) {
header = GetCachedDlHeader();
if (taskId >= header->taskCount) { break; }
}
if (result < NWC24_OK) {
if (result == NWC24_ERR_DONE) { result = NWC24_ERR_FAILED; }
return result;
if (result >= NWC24_OK) {
taskPointer = &task;
selectedId = taskId;
result = ReadDlTaskInline(taskPointer, selectedId);
if (result < NWC24_OK) { return result; }
taskPointer = &task;
result = RemoveDlTask(taskPointer);
if (result < NWC24_OK) { return result; }
} else if (result == NWC24_ERR_DONE) {
result = NWC24_ERR_FAILED;
}
taskPointer = &task;
selectedId = taskId;
result = ReadDlTaskInline(taskPointer, selectedId);
if (result < NWC24_OK) { return result; }
return RemoveDlTask(taskPointer);
return result;
}
NWC24Err NWC24ManageDlTaskListForMenu() {
NWC24DlTask task;
@@ -921,7 +929,9 @@ NWC24Err NWC24ManageDlTaskListForMenu() {
result = ReadDlTaskInline(taskPointer, 2);
if (result == NWC24_ERR_NOT_FOUND) { return NWC24_OK; }
if (result < NWC24_OK) { return result; }
return RemoveDlTask(&task);
taskPointer = &task;
result = RemoveDlTask(taskPointer);
return result;
}
NWC24Err NWC24GetDlOptOutFlags(NWC24DlTask* dlTask, u8* dlOptOutFlags) {

View File

@@ -18,10 +18,8 @@ enum {
#define FRIEND_LIST_MAGIC 'WcFl'
#define FRIEND_LIST_VERSION 2
const char lbl_8166E160[26] __attribute__((section(".data"), aligned(8))) = "/shared2/wc24/nwc24fl.bin";
void* const lbl_8166E160_pad __attribute__((section(".data"))) = (void*)0;
static const char* FLFilePath = lbl_8166E160;
const u32 FLFilePath_pad __attribute__((section(".sdata"), aligned(1))) = 0;
char scNwc24FlPath[] = "/shared2/wc24/nwc24fl.bin";
static const char* FLFilePath = scNwc24FlPath;
const char g_SpecialsChars[16] = { '(', ')', '<', '>', '[', ']', ':', ';', '\\', ',', '"' };

View File

@@ -198,8 +198,10 @@ int SOShutdown(int socket, int how) {
}
int SOPoll(SOPollFD* fds, unsigned int count, s64 timeout) {
s32 size;
s32 bytes;
s32 result;
s32 rm;
s32 result,bytes,size;
PollRequest* request;
SOPollFD* reply;
if((result=SOiPrepare(NULL,&rm))==0) {

View File

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

View File

@@ -20,14 +20,14 @@ void VoiceCallback(void* _voice) {
}
inline u8* getCurrAddr(VoiceInfo* voice) {
AXPB* iVar4 = &voice->getAXVPB()->pb;
AXPB* pb = &voice->getAXVPB()->pb;
nw4r::ut::AutoInterruptLock lock;
if (iVar4 == NULL) {
if (pb == NULL) {
return 0;
}
u16 addrHi = iVar4->addr.currentAddressHi;
u16 addrLo = iVar4->addr.currentAddressLo;
u16 addrHi = pb->addr.currentAddressHi;
u16 addrLo = pb->addr.currentAddressLo;
return (u8*)((addrHi << 16) + addrLo);
}

View File

@@ -692,31 +692,31 @@ CHANSVmObjHdr* CHANSVm_8144B470(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
}
// The 16-bit strings use a single null byte for termination for some reason. Because of that, L"..." cannot be used.
u8 lbl_81669070[19] = {0x00, 'u', 0x00, 'n', 0x00, 'd', 0x00, 'e', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'e', 0x00, 'd', 0x00};
u8 lbl_81669083[17] = {0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
u8 lbl_81669094[19] = {0x00, '-', 0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
u8 scUndefinedUtf16[19] = {0x00, 'u', 0x00, 'n', 0x00, 'd', 0x00, 'e', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'e', 0x00, 'd', 0x00};
u8 scInfinityUtf16[17] = {0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
u8 scMinusInfinityUtf16[19] = {0x00, '-', 0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
// clang-format off
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined = {{(wchar_t*)lbl_81669070, 18}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616C88 = {{(wchar_t*)"\0N\0a\0N", 6}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616C98 = {{(wchar_t*)lbl_81669083, 16}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616CA8 = {{(wchar_t*)lbl_81669094, 18}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616CB8 = {{(wchar_t*)"\0,", 2}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined = {{(wchar_t*)scUndefinedUtf16, 18}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectNaN = {{(wchar_t*)"\0N\0a\0N", 6}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectInfinity = {{(wchar_t*)scInfinityUtf16, 16}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectMinusInfinity = {{(wchar_t*)scMinusInfinityUtf16, 18}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectComma = {{(wchar_t*)"\0,", 2}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringDataEmpty = {{(wchar_t*)"", 0}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined_[] = {{{(void*)&CHANSVmConstStringObjectUndefined, 0}, 0x03800100, vmNull},
{{(void*)&lbl_81616C88, 0}, 0x03800100, vmNull},
{{(void*)&lbl_81616C98, 0}, 0x03800100, vmNull},
{{(void*)&lbl_81616CA8, 0}, 0x03800100, vmNull},
{{(void*)&CHANSVmConstStringObjectNaN, 0}, 0x03800100, vmNull},
{{(void*)&CHANSVmConstStringObjectInfinity, 0}, 0x03800100, vmNull},
{{(void*)&CHANSVmConstStringObjectMinusInfinity, 0}, 0x03800100, vmNull},
{{vmNull, 0}, 0x00800000, vmNull}};
char VmReportFormat[] = "%s";
const CHANSVmFloatConstantList lbl_81616D28[] = {
const CHANSVmFloatConstantList scFloatConstantList[] = {
{ "Infinity", (double*)&VmInf },
{ "+Infinity", (double*)&VmInf },
{ "-Infinity", (double*)&VmMinusInf },
{ "NaN", (double*)&VmNaN }
};
char lbl_8169758A[] = "%.16lg";
char scFloatPrintfFmt[] = "%.16lg";
// clang-format on
static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
@@ -741,8 +741,8 @@ static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
*bufEnd = '\0';
for (i = 0; i < 4; i++) {
if (strcmp(buf, lbl_81616D28[i].spName) == 0) {
number = *lbl_81616D28[i].pValue;
if (strcmp(buf, scFloatConstantList[i].spName) == 0) {
number = *scFloatConstantList[i].pValue;
goto store;
}
}
@@ -786,7 +786,7 @@ CHANSVmObjHdr* CHANSVmConvertToStrFromUndefined(CHANSVm* vm, CHANSVmObjType type
}
s32 CHANSVm_8144B62C(vmWString buf, u32 len, vmFloat val) NO_INLINE {
s32 result = snprintf((char*)buf, len / 2, lbl_8169758A, val);
s32 result = snprintf((char*)buf, len / 2, scFloatPrintfFmt, val);
CHANSVmStrCpyToU16FromU8(buf, (vmString)buf, result);
return VM_STR_LENGTH(result);
}
@@ -899,7 +899,7 @@ vmBoolInt CHANSVmGetEnumedType(CHANSVmObjType* eType, vmU32 iType) NO_INLINE {
}
// TODO: Here was a function defined that was inlined into VmStep.
char lbl_81669128[] = "VmGetResultType";
char scVmGetResultType[] = "VmGetResultType";
// clang-format off
const VmConvertEntry VmTypeConvertFuncTbl[] = {
@@ -1254,7 +1254,7 @@ CHANSVmErr VmBitXor(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSV
}
CHANSVmErr VmCmpEq(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSVmObjHdr* left, CHANSVmObjHdr* right) {
vmBoolInt bVar1;
vmBoolInt stringsMatch;
vmBoolInt isEqual;
CHANSVmErr err;
@@ -1287,11 +1287,11 @@ CHANSVmErr VmCmpEq(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSVm
case CHANS_VM_OBJ_TYPE_STRING: {
isEqual = vmFalse;
if (left->value.string_v->len == right->value.string_v->len) {
bVar1 = vmFalse;
stringsMatch = vmFalse;
if (left->value.string_v->len == 0 || memcmp(*left->value.ptr_v, *right->value.ptr_v, left->value.string_v->len) == 0) {
bVar1 = vmTrue;
stringsMatch = vmTrue;
}
if (bVar1) {
if (stringsMatch) {
isEqual = vmTrue;
}
}
@@ -2225,7 +2225,7 @@ CHANSVmObjHdr* VmArrayJoinCommon(CHANSVm* vm, u32 retObjAddr, CHANSVmObjHdr* obj
u32 actualLen;
if (separatorAddr == 0) {
separatorAddr = *(u32*)&lbl_81616CB8;
separatorAddr = *(u32*)&CHANSVmConstStringObjectComma;
separatorLen = 2;
}
@@ -3790,9 +3790,9 @@ static void VmBlobInitValue(BlobHeader* blob, u32 size) {
static const char VmBlobClassName[] = "Blob";
char lbl_81669DF5[] = "0123456789abcdef";
char* lbl_816976E4 = lbl_81669DF5;
char* lbl_816976E8 = lbl_81669DF5;
char scHexDigits[] = "0123456789abcdef";
char* scHexDigitsPtr = scHexDigits;
char* scHexDigitsPtr2 = scHexDigits;
static CHANSVmObjHdr* VmBlobCreateDirect(CHANSVm* vm, CHANSVmObjHdr* obj, u32 size) NO_INLINE {
CHANSVmNativeClass* cls;
@@ -4292,7 +4292,7 @@ VmMethodDefine(Blob, GetHexString) {
u32 offset = blob->offset;
u32 destOff = 0;
u32 i = 0;
char* hexTbl = lbl_816976E4;
char* hexTbl = scHexDigitsPtr;
u32 loop_i;
src += offset;
@@ -5864,7 +5864,7 @@ VmMethodDefine(Blob, Unpack) {
u8* hexTable;
u8 byte;
u8 nibble;
hexTable = (u8*)lbl_816976E8;
hexTable = (u8*)scHexDigitsPtr2;
srcPos = srcData;
destPos = destStr;
@@ -5992,7 +5992,7 @@ void CHANSVmImageRegisterAllocator(CHANSVmImageAllocatorCallback allocCb, CHANSV
VmImageCtorCallback = ctorCb;
}
char lbl_8169778C[] = "Image";
char scImageClassName[] = "Image";
CHANSVmObjHdr* CHANSVmNewImageObject(CHANSVm* vm, CHANSVmObjHdr* object, vmPtr srcData, vmU16 width, vmU16 height, s32 format) {
u32 bpp;
@@ -6030,7 +6030,7 @@ CHANSVmObjHdr* CHANSVmNewImageObject(CHANSVm* vm, CHANSVmObjHdr* object, vmPtr s
if (object == vmNull) {
goto ret;
}
if (CHANSVmSetObjectAsNativeInstance(vm, object, vmNull, lbl_8169778C) != CHANS_VM_OK) {
if (CHANSVmSetObjectAsNativeInstance(vm, object, vmNull, scImageClassName) != CHANS_VM_OK) {
goto error;
}
image = (CHANSVmImage*)((u32*)object->value.ptr_v)[0];
@@ -6120,10 +6120,10 @@ static vmBoolInt VmWinEmuWrite(CHANSVm* vm, CHANSVmObjHdr* parent, CHANSVmObjHdr
const CHANSVmMethodList VmWinEmuMethodTbl[] = {"write", VmWinEmuWrite};
char lbl_816977AC[] = "Date";
char lbl_816977B1[] = "@Math";
char lbl_816977B7[] = "Math";
char lbl_816977BC[] = "@WinEmu";
char scDateClassName[] = "Date";
char scMathInternalName[] = "@Math";
char scMathClassName[] = "Math";
char scWinEmuInternalName[] = "@WinEmu";
static CHANSVmErr VmPushFuncReturnInfo(CHANSVm* vm, u32 argCount, u32 totalSlots, u32 headerCount);
@@ -6186,7 +6186,7 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
goto class_fail;
/* Date class */
cls = CHANSVmAddNativeClass2(vm, lbl_816977AC, VmDateCtor, 0, VmDateDtor);
cls = CHANSVmAddNativeClass2(vm, scDateClassName, VmDateCtor, 0, VmDateDtor);
if (cls == vmNull) {
ok = vmFalse;
} else {
@@ -6196,7 +6196,7 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
goto class_fail;
/* Math class */
if (CHANSVmNewBuiltinObject(vm, lbl_816977B1, vmNull, vmNull, vmNull, lbl_816977B7, vmNull, VmMathPropertyTbl, CHANSVmPropertyCount(VmMathPropertyTbl),
if (CHANSVmNewBuiltinObject(vm, scMathInternalName, vmNull, vmNull, vmNull, scMathClassName, vmNull, VmMathPropertyTbl, CHANSVmPropertyCount(VmMathPropertyTbl),
VmMathMethodTbl, CHANSVmMethodCount(VmMathMethodTbl)) == 0) {
goto class_fail;
}
@@ -6235,13 +6235,13 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
/* Image class */
VmImageAllocCallback = vmNull;
VmImageCtorCallback = vmNull;
if (CHANSVmNewBuiltinObject(vm, lbl_8169778C, vmNull, VmImageCtor, vmNull, vmNull, vmNull, VmImagePropertyTbl, CHANSVmPropertyCount(VmImagePropertyTbl),
if (CHANSVmNewBuiltinObject(vm, scImageClassName, vmNull, VmImageCtor, vmNull, vmNull, vmNull, VmImagePropertyTbl, CHANSVmPropertyCount(VmImagePropertyTbl),
vmNull, 0) == 0) {
goto class_fail;
}
/* Screen (@WinEmu) class */
if (CHANSVmNewBuiltinObject(vm, lbl_816977BC, vmNull, vmNull, vmNull, "document", vmNull, vmNull, 0, (CHANSVmMethodList*)&VmWinEmuMethodTbl,
if (CHANSVmNewBuiltinObject(vm, scWinEmuInternalName, vmNull, vmNull, vmNull, "document", vmNull, vmNull, 0, (CHANSVmMethodList*)&VmWinEmuMethodTbl,
CHANSVmMethodCount(VmWinEmuMethodTbl)) == 0) {
class_fail:
result = CHANS_VM_ERR_NATIVE_METHOD_INIT;
@@ -7417,7 +7417,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
}
default: {
// TODO: This is an inlined function called "VmGetResultType"
CHANS_VM_PRINTF_CUSTOM("%s: no table for op '%c'\n", lbl_81669128, opKind);
CHANS_VM_PRINTF_CUSTOM("%s: no table for op '%c'\n", scVmGetResultType, opKind);
goto error_setter;
}
}

View File

@@ -21,22 +21,22 @@ namespace textinput {
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8165D2D0[15] = "T_prdc_Text_00";
extern "C" const char lbl_8165D2E0[17] = "P_prdc_scrl_Left";
extern "C" const char scT_prdc_Text_00[15] = "T_prdc_Text_00";
extern "C" const char scP_prdc_scrl_Left[17] = "P_prdc_scrl_Left";
#pragma pop
#pragma push
#pragma section sconst_type ".sdata"
extern "C" const char* lbl_816973C0 = lbl_8165D2D0;
extern "C" const char* lbl_816973C4 = lbl_8165D2E0;
extern "C" const wchar_t lbl_816973C8[4] = {0, 0, 0, 1};
extern "C" const char lbl_816973D0[8] = "P_OnBtn";
extern "C" const char lbl_816973D8[8] = "B_OnBtn";
extern "C" const char* scCommonTextAnimName = scT_prdc_Text_00;
extern "C" const char* scCommonScrollAnimName = scP_prdc_scrl_Left;
extern "C" const wchar_t scEmptyWChars[4] = {0, 0, 0, 1};
extern "C" const char scP_OnBtn[8] = "P_OnBtn";
extern "C" const char scB_OnBtn[8] = "B_OnBtn";
#pragma pop
#define COMMON_TEXT_ANIM lbl_816973C0
#define COMMON_SCROLL_ANIM lbl_816973C4
#define COMMON_TEXT_ANIM scCommonTextAnimName
#define COMMON_SCROLL_ANIM scCommonScrollAnimName
// name made up, no dwarf (?)
struct AnimationFile {
@@ -77,7 +77,7 @@ namespace textinput {
char tail[12];
};
extern "C" const CandidatePaneData lbl_8165D2F8 __attribute__((aligned(8))) = {{
extern "C" const CandidatePaneData scCandidatePaneData __attribute__((aligned(8))) = {{
{KT_CandidateText, "N_predictInput", 1, NULL, {&csAninationFile[0]}},
{KT_ScrollButton,
"P_prdc_scrl_Left",
@@ -212,7 +212,7 @@ namespace textinput {
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8165D984[132] =
extern "C" const char scPaneNameTable[132] =
"B_OffBtn\0\0\0"
"P_JPOffBtn\0"
"P_CNOffBtn\0"
@@ -222,10 +222,10 @@ namespace textinput {
"B_prdc_scrl_Rght\0\0\0"
"P_prdc_scrl_Rght\0\0\0"
"\0\0\0";
extern "C" char lbl_8165DA08[16] = "W_predictWindow";
extern "C" const char lbl_8165DA18[15] = "N_predictInput";
extern "C" const char lbl_8165DA28[13] = "W_OnOff_Area";
extern "C" const char lbl_8165DA38[13] = "N_prdc_Texts";
extern "C" char scW_predictWindow[16] = "W_predictWindow";
extern "C" const char scN_predictInput[15] = "N_predictInput";
extern "C" const char scW_OnOff_Area[13] = "W_OnOff_Area";
extern "C" const char scN_prdc_Texts[13] = "N_prdc_Texts";
#pragma pop
void CandidateBoxCaller::Candidates::addCandidate(const wchar_t* wcString) {
@@ -398,20 +398,20 @@ namespace textinput {
mTextArea.Init();
mOnOffButton.Create(this);
mOnOffButton.Init();
const char* paneNames = lbl_8165D984;
const char* paneNames = scPaneNameTable;
mLeftScroll.Create(this, paneNames + 68, paneNames + 48);
mRightScroll.Create(this, paneNames + 108, paneNames + 88);
mLeftScroll.Init();
mRightScroll.Init();
mTextWindow.Create(this, lbl_8165DA08);
mTextWindow.Create(this, scW_predictWindow);
init();
}
void LayoutByNW4R::createAnmPane_(MEMAllocator* allocator) {
CandidateTextAnmPane* pane;
for (u16 i = 0; i < ARRAY_LENGTH(lbl_8165D2F8.panes); i++) {
for (u16 i = 0; i < ARRAY_LENGTH(scCandidatePaneData.panes); i++) {
pane = NULL;
const PaneToAnimation& p = lbl_8165D2F8.panes[i];
const PaneToAnimation& p = scCandidatePaneData.panes[i];
switch (p.type) {
case KT_ScrollButton: {
void* pBtnBuf = MEMAllocFromAllocator(allocator, sizeof(CandidateScrollAnmPane));
@@ -454,7 +454,7 @@ namespace textinput {
}
void LayoutByNW4R::init() {
searchAnmPane(lbl_8165DA18)->changeAnimation(ANM_Normal);
searchAnmPane(scN_predictInput)->changeAnimation(ANM_Normal);
Base::setInvalid(false);
setActive(true);
setOnOff(false);
@@ -467,7 +467,7 @@ namespace textinput {
mpLayout->CalculateMtx(mDrawInfo);
if (meLanguage == KR) {
mTextWindow.SetVisible(false);
getPane(lbl_8165DA28)->SetVisible(false);
getPane(scW_OnOff_Area)->SetVisible(false);
} else if (meLanguage == CN) {
setOnOff(true);
mTextWindow.SetVisible(true);
@@ -477,16 +477,16 @@ namespace textinput {
} else {
mTextWindow.ChangeAnimation(ANM_Normal);
}
getPane(lbl_8165DA28)->SetVisible(false);
getPane(scW_OnOff_Area)->SetVisible(false);
} else {
getPane(lbl_8165DA28)->SetVisible(true);
getPane(scW_OnOff_Area)->SetVisible(true);
}
}
void LayoutByNW4R::draw() {
getPane(lbl_8165DA38)->SetVisible(false);
getPane(scN_prdc_Texts)->SetVisible(false);
nw4rmanager::Layout::draw();
getPane(lbl_8165DA38)->SetVisible(true);
getPane(scN_prdc_Texts)->SetVisible(true);
if (!isInvalid()) {
mTextArea.Draw(mDrawInfo);
}
@@ -496,8 +496,8 @@ namespace textinput {
nw4rmanager::Layout::calc();
mTextArea.Calc();
if (mbAnimOn) {
getPane(lbl_8165DA38)->Animate(0);
getPane(lbl_8165DA38)->CalculateMtx(mDrawInfo);
getPane(scN_prdc_Texts)->Animate(0);
getPane(scN_prdc_Texts)->CalculateMtx(mDrawInfo);
}
}
@@ -505,7 +505,7 @@ namespace textinput {
Base::setLanguage(language);
init();
// Maybe inlines, maybe not
nw4r::math::VEC3 pos = searchAnmPane(lbl_8165DA08)->getPane()->GetTranslate();
nw4r::math::VEC3 pos = searchAnmPane(scW_predictWindow)->getPane()->GetTranslate();
if (meLanguage == CN || meLanguage == KR) {
Base::checkValidation();
// Potentially an inline
@@ -520,7 +520,7 @@ namespace textinput {
pos.x = 202.0f;
}
searchAnmPane(lbl_8165DA08)->getPane()->SetTranslate(pos);
searchAnmPane(scW_predictWindow)->getPane()->SetTranslate(pos);
if (meLanguage == CN) {
mTextArea.ApplyFontScale(1.2f);
} else if (meLanguage == KR) {
@@ -531,10 +531,10 @@ namespace textinput {
}
void LayoutByNW4R::onOnOffButton(bool arg) {
const char* base = lbl_8165D2D0;
const char* base = scT_prdc_Text_00;
mTextWindow.TurnOnOff(!isOn());
if (isOn()) {
searchAnmPane(lbl_816973D0)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
searchAnmPane(scP_OnBtn)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
if (arg) {
mpEventObserver->onSE(sound::SE_PREDICT_OFF);
}
@@ -588,7 +588,7 @@ namespace textinput {
}
void LayoutByNW4R::startTurnOn(bool on) {
const char* base = lbl_8165D2D0;
const char* base = scT_prdc_Text_00;
if (isInScroll()) {
return;
}
@@ -596,7 +596,7 @@ namespace textinput {
mTextWindow.TurnOnOff(on);
if (!on) {
searchAnmPane(lbl_816973D0)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
searchAnmPane(scP_OnBtn)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
mpEventObserver->onSE(sound::SE_PREDICT_OFF);
} else {
searchAnmPane(base + 0x6a8)->onAnmEvent(nw4rmanager::AnmPane::PE_0);
@@ -637,7 +637,7 @@ namespace textinput {
current = reinterpret_cast<CandidateBoxCaller::Candidates*>(reinterpret_cast<u8*>(current) + sizeof(current->szwcPredicted[0]));
}
}
gui::PaneComponent* p = mpPaneManager->searchPaneComponent(isOn() ? lbl_816973D8 : lbl_8165D984);
gui::PaneComponent* p = mpPaneManager->searchPaneComponent(isOn() ? scB_OnBtn : scPaneNameTable);
if (p != NULL) {
p->lockInitialize(true);
}
@@ -706,8 +706,8 @@ namespace textinput {
}
void LayoutByNW4R::cancelStateFocusIn() {
const PaneToAnimation* pane = lbl_8165D2F8.panes;
for (int i = 0; i < ARRAY_LENGTH(lbl_8165D2F8.panes); i++) {
const PaneToAnimation* pane = scCandidatePaneData.panes;
for (int i = 0; i < ARRAY_LENGTH(scCandidatePaneData.panes); i++) {
CandidateTextAnmPane* p = static_cast<CandidateTextAnmPane*>(searchAnmPane(pane->paneName));
if (p != NULL) {
switch (p->getKeyType()) {
@@ -765,7 +765,7 @@ namespace textinput {
}
void LayoutByNW4R::onEvent(UIObj* obj, u32 id, void* data) {
const char* base = lbl_8165D2D0;
const char* base = scT_prdc_Text_00;
int tmp;
switch (id) {
@@ -996,7 +996,7 @@ namespace textinput {
void UITextArea::Create(nw4rmanager::Layout* layout) {
// These could have been static...
const char* textPanes[NUM_PANES] = {
lbl_8165D2D0, "T_prdc_Text_01", "T_prdc_Text_02", "T_prdc_Text_03", "T_prdc_Text_04", "T_prdc_Text_05", "T_prdc_Text_06",
scT_prdc_Text_00, "T_prdc_Text_01", "T_prdc_Text_02", "T_prdc_Text_03", "T_prdc_Text_04", "T_prdc_Text_05", "T_prdc_Text_06",
"T_prdc_Text_07", "T_prdc_Text_08", "T_prdc_Text_09", "T_prdc_Text_10", "T_prdc_Text_11", "T_prdc_Text_12", "T_prdc_Text_13",
"T_prdc_Text_14", "T_prdc_Text_15", "T_prdc_Text_16", "T_prdc_Text_17", "T_prdc_Text_18", "T_prdc_Text_19",
};
@@ -1015,7 +1015,7 @@ namespace textinput {
mpBoundingPane[i]->setListener(this);
}
mpTextAreaPane = mgr->searchPaneComponent("N_prdcTextArea");
mpTextsPane = mgr->searchPaneComponent(lbl_8165DA38);
mpTextsPane = mgr->searchPaneComponent(scN_prdc_Texts);
mSize = mpTextBoxPane[0]->getTextPane()->GetFontSize();
mpTextAreaPane->setListener(this);
}
@@ -1023,7 +1023,7 @@ namespace textinput {
void UITextArea::Init() {
for (u32 i = 0; i < NUM_PANES; i++) {
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(lbl_816973C8), 0);
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(scEmptyWChars), 0);
mpBoundingPane[i]->setTriggerTarget(true);
}
mfTextWidth = 0.0f;
@@ -1210,7 +1210,7 @@ namespace textinput {
void UITextArea::Clear() {
for (u32 i = 0; i < NUM_PANES; i++) {
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(lbl_816973C8), 0);
mpTextBoxPane[i]->getTextPane()->SetString(const_cast<const wchar_t*>(scEmptyWChars), 0);
}
}
@@ -1493,7 +1493,7 @@ namespace textinput {
if (mgr()->isInScroll() && event != 1 && event != 0) {
return;
}
if (!mgr()->searchAnmPane(lbl_8165DA08)->isInAnimation() || event == 1) {
if (!mgr()->searchAnmPane(scW_predictWindow)->isInAnimation() || event == 1) {
if (!mgr()->isInvalid()) {
switch (event) {
case 4:
@@ -1645,7 +1645,7 @@ namespace textinput {
if (mgr()->isInScroll() && event != 1 && event != 0) {
return;
}
if (!mgr()->searchAnmPane(lbl_8165DA08)->isInAnimation() || event == 1) {
if (!mgr()->searchAnmPane(scW_predictWindow)->isInAnimation() || event == 1) {
if (!mgr()->isInvalid()) {
switch (event) {
case 4:
@@ -1691,15 +1691,15 @@ namespace textinput {
mpOnPictPane = mgr->searchPaneComponent("P_OnBtn");
mpOnBoundPane = mgr->searchPaneComponent("B_OnBtn");
mpOnAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane("P_OnBtn"));
mpOffPictPane = mgr->searchPaneComponent(lbl_8165D2F8.tail);
mpOffBoundPane = mgr->searchPaneComponent(lbl_8165D984);
mpOffAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane(lbl_8165D2F8.tail));
mpOffPictPane = mgr->searchPaneComponent(scCandidatePaneData.tail);
mpOffBoundPane = mgr->searchPaneComponent(scPaneNameTable);
mpOffAnmPane = static_cast<OnOffAnmPane*>(layout->searchAnmPane(scCandidatePaneData.tail));
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D2F8.tail)->GetMaterial()->GetTexture(&mOffTexDefault, 0);
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D984 + 12)->GetMaterial()->GetTexture(&mOffTexJP, 0);
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D984 + 24)->GetMaterial()->GetTexture(&mOffTexCN, 0);
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_816973D0)->GetMaterial()->GetTexture(&mOnTexDefault, 0);
layout->getLayout()->GetRootPane()->FindPaneByName(lbl_8165D984 + 36)->GetMaterial()->GetTexture(&mOnTexCN, 0);
layout->getLayout()->GetRootPane()->FindPaneByName(scCandidatePaneData.tail)->GetMaterial()->GetTexture(&mOffTexDefault, 0);
layout->getLayout()->GetRootPane()->FindPaneByName(scPaneNameTable + 12)->GetMaterial()->GetTexture(&mOffTexJP, 0);
layout->getLayout()->GetRootPane()->FindPaneByName(scPaneNameTable + 24)->GetMaterial()->GetTexture(&mOffTexCN, 0);
layout->getLayout()->GetRootPane()->FindPaneByName(scP_OnBtn)->GetMaterial()->GetTexture(&mOnTexDefault, 0);
layout->getLayout()->GetRootPane()->FindPaneByName(scPaneNameTable + 36)->GetMaterial()->GetTexture(&mOnTexCN, 0);
mpOffBoundPane->setListener(this);
mpOnBoundPane->setListener(this);
@@ -1756,7 +1756,7 @@ namespace textinput {
if (mgr()->isInScroll() && event != 1 && event != 0) {
return;
}
if (!mgr()->searchAnmPane(lbl_8165DA08)->isInAnimation() || event == 1) {
if (!mgr()->searchAnmPane(scW_predictWindow)->isInAnimation() || event == 1) {
OnOffAnmPane* p;
if (&component == mpOnBoundPane) {
p = mpOnAnmPane;

View File

@@ -19,7 +19,7 @@ extern "C" void updateFromReceiver__Q29textinput13CommandSenderFUlPv();
#pragma push
#pragma section const_type ".data"
typedef void (*KeyboardDataFunction)();
extern "C" KeyboardDataFunction const jumptable_81668EF8[0x3f] = {
extern "C" KeyboardDataFunction const scHwKeyboardConvertWCCodeJumpTable[0x3f] = {
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x00000158),
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001d8),
reinterpret_cast<KeyboardDataFunction>(reinterpret_cast<u32>(convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw) + 0x000001f0),
@@ -526,23 +526,6 @@ 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,
0x00, 0x04, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
0x2b, 0x2c, 0x19, 0x1a, 0x1b, 0x13, 0x15, 0x17, 0x14, 0x16, 0x18, 0x00,
0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0f, 0x0e,
0x00, 0x00, 0x00, 0x00,
0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x0b,
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
bool HWKeyboard::updateTappingShift_(input::HKBManager& hkbManager) {
hkbManager.GetModifierState();
input::HKBManager::KeySet currentKeySet;
@@ -636,6 +619,24 @@ const u8 controlKeys[] = {
}
}
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
const u8 controlKeys[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
0x00, 0x04, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
0x2b, 0x2c, 0x19, 0x1a, 0x1b, 0x13, 0x15, 0x17, 0x14, 0x16, 0x18, 0x00,
0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0f, 0x0e,
0x00, 0x00, 0x00, 0x00,
0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x0b,
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
extern "C" asm void setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language() {
nofralloc
cmpwi r4, 2
@@ -736,9 +737,9 @@ const u8 controlKeys[] = {
addi r0, r31, -0x21
cmplwi r0, 0x3e
bgt convertWCCode_HWKeyboard_L1
lis r3, jumptable_81668EF8@ha
lis r3, scHwKeyboardConvertWCCodeJumpTable@ha
slwi r0, r0, 2
addi r3, r3, jumptable_81668EF8@l
addi r3, r3, scHwKeyboardConvertWCCodeJumpTable@l
lwzx r3, r3, r0
mtctr r3
bctr

View File

@@ -139,22 +139,22 @@ extern "C" asm void draw__Q39textinput11nw4rmanager6LayoutFv();
extern "C" asm void searchPaneComponent__Q39textinput3gui11PaneManagerFPCc();
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8165C820[];
extern "C" const char lbl_8165C830[];
extern "C" const char lbl_8165C8C0[];
extern "C" const char lbl_8165C8CC[];
extern "C" const char lbl_8165C8E0[];
extern "C" const char lbl_8165C8F0[];
extern "C" const char lbl_8165C900[];
extern "C" const char lbl_8165C918[];
extern "C" const char lbl_8165C928[];
extern "C" const char lbl_8165C938[];
extern "C" const char lbl_8165C950[];
extern "C" const char lbl_8165C960[];
extern "C" const char scP_txtScrll_UP[];
extern "C" const char scP_txtScrll_DOWN[];
extern "C" const char scN_JPNUSAEUR[];
extern "C" const char scN_separateBarAll[];
extern "C" const char scT_2l_TextBox[];
extern "C" const char scT_title_textJPN[];
extern "C" const char scN_separateBarKOR[];
extern "C" const char scT_2l_TextBoxKOR[];
extern "C" const char scT_title_textKOR[];
extern "C" const char scN_separateBarCHN[];
extern "C" const char scT_2l_TextBoxCHN[];
extern "C" const char scT_title_textCHN[];
extern "C" const char lbl_816973A4[];
extern "C" const char lbl_816973AC[];
#pragma pop
extern "C" const f32 lbl_81694D28;
extern "C" const f32 scInputFormZeroF;
extern "C" void _savegpr_20();
extern "C" void _restgpr_20();
extern "C" void _savegpr_27();
@@ -314,7 +314,7 @@ void Base::resetContextPredict_() {
static GXColor kanaBackground = {128, 255, 128, 255};
static GXColor candidateBackground = {255, 210, 12, 255};
const char* csScrollButtonAnimationTarget = lbl_8165C820;
const char* csScrollButtonAnimationTarget = scP_txtScrll_UP;
struct InputFormAnimationFile {
u32 id;
@@ -337,14 +337,14 @@ extern "C" const InputFormAnimationFile csAninationFile__Q29textinput9inputform[
#pragma section data_type ".rodata"
extern "C" const VisiblePanes csVisiblePaneUEJ__Q29textinput9inputform = {
1, 2,
{lbl_8165C8C0, NULL, NULL, NULL},
{scN_JPNUSAEUR, NULL, NULL, NULL},
{"N_KOR", "N_CHN", NULL, NULL},
};
extern "C" const VisiblePanes csVisiblePaneKOR__Q29textinput9inputform = {
1, 2,
{"N_KOR", NULL, NULL, NULL},
{"N_CHN", lbl_8165C8C0, NULL, NULL},
{"N_CHN", scN_JPNUSAEUR, NULL, NULL},
};
extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
@@ -354,7 +354,7 @@ extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
0,
0,
"N_KOR",
lbl_8165C8C0,
scN_JPNUSAEUR,
0,
0,
0,
@@ -362,23 +362,23 @@ extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
extern "C" const LanguagePaneData csLanguageDependencyDataUEJ__Q29textinput9inputform = {
&csVisiblePaneUEJ__Q29textinput9inputform,
lbl_8165C8CC,
lbl_8165C8E0,
lbl_8165C8F0,
scN_separateBarAll,
scT_2l_TextBox,
scT_title_textJPN,
};
extern "C" const LanguagePaneData csLanguageDependencyDataKOR__Q29textinput9inputform = {
&csVisiblePaneKOR__Q29textinput9inputform,
lbl_8165C900,
lbl_8165C918,
lbl_8165C928,
scN_separateBarKOR,
scT_2l_TextBoxKOR,
scT_title_textKOR,
};
extern "C" const LanguagePaneData csLanguageDependencyDataCHN__Q29textinput9inputform = {
reinterpret_cast<const VisiblePanes*>(csVisiblePaneCHN__Q29textinput9inputform),
lbl_8165C938,
lbl_8165C950,
lbl_8165C960,
scN_separateBarCHN,
scT_2l_TextBoxCHN,
scT_title_textCHN,
};
#pragma section data_type ".data"
@@ -386,39 +386,39 @@ extern "C" const wchar_t pppURLCheck[2][10] = {L"http://", L"https://"};
#pragma pop
extern "C" const f32 lbl_81694D28 = 0.0f;
extern "C" const f32 lbl_81694D2C = 640.0f;
extern "C" const f64 lbl_81694D30 = 4503601774854144.0;
extern "C" const f32 lbl_81694D38 = 1.0f;
extern "C" const f32 lbl_81694D3C = 0.5f;
extern "C" const f32 lbl_81694D40 = 0.7111111f;
extern "C" const f32 lbl_81694D44 = 150.0f;
extern "C" const f32 lbl_81694D48 = 30.0f;
extern "C" const f32 lbl_81694D4C = 50.0f;
extern "C" const f32 lbl_81694D50 = 10.0f;
extern "C" const f32 lbl_81694D54 = 52.0f;
extern "C" const f32 lbl_81694D58 = 2.0f;
extern "C" const f32 lbl_81694D5C = 140.0f;
extern "C" const f32 lbl_81694D60 = 90.0f;
extern "C" const f32 lbl_81694D64 = 253.0f;
extern "C" const f32 lbl_81694D68 = 20.0f;
extern "C" const u8 lbl_81694D6C = 0xff;
extern "C" const u8 lbl_81694D6D = 0x32;
extern "C" const u8 lbl_81694D6E = 0x32;
extern "C" const u8 lbl_81694D6F = 0;
extern "C" const f32 lbl_81694D70 = 255.0f;
extern "C" const f32 lbl_81694D74 = 127.0f;
extern "C" const f32 lbl_81694D78 = 14592.0f;
extern "C" const f64 lbl_81694D80 = 4503599627370496.0;
extern "C" const f32 lbl_81694D88 = 15.0f;
extern "C" const f32 scInputFormZeroF = 0.0f;
extern "C" const f32 scInputForm640F = 640.0f;
extern "C" const f64 scInputFormF32ConvertMagic = 4503601774854144.0;
extern "C" const f32 scInputFormOneF = 1.0f;
extern "C" const f32 scInputFormHalfF = 0.5f;
extern "C" const f32 scInputForm0_7111111F = 0.7111111f;
extern "C" const f32 scInputForm150F = 150.0f;
extern "C" const f32 scInputForm30F = 30.0f;
extern "C" const f32 scInputForm50F = 50.0f;
extern "C" const f32 scInputForm10F = 10.0f;
extern "C" const f32 scInputForm52F = 52.0f;
extern "C" const f32 scInputFormTwoF = 2.0f;
extern "C" const f32 scInputForm140F = 140.0f;
extern "C" const f32 scInputForm90F = 90.0f;
extern "C" const f32 scInputForm253F = 253.0f;
extern "C" const f32 scInputForm20F = 20.0f;
extern "C" const u8 scInputFormColorRU8 = 0xff;
extern "C" const u8 scInputFormColorGU8 = 0x32;
extern "C" const u8 scInputFormColorBU8 = 0x32;
extern "C" const u8 scInputFormColorAU8 = 0;
extern "C" const f32 scInputForm255F = 255.0f;
extern "C" const f32 scInputForm127F = 127.0f;
extern "C" const f32 scInputForm14592F = 14592.0f;
extern "C" const f64 scInputFormF64ConvertMagic = 4503599627370496.0;
extern "C" const f32 scInputForm15F = 15.0f;
f32 sfColorPhase;
bool mbHyphen = true;
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8165C820[] = "P_txtScrll_UP";
extern "C" const char lbl_8165C830[] = "P_txtScrll_DOWN";
extern "C" const char scP_txtScrll_UP[] = "P_txtScrll_UP";
extern "C" const char scP_txtScrll_DOWN[] = "P_txtScrll_DOWN";
struct ButtonAnimations {
KeyType type;
const char* paneName;
@@ -428,27 +428,27 @@ struct ButtonAnimations {
};
const ButtonAnimations csButtonAnimations[] = {
{KT_NormalButton, lbl_8165C820, 8, NULL, {
{KT_NormalButton, scP_txtScrll_UP, 8, NULL, {
&csAninationFile__Q29textinput9inputform[0], &csAninationFile__Q29textinput9inputform[1],
&csAninationFile__Q29textinput9inputform[2], &csAninationFile__Q29textinput9inputform[3],
&csAninationFile__Q29textinput9inputform[4], &csAninationFile__Q29textinput9inputform[5],
&csAninationFile__Q29textinput9inputform[6], &csAninationFile__Q29textinput9inputform[7]}},
{KT_NormalButton, lbl_8165C830, 8, csScrollButtonAnimationTarget, {
{KT_NormalButton, scP_txtScrll_DOWN, 8, csScrollButtonAnimationTarget, {
&csAninationFile__Q29textinput9inputform[0], &csAninationFile__Q29textinput9inputform[1],
&csAninationFile__Q29textinput9inputform[2], &csAninationFile__Q29textinput9inputform[3],
&csAninationFile__Q29textinput9inputform[4], &csAninationFile__Q29textinput9inputform[5],
&csAninationFile__Q29textinput9inputform[6], &csAninationFile__Q29textinput9inputform[7]}}
};
extern "C" const char lbl_8165C8C0[] = "N_JPNUSAEUR";
extern "C" const char lbl_8165C8CC[] = "N_separateBarAll";
extern "C" const char lbl_8165C8E0[] = "T_2l_TextBox";
extern "C" const char lbl_8165C8F0[] = "T_title_textJPN";
extern "C" const char lbl_8165C900[] = "N_separateBarKOR";
extern "C" const char lbl_8165C918[] = "T_2l_TextBoxKOR";
extern "C" const char lbl_8165C928[] = "T_title_textKOR";
extern "C" const char lbl_8165C938[] = "N_separateBarCHN";
extern "C" const char lbl_8165C950[] = "T_2l_TextBoxCHN";
extern "C" const char lbl_8165C960[] = "T_title_textCHN";
extern "C" const char scN_JPNUSAEUR[] = "N_JPNUSAEUR";
extern "C" const char scN_separateBarAll[] = "N_separateBarAll";
extern "C" const char scT_2l_TextBox[] = "T_2l_TextBox";
extern "C" const char scT_title_textJPN[] = "T_title_textJPN";
extern "C" const char scN_separateBarKOR[] = "N_separateBarKOR";
extern "C" const char scT_2l_TextBoxKOR[] = "T_2l_TextBoxKOR";
extern "C" const char scT_title_textKOR[] = "T_title_textKOR";
extern "C" const char scN_separateBarCHN[] = "N_separateBarCHN";
extern "C" const char scT_2l_TextBoxCHN[] = "T_2l_TextBoxCHN";
extern "C" const char scT_title_textCHN[] = "T_title_textCHN";
bool DeadKeyStream::sbCompatibleFilterEnabled = true;
inline bool DeadKeyStream::isCompatible(wchar_t character) {
@@ -509,13 +509,13 @@ void Base::setLanguage(Language language) {
case UK:
setPredictMode(PM_En);
break;
case FR:
case DE:
setPredictMode(PM_De);
break;
case DE:
case IT:
setPredictMode(PM_It);
break;
case IT:
case NL:
setPredictMode(PM_Nl);
break;
case SP:
@@ -525,7 +525,7 @@ void Base::setLanguage(Language language) {
setPredictMode(PM_USSp);
}
break;
case NL:
case FR:
if (meDestination == DST_EU) {
setPredictMode(PM_Fr);
} else {
@@ -2419,178 +2419,42 @@ void Base::onPressRight() {
meScrollFlag = SF_ScrollOn;
}
extern "C" asm void calc__Q39textinput9inputform4BaseFv() {
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
stfd f31, 0x30(r1)
psq_st f31, 0x38(r1), 0, 0
stw r31, 0x2c(r1)
stw r30, 0x28(r1)
mr r30, r3
lwz r12, 0x18c(r3)
lwz r12, 0x14(r12)
mtctr r12
addi r3, r3, 0x18c
bctrl
cmpwi r3, 0
beq calc_L1
lwz r12, 0x18c(r30)
addi r3, r30, 0x18c
lwz r12, 0x10(r12)
mtctr r12
bctrl
frsp f0, f1
stfs f1, 0x188(r30)
stfs f0, 0x100(r30)
calc_L1:
lwz r12, 0x18c(r30)
addi r3, r30, 0x18c
lwz r12, 0x14(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne calc_L2
lwz r12, 0(r30)
mr r3, r30
lwz r12, 0x16c(r12)
mtctr r12
bctrl
calc_L2:
lwz r3, 0x164(r30)
lwz r12, 0(r3)
lwz r12, 0x78(r12)
mtctr r12
bctrl
cmpwi r3, 0
bne calc_L3
lfs f1, lbl_81694D38(r0)
lfs f0, 0x1ac(r30)
fadds f0, f1, f0
stfs f0, 0x1ac(r30)
calc_L3:
lwz r12, 0x18c(r30)
addi r3, r30, 0x18c
lwz r12, 0xc(r12)
mtctr r12
bctrl
lfs f1, sfColorPhase(r0)
lfs f0, lbl_81694D40(r0)
fmuls f1, f0, f1
bl SinFIdx__Q24nw4r4mathFf
lfs f0, lbl_81694D48(r0)
li r0, 0x5a
li r3, 2
li r31, 0xfd
fmuls f2, f0, f1
lfs f0, lbl_81694D44(r0)
stb r3, 0x1c0(r30)
fmr f31, f1
lwz r3, 0x164(r30)
fadds f0, f0, f2
stb r0, 0x1c1(r30)
fctiwz f0, f0
stb r31, 0x1c2(r30)
stfd f0, 8(r1)
lwz r0, 0xc(r1)
stb r0, 0x1c3(r30)
lwz r12, 0(r3)
lwz r12, 0x78(r12)
mtctr r12
bctrl
cmpwi r3, 0
beq calc_L4
lfs f1, lbl_81694D50(r0)
li r0, 0x8c
li r3, 0x34
lfs f0, lbl_81694D4C(r0)
fmuls f1, f1, f31
stb r0, 0x1c1(r30)
stb r3, 0x1c0(r30)
fadds f0, f0, f1
stb r31, 0x1c2(r30)
fctiwz f0, f0
stfd f0, 8(r1)
lwz r0, 0xc(r1)
stb r0, 0x1c3(r30)
b calc_L7
calc_L4:
lfs f1, 0x1ac(r30)
lfs f5, lbl_81694D4C(r0)
fcmpo cr0, f1, f5
cror eq, lt, eq
bne calc_L7
lfs f2, lbl_81694D28(r0)
lfs f3, lbl_81694D54(r0)
fmr f4, f2
lfs f6, lbl_81694D58(r0)
fmr f7, f2
bl hermiteInterporation__Q29textinput4utilFfffffff
fctiwz f0, f1
lfs f2, lbl_81694D28(r0)
lfs f1, 0x1ac(r30)
fmr f4, f2
lfs f3, lbl_81694D5C(r0)
stfd f0, 8(r1)
fmr f7, f2
lfs f5, lbl_81694D4C(r0)
lwz r0, 0xc(r1)
lfs f6, lbl_81694D60(r0)
stb r0, 0x1c0(r30)
bl hermiteInterporation__Q29textinput4utilFfffffff
fctiwz f0, f1
lfs f2, lbl_81694D28(r0)
lfs f3, lbl_81694D64(r0)
fmr f4, f2
lfs f1, 0x1ac(r30)
stfd f0, 0x10(r1)
fmr f6, f3
lfs f5, lbl_81694D4C(r0)
lwz r0, 0x14(r1)
fmr f7, f2
stb r0, 0x1c1(r30)
bl hermiteInterporation__Q29textinput4utilFfffffff
fctiwz f1, f1
lfs f2, sfColorPhase(r0)
lfs f0, lbl_81694D40(r0)
stfd f1, 0x18(r1)
fmuls f1, f0, f2
lwz r0, 0x1c(r1)
stb r0, 0x1c2(r30)
bl SinFIdx__Q24nw4r4mathFf
lfs f2, lbl_81694D28(r0)
fmr f31, f1
lfs f3, lbl_81694D4C(r0)
fmr f4, f2
lfs f1, 0x1ac(r30)
fmr f5, f3
lfs f6, lbl_81694D44(r0)
fmr f7, f2
bl hermiteInterporation__Q29textinput4utilFfffffff
lfs f0, lbl_81694D68(r0)
fmuls f0, f0, f31
fadds f0, f1, f0
fctiwz f0, f0
stfd f0, 0x20(r1)
lwz r0, 0x24(r1)
stb r0, 0x1c3(r30)
calc_L7:
lwz r3, 0x214(r30)
lfs f1, sfColorPhase(r0)
lfs f0, lbl_81694D58(r0)
addi r0, r3, 8
stw r0, 0x214(r30)
fadds f0, f1, f0
stfs f0, sfColorPhase(r0)
psq_l f31, 0x38(r1), 0, 0
lfd f31, 0x30(r1)
lwz r31, 0x2c(r1)
lwz r30, 0x28(r1)
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
inline f32 nextColorPhase(f32 phase) { phase += 2.0f; return phase; }
inline f32 colorSine(f32 phase) { return nw4r::math::SinFIdx(phase * 0.7111111f); }
void Base::calc() {
if (mScrollAnm.isActive()) {
f32 scroll = mScrollAnm.getValue();
mfScrollY = scroll;
mfDrawScrollY = mfScrollY;
}
if (!mScrollAnm.isActive()) autoScroll();
if (!mpString->isOnSustain()) mfSustainTimer = 1.0f + mfSustainTimer;
mScrollAnm.calc();
f32 wave = colorSine(sfColorPhase);
mSelectedColor.r = 2;
mSelectedColor.g = 90;
mSelectedColor.b = 253;
mSelectedColor.a = static_cast<u8>(150.0f + 30.0f * wave);
if (mpString->isOnSustain()) {
mSelectedColor.r = 52;
mSelectedColor.g = 140;
mSelectedColor.b = 253;
mSelectedColor.a = static_cast<u8>(50.0f + 10.0f * wave);
} else if (mfSustainTimer <= 50.0f) {
mSelectedColor.r = static_cast<u8>(util::hermiteInterporation(mfSustainTimer, 0.0f, 52.0f, 0.0f, 50.0f, 2.0f, 0.0f));
mSelectedColor.g = static_cast<u8>(util::hermiteInterporation(mfSustainTimer, 0.0f, 140.0f, 0.0f, 50.0f, 90.0f, 0.0f));
u8 blue = static_cast<u8>(util::hermiteInterporation(mfSustainTimer, 0.0f, 253.0f, 0.0f, 50.0f, 253.0f, 0.0f));
f32 phase = sfColorPhase;
f32 angle = phase * 0.7111111f;
mSelectedColor.b = blue;
wave = nw4r::math::SinFIdx(angle);
f32 alpha = util::hermiteInterporation(mfSustainTimer, 0.0f, 50.0f, 0.0f, 50.0f, 150.0f, 0.0f);
mSelectedColor.a = static_cast<u8>(alpha + 20.0f * wave);
}
u32 cursorTimer = muCursorTimer + 8;
f32 phase = sfColorPhase;
muCursorTimer = cursorTimer;
sfColorPhase = nextColorPhase(phase);
}
Base::RowInfoManager::~RowInfoManager() {
@@ -2824,49 +2688,29 @@ void tistring::Decolated::clear() {
}
namespace inputform {
extern "C" asm void init__Q49textinput9inputform4Base14RowInfoManagerFv() {
nofralloc
li r8, 0
li r4, 0
b init_RowInfo_L1
init_RowInfo_L2:
lwz r7, 0(r3)
subi r5, r8, 1
clrlslwi r6, r8, 16, 3
addi r0, r8, 1
sthux r5, r6, r7
addi r8, r8, 1
sth r0, 2(r6)
sth r4, 4(r6)
sth r4, 6(r6)
init_RowInfo_L1:
lhz r5, 4(r3)
clrlwi r0, r8, 16
cmplw r0, r5
blt init_RowInfo_L2
lhz r0, 4(r3)
subi r5, r5, 1
lwz r7, 0(r3)
li r4, 0
slwi r6, r0, 3
clrlslwi r0, r5, 16, 3
sthux r5, r6, r7
sth r4, 2(r6)
lwz r6, 0(r3)
lhz r5, 4(r3)
add r4, r6, r0
sth r5, 2(r4)
lhz r0, 4(r3)
sth r0, 0(r6)
lhz r5, 4(r3)
lwz r4, 0(r3)
addi r5, r5, 1
clrlslwi r0, r5, 16, 3
sthux r5, r4, r0
lhz r3, 4(r3)
addi r0, r3, 1
sth r0, 2(r4)
blr
inline u16 initializeRowLinks(Base::Info_* const& rows, const u16& capacity) {
for (u16 index = 0; index < capacity; ++index) {
Base::Info_* row = &rows[index];
row->Back = index - 1;
row->Next = index + 1;
row->StrCount = 0;
row->DispRowCount = 0;
}
return capacity;
}
void Base::RowInfoManager::init() {
u16 capacity = initializeRowLinks(mpInfo, mMaxLength);
Info_* freeHead = &mpInfo[mMaxLength];
u16 last = capacity - 1;
freeHead->Back = last;
freeHead->Next = 0;
Info_* rows = mpInfo;
rows[last].Next = mMaxLength;
rows[0].Back = mMaxLength;
u16 activeIndex = mMaxLength + 1;
Info_* activeHead = &mpInfo[activeIndex];
activeHead->Back = activeIndex;
activeHead->Next = mMaxLength + 1;
}
nw4r::math::VEC2 LayoutByNW4R::getScale() const {
return mpLayout->GetRootPane()->FindPaneByName(static_cast<const char*>(mpLayoutData), true)->GetScale();
@@ -3205,8 +3049,8 @@ bool Base::onCursor(CursorPos* cursor) {
glyph.rect.bottom = 0.0f;
glyph.character = *predicted;
calcRect(glyph);
f32 width = glyph.rect.right - glyph.rect.left;
f32 fieldWidth = mRect.right - mRect.left;
f32 width = glyph.rect.GetWidth();
f32 fieldWidth = mRect.GetWidth();
f32 cursorX = GetCursorX();
if (cursorX + width >= fieldWidth) doLineFeed();
Print(*predicted);
@@ -3249,9 +3093,7 @@ bool Base::onCursor(CursorPos* cursor) {
marker.character = 0xE057;
calcRect(space);
calcRect(marker);
f32 markerWidth = marker.rect.right - marker.rect.left;
f32 spaceWidth = space.rect.right - space.rect.left;
f32 offset = ((spaceWidth - markerWidth) * 0.5f) * getScale().x;
f32 offset = ((space.rect.GetWidth() - marker.rect.GetWidth()) / 2.0f) * getScale().x;
MoveCursorX(offset);
Print(0xE057);
MoveCursorX(offset);
@@ -3544,7 +3386,7 @@ void Base::drawCursor(f32 x, f32 y) {
f32 opacity = static_cast<u32>(muGlobalAlpha) / 255.0f;
mfCursorX = x;
mfCursorY = y;
GXColor color = {lbl_81694D6C, lbl_81694D6D, lbl_81694D6E, lbl_81694D6F};
GXColor color = {scInputFormColorRU8, scInputFormColorGU8, scInputFormColorBU8, scInputFormColorAU8};
f32 pulse = nw4r::math::SinFIdx(0.7111111f * muCursorTimer);
color.a = static_cast<s32>(opacity * (127.0f + 127.0f * pulse));
f32 width = mfViewWidth - mfViewX;
@@ -3628,7 +3470,7 @@ void NormalButtonAnmPane::onAnmEvent(AnmPaneEvent event) {
changeAnimation(ANM_Pushed);
}
switch (meState) {
case ANM_FocusOut:
case ANM_FadeIn:
if (event == PE_4) changeAnimation(ANM_Normal);
if (event == PE_1) changeAnimation(ANM_FocusIn);
break;
@@ -3642,7 +3484,7 @@ void NormalButtonAnmPane::onAnmEvent(AnmPaneEvent event) {
case ANM_RollOver:
if (event == PE_2) changeAnimation(ANM_FocusOut);
break;
case ANM_FadeIn:
case ANM_FocusOut:
if (event == PE_4) changeAnimation(ANM_Normal);
if (event == PE_1) changeAnimation(ANM_FocusIn);
break;

View File

@@ -312,6 +312,10 @@ void Manager::SetFont(nw4r::lyt::FontRefLink* link) {
if (mpInputForm) mpInputForm->nw4r::ut::CharWriter::SetFont(*font);
if (mpCellPhoneKeyboard) static_cast<nw4rmanager::Layout&>(*mpCellPhoneKeyboard).SetFontForce(font);
}
void* Manager::getPredictLanguageSelectDialog() { return mpPredictLanguageDialog; }
const void* Manager::getPredictLanguageSelectDialog() const { return mpPredictLanguageDialog; }
void* Manager::getSignKeyboard() { return mpSignWindow; }
const void* Manager::getSignKeyboard() const { return mpSignWindow; }
void Manager::setDefaultPredictionJP(int count, const char** predictions) {
static_cast<tistring::WithAtok*>(getInputForm()->getAtokString())->setDefaultPrediction(count, predictions);
}

View File

@@ -312,7 +312,7 @@ namespace ipl {
#pragma push
#pragma section sconst_type ".sdata2"
extern "C" const f32 lbl_816948EC = 0.0f;
extern "C" const f32 scDateZeroF = 0.0f;
extern "C" const f32 lbl_816948F0;
#pragma pop
} // namespace scene

View File

@@ -10,9 +10,9 @@
namespace ipl {
namespace scene {
// clang-format off
extern "C" char lbl_8164E290[] = "Cursur_a";
extern "C" char scCursur_a[] = "Cursur_a";
static const char* scCursur = lbl_8164E290;
static const char* scCursur = scCursur_a;
static const char* scCursorAnims[] = {
"my_IplTop_d_FocusOff.brlan",
@@ -20,10 +20,10 @@ namespace ipl {
"my_IplTop_d_Select.brlan",
};
extern "C" const char* lbl_8169699C = "T_Balloon";
extern "C" const char* scPaneName_T_Balloon = "T_Balloon";
extern "C" const char* lbl_816969A8 = "W_Base";
extern "C" const char* lbl_816969B4 = "W_Shade";
extern "C" const char* scPaneName_W_Base = "W_Base";
extern "C" const char* scPaneName_W_Shade = "W_Shade";
static const char* scLangGroups[] = {
"JPN",
@@ -38,8 +38,8 @@ namespace ipl {
"KOR",
};
extern "C" char lbl_816969DC[] = "Calc";
extern "C" char lbl_816969E1[] = "Create";
extern "C" char scExport_Calc[] = "Calc";
extern "C" char scExport_Create[] = "Create";
#pragma pack(1)
struct ModuleData {
@@ -53,7 +53,7 @@ namespace ipl {
};
#pragma pack()
extern "C" ModuleData lbl_8164E328 = {
extern "C" ModuleData scModuleData = {
{
{
"JPN",
@@ -112,9 +112,9 @@ namespace ipl {
"icon_Whole.brlan",
};
extern "C" char lbl_8164E6AF[] = "%s_Rso%d.brlan";
extern "C" char lbl_8164E6C0[] = "icon_Start.brlan";
extern "C" char lbl_816969E8[] = "arc";
extern "C" char scBrlan_RsoFmt[] = "%s_Rso%d.brlan";
extern "C" char scBrlan_icon_Start[] = "icon_Start.brlan";
extern "C" char scArc[] = "arc";
static const u32 scLangLookup[SC_PRODUCT_AREA_MAX][16] = {
// Japan
@@ -296,7 +296,7 @@ namespace ipl {
int ChannelObj::calcExtModule(EGG::ExpHeap* expHeap, bool unk0, bool onSceneChange) {
int result = EXT_MODULE_RESULT_WAIT;
const char* dataBase = lbl_8164E290;
const char* dataBase = scCursur_a;
if (mExtModuleState == EXT_MODULE_STATE_UNAVAILABLE) {
return EXT_MODULE_RESULT_UNAVAILABLE;
@@ -354,7 +354,7 @@ namespace ipl {
// Import `int Calc(int)`
// This is during ChannelObj's loop.
mpRSOCalc = (channel::CalcFunc)RSOFindExportSymbolAddr(mpRSOHeader, lbl_816969DC);
mpRSOCalc = (channel::CalcFunc)RSOFindExportSymbolAddr(mpRSOHeader, scExport_Calc);
// Import `void ThreadCalc()`
// This is executed on a seperate thread.
@@ -364,7 +364,7 @@ namespace ipl {
// Import `void Create(nw4r::lyt::Layout*)`
// This is the initialization of the module.
channel::CreateFunc createFunc = (channel::CreateFunc)RSOFindExportSymbolAddr(mpRSOHeader, lbl_816969E1);
channel::CreateFunc createFunc = (channel::CreateFunc)RSOFindExportSymbolAddr(mpRSOHeader, scExport_Create);
if (createFunc != NULL) {
createFunc(mpThumbLayout->getNW4RLyt());
}
@@ -501,8 +501,8 @@ namespace ipl {
}
void ChannelObj::createDiskLayout(void* data) {
const ModuleData* moduleData = reinterpret_cast<const ModuleData*>(lbl_8164E290 + 0x98);
mpDiskLayout = layout::Object::create(mpDiskHeap, 0x19000, data, lbl_816969E8, moduleData->iconBrlyt);
const ModuleData* moduleData = reinterpret_cast<const ModuleData*>(scCursur_a + 0x98);
mpDiskLayout = layout::Object::create(mpDiskHeap, 0x19000, data, scArc, moduleData->iconBrlyt);
setLangPane(mpDiskLayout);
if (mpDiskLayout->searchFile(moduleData->iconBrlan)) {
@@ -638,33 +638,33 @@ namespace ipl {
void ChannelObj::setLangPane(const layout::Object* layout) {
int lang = System::getLanguage();
const char* langGroup = scLangGroups[lang];
char local_50[40] = "";
char langCodeBuf[40] = "";
bool bVar4 = false;
bool foundLangGroup = false;
for (nw4r::lyt::GroupList::Iterator it = layout->GetGroupList().GetBeginIter(); it != layout->GetGroupList().GetEndIter(); it++) {
if (strcmp(it->GetName(), langGroup) == 0) {
bVar4 = true;
foundLangGroup = true;
} else {
bool bVar3 = true;
bool isNonRsoGroup = true;
for (int i = 0; i < channel::MAX_ANIMS; i++) {
char name[6];
sprintf(name, "Rso%d", i);
if (strncmp(it->GetName(), name, 5) == 0) {
bVar3 = false;
isNonRsoGroup = false;
break;
}
}
if (bVar3) {
if (isNonRsoGroup) {
for (nw4r::lyt::PaneLinkList::Iterator it2 = it->GetPaneList().GetBeginIter(); it2 != it->GetPaneList().GetEndIter(); it2++) {
it2->mTarget->SetVisible(false);
}
for (int i = 0; i < 10; i++) {
if (strncmp(it->GetName(), scLangGroups[i], 3) == 0) {
memcpy(&local_50[i], it->GetName(), 3);
local_50[i + 3] = 0;
memcpy(&langCodeBuf[i], it->GetName(), 3);
langCodeBuf[i + 3] = 0;
break;
}
}
@@ -672,7 +672,7 @@ namespace ipl {
}
}
if (bVar4) {
if (foundLangGroup) {
nw4r::lyt::Group* group = layout->FindGroupByName(langGroup);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter(); it++) {
it->mTarget->SetVisible(true);
@@ -680,10 +680,10 @@ namespace ipl {
} else {
s32 region = System::getRegion();
for (int i = 0; i < channel::MAX_ANIMS; i++) {
char* groupName = (char*)lbl_8164E328.langGroupLookup[region][i];
char* groupName = (char*)scModuleData.langGroupLookup[region][i];
if (groupName != NULL) {
if (strcmp(groupName, &local_50[scLangLookup[region][i]]) == 0) {
if (strcmp(groupName, &langCodeBuf[scLangLookup[region][i]]) == 0) {
nw4r::lyt::Group* group = layout->FindGroupByName(groupName);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter();
it++) {
@@ -698,7 +698,7 @@ namespace ipl {
void ChannelObj::bindRsoAnm(layout::Object* layout, layout::Animator** anims, const char* layoutFile) {
for (int i = 0; i < channel::MAX_ANIMS; i++) {
char fileName[20];
sprintf(fileName, lbl_8164E6AF, layoutFile, i);
sprintf(fileName, scBrlan_RsoFmt, layoutFile, i);
if (layout->searchFile(fileName)) {
char groupName[8];
@@ -730,7 +730,7 @@ namespace ipl {
}
void ChannelObj::createThumbnail() {
bool bVar1 = false;
bool shouldAdjustHeap = false;
if (mpBalloonLayout == NULL && System::getChannelManager()->isLoaded(mChanPage, mChanIndex)) {
initBalloon();
@@ -746,12 +746,12 @@ namespace ipl {
frame = createWadThumbnail();
} else {
frame = createWrongThumbnail();
bVar1 = true;
shouldAdjustHeap = true;
}
}
} else {
frame = createEmptyThumbnail();
bVar1 = true;
shouldAdjustHeap = true;
}
calcNormal();
@@ -764,7 +764,7 @@ namespace ipl {
mpThumbAnim->setCurrentFrame(frame);
}
if (bVar1) {
if (shouldAdjustHeap) {
mpThumbLayout->adjustHeap();
}
}
@@ -772,10 +772,10 @@ namespace ipl {
f32 ChannelObj::createWadThumbnail() {
f32 frame = 0.0f;
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpThumbFile->getBuffer(), lbl_816969E8, lbl_8164E290 + 0x3F8);
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpThumbFile->getBuffer(), scArc, scCursur_a + 0x3F8);
setLangPane(mpThumbLayout);
const char* dataBase = lbl_8164E290;
const char* dataBase = scCursur_a;
u32 rsoIdx = System::getChannelManager()->getIconRSOIdx(mChanPage, mChanIndex);
u32 csIdx = System::getChannelManager()->getIconCSIdx(mChanPage, mChanIndex);
@@ -826,11 +826,11 @@ namespace ipl {
return frame;
}
extern "C" char lbl_8164E6CF[] = "my_IplTop_b.brlyt";
extern "C" char lbl_8164E6E1[] = "my_IplTop_b.brlan";
extern "C" char scBrlyt_my_IplTop_b[] = "my_IplTop_b.brlyt";
extern "C" char scBrlan_my_IplTop_b[] = "my_IplTop_b.brlan";
f32 ChannelObj::createWrongThumbnail() {
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpSysLayoutFile, lbl_816969E8, lbl_8164E6CF);
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpSysLayoutFile, scArc, scBrlyt_my_IplTop_b);
mpThumbLayout->FindPaneByName("Ch0")->SetVisible(false);
mpThumbLayout->FindPaneByName("Ch1")->GetMaterial()->SetTevColor(0, (GXColorS10){0, 0, 0, 255});
@@ -841,8 +841,8 @@ namespace ipl {
}
f32 ChannelObj::createEmptyThumbnail() {
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpSysLayoutFile, lbl_816969E8, lbl_8164E6CF);
mpThumbAnim = mpThumbLayout->bind(lbl_8164E6E1);
mpThumbLayout = layout::Object::create(mpMainHeap, 0x8000, mpSysLayoutFile, scArc, scBrlyt_my_IplTop_b);
mpThumbAnim = mpThumbLayout->bind(scBrlan_my_IplTop_b);
return System::getRndm()->get_u16() % 2000;
}
@@ -871,12 +871,12 @@ namespace ipl {
calcBalloon(pos);
}
extern "C" char lbl_8164E6F3[] = "my_IplTop_d.brlyt";
extern "C" char lbl_8164E705[] = "my_IplTopBalloon_a.brlyt";
extern "C" char lbl_8164E71E[] = "my_IplTopBalloon_a_BalloonInOut.brlan";
extern "C" char scBrlyt_my_IplTop_d[] = "my_IplTop_d.brlyt";
extern "C" char scBrlyt_my_IplTopBalloon_a[] = "my_IplTopBalloon_a.brlyt";
extern "C" char scBrlan_BalloonInOut[] = "my_IplTopBalloon_a_BalloonInOut.brlan";
void ChannelObj::initCursor() {
mpCursorLayout = new (mpCursorHeap, 4) layout::Object(mpCursorHeap, mpSysLayoutFile, lbl_816969E8, lbl_8164E6F3);
mpCursorLayout = new (mpCursorHeap, 4) layout::Object(mpCursorHeap, mpSysLayoutFile, scArc, scBrlyt_my_IplTop_d);
for (int i = 0; i < ANIM_CURSOR_MAX; i++) {
mpCursorAnims[i] = mpCursorLayout->bind(scCursorAnims[i], scCursur, false);
@@ -1001,19 +1001,19 @@ namespace ipl {
mpBalloonLayout = NULL;
return;
}
mpBalloonLayout = new (mpBalloonHeap, 4) layout::Object(mpBalloonHeap, mpSysLayoutFile, lbl_816969E8, lbl_8164E705);
mpBalloonLayout = new (mpBalloonHeap, 4) layout::Object(mpBalloonHeap, mpSysLayoutFile, scArc, scBrlyt_my_IplTopBalloon_a);
setBalloonText((wchar_t*)System::getChannelManager()->getTitleName(mChanPage, mChanIndex, 0));
mpBalloonAnim = mpBalloonLayout->bind(lbl_8164E71E);
mpBalloonAnim = mpBalloonLayout->bind(scBrlan_BalloonInOut);
setBalloonAnim(0);
mpBalloonLayout->finishBinding();
}
extern "C" char lbl_8164E744[] = "WIPL_SE_BALLOON";
extern "C" char scSE_BALLOON[] = "WIPL_SE_BALLOON";
void ChannelObj::setBalloonText(const wchar_t* text) {
nw4r::lyt::TextBox* textPane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpBalloonLayout->FindPaneByName(lbl_8169699C));
nw4r::lyt::TextBox* textPane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpBalloonLayout->FindPaneByName(scPaneName_T_Balloon));
wchar_t fullStr[channel::META_CHANNEL_NAME_LENGTH + 3] = L"";
u32 strLen;
@@ -1052,22 +1052,22 @@ namespace ipl {
nw4r::ut::Rect textRect = textPane->GetTextDrawRect(*mpBalloonLayout->getDrawInfo());
nw4r::lyt::Size newSize(mpBalloonLayout->FindPaneByName(lbl_816969A8)->GetSize());
nw4r::lyt::Size newSize(mpBalloonLayout->FindPaneByName(scPaneName_W_Base)->GetSize());
newSize.width = textRect.right - textRect.left + 40.0f;
if (newSize.width < mLocationAdjust * 160.0f) {
newSize.width = mLocationAdjust * 160.0f;
}
mpBalloonLayout->FindPaneByName(lbl_816969B4)->SetSize(newSize);
mpBalloonLayout->FindPaneByName(lbl_816969A8)->SetSize(newSize);
mpBalloonLayout->FindPaneByName(scPaneName_W_Shade)->SetSize(newSize);
mpBalloonLayout->FindPaneByName(scPaneName_W_Base)->SetSize(newSize);
}
void ChannelObj::calcBalloon(const nw4r::math::VEC3& vec) {
if (mpBalloonLayout != NULL) {
nw4r::lyt::Size size;
size = mpBalloonLayout->FindPaneByName(lbl_816969A8)->GetSize();
size = mpBalloonLayout->FindPaneByName(scPaneName_W_Base)->GetSize();
f32 val = -2.0f + ((size.height / 2) + mThumbHeight);
val *= -1.0f;
@@ -1117,7 +1117,7 @@ namespace ipl {
mpBalloonLayout->GetRootPane()->SetVisible(true);
mpBalloonLayout->setAnmType(ANIM_TYPE_FORWARD);
mpBalloonLayout->start();
snd::getSystem()->startSE(lbl_8164E744);
snd::getSystem()->startSE(scSE_BALLOON);
} else if (unk == 4) {
unk_0x68 = 0;
}
@@ -1229,7 +1229,7 @@ namespace ipl {
if (group != NULL) {
mpNwc24NewGroup = group;
} else {
lookup = (char**)lbl_8164E328.langGroupLookup[System::getRegion()];
lookup = (char**)scModuleData.langGroupLookup[System::getRegion()];
for (int i = 0; lookup[i] != NULL; i++) {
sprintf(grpName, "New_%s", lookup[i]);

View File

@@ -131,15 +131,15 @@ namespace ipl {
extern "C" char mscBasePaneNames__Q33ipl5scene13ChannelSelect[];
extern "C" char mscClockPaneNames__Q33ipl5scene13ChannelSelect[];
extern "C" u32 mscMaskPaneName__Q33ipl5scene13ChannelSelect;
extern "C" char lbl_8164DFE1[];
extern "C" char lbl_8164DE64[];
extern "C" char lbl_8164DE6D[];
extern "C" char lbl_8164DE9C[];
extern "C" char lbl_8164DFCB[];
extern "C" char lbl_8164DFF1[];
extern "C" char lbl_8164E000[];
extern "C" char lbl_8164E024[];
extern "C" char lbl_8164E038[];
extern "C" char scSE_WIPL_SE_CH_HOLD[];
extern "C" char scPaneName_N_GCIcon[];
extern "C" char scPaneName_N_DiscUpdateIcon[];
extern "C" char scSE_WSD_SELECT[];
extern "C" char scSE_WIPL_SE_CH_TARGETTING[];
extern "C" char scSE_WIPL_SE_CH_SET[];
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[];
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[];
extern "C" char scSE_WIPL_SE_DECIDE[];
extern "C" void draw__Q33ipl6layout6ObjectFPQ34nw4r3lyt4Pane();
extern "C" void SetVisible__Q34nw4r3lyt4PaneFb();
extern "C" void drawChannelThumbnails__Q33ipl5scene13ChannelSelectFv();
@@ -855,8 +855,8 @@ namespace ipl {
mpDiskInOutLyt->finishBinding();
}
extern "C" char lbl_8164DE64[] = "N_GCIcon";
extern "C" char lbl_8164DE6D[] = "N_DiscUpdateIcon";
extern "C" char scPaneName_N_GCIcon[] = "N_GCIcon";
extern "C" char scPaneName_N_DiscUpdateIcon[] = "N_DiscUpdateIcon";
extern "C" void* jumptable_8164DE80[7] = {
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C),
@@ -1359,8 +1359,8 @@ namespace ipl {
cmpwi r0, 0x1
beq updateDiskState_813AD2C8
lwz r3, 0x94(r3)
lis r29, lbl_8164DE64@ha
addi r4, r29, lbl_8164DE64@l
lis r29, scPaneName_N_GCIcon@ha
addi r4, r29, scPaneName_N_GCIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
@@ -1370,8 +1370,8 @@ namespace ipl {
li r4, 0x1
bl SetVisible__Q34nw4r3lyt4PaneFb
lwz r3, 0x94(r31)
lis r30, lbl_8164DE6D@ha
addi r4, r30, lbl_8164DE6D@l
lis r30, scPaneName_N_DiscUpdateIcon@ha
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
@@ -1419,7 +1419,7 @@ namespace ipl {
bne updateDiskState_813AD134
lwz r3, 0x84(r28)
li r0, 0x0
addi r4, r29, lbl_8164DE64@l
addi r4, r29, scPaneName_N_GCIcon@l
li r5, 0x1
stb r0, 0x1b81(r3)
lwz r3, 0x94(r31)
@@ -1431,7 +1431,7 @@ namespace ipl {
li r4, 0x0
bl SetVisible__Q34nw4r3lyt4PaneFb
lwz r3, 0x94(r31)
addi r4, r30, lbl_8164DE6D@l
addi r4, r30, scPaneName_N_DiscUpdateIcon@l
li r5, 0x1
lwz r3, 0x14(r3)
lwz r12, 0x0(r3)
@@ -2087,10 +2087,11 @@ namespace ipl {
mpMoveLytDrop->getAnim()->initAnmFrame();
}
extern "C" char lbl_8164DFCB[] = "WIPL_SE_CH_TARGETTING";
extern "C" char lbl_8164DFE1[] = "WIPL_SE_CH_HOLD";
extern "C" char lbl_8164DFF1[] = "WIPL_SE_CH_SET";
extern "C" char lbl_8164E000[] = "WIPL_SE_CH_NOT_MOVE";
extern "C" char scSE_WSD_SELECT[] = "WSD_SELECT";
extern "C" char scSE_WIPL_SE_CH_TARGETTING[] = "WIPL_SE_CH_TARGETTING";
extern "C" char scSE_WIPL_SE_CH_HOLD[] = "WIPL_SE_CH_HOLD";
extern "C" char scSE_WIPL_SE_CH_SET[] = "WIPL_SE_CH_SET";
extern "C" char scSE_WIPL_SE_CH_NOT_MOVE[] = "WIPL_SE_CH_NOT_MOVE";
void ChannelSelect::calcNormalGrab() {
Button* button = getButton();
@@ -2167,7 +2168,7 @@ namespace ipl {
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
mpGui->initPane(getChannelBasePane(i));
}
snd::getSystem()->startSE(lbl_8164DE9C);
snd::getSystem()->startSE(scSE_WSD_SELECT);
return;
}
}
@@ -2193,7 +2194,7 @@ namespace ipl {
for (int i = 0; i < MAX_CHANNEL_INDEX; i++) {
mpGui->initPane(getChannelBasePane(i));
}
snd::getSystem()->startSE(lbl_8164DE9C);
snd::getSystem()->startSE(scSE_WSD_SELECT);
return;
}
}
@@ -2357,7 +2358,7 @@ namespace ipl {
case ::gui::EventHandler::ON_POINT: {
if (isReleasableArea(mCurrentPage, id) || (mCurrentPage == mMoveOldPage && id == mMoveOldIndex)) {
searchList(mCurrentPage, id)->onPoint(2);
snd::getSystem()->startSE(lbl_8164DFCB);
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
con->rumble(1);
break;
}
@@ -2438,7 +2439,7 @@ namespace ipl {
mbModuleSceneChange = true;
unk_0x185 = true;
snd::getSystem()->startSEwithPos(lbl_8164DFE1, mDragPos.x);
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_HOLD, mDragPos.x);
mState = STATE_NORMAL_GRAB;
}
@@ -2450,13 +2451,13 @@ namespace ipl {
mpMoveLytDrop->GetRootPane()->SetTranslate(translate);
mpMoveLytDrop->getAnim(0)->play();
snd::getSystem()->startSEwithPos(lbl_8164DFF1, mDragPos.x);
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_SET, mDragPos.x);
mpMoveLytMask->getAnim(1)->play();
mState = STATE_NORMAL_MOVE_CHAN_IN;
} else {
snd::getSystem()->startSEwithPos(lbl_8164E000, mDragPos.x);
snd::getSystem()->startSEwithPos(scSE_WIPL_SE_CH_NOT_MOVE, mDragPos.x);
mState = STATE_NORMAL_RELEASE_WAIT;
}
@@ -2519,8 +2520,8 @@ namespace ipl {
}
}
extern "C" char lbl_8164E024[] = "WIPL_SE_GRAY_BUTTON";
extern "C" char lbl_8164E038[] = "WIPL_SE_DECIDE";
extern "C" char scSE_WIPL_SE_GRAY_BUTTON[] = "WIPL_SE_GRAY_BUTTON";
extern "C" char scSE_WIPL_SE_DECIDE[] = "WIPL_SE_DECIDE";
void ChannelSelectEventHandler::onEvent(u32 compId, u32 event, void* data) {
gui::PaneComponent* component = static_cast<gui::PaneComponent*>(mpManager->getComponent(compId));
@@ -2561,7 +2562,7 @@ namespace ipl {
case ::gui::EventHandler::ON_POINT: {
if (mpInstance->mState == ChannelSelect::STATE_NORMAL && chanObj->isValid()) {
chanObj->onPoint(0);
snd::getSystem()->startSE(lbl_8164DFCB);
snd::getSystem()->startSE(scSE_WIPL_SE_CH_TARGETTING);
con->rumble(1);
}
break;
@@ -2599,13 +2600,13 @@ namespace ipl {
if (System::isSafeMode()) {
System::getDialog()->callBtn0(MESG_CHAN_SEL_SAFE_MODE, 180);
mpInstance->mState = ChannelSelect::STATE_NORMAL_SAFE_MODE_DIALOG;
snd::getSystem()->startSE(lbl_8164E024);
snd::getSystem()->startSE(scSE_WIPL_SE_GRAY_BUTTON);
} else {
mpInstance->setSomething();
mpInstance->mState = ChannelSelect::STATE_START_BOARD_SCENE;
mpInstance->tryToStartBoardScene();
TVRCManager::getHandle()->setEnable(FALSE);
snd::getSystem()->startSE(lbl_8164E038);
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
}
} else if (Button::cmpButtonName(paneName, Button::BTN_SETTING) == 0) {
button->setEventHandler(NULL);
@@ -2615,7 +2616,7 @@ namespace ipl {
System::getFader()->fadeOut();
TVRCManager::getHandle()->setEnable(FALSE);
mpInstance->mState = ChannelSelect::STATE_START_SETTING_SCENE;
snd::getSystem()->startSE(lbl_8164E038);
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
} else if (Button::cmpButtonName(paneName, Button::BTN_ARROW_LEFT) == 0 && mpInstance->mCurrentPage > 0) {
button->animation(Button::IDANIM_ARROW_LEFT_SELECT);
mpInstance->preparePageScrolling(ChannelSelect::STATE_PREP_LEFT_PAGE_SCROLL);
@@ -2650,7 +2651,7 @@ namespace ipl {
System::getFader()->fadeOut();
TVRCManager::getHandle()->setEnable(FALSE);
mpInstance->mState = ChannelSelect::STATE_START_SD_MENU_SCENE;
snd::getSystem()->startSE(lbl_8164E038);
snd::getSystem()->startSE(scSE_WIPL_SE_DECIDE);
}
}
break;

View File

@@ -2289,7 +2289,7 @@ namespace ipl {
unk_0x360 = false;
System::getTask1()->request(iplChannelTitle_813BA684, this, NULL);
System::getTask1()->request(markTmdReadyTask, this, NULL);
mState = STATE_WAIT_TMD;
} else {
@@ -2301,7 +2301,7 @@ namespace ipl {
unk_0x360 = false;
System::getTask1()->request(iplChannelTitle_813BA684, this, NULL);
System::getTask1()->request(markTmdReadyTask, this, NULL);
mState = STATE_WAIT_TMD;
}
@@ -2408,7 +2408,7 @@ namespace ipl {
if (mTmpTitleID != 0) {
SCSetTmpTitleID(0);
System::getTask1()->request(iplChannelTitle_813BA784, this, NULL);
System::getTask1()->request(deleteTmpTitleContentTask, this, NULL);
} else {
unk_0x370 = true;
}
@@ -2604,8 +2604,8 @@ namespace ipl {
wcscpy(limitStr, System::getMessage(MESG_CHAN_SEL_TIME_LIMIT));
wchar_t local_38[16] = L"";
wchar_t local_58[16] = L"";
wchar_t hourStr[16] = L"";
wchar_t minuteStr[16] = L"";
if (hour == 0 && minute == 0) {
swprintf(limitStr, 65, L"%ls %ls", limitStr, System::getMessage(MESG_CHAN_SEL_LIMIT_UNDER_60));
@@ -2616,42 +2616,42 @@ namespace ipl {
if (System::getLanguage() == SC_LANG_JAPANESE || System::getLanguage() == SC_LANG_KOREAN ||
System::getLanguage() == SC_LANG_GERMAN) {
if (hour == 1) {
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
} else if (hour != 0) {
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
}
if (minute == 1) {
swprintf(local_58, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
swprintf(minuteStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
} else if (minute != 0) {
swprintf(local_58, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
swprintf(minuteStr, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
}
} else if (System::getLanguage() == SC_LANG_FRENCH || System::getLanguage() == SC_LANG_ITALIAN) {
if (hour == 1) {
swprintf(local_38, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
swprintf(hourStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
} else if (hour != 0) {
swprintf(local_38, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
swprintf(hourStr, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
}
if (minute == 1) {
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
} else if (minute != 0) {
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
}
} else {
if (hour == 1) {
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
} else if (hour != 0) {
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
}
if (minute == 1) {
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
} else if (minute != 0) {
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
}
}
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, local_38, local_58);
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, hourStr, minuteStr);
}
}
}
@@ -2673,7 +2673,7 @@ namespace ipl {
chanTtl->unk_0x360 = true;
}
void ChannelTitle::iplChannelTitle_813BA684(void* work) {
void ChannelTitle::markTmdReadyTask(void* work) {
ChannelTitle* chanTtl = static_cast<ChannelTitle*>(work);
chanTtl->unk_0x360 = true;
}
@@ -2699,7 +2699,7 @@ namespace ipl {
}
#pragma pop
void ChannelTitle::iplChannelTitle_813BA784(void* work) {
void ChannelTitle::deleteTmpTitleContentTask(void* work) {
ChannelTitle* chanTtl = static_cast<ChannelTitle*>(work);
if (chanTtl->mTmpTitleID != 0) {

View File

@@ -749,7 +749,7 @@ void GCWindow::onMemEvent(long event, u8 cardState) {
break;
}
goto process_complete;
case 0x15:
default:
return;
process_complete:
@@ -758,6 +758,18 @@ void GCWindow::onMemEvent(long event, u8 cardState) {
show_button_ok();
mState = 0xe;
break;
case 0:
case 1:
case 3:
case 4:
case 5:
case 6:
case 7:
case 0xB:
case 0xD:
case 0x10:
case 0x15:
break;
}
}
}

View File

@@ -48,7 +48,7 @@ void IPLContestGSFree(void* block);
void* IPLContestGSRealloc(void* oldBlock, u32 newSize);
void* IPLContestGSMemalign(u32 align, u32 size);
void iplContest_813D54F8(BOOL success, NAT nat);
void onNatDetectionDone(BOOL success, NAT nat);
void* IPLContestAlloc(int size);
void IPLContestFree(void* block, u32 _unused);
@@ -227,7 +227,7 @@ int IPLContestProcess() {
break;
}
case 2: {
NNStartNatDetection(iplContest_813D54F8);
NNStartNatDetection(onNatDetectionDone);
g_session.unk_0x030 = 3;
OSReport("Port mapping detectioning test has been started.\n");
g_session.detectStartTime = OSGetTime();
@@ -461,7 +461,7 @@ void sNHTTPCleanupCallback() {
g_session.state = 3;
}
void iplContest_813D54F8(gsi_bool success, NAT nat) {
void onNatDetectionDone(gsi_bool success, NAT nat) {
if (success) {
g_session.nat = nat;
g_session.unk_0x03c = 0;

View File

@@ -512,25 +512,25 @@ namespace ipl {
case 12:
onDialogState12();
break;
case 13:
case 19:
onDialogState13();
break;
case 14:
case 13:
onDialogState14();
break;
case 15:
case 14:
onDialogState15();
break;
case 16:
case 15:
onDialogState16();
break;
case 17:
case 16:
onDialogState17();
break;
case 18:
case 17:
onDialogState18();
break;
case 19:
case 18:
onDialogState19();
break;
case 20:
@@ -1058,7 +1058,7 @@ namespace ipl {
}
const ESTitleId* titleEntry = &mTitleIds[mCurrentTitle];
System::getChannelManager()->fn_8133AA50(*titleEntry);
System::getChannelManager()->unloadBanner(*titleEntry);
if (mpSDChannelSelect->getWorker()->get_async_result() == 0) {
mCurrentTitle++;

View File

@@ -49,42 +49,42 @@ namespace ipl {
};
static const f32 scThumbnailOffsets[][2] = {{64.0f, 48.0f}, {85.0f, 48.0f}};
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
EGG::ExpHeap* secondHeap) NO_INLINE;
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane) NO_INLINE;
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile) NO_INLINE;
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel) NO_INLINE;
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool request) NO_INLINE;
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, bool request) NO_INLINE;
extern "C" void iplSDChannelObj_813E3580(const layout::Object* layout) NO_INLINE;
extern "C" void iplSDChannelObj_813E3858(SDChannelObj* channel) NO_INLINE;
extern "C" f32 iplSDChannelObj_813E3920(SDChannelObj* channel) NO_INLINE;
extern "C" f32 iplSDChannelObj_813E3A84(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E3B1C(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E3BA0(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E3C58(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
extern "C" void iplSDChannelObj_813E3C9C(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_813E3E38(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E3F28(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_813E3F74(SDChannelObj* channel) NO_INLINE;
extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int index) NO_INLINE;
extern "C" void iplSDChannelObj_813E413C(SDChannelObj* channel, const wchar_t* text) NO_INLINE;
extern "C" void iplSDChannelObj_813E4410(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
extern "C" void iplSDChannelObj_813E4558(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_813E4704(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E481C(SDChannelObj* channel, layout::Object* layout) NO_INLINE;
extern "C" void iplSDChannelObj_813E49A8(SDChannelObj* channel) NO_INLINE;
extern "C" BOOL iplSDChannelObj_813E4A54(SDChannelObj* channel) NO_INLINE;
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane) NO_INLINE;
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile) NO_INLINE;
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel) NO_INLINE;
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool request) NO_INLINE;
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) NO_INLINE;
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) NO_INLINE;
extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) NO_INLINE;
extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) NO_INLINE;
extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_syncLayoutsToPane(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_createPageLayout(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_setPageTranslate(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
extern "C" void iplSDChannelObj_setPageAnim(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_updatePageAnim(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_playPageAnimator(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_createDialogLayout(SDChannelObj* channel) NO_INLINE;
extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int index) NO_INLINE;
extern "C" void iplSDChannelObj_setBalloonText(SDChannelObj* channel, const wchar_t* text) NO_INLINE;
extern "C" void iplSDChannelObj_positionDialog(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
extern "C" void iplSDChannelObj_setDialogAnim(SDChannelObj* channel, int request) NO_INLINE;
extern "C" void iplSDChannelObj_updateDialogAnim(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_findNewMessageGroup(SDChannelObj* channel, layout::Object* layout) NO_INLINE;
extern "C" void iplSDChannelObj_updateNewMessage(SDChannelObj* channel) NO_INLINE;
extern "C" BOOL iplSDChannelObj_checkNewMessage(SDChannelObj* channel) NO_INLINE;
SDChannelObj::SDChannelObj(EGG::Heap* heap, int page, int index)
: mpHeap(heap), mpDialogHeap(NULL), mpChannelHeap(NULL), mState(0), mPage(page), mIndex(index),
@@ -112,42 +112,42 @@ namespace ipl {
if (mpDialogLayout != NULL)
delete mpDialogLayout;
}
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel) {
if (channel->mState == 0)
channel->mState = 2;
}
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
EGG::ExpHeap* secondHeap) {
channel->mpDialogHeap = firstHeap;
channel->mpChannelHeap = secondHeap;
}
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel) {
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel) {
if (channel->mpThumbnailData == NULL)
channel->mpThumbnailData = new (channel->mpHeap, 32) u8[0x19000];
return channel->mpThumbnailData;
}
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane) {
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane) {
channel->mpPane = pane;
}
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile) {
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile) {
if (!SDChannelSelect::isChannelReady(channel)) {
channel->mpLayoutFile = layoutFile;
if (channel->mpPageLayout == NULL)
iplSDChannelObj_813E3BA0(channel);
iplSDChannelObj_createPageLayout(channel);
if (channel->mpDialogLayout == NULL)
iplSDChannelObj_813E3F74(channel);
iplSDChannelObj_createDialogLayout(channel);
if (channel->mState == 2 || channel->mState == 1 && channel->mpPaneAnimator->isFinished()) {
iplSDChannelObj_813E3858(channel);
iplSDChannelObj_createBaseLayout(channel);
channel->mState = 3;
}
}
}
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel) {
switch (channel->mState) {
case 0:
channel->mState = 2;
@@ -157,25 +157,25 @@ namespace ipl {
break;
channel->mState = 2;
case 2:
iplSDChannelObj_813E3858(channel);
iplSDChannelObj_createBaseLayout(channel);
channel->mState = 3;
break;
case 3:
iplSDChannelObj_813E3B1C(channel);
iplSDChannelObj_syncLayoutsToPane(channel);
break;
}
}
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel) {
if (SDChannelSelect::isChannelReady(channel))
channel->mpBaseLayout->draw();
}
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel) {
channel->mpPageLayout->draw();
}
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel) {
if (channel->mpDialogLayout != NULL)
channel->mpDialogLayout->draw();
}
@@ -184,14 +184,14 @@ namespace ipl {
return (nw4r::math::VEC3&)mpBaseLayout->GetRootPane()->GetTranslate();
}
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel) {
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel) {
if (channel->mStateFlags == 0 || channel->mStateFlags == 3)
return true;
else
return false;
}
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int request) {
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int request) {
if (request & 0x10000U) {
channel->mAnimationState = 0;
} else if (request & 0x20000U) {
@@ -201,14 +201,14 @@ namespace ipl {
}
if (!(request & 1)) {
iplSDChannelObj_813E3C9C(channel, 1);
iplSDChannelObj_setPageAnim(channel, 1);
}
if (!(request & 2)) {
iplSDChannelObj_813E4558(channel, 1);
iplSDChannelObj_setDialogAnim(channel, 1);
}
}
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int request) {
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int request) {
if (request & 0x10000U) {
channel->mAnimationState = 0;
} else if (request & 0x20000U) {
@@ -218,44 +218,44 @@ namespace ipl {
}
if (!(request & 1)) {
iplSDChannelObj_813E3C9C(channel, 3);
iplSDChannelObj_setPageAnim(channel, 3);
}
if (!(request & 2)) {
iplSDChannelObj_813E4558(channel, 4);
iplSDChannelObj_setDialogAnim(channel, 4);
}
}
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool request) {
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool request) {
if (request) {
iplSDChannelObj_813E3C9C(channel, 1);
iplSDChannelObj_setPageAnim(channel, 1);
channel->mAnimationState = 1;
} else {
iplSDChannelObj_813E3C9C(channel, 0);
iplSDChannelObj_setPageAnim(channel, 0);
channel->mAnimationState = 0;
}
iplSDChannelObj_813E4558(channel, 0);
iplSDChannelObj_setDialogAnim(channel, 0);
}
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel) {
iplSDChannelObj_813E3C9C(channel, 4);
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) {
iplSDChannelObj_setPageAnim(channel, 4);
}
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int request) {
iplSDChannelObj_813E3C9C(channel, 0);
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) {
iplSDChannelObj_setPageAnim(channel, 0);
if (request) {
channel->mAnimationState = 0;
}
}
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, bool request) {
iplSDChannelObj_813E4558(channel, 0);
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) {
iplSDChannelObj_setDialogAnim(channel, 0);
if (request) {
channel->mAnimationState = 0;
}
}
extern "C" void iplSDChannelObj_813E3580(const layout::Object* layout) {
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) {
int lang = System::getLanguage();
const char* langGroup = scLangGroups[lang];
char availableLanguages[10][4] = {};
@@ -319,18 +319,18 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_813E3858(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) {
bool adjust = false;
if (channel->mpDialogLayout == NULL)
iplSDChannelObj_813E3F74(channel);
iplSDChannelObj_createDialogLayout(channel);
f32 frame;
if (iplSDChannelObj_813E3330(channel))
frame = iplSDChannelObj_813E3920(channel);
if (iplSDChannelObj_hasAppMeta(channel))
frame = iplSDChannelObj_createIconLayout(channel);
else {
frame = iplSDChannelObj_813E3A84(channel);
frame = iplSDChannelObj_createMenuLayout(channel);
adjust = true;
}
iplSDChannelObj_813E3B1C(channel);
iplSDChannelObj_syncLayoutsToPane(channel);
if (channel->mpBaseAnimator != NULL)
channel->mpBaseAnimator->play();
channel->mpBaseLayout->finishBinding();
@@ -340,11 +340,11 @@ namespace ipl {
channel->mpBaseLayout->adjustHeap();
}
extern "C" f32 iplSDChannelObj_813E3920(SDChannelObj* channel) {
extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) {
f32 frame = 0.0f;
channel->mpBaseLayout =
layout::Object::create(channel->mpHeap, 0x8000, channel->mpThumbnailData, "arc", "icon.brlyt");
iplSDChannelObj_813E3580(channel->mpBaseLayout);
iplSDChannelObj_applyLanguageGroups(channel->mpBaseLayout);
if (channel->mpBaseLayout->searchFile("icon.brlan"))
channel->mpBaseAnimator = channel->mpBaseLayout->bind("icon.brlan");
else if (channel->mpBaseLayout->searchFile("icon_Whole.brlan"))
@@ -357,30 +357,30 @@ namespace ipl {
frame = minimum + (System::getRndm()->get_u16() % (u16)(maximum - minimum));
}
if (channel->mStateFlags == 0) {
iplSDChannelObj_813E481C(channel, channel->mpBaseLayout);
iplSDChannelObj_findNewMessageGroup(channel, channel->mpBaseLayout);
channel->mNewMessageState = 1;
}
return frame;
}
extern "C" f32 iplSDChannelObj_813E3A84(SDChannelObj* channel) {
extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) {
channel->mpBaseLayout =
layout::Object::create(channel->mpHeap, 0x8000, channel->mpLayoutFile, "arc", "mn_SdcardMenu_d.brlyt");
channel->mpBaseAnimator = channel->mpBaseLayout->bind("mn_SdcardMenu_d.brlan");
return System::getRndm()->get_u16() % 2000;
}
extern "C" void iplSDChannelObj_813E3B1C(SDChannelObj* channel) {
iplSDChannelObj_813E49A8(channel);
extern "C" void iplSDChannelObj_syncLayoutsToPane(SDChannelObj* channel) {
iplSDChannelObj_updateNewMessage(channel);
nw4r::math::VEC3 position(0, 0, 0);
MTXMultVec(channel->mpPane->GetGlobalMtx(), position, position);
channel->mpBaseLayout->GetRootPane()->SetTranslate(position);
channel->mpBaseLayout->calc();
iplSDChannelObj_813E3C58(channel, position);
iplSDChannelObj_813E4410(channel, position);
iplSDChannelObj_setPageTranslate(channel, position);
iplSDChannelObj_positionDialog(channel, position);
}
extern "C" void iplSDChannelObj_813E3BA0(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_createPageLayout(SDChannelObj* channel) {
channel->mpPageLayout = new (channel->mpDialogHeap, 4)
layout::Object(channel->mpDialogHeap, channel->mpLayoutFile, "arc", "my_IplTop_d.brlyt");
@@ -388,17 +388,17 @@ namespace ipl {
channel->mpPageAnimators[i] = channel->mpPageLayout->bind(scCursorAnims[i], scCursur, false);
}
iplSDChannelObj_813E3C9C(channel, 0);
iplSDChannelObj_setPageAnim(channel, 0);
channel->mpPageLayout->finishBinding();
}
extern "C" void iplSDChannelObj_813E3C58(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
extern "C" void iplSDChannelObj_setPageTranslate(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
channel->mpPageLayout->GetRootPane()->SetTranslate(vec);
iplSDChannelObj_813E3E38(channel);
iplSDChannelObj_updatePageAnim(channel);
channel->mpPageLayout->calc();
}
extern "C" void iplSDChannelObj_813E3C9C(SDChannelObj* channel, int request) {
extern "C" void iplSDChannelObj_setPageAnim(SDChannelObj* channel, int request) {
if (request == 0) {
channel->mPageAnimation = 0;
channel->mPageAnimationFrame = 0;
@@ -413,14 +413,14 @@ namespace ipl {
channel->mPageAnimation = 4;
channel->mPageAnimationFrame = 0;
channel->mpPageLayout->GetRootPane()->SetVisible(true);
iplSDChannelObj_813E3F28(channel, 2);
iplSDChannelObj_playPageAnimator(channel, 2);
} else {
switch (channel->mPageAnimation) {
case 0: {
if (request == 1) {
channel->mPageAnimation = 1;
channel->mpPageLayout->GetRootPane()->SetVisible(true);
iplSDChannelObj_813E3F28(channel, 1);
iplSDChannelObj_playPageAnimator(channel, 1);
}
break;
}
@@ -437,7 +437,7 @@ namespace ipl {
case 2: {
if (request == 3) {
channel->mPageAnimation = 3;
iplSDChannelObj_813E3F28(channel, 0);
iplSDChannelObj_playPageAnimator(channel, 0);
}
break;
}
@@ -453,7 +453,7 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_813E3E38(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_updatePageAnim(SDChannelObj* channel) {
switch (channel->mPageAnimation) {
case 1: {
if (!channel->mpPageAnimators[1]->isPlaying()) {
@@ -472,7 +472,7 @@ namespace ipl {
break;
}
if (prev == 3) {
iplSDChannelObj_813E3C9C(channel, 3);
iplSDChannelObj_setPageAnim(channel, 3);
channel->mPageAnimationFrame = 0;
}
}
@@ -481,46 +481,46 @@ namespace ipl {
case 3: {
if (!channel->mpPageAnimators[0]->isPlaying()) {
int prev = channel->mPageAnimationFrame;
iplSDChannelObj_813E3C9C(channel, 0);
iplSDChannelObj_setPageAnim(channel, 0);
if (prev == 1) {
iplSDChannelObj_813E3C9C(channel, 1);
iplSDChannelObj_setPageAnim(channel, 1);
}
}
break;
}
case 4: {
if (!channel->mpPageAnimators[2]->isPlaying()) {
iplSDChannelObj_813E3C9C(channel, 0);
iplSDChannelObj_setPageAnim(channel, 0);
}
break;
}
}
}
extern "C" void iplSDChannelObj_813E3F28(SDChannelObj* channel, int request) {
extern "C" void iplSDChannelObj_playPageAnimator(SDChannelObj* channel, int request) {
channel->mpPageAnimators[request]->setAnmType(ANIM_TYPE_FORWARD);
channel->mpPageAnimators[request]->play();
}
extern "C" void iplSDChannelObj_813E3F74(SDChannelObj* channel) {
if (!iplSDChannelObj_813E3330(channel)) {
extern "C" void iplSDChannelObj_createDialogLayout(SDChannelObj* channel) {
if (!iplSDChannelObj_hasAppMeta(channel)) {
channel->mpDialogLayout = NULL;
return;
}
channel->mpDialogLayout = new (channel->mpChannelHeap, 4)
layout::Object(channel->mpChannelHeap, channel->mpLayoutFile, "arc", "my_IplTopBalloon_a.brlyt");
if (channel->mStateFlags == 0)
iplSDChannelObj_813E413C(channel, iplSDChannelObj_813E4060(channel, 0));
iplSDChannelObj_setBalloonText(channel, iplSDChannelObj_getLocalizedName(channel, 0));
else if (channel->mStateFlags == 3)
iplSDChannelObj_813E413C(channel, scUnknownName);
iplSDChannelObj_setBalloonText(channel, scUnknownName);
else
iplSDChannelObj_813E413C(channel, L"");
iplSDChannelObj_setBalloonText(channel, L"");
channel->mpDialogAnimator = channel->mpDialogLayout->bind("my_IplTopBalloon_a_BalloonInOut.brlan");
iplSDChannelObj_813E4558(channel, 0);
iplSDChannelObj_setDialogAnim(channel, 0);
channel->mpDialogLayout->finishBinding();
}
extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int index) {
extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int index) {
if (channel->mAppMeta.metaHdr.names[System::getLanguage()][index][0] != 0)
return channel->mAppMeta.metaHdr.names[System::getLanguage()][index];
const u32* languages = scLangLookup[System::getRegion()];
@@ -533,7 +533,7 @@ namespace ipl {
return channel->mAppMeta.metaHdr.names[languages[0]][index];
}
extern "C" void iplSDChannelObj_813E413C(SDChannelObj* channel, const wchar_t* text) {
extern "C" void iplSDChannelObj_setBalloonText(SDChannelObj* channel, const wchar_t* text) {
nw4r::lyt::TextBox* textPane =
nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(channel->mpDialogLayout->FindPaneByName(scBalloon));
@@ -585,7 +585,7 @@ namespace ipl {
channel->mpDialogLayout->FindPaneByName(scBase)->SetSize(newSize);
}
extern "C" void iplSDChannelObj_813E4410(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
extern "C" void iplSDChannelObj_positionDialog(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
if (channel->mpDialogLayout != NULL) {
nw4r::lyt::Size size;
@@ -611,12 +611,12 @@ namespace ipl {
const nw4r::math::VEC3 pos(vec.x + horizontalOffset, vec.y + verticalOffset, 0.0f);
channel->mpDialogLayout->GetRootPane()->SetTranslate(pos);
iplSDChannelObj_813E4704(channel);
iplSDChannelObj_updateDialogAnim(channel);
channel->mpDialogLayout->calc();
}
}
extern "C" void iplSDChannelObj_813E4558(SDChannelObj* channel, int request) {
extern "C" void iplSDChannelObj_setDialogAnim(SDChannelObj* channel, int request) {
if (channel->mpDialogLayout != NULL) {
if (request == 0) {
channel->mDialogState = 0;
@@ -676,11 +676,11 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_813E4704(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_updateDialogAnim(SDChannelObj* channel) {
switch (channel->mDialogState) {
case 1: {
if ((reinterpret_cast<u32&>(channel->mDialogTimer) += 1) >= 20.0f) {
iplSDChannelObj_813E4558(channel, 2);
iplSDChannelObj_setDialogAnim(channel, 2);
break;
}
}
@@ -690,9 +690,9 @@ namespace ipl {
case 2: {
if (!channel->mpDialogLayout->isPlaying(0)) {
int prev = channel->mDialogFrame;
iplSDChannelObj_813E4558(channel, 3);
iplSDChannelObj_setDialogAnim(channel, 3);
if (prev == 4) {
iplSDChannelObj_813E4558(channel, 4);
iplSDChannelObj_setDialogAnim(channel, 4);
channel->mDialogFrame = 0;
}
}
@@ -701,9 +701,9 @@ namespace ipl {
case 4: {
if (!channel->mpDialogLayout->isPlaying(0)) {
int prev = channel->mDialogFrame;
iplSDChannelObj_813E4558(channel, 0);
iplSDChannelObj_setDialogAnim(channel, 0);
if (prev == 1) {
iplSDChannelObj_813E4558(channel, 1);
iplSDChannelObj_setDialogAnim(channel, 1);
}
}
break;
@@ -711,7 +711,7 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_813E481C(SDChannelObj* channel, layout::Object* layout) {
extern "C" void iplSDChannelObj_findNewMessageGroup(SDChannelObj* channel, layout::Object* layout) {
char groupName[20];
char** lookup;
nw4r::lyt::Group* group;
@@ -752,11 +752,11 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_813E49A8(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_updateNewMessage(SDChannelObj* channel) {
if (System::getNwc24Manager() != NULL) {
switch (channel->mNewMessageState) {
case 1: {
if (iplSDChannelObj_813E4A54(channel)) {
if (iplSDChannelObj_checkNewMessage(channel)) {
channel->mNewMessageState = 2;
channel->mNewMessageFrame = 0;
}
@@ -772,7 +772,7 @@ namespace ipl {
}
}
extern "C" BOOL iplSDChannelObj_813E4A54(SDChannelObj* channel) {
extern "C" BOOL iplSDChannelObj_checkNewMessage(SDChannelObj* channel) {
if (System::getNwc24Manager() == NULL || !System::getNwc24Manager()->getNewTitleTbl(NULL)) {
return FALSE;
}

View File

@@ -113,7 +113,7 @@ namespace ipl {
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, int enabled);
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, int enabled);
SDChannelSelect::SDChannelSelect(EGG::Heap* heap)
: FaderSceneBase(heap),
@@ -213,7 +213,7 @@ namespace ipl {
SDChannelObj* channel = NULL;
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
iplSDChannelObj_813E3104(channel);
iplSDChannelObj_activateIfIdle(channel);
}
}
@@ -602,7 +602,7 @@ namespace ipl {
mpCurrentLoadedChannel = loadedChannel;
mpSDWorker->get_sd_app_meta_async(
static_cast<ESTitleId32>(notice.titleId),
static_cast<u8*>(iplSDChannelObj_813E3128(loadedChannel)),
static_cast<u8*>(iplSDChannelObj_getOrAllocThumbnailData(loadedChannel)),
&loadedChannel->mAppMeta);
mWorkerCommand = 3;
}
@@ -845,9 +845,9 @@ namespace ipl {
SDChannelObj* completed = mpCurrentLoadedChannel;
completed->mStateFlags = 0;
completed->mState = 2;
DCFlushRange(iplSDChannelObj_813E3128(mpCurrentLoadedChannel), 0x19000);
DCFlushRange(iplSDChannelObj_getOrAllocThumbnailData(mpCurrentLoadedChannel), 0x19000);
} else {
memcpy(iplSDChannelObj_813E3128(mpCurrentLoadedChannel),
memcpy(iplSDChannelObj_getOrAllocThumbnailData(mpCurrentLoadedChannel),
mpCorruptIconFile->getBuffer(), mpCorruptIconFile->getLength());
memset(&mpCurrentLoadedChannel->mAppMeta, 0, sizeof(mpCurrentLoadedChannel->mAppMeta));
SDChannelObj* completed = mpCurrentLoadedChannel;
@@ -1037,52 +1037,52 @@ namespace ipl {
}
switch (mWorkerCommand) {
case 0:
case 1:
processWorkerCommands();
break;
case 1:
case 0:
handleNandTitleUsageComplete();
break;
case 2:
handleSDTitleList();
break;
case 3:
case 4:
handleSDMountComplete();
break;
case 4:
case 5:
handleSDTitleListResult();
break;
case 5:
case 3:
handleSDChannelUpdateComplete();
break;
case 6:
case 7:
handleCopyComplete();
break;
case 7:
case 8:
handleSDLocationUpdateComplete();
break;
case 8:
case 9:
handleSDLocationReadComplete();
break;
case 9:
case 10:
handleMoveComplete();
break;
case 10:
case 11:
handleBackupFitComplete();
break;
case 11:
case 12:
handleNandSDCleanupComplete();
break;
case 12:
case 13:
handleSDDeleteComplete();
break;
case 13:
case 6:
handleSDCardReady();
break;
case 14:
case 15:
handleCardCommand();
break;
case 15:
case 14:
break;
}
@@ -1749,79 +1749,79 @@ namespace ipl {
}
switch (state) {
case 0:
case 1:
processNormalInput();
break;
case 1:
case 8:
case 9:
setPageActionFrame();
break;
case 2:
case 10:
case 11:
finishPageScroll();
break;
case 3:
case 5:
createChildScene(0x23, this, NULL, this);
mState = 6;
break;
case 4:
case 7:
advancePageAnimation();
break;
case 5:
case 12:
mState = 13;
break;
case 6:
case 14:
initializeNormalPage();
break;
case 7:
case 15:
updateDragState();
break;
case 8:
case 16:
updateDragPageTransition();
break;
case 9:
case 17:
finishDragWait();
break;
case 10:
case 18:
finishDragPageTransition();
break;
case 11:
case 19:
applyChannelMove();
break;
case 12:
case 20:
finishChannelMove();
break;
case 13:
case 21:
resetDragPreview();
break;
case 14:
finishDragPageChange();
break;
case 15:
handleFourPageDialog();
break;
case 16:
flushSaveDataAndMountSD();
break;
case 17:
handleThreePageDialog();
break;
case 18:
finishCardDialog();
break;
case 19:
finishDialogOperation();
break;
case 20:
finishDialogTransition();
break;
case 21:
case 22:
case 23:
finishDragPageChange();
break;
case 24:
handleFourPageDialog();
break;
case 25:
flushSaveDataAndMountSD();
break;
case 26:
handleThreePageDialog();
break;
case 27:
finishCardDialog();
break;
case 28:
finishDialogOperation();
break;
case 29:
finishDialogTransition();
break;
case 0:
case 2:
case 3:
case 4:
case 6:
case 13:
default:
break;
}
@@ -1835,9 +1835,9 @@ namespace ipl {
int channelIndex = channel->getIndex();
if (channelPage == mCurrentPage) {
if (mState != 5 || channelIndex != mCurrentChannelIndex) {
iplSDChannelObj_813E34E8(channel, 1);
iplSDChannelObj_resetPageAnim(channel, 1);
}
iplSDChannelObj_813E3534(channel, 1);
iplSDChannelObj_resetDialogAnim(channel, 1);
}
}
@@ -2059,19 +2059,19 @@ namespace ipl {
}
void SDChannelSelect::updateChannelObject(SDChannelObj* channel) {
iplSDChannelObj_813E3104(channel);
iplSDChannelObj_813E311C(channel, mpDialogHeap, mpChannelHeap);
iplSDChannelObj_813E3178(channel,
iplSDChannelObj_activateIfIdle(channel);
iplSDChannelObj_setHeaps(channel, mpDialogHeap, mpChannelHeap);
iplSDChannelObj_setPane(channel,
getChannelBasePane(channel->getPage(), channel->getIndex(),
mCurrentPage));
iplSDChannelObj_813E3180(channel, mpLayoutFile);
iplSDChannelObj_setLayoutFile(channel, mpLayoutFile);
}
void SDChannelSelect::calcChannelObjects() {
SDChannelObj* channel = NULL;
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
iplSDChannelObj_813E322C(channel);
iplSDChannelObj_calc(channel);
}
}
@@ -2086,9 +2086,9 @@ namespace ipl {
}
setChannelScissor(channel);
iplSDChannelObj_813E32C8(channel);
iplSDChannelObj_drawBase(channel);
if (iplSDChannelObj_813E3330(channel)) {
if (iplSDChannelObj_hasAppMeta(channel)) {
switch (mState) {
case 15:
case 16:
@@ -2154,7 +2154,7 @@ namespace ipl {
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
if (hasChannelObject(channel->getPage(), channel->getIndex())) {
iplSDChannelObj_813E3304(channel);
iplSDChannelObj_drawPage(channel);
}
}
@@ -2162,7 +2162,7 @@ namespace ipl {
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
if (hasChannelObject(channel->getPage(), channel->getIndex())) {
iplSDChannelObj_813E330C(channel);
iplSDChannelObj_drawDialog(channel);
}
}
}
@@ -2296,7 +2296,7 @@ namespace ipl {
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
int titleIndex = channel->getPage() * MAX_CHANNEL_INDEX + channel->getIndex();
if (!iplSDChannelObj_813E3330(channel) && mpChannelTitleIds[titleIndex] != 0 &&
if (!iplSDChannelObj_hasAppMeta(channel) && mpChannelTitleIds[titleIndex] != 0 &&
mbNeedsRefresh) {
channel->mStateFlags = 2;
}
@@ -2391,7 +2391,7 @@ namespace ipl {
while (channel = static_cast<SDChannelObj*>(
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
if (iplSDChannelObj_813E3330(channel)) {
if (iplSDChannelObj_hasAppMeta(channel)) {
SDChannelObj* previous = static_cast<SDChannelObj*>(
nw4r::ut::List_GetPrev(&mChannelObjects, channel));
nw4r::ut::List_Remove(&mChannelObjects, channel);
@@ -2418,7 +2418,7 @@ namespace ipl {
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
int channelIndex = channel->mPage * 12 + channel->mIndex;
if (!iplSDChannelObj_813E3330(channel) &&
if (!iplSDChannelObj_hasAppMeta(channel) &&
mpChannelTitleIds[channelIndex] != 0) {
channel->mStateFlags = 2;
}
@@ -2634,7 +2634,7 @@ namespace ipl {
initPageAnimations(
math::VEC3((nw4r::math::VEC3&)channel->mpBaseLayout->GetRootPane()->GetTranslate()),
0);
iplSDChannelObj_813E34E0(channel);
iplSDChannelObj_playPageHide(channel);
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
if (mbLeftArrowVisible) {
@@ -2982,7 +2982,7 @@ namespace ipl {
while (channel = static_cast<SDChannelObj*>(
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
iplSDChannelObj_813E34E8(channel, 1);
iplSDChannelObj_resetPageAnim(channel, 1);
}
for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) {
@@ -3004,7 +3004,7 @@ namespace ipl {
while (channel = static_cast<SDChannelObj*>(
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
iplSDChannelObj_813E34E8(channel, 1);
iplSDChannelObj_resetPageAnim(channel, 1);
}
for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) {
@@ -3066,10 +3066,10 @@ namespace ipl {
} else {
SDChannelObj* destination = findChannelObject(mDestinationPage, mDestinationIndex);
iplSDChannelObj_813E3178(
iplSDChannelObj_setPane(
static_cast<SDChannelObj*>(mpCurrentChannel),
getChannelBasePane(mDestinationPage, mDestinationIndex, mCurrentPage));
iplSDChannelObj_813E3178(
iplSDChannelObj_setPane(
destination, getChannelBasePane(mSourcePage, mSourceIndex, mCurrentPage));
SDChannelObj* current;
@@ -3083,8 +3083,8 @@ namespace ipl {
destination->mPage = sourcePage;
destination->mIndex = sourceIndex;
iplSDChannelObj_813E322C(static_cast<SDChannelObj*>(mpCurrentChannel));
iplSDChannelObj_813E322C(destination);
iplSDChannelObj_calc(static_cast<SDChannelObj*>(mpCurrentChannel));
iplSDChannelObj_calc(destination);
mpCurrentChannel = transitionAnimator;
destination->mpBaseAnimator->setCurrentFrame(mpHelpLayout->getCurrentFrame());
@@ -3208,7 +3208,7 @@ namespace ipl {
if (isChannelMoveTarget(mCurrentPage, index) ||
(mCurrentPage == mSourcePage && index == mSourceIndex)) {
SDChannelObj* channel = findChannelObject(mCurrentPage, index);
iplSDChannelObj_813E3354(channel, 2);
iplSDChannelObj_startAppear(channel, 2);
snd::getSystem()->startSE("WIPL_SE_CH_TARGETTING");
controller->rumble(1);
}
@@ -3217,7 +3217,7 @@ namespace ipl {
if (isChannelMoveTarget(mCurrentPage, index) ||
(mCurrentPage == mSourcePage && index == mSourceIndex)) {
SDChannelObj* channel = findChannelObject(mCurrentPage, index);
iplSDChannelObj_813E33EC(channel, 2);
iplSDChannelObj_startDisappear(channel, 2);
}
break;
default:
@@ -3297,7 +3297,7 @@ namespace ipl {
int channelPage = channel->getPage();
int channelIndex = channel->getIndex();
bool selected = channelPage == page && channelIndex == index;
iplSDChannelObj_813E3480(channel, selected);
iplSDChannelObj_setSelected(channel, selected);
}
snd::getSystem()->startSEwithPos("WIPL_SE_CH_HOLD", mPointerPosition.x);
@@ -3333,7 +3333,7 @@ namespace ipl {
SDChannelObj* channel = NULL;
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
channel != NULL) {
iplSDChannelObj_813E34E8(channel, 1);
iplSDChannelObj_resetPageAnim(channel, 1);
}
for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) {
@@ -3432,14 +3432,14 @@ namespace ipl {
break;
case ::gui::EventHandler::ON_POINT:
if (mpScene->mState == 1 && SDChannelSelect::isChannelReady(channel)) {
iplSDChannelObj_813E3354(channel, 0);
iplSDChannelObj_startAppear(channel, 0);
snd::getSystem()->startSE("WIPL_SE_CH_TARGETTING");
controller->rumble(1);
}
break;
case ::gui::EventHandler::ON_LEFT:
if (mpScene->mState == 1 && SDChannelSelect::isChannelReady(channel)) {
iplSDChannelObj_813E33EC(channel, 0);
iplSDChannelObj_startDisappear(channel, 0);
}
break;
}

File diff suppressed because it is too large Load Diff

View File

@@ -19,7 +19,7 @@ extern "C" {
}
extern "C" void _seBlk__Q23ipl3snd();
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
extern "C" const f32 lbl_816946A4;
extern "C" const f32 scSoundZeroF;
extern "C" const f32 lbl_816946AC;
extern "C" const f32 lbl_816946A8;
extern "C" const f32 lbl_816946B0;
@@ -265,10 +265,10 @@ namespace ipl {
li r5, 0
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
lfs f1, lbl_816946A4
lfs f1, scSoundZeroF
li r4, 0
bl SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi
lfs f1, lbl_816946A4
lfs f1, scSoundZeroF
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
bl setMasterVolume__17BannerSoundPlayerFf
addi r11, r1, 0x20
@@ -315,7 +315,7 @@ namespace ipl {
sBannerSoundPlayer.setMasterVolume(0.9f);
}
extern "C" const f32 lbl_816946A4 = 0.0f;
extern "C" const f32 scSoundZeroF = 0.0f;
void System::stopBannerSound(int unk) {
sBannerSoundPlayer.stop(unk);

View File

@@ -1,19 +1,19 @@
#include <revolution/gx/GXStruct.h>
#include <revolution/os/OSError.h>
extern "C" const unsigned char lbl_8169622C;
extern "C" const unsigned char lbl_8169622D;
extern "C" const unsigned char lbl_8169622E;
extern "C" const unsigned char lbl_8169622F;
extern "C" const char lbl_81639230[65];
extern "C" const unsigned char scRsoFatalColorR;
extern "C" const unsigned char scRsoFatalColorG;
extern "C" const unsigned char scRsoFatalColorB;
extern "C" const unsigned char scRsoFatalColorA;
extern "C" const char scRsoFatalMsg[65];
#define NW4R_DB_ASSERT_H
#define NW4R_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {*((volatile const unsigned char*)&lbl_8169622C), *((volatile const unsigned char*)&lbl_8169622D), *((volatile const unsigned char*)&lbl_8169622E), *((volatile const unsigned char*)&lbl_8169622F)}; \
GXColor front = {*((volatile const unsigned char*)&scRsoFatalColorR), *((volatile const unsigned char*)&scRsoFatalColorG), *((volatile const unsigned char*)&scRsoFatalColorB), *((volatile const unsigned char*)&scRsoFatalColorA)}; \
GXColor back = {0, 0, 0, 0}; \
OSFatal((GXColor)front, (GXColor)back, lbl_81639230); \
OSFatal((GXColor)front, (GXColor)back, scRsoFatalMsg); \
} \
}
@@ -326,15 +326,15 @@ __declspec(export) void IplRso_symbolMaker() {
wideTextWriter->CalcStringRect(&rect, L"");
}
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622C = 255;
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622D = 255;
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622E = 255;
extern "C" __declspec(section ".sdata") const unsigned char lbl_8169622F = 0;
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorR = 255;
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorG = 255;
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorB = 255;
extern "C" __declspec(section ".sdata") const unsigned char scRsoFatalColorA = 0;
extern "C" __declspec(section ".data") const char lbl_81639230[65] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
extern "C" __declspec(section ".data") const char scRsoFatalMsg[65] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
extern "C" __declspec(section ".data") __declspec(align(1)) const f32 rso_data_pad_f32 = 0.0f;
extern "C" __declspec(section ".data") __declspec(align(1)) const u16 rso_data_pad_u16 = 0;
extern "C" __declspec(section ".data") __declspec(align(1)) const u8 rso_data_pad_u8 = 0;
extern "C" __declspec(section ".sdata2") const f32 lbl_81694598 = 0.0f;
extern "C" __declspec(section ".sdata2") const f32 scRsoZeroF = 0.0f;

View File

@@ -1235,7 +1235,7 @@ namespace ipl {
#pragma pop
SEntry* Manager::fn_8133A4E0(ESTitleId titleId) {
SEntry* Manager::findEntryByTitleId(ESTitleId titleId) {
for (int page = 0; page < MAX_CHANNEL_PAGE; page++) {
for (int index = 0; index < MAX_CHANNEL_INDEX; index++) {
ESTitleId cmp = ES_TITLE_ID(mChannels[page][index].info.titleType, mChannels[page][index].info.titleCode);
@@ -1255,8 +1255,8 @@ namespace ipl {
return NULL;
}
u32 Manager::fn_8133A57C(ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
u32 Manager::getBannerCSIdx(ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel != NULL) {
return channel->metaHdr->blockHdr.bannerCSIdx;
} else {
@@ -1264,8 +1264,8 @@ namespace ipl {
}
}
u32 Manager::fn_8133A5B8(ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
u32 Manager::getSoundSize(ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel != NULL) {
return channel->metaHdr->blockHdr.soundSize;
} else {
@@ -1273,8 +1273,8 @@ namespace ipl {
}
}
BOOL Manager::fn_8133A5F0(ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
BOOL Manager::needsNetSetting(ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel != NULL && (channel->metaHdr->blockHdr.netSetting << 8)) {
return TRUE;
} else {
@@ -1282,8 +1282,8 @@ namespace ipl {
}
}
BOOL Manager::fn_8133A634(ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
BOOL Manager::usesAltSound(ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel != NULL && (channel->metaHdr->blockHdr.useAltSound << 14)) {
return TRUE;
} else {
@@ -1291,8 +1291,8 @@ namespace ipl {
}
}
BOOL Manager::fn_8133A678(ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
BOOL Manager::isMissingTicket(ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel != NULL && channel->missingTicket != FALSE) {
return TRUE;
} else {
@@ -1300,8 +1300,8 @@ namespace ipl {
}
}
BOOL Manager::fn_8133A6B8(ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
BOOL Manager::isNewsChannelV6Plus(ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel == NULL) {
return FALSE;
}
@@ -1315,8 +1315,8 @@ namespace ipl {
}
}
BOOL Manager::fn_8133A73C(ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
BOOL Manager::isOperaChannel(ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel == NULL) {
return FALSE;
}
@@ -1329,8 +1329,8 @@ namespace ipl {
}
}
nand::MetaFile* Manager::fn_8133A7A4(EGG::Heap* heap, ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
nand::MetaFile* Manager::readBannerMetaAsync(EGG::Heap* heap, ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel == NULL) {
return NULL;
}
@@ -1343,8 +1343,8 @@ namespace ipl {
}
}
nand::MetaFile* Manager::fn_8133A85C(EGG::Heap* heap, ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
nand::MetaFile* Manager::readSoundMetaAsync(EGG::Heap* heap, ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel == NULL) {
return NULL;
}
@@ -1357,8 +1357,8 @@ namespace ipl {
}
}
nand::SharedFile* Manager::fn_8133A924(EGG::Heap* heap, ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
nand::SharedFile* Manager::readBannerCSAsync(EGG::Heap* heap, ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel == NULL) {
return NULL;
}
@@ -1366,7 +1366,7 @@ namespace ipl {
if (!channel->loadedBnr || channel->info.primaryType == channel::PRIMARY_TYPE_DISK) {
return NULL;
} else {
u32 index = fn_8133A57C(titleId);
u32 index = getBannerCSIdx(titleId);
if (index == 0) {
return NULL;
}
@@ -1375,15 +1375,15 @@ namespace ipl {
}
}
void Manager::fn_8133A9F0() {
void Manager::clearTmpChannel() {
if (mTmpChannel.bnrFile != NULL) {
delete mTmpChannel.bnrFile;
}
memset(&mTmpChannel, 0, sizeof(mTmpChannel));
}
void Manager::fn_8133AA50(ESTitleId titleId) {
SEntry* channel = fn_8133A4E0(titleId);
void Manager::unloadBanner(ESTitleId titleId) {
SEntry* channel = findEntryByTitleId(titleId);
if (channel != NULL) {
channel->loadedBnr = false;
}

View File

@@ -230,34 +230,29 @@ namespace ipl {
blr
}
asm int Manager::getNumValidChannel() const {
nofralloc
li r9, 0
li r10, 0
li r4, 0
li r0, 0xc
getNumValidChannel_L1:
add r8, r3, r4
li r5, 0
mtctr r0
getNumValidChannel_L2:
add r7, r8, r5
lbz r6, 0x30(r7)
cmpwi r6, 0
beq getNumValidChannel_L3
lwz r6, 0x34(r7)
cmpwi r6, 0
beq getNumValidChannel_L3
addi r9, r9, 1
getNumValidChannel_L3:
addi r5, r5, 0x10
bdnz getNumValidChannel_L2
addi r10, r10, 1
addi r4, r4, 0xc0
cmpwi r10, 4
blt getNumValidChannel_L1
mr r3, r9
blr
int Manager::getNumValidChannel() const {
const ChannelSlot* q;
int dens = 12;
const ChannelPage* p;
int slot;
int count = 0;
int page;
u8 flag;
s32 val;
for (page = 0; page < 4; page++) {
p = (const ChannelPage*)((const u8*)this + page * 0xc0);
for (slot = 0; slot < dens; slot++) {
q = &p->slots[slot];
flag = q->valid;
if (flag != 0) {
val = q->titleId;
if (val != 0) {
count++;
}
}
}
}
return count;
}
BOOL Manager::isResetAcceptable() {
@@ -1003,39 +998,21 @@ namespace ipl {
return count - 1;
}
asm int Manager::getAvailableInList(register const ESTitleId* titleIds, register u32 titleCount) {
nofralloc
li r8, 0
li r6, 0
li r7, 0xc
mtctr r5
cmplwi r5, 0
ble getAvailableInList_L3
getAvailableInList_L1:
add r5, r4, r6
lwzx r0, r4, r6
lwz r5, 4(r5)
or. r0, r5, r0
bne getAvailableInList_L2
divw r5, r8, r7
mullw r0, r5, r7
mulli r5, r5, 0xc0
subf r0, r0, r8
add r5, r3, r5
slwi r0, r0, 4
add r5, r5, r0
lbz r0, 0x30(r5)
cmplwi r0, 1
beq getAvailableInList_L2
mr r3, r8
blr
getAvailableInList_L2:
addi r8, r8, 1
addi r6, r6, 8
bdnz getAvailableInList_L1
getAvailableInList_L3:
li r3, -1
blr
int Manager::getAvailableInList(const ESTitleId* titleIds, u32 titleCount) {
int dens = 12;
u32 i;
for (i = 0; i < titleCount; i++) {
if (titleIds[i] == 0) {
int page = (int)i / dens;
int slot = (int)i % dens;
u8* p = (u8*)this + page * 0xc0;
p += slot * 16;
if (*(p + 0x30) != 1) {
return (int)i;
}
}
}
return -1;
}
asm int Manager::isEqualChannel(register ESTitleId titleId0, register ESTitleId titleId1) {

View File

@@ -152,81 +152,81 @@ Rvl_decode_szs_done:
}
#else
int Rvl_decode_szs(u8* out, u8* in) {
register u8* pbVar1;
register u8 bVar2;
register u8 bVar3;
register u8* pbVar5;
register int iVar6;
register int iVar7;
register u32 uVar8;
register u32 uVar9;
register u32 uVar10;
register u32 param_5;
iVar6 = *(int*)(in + 4);
uVar8 = 0;
register u8* copySrc;
register u8 hdrByte;
register u8 extLenByte;
register u8* inPtr;
register int decodedSize;
register int remaining;
register u32 bitMask;
register u32 copyLen;
register u32 blockCount;
register u32 flags;
decodedSize = *(int*)(in + 4);
bitMask = 0;
in += 0x10;
iVar7 = iVar6;
remaining = decodedSize;
do {
next:
while (1) {
uVar8 >>= 1;
pbVar5 = in;
if (uVar8 == 0) {
param_5 = *in;
uVar8 = 0x80;
pbVar5 = in + 1;
bitMask >>= 1;
inPtr = in;
if (bitMask == 0) {
flags = *in;
bitMask = 0x80;
inPtr = in + 1;
}
bVar2 = *pbVar5;
if ((uVar8 & param_5) == 0) {
hdrByte = *inPtr;
if ((bitMask & flags) == 0) {
break;
}
in = pbVar5 + 1;
iVar7--;
*out = bVar2;
in = inPtr + 1;
remaining--;
*out = hdrByte;
out++;
if (iVar7 != 0) {
if (remaining != 0) {
goto next;
}
goto done;
}
uVar9 = bVar2 >> 4;
in = pbVar5 + 2;
if (uVar9 == 0) {
bVar3 = *in;
in = pbVar5 + 3;
uVar9 = bVar3 + 0x10;
copyLen = hdrByte >> 4;
in = inPtr + 2;
if (copyLen == 0) {
extLenByte = *in;
in = inPtr + 3;
copyLen = extLenByte + 0x10;
}
pbVar5 = out - (((bVar2 & 0xf) << 8) | pbVar5[1]);
iVar7 = (iVar7 - uVar9) - 2;
*out = pbVar5[-1];
out[1] = *pbVar5;
pbVar5 += 2;
uVar10 = uVar9 >> 3;
inPtr = out - (((hdrByte & 0xf) << 8) | inPtr[1]);
remaining = (remaining - copyLen) - 2;
*out = inPtr[-1];
out[1] = *inPtr;
inPtr += 2;
blockCount = copyLen >> 3;
out += 2;
if (uVar10 != 0) {
if (blockCount != 0) {
do {
*out = pbVar5[-1];
out[1] = *pbVar5;
out[2] = pbVar5[1];
out[3] = pbVar5[2];
out[4] = pbVar5[3];
out[5] = pbVar5[4];
out[6] = pbVar5[5];
out[7] = pbVar5[6];
pbVar5 += 8;
*out = inPtr[-1];
out[1] = *inPtr;
out[2] = inPtr[1];
out[3] = inPtr[2];
out[4] = inPtr[3];
out[5] = inPtr[4];
out[6] = inPtr[5];
out[7] = inPtr[6];
inPtr += 8;
out += 8;
uVar10--;
} while (uVar10 != 0);
blockCount--;
} while (blockCount != 0);
}
for (uVar9 &= 7; uVar9 != 0; uVar9--) {
pbVar1 = pbVar5 - 1;
pbVar5++;
*out = *pbVar1;
for (copyLen &= 7; copyLen != 0; copyLen--) {
copySrc = inPtr - 1;
inPtr++;
*out = *copySrc;
out++;
}
} while (0 < iVar7);
} while (0 < remaining);
done:
return iVar6;
return decodedSize;
}
#endif
#ifdef __MWERKS__
@@ -490,225 +490,225 @@ L_Rvl_decode_ash_return:
}
#else
int Rvl_decode_ash(u8* out, u8* in) {
u8* puVar1;
u32* puVar2;
u32 uVar3;
u32 uVar4;
u32 uVar5;
u32 uVar6;
int iVar7;
u16 uVar8;
u16 uVar10;
u8* puVar9;
int iVar11;
u32 uVar12;
u32 uVar13;
u32 uVar14;
u32 uVar15;
int iVar16;
int iVar17;
u32 uVar18;
u32 uVar19;
u32 uVar20;
u16* puVar21;
u8* dst;
u32* inWordPtr;
u32 decodedSize;
u32 sym9;
u32 sym11;
u32 nodeVal;
int needBits;
u16 nodeCount;
u16 nextNode;
u8* litPtr;
int bitOff1;
u32 bitPos1;
u32 shifted;
u32 bitWord1;
u32 tmp15;
int stackDepth;
int bitOff2;
u32 bitPos2;
u32 bitWord2;
u32 tmp20;
u16* stackPtr;
uVar3 = *(u32*)(in + 4) & 0xffffff;
iVar11 = 0x10;
uVar12 = 0;
uVar18 = 0;
uVar19 = *(u32*)(*(int*)(in + 8) + in);
iVar17 = *(int*)(in + 8) + 4;
puVar21 = (u16*)&work[0x4ff8];
uVar8 = 0x200;
iVar16 = 0;
uVar14 = *(u32*)(in + 0xc);
uVar10 = 0x200;
decodedSize = *(u32*)(in + 4) & 0xffffff;
bitOff1 = 0x10;
bitPos1 = 0;
bitPos2 = 0;
bitWord2 = *(u32*)(*(int*)(in + 8) + in);
bitOff2 = *(int*)(in + 8) + 4;
stackPtr = (u16*)&work[0x4ff8];
nodeCount = 0x200;
stackDepth = 0;
bitWord1 = *(u32*)(in + 0xc);
nextNode = 0x200;
do {
while (1) {
if (uVar12 == 0x1f) {
uVar13 = *(u32*)(in + iVar11);
uVar12 = 0;
iVar11 = iVar11 + 4;
if (bitPos1 == 0x1f) {
shifted = *(u32*)(in + bitOff1);
bitPos1 = 0;
bitOff1 = bitOff1 + 4;
} else {
uVar12 = uVar12 + 1;
uVar13 = uVar14 << 1;
bitPos1 = bitPos1 + 1;
shifted = bitWord1 << 1;
}
if (-1 < (int)uVar14) {
if (-1 < (int)bitWord1) {
break;
}
*puVar21 = uVar10 | 0x8000;
puVar21[1] = uVar10 | 0x4000;
puVar21 = puVar21 + 2;
iVar16 = iVar16 + 2;
uVar8 = uVar8 + 1;
uVar14 = uVar13;
uVar10 = uVar10 + 1;
*stackPtr = nextNode | 0x8000;
stackPtr[1] = nextNode | 0x4000;
stackPtr = stackPtr + 2;
stackDepth = stackDepth + 2;
nodeCount = nodeCount + 1;
bitWord1 = shifted;
nextNode = nextNode + 1;
}
iVar7 = uVar12 + 9;
if (iVar7 < 0x21) {
uVar4 = uVar13 >> 0x17;
if (iVar7 == 0x20) {
uVar14 = *(u32*)(in + iVar11);
uVar12 = 0;
iVar11 = iVar11 + 4;
needBits = bitPos1 + 9;
if (needBits < 0x21) {
sym9 = shifted >> 0x17;
if (needBits == 0x20) {
bitWord1 = *(u32*)(in + bitOff1);
bitPos1 = 0;
bitOff1 = bitOff1 + 4;
} else {
uVar14 = uVar13 << 9;
uVar12 = uVar12 + 9;
bitWord1 = shifted << 9;
bitPos1 = bitPos1 + 9;
}
} else {
puVar2 = (u32*)(in + iVar11);
iVar11 = iVar11 + 4;
uVar4 = uVar13 >> 0x17 | *puVar2 >> (0x40U - iVar7 & 0x3f);
uVar12 = uVar12 - 0x17;
uVar14 = *puVar2 << (uVar12 & 0x3f);
inWordPtr = (u32*)(in + bitOff1);
bitOff1 = bitOff1 + 4;
sym9 = shifted >> 0x17 | *inWordPtr >> (0x40U - needBits & 0x3f);
bitPos1 = bitPos1 - 0x17;
bitWord1 = *inWordPtr << (bitPos1 & 0x3f);
}
while (1) {
puVar21 = puVar21 - 1;
uVar10 = *puVar21;
iVar16 = iVar16 - 1;
iVar7 = (uVar10 & 0x3fff) * 2;
if ((uVar10 & 0x8000) == 0) {
stackPtr = stackPtr - 1;
nextNode = *stackPtr;
stackDepth = stackDepth - 1;
needBits = (nextNode & 0x3fff) * 2;
if ((nextNode & 0x8000) == 0) {
break;
}
*(u16*)(&work[0x7fe] + iVar7) = (u16)uVar4;
uVar4 = uVar10 & 0x3fff;
if (iVar16 == 0) {
uVar8 = 0x800;
iVar16 = 0;
uVar10 = 0x800;
*(u16*)(&work[0x7fe] + needBits) = (u16)sym9;
sym9 = nextNode & 0x3fff;
if (stackDepth == 0) {
nodeCount = 0x800;
stackDepth = 0;
nextNode = 0x800;
do {
while (1) {
if (uVar18 == 0x1f) {
uVar13 = *(u32*)(in + iVar17);
uVar18 = 0;
iVar17 = iVar17 + 4;
if (bitPos2 == 0x1f) {
shifted = *(u32*)(in + bitOff2);
bitPos2 = 0;
bitOff2 = bitOff2 + 4;
} else {
uVar18 = uVar18 + 1;
uVar13 = uVar19 << 1;
bitPos2 = bitPos2 + 1;
shifted = bitWord2 << 1;
}
if (-1 < (int)uVar19) {
if (-1 < (int)bitWord2) {
break;
}
*puVar21 = uVar10 | 0x8000;
puVar21[1] = uVar10 | 0x4000;
puVar21 = puVar21 + 2;
iVar16 = iVar16 + 2;
uVar8 = uVar8 + 1;
uVar19 = uVar13;
uVar10 = uVar10 + 1;
*stackPtr = nextNode | 0x8000;
stackPtr[1] = nextNode | 0x4000;
stackPtr = stackPtr + 2;
stackDepth = stackDepth + 2;
nodeCount = nodeCount + 1;
bitWord2 = shifted;
nextNode = nextNode + 1;
}
iVar7 = uVar18 + 0xb;
if (iVar7 < 0x21) {
uVar5 = uVar13 >> 0x15;
if (iVar7 == 0x20) {
uVar19 = *(u32*)(in + iVar17);
uVar18 = 0;
iVar17 = iVar17 + 4;
needBits = bitPos2 + 0xb;
if (needBits < 0x21) {
sym11 = shifted >> 0x15;
if (needBits == 0x20) {
bitWord2 = *(u32*)(in + bitOff2);
bitPos2 = 0;
bitOff2 = bitOff2 + 4;
} else {
uVar19 = uVar13 << 0xb;
uVar18 = uVar18 + 0xb;
bitWord2 = shifted << 0xb;
bitPos2 = bitPos2 + 0xb;
}
} else {
puVar2 = (u32*)(in + iVar17);
iVar17 = iVar17 + 4;
uVar5 = uVar13 >> 0x15 | *puVar2 >> (0x40U - iVar7 & 0x3f);
uVar18 = uVar18 - 0x15;
uVar19 = *puVar2 << (uVar18 & 0x3f);
inWordPtr = (u32*)(in + bitOff2);
bitOff2 = bitOff2 + 4;
sym11 = shifted >> 0x15 | *inWordPtr >> (0x40U - needBits & 0x3f);
bitPos2 = bitPos2 - 0x15;
bitWord2 = *inWordPtr << (bitPos2 & 0x3f);
}
while (1) {
puVar21 = puVar21 - 1;
uVar10 = *puVar21;
iVar16 = iVar16 - 1;
iVar7 = (uVar10 & 0x3fff) * 2;
if ((uVar10 & 0x8000) == 0) {
stackPtr = stackPtr - 1;
nextNode = *stackPtr;
stackDepth = stackDepth - 1;
needBits = (nextNode & 0x3fff) * 2;
if ((nextNode & 0x8000) == 0) {
break;
}
*(u16*)(&work[0x2ffa] + iVar7) = (u16)uVar5;
uVar5 = uVar10 & 0x3fff;
uVar6 = uVar4;
uVar13 = uVar3;
if (iVar16 == 0) {
*(u16*)(&work[0x2ffa] + needBits) = (u16)sym11;
sym11 = nextNode & 0x3fff;
nodeVal = sym9;
shifted = decodedSize;
if (stackDepth == 0) {
do {
while (0x1ff < uVar6) {
if (uVar12 == 0x1f) {
uVar15 = *(u32*)(in + iVar11);
iVar11 = iVar11 + 4;
uVar12 = 0;
while (0x1ff < nodeVal) {
if (bitPos1 == 0x1f) {
tmp15 = *(u32*)(in + bitOff1);
bitOff1 = bitOff1 + 4;
bitPos1 = 0;
} else {
uVar12 = uVar12 + 1;
uVar15 = uVar14 << 1;
bitPos1 = bitPos1 + 1;
tmp15 = bitWord1 << 1;
}
if ((int)uVar14 < 0) {
uVar6 = *(u16*)(&work[0x7fe] + uVar6 * 2);
uVar14 = uVar15;
if ((int)bitWord1 < 0) {
nodeVal = *(u16*)(&work[0x7fe] + nodeVal * 2);
bitWord1 = tmp15;
} else {
uVar6 = *(u16*)((u8*)work + uVar6 * 2);
uVar14 = uVar15;
nodeVal = *(u16*)((u8*)work + nodeVal * 2);
bitWord1 = tmp15;
}
}
uVar15 = uVar5;
if (uVar6 < 0x100) {
*out = (char)uVar6;
tmp15 = sym11;
if (nodeVal < 0x100) {
*out = (char)nodeVal;
out = out + 1;
uVar13 = uVar13 - 1;
shifted = shifted - 1;
} else {
while (0x7ff < uVar15) {
if (uVar18 == 0x1f) {
uVar20 = *(u32*)(in + iVar17);
iVar17 = iVar17 + 4;
uVar18 = 0;
while (0x7ff < tmp15) {
if (bitPos2 == 0x1f) {
tmp20 = *(u32*)(in + bitOff2);
bitOff2 = bitOff2 + 4;
bitPos2 = 0;
} else {
uVar18 = uVar18 + 1;
uVar20 = uVar19 << 1;
bitPos2 = bitPos2 + 1;
tmp20 = bitWord2 << 1;
}
if ((int)uVar19 < 0) {
uVar15 = *(u16*)(&work[0x2ffa] + uVar15 * 2);
uVar19 = uVar20;
if ((int)bitWord2 < 0) {
tmp15 = *(u16*)(&work[0x2ffa] + tmp15 * 2);
bitWord2 = tmp20;
} else {
uVar15 = *(u16*)(&work[0xffc] + uVar15 * 2);
uVar19 = uVar20;
tmp15 = *(u16*)(&work[0xffc] + tmp15 * 2);
bitWord2 = tmp20;
}
}
uVar6 = uVar6 - 0xfd;
puVar9 = out - uVar15;
uVar13 = uVar13 - uVar6;
uVar15 = uVar6 >> 3;
if (uVar15 == 0) {
goto LAB_813325b8;
nodeVal = nodeVal - 0xfd;
litPtr = out - tmp15;
shifted = shifted - nodeVal;
tmp15 = nodeVal >> 3;
if (tmp15 == 0) {
goto copy_lit_tail;
}
do {
*out = puVar9[-1];
out[1] = *puVar9;
out[2] = puVar9[1];
out[3] = puVar9[2];
out[4] = puVar9[3];
out[5] = puVar9[4];
out[6] = puVar9[5];
out[7] = puVar9[6];
puVar9 = puVar9 + 8;
*out = litPtr[-1];
out[1] = *litPtr;
out[2] = litPtr[1];
out[3] = litPtr[2];
out[4] = litPtr[3];
out[5] = litPtr[4];
out[6] = litPtr[5];
out[7] = litPtr[6];
litPtr = litPtr + 8;
out = out + 8;
uVar15 = uVar15 - 1;
} while (uVar15 != 0);
for (uVar6 = uVar6 & 7; uVar6 != 0; uVar6 = uVar6 - 1) {
LAB_813325b8:
puVar1 = puVar9 - 1;
puVar9 = puVar9 + 1;
*out = *puVar1;
tmp15 = tmp15 - 1;
} while (tmp15 != 0);
for (nodeVal = nodeVal & 7; nodeVal != 0; nodeVal = nodeVal - 1) {
copy_lit_tail:
dst = litPtr - 1;
litPtr = litPtr + 1;
*out = *dst;
out = out + 1;
}
}
uVar6 = uVar4;
} while (uVar13 != 0);
return uVar3;
nodeVal = sym9;
} while (shifted != 0);
return decodedSize;
}
}
*(u16*)(&work[0xffc] + iVar7) = (u16)uVar5;
uVar10 = uVar8;
*(u16*)(&work[0xffc] + needBits) = (u16)sym11;
nextNode = nodeCount;
} while (1);
}
}
*(u16*)((u8*)work + iVar7) = (u16)uVar4;
uVar10 = uVar8;
*(u16*)((u8*)work + needBits) = (u16)sym9;
nextNode = nodeCount;
} while (1);
}
#endif

View File

@@ -0,0 +1,358 @@
# tiInputForm continuation
Baseline quick gate: instruction-exact 214/221; objdiff 216/221; code 45080/50656; data 908/3772; asm bodies 3; pool identical; regressions 0; DOL SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
Structural diagnosis before experiments:
- onCursor: same 0x120 frame and 473 instructions; five differences at width temporaries and two multiplication operands. Inline Rect accessors affect operand form.
- calcCursorPos: same 0xf0 frame and 326 instructions; scale components occupy reversed FP registers, rectangle arithmetic is jointly scheduled rather than the target's separate inline height/width boundaries.
- LayoutByNW4R::create: 352/356 instructions; initial root query uses virtual getPane instead of direct FindPaneByName; later conditional query hoists receiver loads; animation-file pointer is cached across calls where target reloads it.
- setLanguage: same frame and 237 instructions; two conditional pane-name blocks hoist layout/root loads before branch. No string-pool divergence.
- Concatenated isEnableCursorCache/getStartPos: original eight-byte symbol covers two existing members. No source/config renaming or resizing allowed.
- disasm_fn stops at paired-single instructions on this Capstone build; ctxdiff and per-instruction declsearch decoding expose the full body.
Initial nine cursor trials were rerun with corrected pool_diff arguments below. First copies without pool output are excluded from the audit.
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-0 | 540b49819992 | score (0, 4) instructions 473/473 |
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-1 | 1018ca1bcebf | score (0, 3) instructions 473/473 |
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-2 | 10371ce40618 | score (10, 17) instructions 473/473 |
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-3 | f728d01ca4c9 | score (0, 4) instructions 473/473 |
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-4 | 318a3e072a93 | score (4, 8) instructions 473/473 |
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-0 | df65ad444316 | score (14, 17) instructions 473/473 |
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-1 | 39992fee9a8b | score (14, 17) instructions 473/473 |
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-2 | db564c79896e | score (0, 7) instructions 473/473 |
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-3 | 9868b91a4ea9 | score (0, 3) instructions 473/473 |
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-0 | 540b49819992 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-1 | 1018ca1bcebf | score (0, 3) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-2 | 10371ce40618 | score (10, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-3 | f728d01ca4c9 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-accessor-boundary-4 | 318a3e072a93 | score (4, 8) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-0 | df65ad444316 | score (14, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-1 | 39992fee9a8b | score (14, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-2 | db564c79896e | score (0, 7) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-center-helper-3 | 9868b91a4ea9 | score (0, 3) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-0 | fbfea889b955 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-1 | 30287152ca58 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-2 | db5ab9c485e4 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-3 | 03cd168ad159 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-4 | 58ce0d8ec056 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-5 | 74a1b2358802 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-6 | a5f82cf8538b | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-7 | b147b955a959 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-8 | 3930e547f58d | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-9 | ba9eb102785b | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-10 | 7ad938b508c7 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-reuse-rectangle-11 | 3c182590a36c | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-0 | d11215cf5e08 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-0 | 266cd86b5276 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-0 | 9cfc32375c4d | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-1 | 3afe057a0e80 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-1 | 49f309a1542e | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-1 | 21300e88c458 | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-2 | 6040e571ab84 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-2 | 68e4541c6b7e | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-2 | 420ff29a9882 | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-3 | 6e91b9f42d87 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-3 | 11a0ffa84178 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-3 | e9c8fd782fdc | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-4 | e91f413718f5 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-4 | b6eb44567fbb | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-4 | 4a9aa7494020 | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-0-5 | f728d01ca4c9 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-1-5 | 67c80fb73b61 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-decl-scope-2-5 | 15913b71258b | score (0, 6) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-0 | 229f61d14189 | score (26, 43) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-1 | 0c12625beaf2 | score (26, 43) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-2 | b2f56ff914f1 | score (80, 235) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-3 | 721eb7bbb34b | score (80, 235) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-4 | 23f72561d7f1 | score (26, 54) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-5 | 7382d3822dec | score (26, 54) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-6 | c099e471bba7 | score (26, 54) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-7 | b8accdca32b1 | score (26, 54) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-8 | 0c49513b1190 | score (72, 329) instructions 331/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-9 | 567002642739 | score (72, 329) instructions 331/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-10 | 30a4359e3249 | score (245, 397) instructions 401/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-inline-geometry-11 | 81459b226e6c | score (245, 397) instructions 401/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-0 | ce49aebb516b | score (0, 5) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-1 | a135e0144bc9 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-2 | c286200c90fa | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-3 | e8a7bfb851a4 | score (0, 3) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-4 | 8c86eb679ff1 | score (0, 7) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-5 | 293a7c71503b | score (14, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-6 | b01025a3ca45 | score (0, 7) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-7 | 2003dd441280 | score (0, 7) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-8 | 917a6209708b | score (14, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-9 | d9346cd0dc50 | score (0, 7) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-10 | e70ab2990eaf | score (10, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-11 | 9a1a3c6f0761 | score (0, 4) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-12 | 20b779c34e7e | score (10, 17) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-operand-helper-13 | 93c0fbd6d383 | score (0, 3) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-0 | de89b173bcd2 | score (0, 2) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-1 | 859f4ef7ab72 | score (0, 1) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-2 | 87ff22954cef | score (0, 2) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-3 | 1097890e7782 | score (0, 1) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-4 | 81faa3d995dc | score (0, 1) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
onCursor__Q39textinput9inputform4BaseFPQ49textinput10textdrawer4Base9CursorPos | cursor-all-accessors-5 | 8e7f6ceaecca | score (0, 0) instructions 473/473 | POOL IDENTICAL up to 20 (mine=20 base=20)
Accepted onCursor: fresh full gate PASS; objdiff 100.0%; ctxdiff 473/473, diffs 0; pool identical; regressions 0; readability/forbidden 0; DOL correct. Inline width accessors throughout onCursor plus a single centered width expression preserve target temporary homes and multiplication operands. Shared headers unchanged.
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-0 | 0d0c42639971 | score (24, 186) instructions 239/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-1 | a2a02ac0dc07 | score (24, 186) instructions 239/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-2 | build failed; excluded
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-3 | fdbfdb7f264d | score (12, 22) instructions 237/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-4 | e659de7a358f | score (12, 22) instructions 237/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-5 | 9f7f572dbf04 | score (23, 190) instructions 252/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-selector-boundary-6 | ba10179ece2a | score (31, 190) instructions 252/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-0 | 8e7f6ceaecca | score (20, 230) instructions 352/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-1 | 0a364a04c1a3 | score (15, 178) instructions 354/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-2 | 3dd47ea1b7d0 | score (11, 231) instructions 354/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-3 | eefda73f93e6 | score (6, 153) instructions 356/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-4 | 9420eff8e29f | score (20, 230) instructions 352/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-5 | 01d2c5a19793 | score (15, 178) instructions 354/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-6 | 62883ff07dd4 | score (11, 231) instructions 354/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | layoutcreate-query-file-slots-7 | 379e110e3fb7 | score (6, 153) instructions 356/356 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-0 | f1745af389f0 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-1 | build failed; excluded
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-2 | 29237d032c25 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-3 | d100c1be01c9 | score (0, 27) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-4 | 53166392bdfb | score (0, 27) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-5 | build failed; excluded
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-6 | 8eb55addec1d | score (0, 27) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-row-helper-7 | 229f003b20cb | score (0, 27) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-0 | build failed; excluded
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-1 | build failed; excluded
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-2 | build failed; excluded
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-3 | build failed; excluded
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-4 | build failed; excluded
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-5 | build failed; excluded
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-6 | build failed; excluded
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-7 | build failed; excluded
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-8 | build failed; excluded
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-9 | build failed; excluded
Assembly conversion diagnosis:
- Base::create target frame 0x20, 72 instructions. First C++ form has identical structure and frame, 26 register differences confined to circular row removal/insertion. The inline-helper boundary trials retain structure but change row/index register homes.
- Base::calc target frame 0x40, 165 instructions. Animation, kana timer and color interpolation calls are structurally represented; remaining checks compare sine angle operands, float conversion/store scheduling and counter/phase updates.
- RowInfoManager::init target leaf, 39 instructions. u16 loop index; row Back/Next/StrCount/DispRowCount stores; target re-reads capacity for free/active sentinels and uses update-address stores.
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-0 | 239a30680a4e | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-1 | d0c86385a93f | score (15, 21) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-2 | 0f58ed0ac038 | score (15, 21) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-3 | 49b8cf4e2fec | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-4 | 04b55da1bd68 | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-5 | 618bd5ec4be4 | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-6 | 33ff141f1f0a | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-7 | 1e799393dd2d | score (15, 24) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-8 | 9e6d79635811 | score (19, 22) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-9 | 33bef97a5cd5 | score (13, 21) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-0 | ec8b1b6f2d22 | score (8, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-1 | 09e37bef8e4a | score (8, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-2 | e789d7c358de | score (7, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-3 | 83832dfadf25 | score (7, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-4 | 86c40292827f | score (8, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-5 | d2f1f0e27b81 | score (8, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-6 | 4a519ea9b66e | score (7, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-head-boundary-7 | 417c06aece08 | score (7, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-inspect | 49b8cf4e2fec | score (15, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-0 | 2126f11ffa6e | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-1 | dafd3daec426 | score (10, 16) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-2 | 1ee30699a55d | score (10, 16) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-3 | 1e7b8c222fa3 | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-4 | 35c8f47bee42 | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-5 | 6767ce1a898b | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-6 | 43069bea0824 | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
Calc semantic correction from target offsets: 0x78 is Decolated::isOnSustain, not 0xC0 isKanaFix. The store at Base+0x100 is mfDrawScrollY, not CharWriter cursorY. Initial calc trials used these incorrect APIs and were not candidates; corrected and rerun.
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-7 | ce8459d74e29 | score (10, 19) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-8 | a76720f622cd | score (14, 17) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-color-sine-boundary-9 | 6777eef4b9ad | score (8, 16) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-corrected-inspect | 1e7b8c222fa3 | score (10, 14) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-init-inspect | ec8b1b6f2d22 | score (8, 15) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-0 | 4640f7059093 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-1 | 2ba30cd77e4b | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-2 | 7f88daa38038 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-3 | 48a587ce1fde | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-4 | f18185222219 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-5 | 2ce8c5cc738f | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-6 | f3dfcf774839 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-7 | 2ce8c5cc738f | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-8 | ca4f607b4fd7 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-9 | 3b2250a30010 | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-10 | ca4f607b4fd7 | score (0, 5) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-blue-angle-phase-staging-11 | a18dc38b6b17 | score (4, 9) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-0 | aa8541648f06 | score (5, 20) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-1 | e21fdd48c5c6 | score (5, 20) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-2 | faca7686c58e | score (5, 20) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-3 | b4249a99d930 | score (5, 20) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-4 | 9ab268f25ddd | score (5, 20) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-5 | ee59a86845cc | score (5, 16) instructions 166/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-6 | a3120eb506b9 | score (2, 6) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-7 | 1fe2ad3b1397 | score (2, 6) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-8 | a1beabe08f52 | score (2, 6) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-9 | 363f9e0250f8 | score (2, 6) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-10 | 79f77912079d | score (2, 6) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-11 | 902951983695 | score (2, 2) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-12 | 7b9abaf39016 | score (0, 4) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-13 | ffac791f24ec | score (0, 4) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-14 | be4f91ea1749 | score (0, 4) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-15 | b438cb6f1be9 | score (0, 4) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-16 | 862dc5c969dd | score (0, 4) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
calc__Q39textinput9inputform4BaseFv | calc-conversion-phase-order-17 | 2576056bcbd8 | score (0, 0) instructions 165/165 | POOL IDENTICAL up to 20 (mine=20 base=20)
Accepted Base::calc conversion: fresh full gate PASS; exact-name objdiff 100.0%; ctxdiff 165/165, diffs 0; pool identical; regressions/readability/forbidden 0; DOL correct. Ordinary phase, angle and blue locals plus inline sine/phase helpers reproduce conversion scheduling. Asm bodies 3 -> 2. Shared headers unchanged.
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-0 | dfc2c3928b7b | score (6, 29) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-1 | 79524dce7876 | score (1, 19) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-2 | 6ac603673f04 | score (7, 29) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-3 | de7cfab457b6 | score (1, 13) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-4 | e8c333cd6103 | score (6, 29) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-5 | 8a721e15fd5f | score (1, 19) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-6 | 86f2f41a660b | score (7, 29) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-loop-inline-boundary-7 | 28aa8b233900 | score (1, 13) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-helper-inspect | de7cfab457b6 | score (1, 13) instructions 40/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-0 | 1e041c5fef80 | score (30, 44) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-1 | 4f7f7c023d8b | score (30, 41) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-2 | 00e14a2f6393 | score (26, 43) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-3 | 0d019d99741b | score (26, 43) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-4 | 5627486657ea | score (47, 274) instructions 328/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-5 | 8868c258fb15 | score (47, 274) instructions 328/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-6 | 8d4526a2623b | score (43, 274) instructions 328/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-7 | 4031d758a885 | score (43, 274) instructions 328/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-8 | d143733e3881 | score (87, 236) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-9 | b4f2b359a081 | score (87, 236) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-10 | defd99d47ba5 | score (83, 236) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-width-height-staging-11 | 411946c62b40 | score (83, 236) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
init__Q49textinput9inputform4Base14RowInfoManagerFv | rows-sentinel-link-pointer-0 | da8f49bed7c6 | score (0, 0) instructions 39/39 | POOL IDENTICAL up to 20 (mine=20 base=20)
RowInfoManager::init exact source: the inline initialization loop returns its final capacity read; the caller obtains the free sentinel separately, then retains one row-array pointer while linking last/first free rows. This removes the erroneous extra pointer reload after the last-row Next store. All 39 instructions now match.
Accepted RowInfoManager::init conversion: fresh full gate PASS; exact-name objdiff 100.0%; ctxdiff 39/39, diffs 0; pool identical; regressions/readability/forbidden 0; DOL correct; asm bodies 2 -> 1. Shared headers unchanged.
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-0 | e042cd32ef69 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-1 | ade50018c439 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-2 | 599cf4ca313c | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-3 | 49a2bbe294f3 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-4 | 62954c466ad1 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-5 | 91272c7d5545 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-6 | a53d64c51aa3 | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-7 | e39b83eaa20b | score (40, 84) instructions 110/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
Conversion integration check: the full row-init gate passed exact/regression checks, but LayoutByNW4R::create fell from 95.02809% to 84.07865% because MWCC auto-inlined the newly available initializer. Target create explicitly calls RowInfoManager::init. Definition-only never_inline was too late for earlier callers. Added the repository-standard never_inline declaration only for TIINPUTFORM_IMPLEMENTATION inside the existing RowInfoManager guard; the TIMANAGER side retains its original void init declaration. Only this .cpp defines TIINPUTFORM_IMPLEMENTATION. No guard was removed or widened. Fresh full gate follows before committing this boundary correction.
Accepted initializer boundary correction: full gate PASS; LayoutByNW4R::create restored to 352/356 instructions and 95.02809%; RowInfoManager::init still 39/39, diffs 0 and objdiff 100.0%; pool identical, regressions/readability/forbidden 0; DOL correct.
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-0 | e042cd32ef69 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-1 | ade50018c439 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-2 | 599cf4ca313c | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-3 | 49a2bbe294f3 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-4 | 62954c466ad1 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-5 | 91272c7d5545 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-6 | a53d64c51aa3 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-7 | e39b83eaa20b | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-8 | df9472b3186e | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-9 | 6895d3bc27eb | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-10 | 5a0360a632d8 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-11 | 75e599406c64 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-12 | f344d29fa00d | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-13 | ac42aaba75f3 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-14 | 61f231e282c7 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-reference-helper-15 | c8e3540e4959 | score (1, 39) instructions 73/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-0 | f776393f0aed | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-1 | 2b0fb7b0c98b | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-2 | d5215b77be19 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-3 | 44f54d993847 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-4 | 8601c987d6ad | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-5 | 6f1e7633e326 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-6 | 6014399e7ba8 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-leading-ring-locals-7 | 65428f0b90c0 | score (0, 26) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-0 | 4417f7ecc4a2 | score (12, 184) instructions 245/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-1 | b5b75ace0dc1 | score (8, 183) instructions 241/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-2 | 9afb465f5890 | score (12, 22) instructions 237/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-3 | 922960de967b | score (16, 26) instructions 237/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-4 | 149947ecad68 | score (12, 22) instructions 237/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language | language-switch-selector-5 | 4e1574eddac8 | score (34, 250) instructions 256/237 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-0 | 49a0a5720575 | score (42, 59) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-1 | b068c5da5a9b | score (44, 62) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-2 | 3b2c10513378 | score (42, 59) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-3 | fdeede389926 | score (87, 234) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-4 | b5ed4ad23f31 | score (42, 59) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-5 | 05c76f1f77d6 | score (44, 62) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-6 | 17176a8e11bd | score (42, 59) instructions 326/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
calcCursorPos__Q39textinput9inputform4BaseFff | cursorpos-three-value-inline-7 | 93af05e2b2f8 | score (87, 234) instructions 317/326 | POOL IDENTICAL up to 20 (mine=20 base=20)
Base::create register search seed 0:
```text
declaration block:
Info_* rows;
Info_* selected;
u16 previous;
u16 next;
u16 selectedIndex;
Info_* listEnd;
start (0, 26)
improved (0, 25)
improved (0, 22)
improved (0, 20)
best (0, 20) after 57 builds; kept in source:
u16 previous;
Info_* listEnd;
Info_* rows;
u16 next;
Info_* selected;
u16 selectedIndex;
```
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-declsearch-0 | 126621259fa8 | score (0, 20) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
Base::create register search seed 7:
```text
declaration block:
u16 selectedIndex;
Info_* rows;
Info_* listEnd;
u16 next;
Info_* selected;
u16 previous;
start (0, 25)
improved (0, 24)
improved (0, 22)
improved (0, 20)
best (0, 20) after 52 builds; kept in source:
u16 previous;
Info_* rows;
Info_* listEnd;
u16 next;
Info_* selected;
u16 selectedIndex;
```
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-declsearch-7 | 55560468d892 | score (0, 20) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
Base::create register search seed 19:
```text
declaration block:
Info_* selected;
u16 next;
u16 previous;
u16 selectedIndex;
Info_* rows;
Info_* listEnd;
start (0, 27)
improved (0, 25)
improved (0, 24)
improved (0, 23)
improved (0, 19)
best (0, 19) after 59 builds; kept in source:
u16 next;
Info_* rows;
Info_* selected;
u16 previous;
u16 selectedIndex;
Info_* listEnd;
```
Remaining source forms after structural trials:
- calcCursorPos: scalar/vector scale forms, direct/inline rectangle extents, height/width temporaries and order were built. No exact C++ candidate; original 326-instruction body retained.
- LayoutByNW4R::create: direct initial root lookup and animation-file slot references recover 356/356 instructions; conditional receiver load timing and register allocation still differ. Restored original body.
- setLanguage: inline name/root selectors, explicit temporaries, duplicate calls, switch/loop/goto forms all built; receiver hoisting or extra branch instructions persist. Restored original body.
- Base::create: circular row helpers and pointer/reference boundaries were built; plain C++ reaches 72/72 with zero structural differences. Declaration searches are the final register-only experiments; no non-exact conversion will be retained.
- Concatenated cache/start symbol remains an eight-byte original symbol spanning two existing C++ members, without an exact-name source counterpart. Renaming or resizing either source/config symbol is forbidden; no trials can legitimately repair its identity.
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer | basecreate-declsearch-19 | 54bad2f75ddf | score (0, 19) instructions 72/72 | POOL IDENTICAL up to 20 (mine=20 base=20)
Final open-function audit, all non-exact trials restored:
calcCursorPos__Q39textinput9inputform4BaseFff: 32 distinct successfully built source variants, pool identical.
create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer: 8 distinct successfully built source variants, pool identical.
setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language: 12 distinct successfully built source variants, pool identical.
create__Q39textinput9inputform4BaseFP12MEMAllocatorPQ39textinput9inputform10EditBuffer: 33 distinct successfully built source variants, pool identical.
Register search total: 168 builds, three distinct initial declaration orders; best C++ Base::create score structural 0 / exact 19, instructions 72/72; restored. Asm bodies 3 -> 1.
Final full clean-build gate PASS. Instruction-exact 214 -> 215; objdiff-exact 216 -> 217; code bytes 45080 -> 46972; data 908 -> 908; asm bodies 3 -> 1. Pool identical, regressions 0, forbidden/readability 0, DOL SHA1 correct. All unaccepted source trials restored.

View File

@@ -0,0 +1,65 @@
# tiInputForm matching continuation
Instruction-exact 214/221 -> 215/221. Objdiff-exact 216/221 -> 217/221.
Matched code 45080/50656 -> 46972/50656 bytes. Matched data 908/3772 -> 908/3772 bytes.
Assembly bodies 3 -> 1. Exact C++ conversions: Base::calc, Base::RowInfoManager::init.
New exact function: Base::onCursor.
The cursor change uses existing rectangle width accessors and computes the centered marker offset in one expression. This preserves width temporary homes and both multiplication operand orders. Fresh ctxdiff: 473/473 instructions, diffs 0.
The calculation conversion follows the actual sustain virtual slot and cached draw-scroll field. Separate blue, phase and angle values preserve conversion/store/sine scheduling. Ordinary inline sine and phase helpers reproduce the target operand order. Fresh ctxdiff: 165/165 instructions, diffs 0.
The row initializer uses an inline loop returning its final capacity read, then retains the row-array pointer for linking the final and first free rows. Fresh ctxdiff: 39/39 instructions, diffs 0. The original creation functions call the initializer out of line. The repository-standard never_inline attribute is therefore applied to its declaration only under TIINPUTFORM_IMPLEMENTATION, inside the existing guard. The other existing guard sides keep their declarations. A definition-only attribute was ineffective and was removed. The final header correction restores LayoutByNW4R::create to its original 352/356 instructions and 95.02809%.
## Remaining functions
| Function | Objdiff | Evidence |
| --- | --- | --- |
| Base::calcCursorPos | 91.622696% | 326/326 instructions; cached scale register homes and rectangle arithmetic scheduling differ. 32 distinct built source variants. |
| LayoutByNW4R::create | 95.02809% | 352/356 instructions; initial root lookup, conditional receiver timing and animation-file pointer reload boundaries differ. 8 distinct built variants. Direct root lookup and file-slot references reach 356/356 but remain non-exact. |
| LayoutByNW4R::setLanguage | 96.44726% | 237/237 instructions; root receiver loads move ahead of conditional pane-name selection. 12 distinct built variants. |
| Concatenated isEnableCursorCache/getStartPos | None | Original eight-byte symbol spans two existing members. No permitted source/config identity change repairs this pairing. |
Base::create remains an instruction-exact assembly body. Its C++ conversion trials reached 72/72 instructions with zero structural differences. Three final declaration searches performed 168 builds; best result retains 19 register differences. All non-exact conversions were restored. Its 33 distinct successfully built source variants are recorded in the attempts log.
The remaining actual functions and the remaining assembly conversion each have at least three distinct built source attempts. No shared guard side was removed or widened. No configuration, symbol sizes, other translation-unit source, protected tools or baseline reports were changed.
Data remains incomplete in objdiff. Existing weak/deduplicated data and the concatenated source-symbol identity remain unresolved; this run makes no full-unit or linked-completion claim. Two existing instruction-gate branch-normalization artifacts also remain; their objdiff scores are 100%. No symbols or offsets were adjusted to alter their counts.
## Local commits
- 7ebf38b7 match input form cursor marker spacing
- 0d9e4bd0 replace input form calculation assembly with c++
- 9ea85e5a replace row initialization assembly with c++
- fc9db92c preserve row initializer call boundary
## Final full gate
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[src/keyboard/tiInputForm] pool: IDENTICAL
[src/keyboard/tiInputForm] objdiff: code 46972/50656 data 908/3772 functions 217/221 fuzzy 99.5623 linked code 0
[src/keyboard/tiInputForm] instruction-exact functions: 215/221
[src/keyboard/tiInputForm] section .bss size 96 match None
[src/keyboard/tiInputForm] section .ctors size 4 match 100.0
[src/keyboard/tiInputForm] section .data size 2736 match 65.53332
[src/keyboard/tiInputForm] section .rodata size 760 match 100.0
[src/keyboard/tiInputForm] section .sbss size 32 match 33.333336
[src/keyboard/tiInputForm] section .sdata size 40 match 100.0
[src/keyboard/tiInputForm] section .sdata2 size 104 match 100.0
[src/keyboard/tiInputForm] section .text size 50656 match 99.5623
[src/keyboard/tiInputForm] below 100: calcCursorPos__Q39textinput9inputform4BaseFff 91.622696
[src/keyboard/tiInputForm] below 100: create__Q39textinput9inputform12LayoutByNW4RFP12MEMAllocatorPQ39textinput9inputform10EditBuffer 95.02809
[src/keyboard/tiInputForm] below 100: setLanguage__Q39textinput9inputform12LayoutByNW4RFQ29textinput8Language 96.44726
[src/keyboard/tiInputForm] below 100: isEnableCursorCache__Q39textinput10textdrawer4BaseCFvgetStartPos__Q39textinput10textdrawer4BaseCFv None
[src/keyboard/tiInputForm] baseline: code 45080/50656 data 908 functions 216 fuzzy 99.5591
regressions vs baseline: 0
global matched_code_percent: 87.67423 -> 87.73740
global fuzzy_match_percent: 99.36937 -> 99.36944
global complete_code_percent: 61.81448 -> 61.81448
global matched_data_percent: 91.15570 -> 91.15570
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```

View File

@@ -0,0 +1,139 @@
# Structural round 12
Starting HEAD a348c9777aa65410b85f255be2a24363187d83aa
libs/RevoEX/src/nwc24/NWC24Download | diagnosis NWC24InitDlTask | {'score': (0, 31), 'insns': (144, 144), 'diffs': 31} | objdiff 98.923615
libs/RevoEX/src/nwc24/NWC24Download | diagnosis NWC24IterateDlTask | {'score': (0, 10), 'insns': (79, 79), 'diffs': 10} | objdiff 99.303795
libs/RevoEX/src/nwc24/NWC24Download | diagnosis NWC24UpdateDlTask | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} | objdiff 95.00395
libs/RevoEX/src/nwc24/NWC24Download | diagnosis NWC24PurgeOldestDlTask | {'score': (29, 95), 'insns': (167, 176), 'diffs': 95} | objdiff 87.11364
libs/RevoEX/src/nwc24/NWC24Download | diagnosis NWC24ManageDlTaskListForMenu | {'score': (12, 36), 'insns': (150, 152), 'diffs': 36} | objdiff 96.74342
libs/RevoEX/src/nwc24/NWC24Download | diagnosis NWC24iCheckDlHeaderConsistency | {'score': (2, 3), 'insns': (212, 212), 'diffs': 3} | objdiff 98.77358
libs/RevoEX/src/nwc24/NWC24Download | diagnosis AddTaskInternal | {'score': (20, 323), 'insns': (398, 401), 'diffs': 323} | objdiff 97.7182
libs/RVL_SDK/src/nup/nup | diagnosis __nupParseServerInfo__FP14NUPContextInfoPcPcUx | {'score': (0, 148), 'insns': (452, 452), 'diffs': 148} | objdiff 98.108406
libs/RVL_SDK/src/nup/nup | diagnosis __nupBase64Encode__FPUcPUcUl | {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} | objdiff 94.20635
libs/RVL_SDK/src/nup/nup | diagnosis __nupGetBootVersion__FP14ESTitleVersion | {'score': (0, 17), 'insns': (163, 163), 'diffs': 17} | objdiff None
libs/RVL_SDK/src/nup/nup | diagnosis __nupGetTitleSize__FP12NUPTitleInfo | {'score': (0, 22), 'insns': (139, 139), 'diffs': 22} | objdiff 99.100716
libs/RVL_SDK/src/nup/nup | diagnosis __nupOp | {'score': (4, 47), 'insns': (438, 438), 'diffs': 47} | objdiff 99.25799
src/scene/setting/iplSetting | diagnosis createBrowser__Q33ipl5scene7SettingFv | {'score': (15, 114), 'insns': (299, 301), 'diffs': 114} | objdiff 98.8505
src/scene/setting/iplSetting | diagnosis draw__Q33ipl5scene7SettingFv | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} | objdiff 91.525314
src/scene/setting/iplSetting | diagnosis initKeyboard__Q33ipl5scene7SettingFPCc | {'score': (4, 195), 'insns': (215, 213), 'diffs': 195} | objdiff 98.38498
src/scene/setting/iplSetting | diagnosis calcKeyboard__Q33ipl5scene7SettingFv | {'score': (15, 258), 'insns': (292, 290), 'diffs': 258} | objdiff 98.0
src/scene/setting/iplSetting | diagnosis convertRevIP__Q33ipl5scene7SettingFPUcPCc | {'score': (0, 16), 'insns': (73, 73), 'diffs': 16} | objdiff 98.69863
src/scene/setting/iplSetting | diagnosis scanAP__Q33ipl5scene7SettingFv | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} | objdiff 95.39338
NWC24InitDlTask | initialize owner path with memset rather than aggregate stores | {'score': (0, 31), 'insns': (144, 144), 'diffs': 31} -> {'score': (21, 136), 'insns': (132, 144), 'diffs': 136} | objdiff 85.9375 | pool True | lost [] | restored
NWC24InitDlTask | owner identity stored in a scalarized high-low pair | BUILD FAIL | _RVL -ipa file -fp_contract off -lang=c -MMD -c libs/RevoEX/src/nwc24/NWC24Download.c -o build/43U/src/libs/RevoEX/src/nwc24 && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RevoEX/src/nwc24/NWC24Download.d build/43U/src/libs/RevoEX/src/nwc24/NWC24Download.d ### mwcceppc.exe Compiler: # File: libs\RevoEX\src\nwc24\NWC24Download.c # ---------------------------------------------- # 293: task->ownerId.high = ownerId.high; # Error: ^ # (10393) 'ownerId' is not a member of class 'struct ' # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
NWC24InitDlTask | reuse initial cached header for the final writable-task validation | {'score': (0, 31), 'insns': (144, 144), 'diffs': 31} -> {'score': (0, 31), 'insns': (144, 144), 'diffs': 31} | objdiff 98.923615 | pool True | lost [] | restored
NWC24InitDlTask | owner identity stored in a scalarized high-low pair with real task fields | {'score': (0, 31), 'insns': (144, 144), 'diffs': 31} -> {'score': (0, 31), 'insns': (144, 144), 'diffs': 31} | objdiff 98.923615 | pool True | lost [] | restored
NWC24InitDlTask | home path terminators use named null character shared with cached-header initialization | {'score': (0, 31), 'insns': (144, 144), 'diffs': 31} -> {'score': (0, 31), 'insns': (144, 144), 'diffs': 31} | objdiff 98.923615 | pool True | lost [] | restored
NWC24InitDlTask | group writability cached as a separate boolean within final validation | {'score': (0, 31), 'insns': (144, 144), 'diffs': 31} -> {'score': (2, 33), 'insns': (144, 144), 'diffs': 33} | objdiff 98.84722 | pool True | lost [] | restored
NWC24InitDlTask | declaration search after path and validation structural trials | {'score': (0, 31), 'insns': (144, 144), 'diffs': 31} -> {'score': (0, 31), 'insns': (144, 144), 'diffs': 31}
NWC24IterateDlTask | iterator uses a for-loop update with cached entry header | {'score': (0, 10), 'insns': (79, 79), 'diffs': 10} -> {'score': (0, 10), 'insns': (79, 79), 'diffs': 10} | objdiff 99.303795 | pool True | lost [] | restored
NWC24IterateDlTask | entry header references are derived at each use from the cached work pointer | {'score': (0, 10), 'insns': (79, 79), 'diffs': 10} -> {'score': (5, 51), 'insns': (78, 79), 'diffs': 51} | objdiff 95.44304 | pool True | lost [] | restored
NWC24IterateDlTask | iteration validity checks share an inline task lookup boundary | {'score': (0, 10), 'insns': (79, 79), 'diffs': 10} -> {'score': (12, 51), 'insns': (84, 79), 'diffs': 51} | objdiff 86.88608 | pool True | lost [] | restored
NWC24IterateDlTask | declaration search after loop and validation trials | {'score': (0, 10), 'insns': (79, 79), 'diffs': 10} -> {'score': (0, 10), 'insns': (79, 79), 'diffs': 10}
NWC24UpdateDlTask | writable group predicate initialized inside update-specific helper | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (11, 34), 'insns': (253, 253), 'diffs': 34} | objdiff 97.56917 | pool True | lost [] | restored
NWC24UpdateDlTask | update-specific permission helper with identifier output boundary for access time | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (11, 31), 'insns': (253, 253), 'diffs': 31} | objdiff 97.628456 | pool True | lost [] | restored
NWC24UpdateDlTask | permission and access boundaries with shifted retry bit as the first operand | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (11, 31), 'insns': (253, 253), 'diffs': 31} | objdiff 97.648224 | pool True | lost [] | restored
NWC24UpdateDlTask | nested writable-group predicate keeps explicit true assignment | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} | objdiff 95.00395 | pool True | lost [] | restored
NWC24UpdateDlTask | nested group check reads fields inside its task-pointer helper | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (5, 29), 'insns': (253, 253), 'diffs': 29} | objdiff 98.972336 | pool True | lost [] | restored
NWC24UpdateDlTask | nested group check plus retry-specific nonnull-header validation | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (5, 29), 'insns': (253, 253), 'diffs': 29} | objdiff 98.992096 | pool True | lost [] | restored
NWC24PurgeOldestDlTask | iterator initializer fields in target order and shared iterator error tail | {'score': (29, 95), 'insns': (167, 176), 'diffs': 95} -> {'score': (12, 49), 'insns': (172, 176), 'diffs': 49} | objdiff 95.82386 | pool True | lost [] | restored
NWC24PurgeOldestDlTask | initializer plus separate deletion result inside nested validation branch | {'score': (29, 95), 'insns': (167, 176), 'diffs': 95} -> {'score': (12, 49), 'insns': (171, 176), 'diffs': 49} | objdiff 96.02273 | pool True | lost [] | restored
NWC24PurgeOldestDlTask | selected identifier captured before task pointer and deletion status checked explicitly | {'score': (29, 95), 'insns': (167, 176), 'diffs': 95} -> {'score': (28, 81), 'insns': (168, 176), 'diffs': 81} | objdiff 87.795456 | pool True | lost [] | restored
NWC24ManageDlTaskListForMenu | menu deletion uses separate deletion status with nested validation | {'score': (12, 36), 'insns': (150, 152), 'diffs': 36} -> {'score': (12, 36), 'insns': (149, 152), 'diffs': 36} | objdiff 96.97369 | pool True | lost [] | restored
NWC24ManageDlTaskListForMenu | menu task pointer lifetime starts at deletion boundary | {'score': (12, 36), 'insns': (150, 152), 'diffs': 36} -> {'score': (0, 0), 'insns': (152, 152), 'diffs': 0} | objdiff 100.0 | pool True | lost [] | CANDIDATE
NWC24ManageDlTaskListForMenu | menu deletion has its own validation and delete-result boundaries | BUILD FAIL | BUG=1 -DTARGET_RVL -ipa file -fp_contract off -lang=c -MMD -c libs/RevoEX/src/nwc24/NWC24Download.c -o build/43U/src/libs/RevoEX/src/nwc24 && "/usr/bin/python3" tools/transform_dep.py build/43U/src/libs/RevoEX/src/nwc24/NWC24Download.d build/43U/src/libs/RevoEX/src/nwc24/NWC24Download.d ### mwcceppc.exe Compiler: # File: libs\RevoEX\src\nwc24\NWC24Download.c # ---------------------------------------------- # 929: NWC24Err deletionResult = DeleteDlTask(dlTask); # Error: ^^^^^^^^ # (10141) expression syntax error # Too many errors printed, aborting program User break, cancelled... ninja: build stopped: subcommand failed.
NWC24iCheckDlHeaderConsistency | repair loop inline helper receives stack task before header and repair parameters | {'score': (2, 3), 'insns': (212, 212), 'diffs': 3} -> {'score': (5, 6), 'insns': (212, 212), 'diffs': 6} | objdiff 96.95283 | pool True | lost ['NWC24iOpenDlTaskList'] | restored
NWC24iCheckDlHeaderConsistency | repair loop inline helper receives header and repair before the stack task | {'score': (2, 3), 'insns': (212, 212), 'diffs': 3} -> {'score': (5, 6), 'insns': (212, 212), 'diffs': 6} | objdiff 96.95283 | pool True | lost ['NWC24iOpenDlTaskList'] | restored
NWC24iCheckDlHeaderConsistency | header loop captures repair flag only when an entry is found | {'score': (2, 3), 'insns': (212, 212), 'diffs': 3} -> {'score': (2, 3), 'insns': (212, 212), 'diffs': 3} | objdiff 98.77358 | pool True | lost [] | restored
NWC24iCheckDlHeaderConsistency | declaration search after inline-loop and parameter lifetime trials | {'score': (2, 3), 'insns': (212, 212), 'diffs': 3} -> {'score': (2, 3), 'insns': (212, 212), 'diffs': 3}
AddTaskInternal | URL length error returned before scheme validation helper work | {'score': (20, 323), 'insns': (398, 401), 'diffs': 323} -> {'score': (23, 302), 'insns': (394, 401), 'diffs': 302} | objdiff 96.720695 | pool True | lost [] | restored
AddTaskInternal | free slot counter remains wide and is narrowed explicitly at entry indexing | {'score': (20, 323), 'insns': (398, 401), 'diffs': 323} -> {'score': (10, 324), 'insns': (400, 401), 'diffs': 324} | objdiff 98.81546 | pool True | lost [] | restored
AddTaskInternal | add loop handles successful free-slot lookup as its own branch | {'score': (20, 323), 'insns': (398, 401), 'diffs': 323} -> {'score': (26, 322), 'insns': (398, 401), 'diffs': 322} | objdiff 96.80299 | pool True | lost [] | restored
NWC24PurgeOldestDlTask | fresh stack-task pointer assignment separates read and delete lifetimes after initializer | {'score': (29, 95), 'insns': (167, 176), 'diffs': 95} -> {'score': (5, 24), 'insns': (174, 176), 'diffs': 24} | objdiff 98.63636 | pool True | lost [] | restored
NWC24PurgeOldestDlTask | fresh delete pointer and read identifier declared before the pointer | {'score': (29, 95), 'insns': (167, 176), 'diffs': 95} -> {'score': (5, 16), 'insns': (174, 176), 'diffs': 16} | objdiff 98.86364 | pool True | lost [] | restored
NWC24PurgeOldestDlTask | fresh delete pointer with read identifier initialized before read pointer | {'score': (29, 95), 'insns': (167, 176), 'diffs': 95} -> {'score': (5, 24), 'insns': (174, 176), 'diffs': 24} | objdiff 98.63636 | pool True | lost [] | restored
NWC24PurgeOldestDlTask | initializer and read/delete task lifetimes inside successful iterator branch | {'score': (29, 95), 'insns': (167, 176), 'diffs': 95} -> {'score': (0, 8), 'insns': (176, 176), 'diffs': 8} | objdiff 99.77273 | pool True | lost [] | restored
NWC24PurgeOldestDlTask | successful iterator branch with selected id declared before task pointer | {'score': (29, 95), 'insns': (167, 176), 'diffs': 95} -> {'score': (0, 0), 'insns': (176, 176), 'diffs': 0} | objdiff 100.0 | pool True | lost [] | CANDIDATE
NWC24UpdateDlTask | update permission and retry structural refinement group-order | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} | objdiff 95.02371 | pool True | lost [] | restored
NWC24UpdateDlTask | update permission and retry structural refinement retry-arguments | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (5, 29), 'insns': (253, 253), 'diffs': 29} | objdiff 98.992096 | pool True | lost [] | restored
NWC24UpdateDlTask | update permission and retry structural refinement cached-work | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (0, 26), 'insns': (253, 253), 'diffs': 26} | objdiff 99.48617 | pool True | lost [] | restored
NWC24UpdateDlTask | update permission and retry structural refinement retry-result | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (5, 29), 'insns': (253, 253), 'diffs': 29} | objdiff 98.992096 | pool True | lost [] | restored
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | tag lookup splits each failure check at its own inline-helper boundary | {'score': (0, 148), 'insns': (452, 452), 'diffs': 148} -> {'score': (83, 471), 'insns': (496, 452), 'diffs': 471} | objdiff 87.88717 | pool True | lost [] | restored
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | tag lookup initializes cursor from response and declares end before start | {'score': (0, 148), 'insns': (452, 452), 'diffs': 148} -> {'score': (0, 148), 'insns': (452, 452), 'diffs': 148} | objdiff 98.108406 | pool True | lost [] | restored
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | tag range and next cursor computed before output parameter stores | {'score': (0, 148), 'insns': (452, 452), 'diffs': 148} -> {'score': (18, 161), 'insns': (452, 452), 'diffs': 161} | objdiff 94.358406 | pool True | lost [] | restored
__nupBase64Encode__FPUcPUcUl | base64 alphabet accessed through an ordinary named constant pointer | {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} -> {'score': (16, 42), 'insns': (59, 63), 'diffs': 42} | objdiff 77.93651 | pool True | lost [] | restored
__nupBase64Encode__FPUcPUcUl | base64 counter and accumulator use a named scalar state pair | {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} -> {'score': (44, 73), 'insns': (74, 63), 'diffs': 73} | objdiff 46.349205 | pool True | lost [] | restored
__nupBase64Encode__FPUcPUcUl | base64 byte accumulation combines shift and read in one expression | {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} -> {'score': (9, 23), 'insns': (63, 63), 'diffs': 23} | objdiff 94.04762 | pool True | lost [] | restored
NWC24UpdateDlTask | cached retry work and permission helper receives explicit write flag | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (0, 26), 'insns': (253, 253), 'diffs': 26} | objdiff 99.48617 | pool True | lost [] | restored
NWC24UpdateDlTask | cached retry work and permission group flags captured before group id | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (0, 26), 'insns': (253, 253), 'diffs': 26} | objdiff 99.48617 | pool True | lost [] | restored
NWC24UpdateDlTask | cached retry work and group field captured by output identifier boundary | {'score': (19, 250), 'insns': (249, 253), 'diffs': 250} -> {'score': (0, 26), 'insns': (253, 253), 'diffs': 26} | objdiff 99.48617 | pool True | lost [] | restored
__nupGetBootVersion__FP14ESTitleVersion | owned title loop captures requested title id before comparisons | {'score': (0, 17), 'insns': (163, 163), 'diffs': 17} -> {'score': (0, 17), 'insns': (163, 163), 'diffs': 17} | objdiff None | pool True | lost [] | restored
__nupGetBootVersion__FP14ESTitleVersion | installed count captured after TMD success and refreshed after ES content listing | {'score': (0, 17), 'insns': (163, 163), 'diffs': 17} -> {'score': (0, 17), 'insns': (163, 163), 'diffs': 17} | objdiff None | pool True | lost [] | restored
__nupGetBootVersion__FP14ESTitleVersion | boot title version conversion written at its actual call boundary | {'score': (0, 17), 'insns': (163, 163), 'diffs': 17} -> {'score': (4, 26), 'insns': (163, 163), 'diffs': 26} | objdiff None | pool True | lost [] | restored
__nupGetTitleSize__FP12NUPTitleInfo | progress increment follows ticket TMD and content-map overhead allocation | {'score': (0, 22), 'insns': (139, 139), 'diffs': 22} -> {'score': (4, 26), 'insns': (139, 139), 'diffs': 26} | objdiff 94.352516 | pool True | lost [] | restored
__nupGetTitleSize__FP12NUPTitleInfo | rounded TMD allocation retained in an explicit 32-bit byte count | {'score': (0, 22), 'insns': (139, 139), 'diffs': 22} -> {'score': (0, 22), 'insns': (139, 139), 'diffs': 22} | objdiff 99.100716 | pool True | lost [] | restored
__nupGetTitleSize__FP12NUPTitleInfo | size-specific installed content helper declares index before pointer | {'score': (0, 22), 'insns': (139, 139), 'diffs': 22} -> {'score': (0, 22), 'insns': (139, 139), 'diffs': 22} | objdiff 99.100716 | pool True | lost [] | restored
__nupOp | boot output initialized within width-valid successful branch instead of caller | {'score': (4, 47), 'insns': (438, 438), 'diffs': 47} -> {'score': (0, 19), 'insns': (438, 438), 'diffs': 19} | objdiff 99.748856 | pool True | lost [] | restored
__nupOp | system title selection uses requested title as first equality operand | {'score': (4, 47), 'insns': (438, 438), 'diffs': 47} -> {'score': (4, 47), 'insns': (438, 438), 'diffs': 47} | objdiff 99.28082 | pool True | lost [] | restored
__nupOp | title selection loop uses a dedicated index lifetime | {'score': (4, 47), 'insns': (438, 438), 'diffs': 47} -> {'score': (4, 47), 'insns': (438, 438), 'diffs': 47} | objdiff 99.25799 | pool True | lost [] | restored
NWC24UpdateDlTask | declaration search after retry branch and permission lifetime repairs | {'score': (0, 26), 'insns': (253, 253), 'diffs': 26} -> {'score': (0, 26), 'insns': (253, 253), 'diffs': 26}
__nupParseServerInfo__FP14NUPContextInfoPcPcUx | declaration search after structural trials in __nupParseServerInfo | {'score': (0, 148), 'insns': (452, 452), 'diffs': 148} -> {'score': (0, 148), 'insns': (452, 452), 'diffs': 148} | exit 0
setUpdate_NoUpdateDialog___Q33ipl5scene7SettingFv | instruction comparator reports two relative branch differences but raw bytes identical True, 120 bytes; objdiff exact 100; no source tuning needed
__nupBase64Encode__FPUcPUcUl | declaration search after structural trials in __nupBase64Encode | {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} -> {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} | exit 0
__nupGetTitleSize__FP12NUPTitleInfo | declaration search after structural trials in __nupGetTitleSize | {'score': (0, 22), 'insns': (139, 139), 'diffs': 22} -> {'score': (0, 22), 'insns': (139, 139), 'diffs': 22} | exit 0
__nupOp | declaration search after structural trials in __nupOp | {'score': (0, 19), 'insns': (438, 438), 'diffs': 19} -> {'score': (0, 19), 'insns': (438, 438), 'diffs': 19} | exit 0
createBrowser__Q33ipl5scene7SettingFv | direct-page fallback keeps case seven separate from the default branch | {'score': (15, 114), 'insns': (299, 301), 'diffs': 114} -> {'score': (15, 111), 'insns': (303, 301), 'diffs': 111} | objdiff 98.75083 | pool True | lost [] | restored
createBrowser__Q33ipl5scene7SettingFv | direct-page search index declared with URL buffers before region lookup | {'score': (15, 114), 'insns': (299, 301), 'diffs': 114} -> {'score': (15, 114), 'insns': (299, 301), 'diffs': 114} | objdiff 98.8505 | pool True | lost [] | restored
createBrowser__Q33ipl5scene7SettingFv | URL root table copied with character-pointer indexing rather than temporary page index | {'score': (15, 114), 'insns': (299, 301), 'diffs': 114} -> {'score': (15, 114), 'insns': (299, 301), 'diffs': 114} | objdiff 98.8505 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render mode assignment begins after the local object declaration | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (34, 570), 'insns': (629, 632), 'diffs': 570} | objdiff 97.69462 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | window-null branch precedes the field load and scroll direction uses signed boolean result | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (77, 567), 'insns': (595, 632), 'diffs': 567} | objdiff 92.17405 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render-mode copy uses typed scalar fields sample pairs and seven filter bytes | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (76, 537), 'insns': (632, 632), 'diffs': 537} | objdiff 91.01899 | pool True | lost [] | restored
initKeyboard__Q33ipl5scene7SettingFPCc | row and string defaults are assigned only in the switch default branch | {'score': (4, 195), 'insns': (215, 213), 'diffs': 195} -> {'score': (19, 156), 'insns': (216, 213), 'diffs': 156} | objdiff 97.89202 | pool True | lost [] | restored
initKeyboard__Q33ipl5scene7SettingFPCc | keyboard validation result initialized immediately before its validation switch | {'score': (4, 195), 'insns': (215, 213), 'diffs': 195} -> {'score': (4, 199), 'insns': (215, 213), 'diffs': 199} | objdiff 97.10329 | pool True | lost [] | restored
initKeyboard__Q33ipl5scene7SettingFPCc | dictionary pointers captured before obtaining the memo form | {'score': (4, 195), 'insns': (215, 213), 'diffs': 195} -> {'score': (4, 194), 'insns': (215, 213), 'diffs': 194} | objdiff 98.4554 | pool True | lost [] | restored
calcKeyboard__Q33ipl5scene7SettingFv | text pointer copied to an initialized commit pointer after each form switch | {'score': (15, 258), 'insns': (292, 290), 'diffs': 258} -> {'score': (15, 258), 'insns': (292, 290), 'diffs': 258} | objdiff 98.0 | pool True | lost [] | restored
calcKeyboard__Q33ipl5scene7SettingFv | asterisk replacement loop separates byte store from index update | {'score': (15, 258), 'insns': (292, 290), 'diffs': 258} -> {'score': (9, 274), 'insns': (291, 290), 'diffs': 274} | objdiff 98.63793 | pool True | lost [] | restored
calcKeyboard__Q33ipl5scene7SettingFv | form text defaults are assigned inside each switch default clause | {'score': (15, 258), 'insns': (292, 290), 'diffs': 258} -> {'score': (21, 267), 'insns': (294, 290), 'diffs': 267} | objdiff 97.27586 | pool True | lost [] | restored
convertRevIP__Q33ipl5scene7SettingFPUcPCc | component count initialized after UTF conversion when parsing begins | {'score': (0, 16), 'insns': (73, 73), 'diffs': 16} -> {'score': (2, 21), 'insns': (73, 73), 'diffs': 21} | objdiff 95.945206 | pool True | lost [] | restored
convertRevIP__Q33ipl5scene7SettingFPUcPCc | output cursor index and component boundary declared at entry | {'score': (0, 16), 'insns': (73, 73), 'diffs': 16} -> {'score': (0, 15), 'insns': (73, 73), 'diffs': 15} | objdiff 98.630135 | pool True | lost [] | restored
convertRevIP__Q33ipl5scene7SettingFPUcPCc | character parser uses continue for non-delimiter characters | {'score': (0, 16), 'insns': (73, 73), 'diffs': 16} -> {'score': (0, 16), 'insns': (73, 73), 'diffs': 16} | objdiff 98.69863 | pool True | lost [] | restored
scanAP__Q33ipl5scene7SettingFv | animation booleans compared through signed integer readiness | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (9, 12), 'insns': (272, 272), 'diffs': 12} | objdiff 98.31618 | pool True | lost [] | restored
scanAP__Q33ipl5scene7SettingFv | case-seven animation index captured before flag store with signed readiness | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (6, 7), 'insns': (272, 272), 'diffs': 7} | objdiff 99.14706 | pool True | lost [] | restored
scanAP__Q33ipl5scene7SettingFv | case-nine layout and animation index lifetimes acquired together before readiness | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (6, 7), 'insns': (272, 272), 'diffs': 7} | objdiff 99.14706 | pool True | lost [] | restored
__nupOp | validated boot conversion with title selection direct | {'score': (4, 47), 'insns': (438, 438), 'diffs': 47} -> {'score': (0, 19), 'insns': (438, 438), 'diffs': 19} | objdiff 99.748856 | pool True | lost [] | restored
__nupOp | validated boot conversion with title selection reference | {'score': (4, 47), 'insns': (438, 438), 'diffs': 47} -> {'score': (0, 19), 'insns': (438, 438), 'diffs': 19} | objdiff 99.748856 | pool True | lost [] | restored
__nupOp | validated boot conversion with title selection array | {'score': (4, 47), 'insns': (438, 438), 'diffs': 47} -> {'score': (0, 0), 'insns': (438, 438), 'diffs': 0} | objdiff 100.0 | pool True | lost [] | CANDIDATE
__nupOp | output initialization review: ES_GetBoot2Version writes bootVersion only for IPC_RESULT_OK (0), with negative IPC error constants in private/ipc/types.h; the inline conversion writes the caller output on successful width validation. Target stores that output only after the second width comparison. No value is read on an error path. Array title access removes the extra u64 lifetime and matches all 438 instructions.
draw__Q33ipl5scene7SettingFv | render-mode assignment plus window scroll and geometry repair branches | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (29, 567), 'insns': (629, 632), 'diffs': 567} | objdiff 98.34335 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render-mode assignment plus window scroll and geometry repair texture-guards | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (29, 567), 'insns': (629, 632), 'diffs': 567} | objdiff 98.34335 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render-mode assignment plus window scroll and geometry repair right-first | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (35, 568), 'insns': (629, 632), 'diffs': 568} | objdiff 97.870255 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render-mode assignment plus window scroll and geometry repair left-expression | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (22, 241), 'insns': (632, 632), 'diffs': 241} | objdiff 97.658226 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render-mode assignment plus window scroll and geometry repair both-edges | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (62, 629), 'insns': (631, 632), 'diffs': 629} | objdiff 93.610756 | pool True | lost [] | restored
scanAP__Q33ipl5scene7SettingFv | captured index before layout and animation helper signed | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (6, 7), 'insns': (272, 272), 'diffs': 7} | objdiff 99.14706 | pool True | lost [] | restored
scanAP__Q33ipl5scene7SettingFv | captured index before layout and animation helper output | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (26, 160), 'insns': (266, 272), 'diffs': 160} | objdiff 96.224266 | pool True | lost [] | restored
scanAP__Q33ipl5scene7SettingFv | captured index before layout and animation helper invert | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (28, 160), 'insns': (266, 272), 'diffs': 160} | objdiff 95.15809 | pool True | lost [] | restored
scanAP__Q33ipl5scene7SettingFv | captured index before layout and animation helper bool-int | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (28, 160), 'insns': (266, 272), 'diffs': 160} | objdiff 95.15809 | pool True | lost [] | restored
convertRevIP__Q33ipl5scene7SettingFPUcPCc | explicit leading declarations and parsing lifetime index-first | {'score': (0, 16), 'insns': (73, 73), 'diffs': 16} -> {'score': (0, 8), 'insns': (73, 73), 'diffs': 8} | objdiff 99.31507 | pool True | lost [] | restored
convertRevIP__Q33ipl5scene7SettingFPUcPCc | explicit leading declarations and parsing lifetime array-cursor | {'score': (0, 16), 'insns': (73, 73), 'diffs': 16} -> {'score': (9, 56), 'insns': (71, 73), 'diffs': 56} | objdiff 92.46575 | pool True | lost [] | restored
convertRevIP__Q33ipl5scene7SettingFPUcPCc | explicit leading declarations and parsing lifetime cursor-before-index | {'score': (0, 16), 'insns': (73, 73), 'diffs': 16} -> {'score': (0, 10), 'insns': (73, 73), 'diffs': 10} | objdiff 99.178085 | pool True | lost [] | restored
convertRevIP__Q33ipl5scene7SettingFPUcPCc | explicit leading declarations and parsing lifetime cursor-address | {'score': (0, 16), 'insns': (73, 73), 'diffs': 16} -> {'score': (0, 10), 'insns': (73, 73), 'diffs': 10} | objdiff 99.178085 | pool True | lost [] | restored
convertRevIP__Q33ipl5scene7SettingFPUcPCc | explicit leading declarations and parsing lifetime count-before-component | {'score': (0, 16), 'insns': (73, 73), 'diffs': 16} -> {'score': (0, 10), 'insns': (73, 73), 'diffs': 10} | objdiff 99.178085 | pool True | lost [] | restored
convertRevIP__Q33ipl5scene7SettingFPUcPCc | declaration search after structural trials in Setting::convertRevIP | {'score': (0, 8), 'insns': (73, 73), 'diffs': 8} -> {'score': (0, 8), 'insns': (73, 73), 'diffs': 8} | exit 0
draw__Q33ipl5scene7SettingFv | render assignment with scroll and rectangle form early-store | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (30, 569), 'insns': (629, 632), 'diffs': 569} | objdiff 97.93987 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render assignment with scroll and rectangle form loop-store | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (28, 567), 'insns': (631, 632), 'diffs': 567} | objdiff 98.33544 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render assignment with scroll and rectangle form switch-store | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (36, 565), 'insns': (635, 632), 'diffs': 565} | objdiff 96.957275 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render assignment with scroll and rectangle form integer-left | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (22, 241), 'insns': (632, 632), 'diffs': 241} | objdiff 97.658226 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render assignment with scroll and rectangle form left-width | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (21, 240), 'insns': (632, 632), 'diffs': 240} | objdiff 97.52057 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render assignment with scroll and rectangle form left-last | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (43, 568), 'insns': (629, 632), 'diffs': 568} | objdiff 96.60918 | pool True | lost [] | restored
draw__Q33ipl5scene7SettingFv | render assignment with scroll and rectangle form integer-extents | {'score': (82, 570), 'insns': (595, 632), 'diffs': 570} -> {'score': (52, 616), 'insns': (635, 632), 'diffs': 616} | objdiff 93.55538 | pool True | lost [] | restored
__nupBase64Encode__FPUcPUcUl | sextet temporaries follow first then second source order order-only | {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} -> {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} | objdiff 94.20635 | pool True | lost [] | restored
__nupBase64Encode__FPUcPUcUl | sextet temporaries follow first then second source order reset-after-first | {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} -> {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} | objdiff 94.20635 | pool True | lost [] | restored
__nupBase64Encode__FPUcPUcUl | sextet temporaries follow first then second source order contiguous | {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} -> {'score': (15, 46), 'insns': (60, 63), 'diffs': 46} | objdiff 81.269844 | pool True | lost [] | restored
__nupBase64Encode__FPUcPUcUl | sextet temporaries follow first then second source order reset-before | {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} -> {'score': (9, 21), 'insns': (63, 63), 'diffs': 21} | objdiff 94.20635 | pool True | lost [] | restored
scanAP__Q33ipl5scene7SettingFv | private guarded animation readiness implementation bool-branch | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (28, 160), 'insns': (266, 272), 'diffs': 160} | objdiff 95.15809 | pool True | lost ['changeVideoMode__Q33ipl5scene7SettingFv', 'isAnimating__Q33ipl5scene7SettingFv', 'isWaitPlaying__Q33ipl5scene7SettingFv', 'setUpdate_ConnectTestRun___Q33ipl5scene7SettingFv'] | restored
scanAP__Q33ipl5scene7SettingFv | private guarded animation readiness implementation integer-branch | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (28, 160), 'insns': (266, 272), 'diffs': 160} | objdiff 95.15809 | pool True | lost ['changeVideoMode__Q33ipl5scene7SettingFv', 'isAnimating__Q33ipl5scene7SettingFv', 'isWaitPlaying__Q33ipl5scene7SettingFv'] | restored
scanAP__Q33ipl5scene7SettingFv | private guarded animation readiness implementation integer-ternary | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (26, 160), 'insns': (266, 272), 'diffs': 160} | objdiff 96.224266 | pool True | lost ['isAnimating__Q33ipl5scene7SettingFv'] | restored
scanAP__Q33ipl5scene7SettingFv | private guarded animation readiness implementation integer-equality | {'score': (53, 160), 'insns': (266, 272), 'diffs': 160} -> {'score': (26, 160), 'insns': (266, 272), 'diffs': 160} | objdiff 96.224266 | pool True | lost [] | restored
Final audit: 15 objdiff-open functions; each has at least three distinct successful source attempts and source snapshots. Unowned report changes: 0. Final full gate: GATE PASS.

View File

@@ -0,0 +1,53 @@
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 8140/12496 data 80/80 functions 25/30 fuzzy 99.1521 linked code 0
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 25/30
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 99.15205
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 99.303795
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 95.00395
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 97.7182
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 6828/12496 data 80 functions 23 fuzzy 98.2676
[libs/RVL_SDK/src/nup/nup] pool: IDENTICAL
[libs/RVL_SDK/src/nup/nup] objdiff: code 7496/10764 data 1720/1720 functions 19/23 fuzzy 93.4430 linked code 0
[libs/RVL_SDK/src/nup/nup] instruction-exact functions: 19/23
[libs/RVL_SDK/src/nup/nup] section .data size 1592 match 100.0
[libs/RVL_SDK/src/nup/nup] section .rodata size 88 match 100.0
[libs/RVL_SDK/src/nup/nup] section .sbss size 8 match 100.0
[libs/RVL_SDK/src/nup/nup] section .sdata size 32 match 100.0
[libs/RVL_SDK/src/nup/nup] section .text size 10764 match 93.442955
[libs/RVL_SDK/src/nup/nup] below 100: __nupParseServerInfo__FP14NUPContextInfoPcPcUx 98.108406
[libs/RVL_SDK/src/nup/nup] below 100: __nupBase64Encode__FPUcPUcUl 94.20635
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetBootVersion__FP14ESTitleVersion None
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetTitleSize__FP12NUPTitleInfo 99.100716
[libs/RVL_SDK/src/nup/nup] baseline: code 5744/10764 data 1720 functions 18 fuzzy 93.3222
[src/scene/setting/iplSetting] pool: IDENTICAL
[src/scene/setting/iplSetting] objdiff: code 30760/37884 data 1040/5696 functions 106/112 fuzzy 99.1581 linked code 0
[src/scene/setting/iplSetting] instruction-exact functions: 105/112
[src/scene/setting/iplSetting] section .bss size 456 match 100.0
[src/scene/setting/iplSetting] section .data size 4016 match 5.146636
[src/scene/setting/iplSetting] section .rodata size 640 match 32.25412
[src/scene/setting/iplSetting] section .sbss size 16 match 100.0
[src/scene/setting/iplSetting] section .sdata size 504 match 100.0
[src/scene/setting/iplSetting] section .sdata2 size 64 match 100.0
[src/scene/setting/iplSetting] section .text size 37884 match 99.15806
[src/scene/setting/iplSetting] below 100: createBrowser__Q33ipl5scene7SettingFv 98.8505
[src/scene/setting/iplSetting] below 100: draw__Q33ipl5scene7SettingFv 91.525314
[src/scene/setting/iplSetting] below 100: initKeyboard__Q33ipl5scene7SettingFPCc 98.38498
[src/scene/setting/iplSetting] below 100: calcKeyboard__Q33ipl5scene7SettingFv 98.0
[src/scene/setting/iplSetting] below 100: convertRevIP__Q33ipl5scene7SettingFPUcPCc 98.69863
[src/scene/setting/iplSetting] below 100: scanAP__Q33ipl5scene7SettingFv 95.39338
[src/scene/setting/iplSetting] baseline: code 30760/37884 data 1040 functions 106 fuzzy 99.1581
regressions vs baseline: 0
global matched_code_percent: 87.68906 -> 87.79135
global fuzzy_match_percent: 99.36968 -> 99.37380
global complete_code_percent: 61.81448 -> 61.81448
global matched_data_percent: 91.26920 -> 91.26920
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS

View File

@@ -0,0 +1,126 @@
# Structural round 12 final report
Matching-only pass in the current worktree. No linking configuration, symbols, assembly, shared-header changes, remote operations or other worktrees were retained.
## Final full gate
Command:
```text
python3 /mnt/drive2/projects/wii-ipl-workers/_restore0928-tools/gate.py libs/RevoEX/src/nwc24/NWC24Download libs/RVL_SDK/src/nup/nup src/scene/setting/iplSetting
```
```text
full build: ok
main.dol sha1: 26116613f624061ba99c8d1a299aaa6efa85670d
[libs/RevoEX/src/nwc24/NWC24Download] pool: IDENTICAL
[libs/RevoEX/src/nwc24/NWC24Download] objdiff: code 8140/12496 data 80/80 functions 25/30 fuzzy 99.1521 linked code 0
[libs/RevoEX/src/nwc24/NWC24Download] instruction-exact functions: 25/30
[libs/RevoEX/src/nwc24/NWC24Download] section .data size 56 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sbss size 8 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .sdata size 16 match 100.0
[libs/RevoEX/src/nwc24/NWC24Download] section .text size 12496 match 99.15205
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24InitDlTask 98.923615
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24IterateDlTask 99.303795
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24UpdateDlTask 95.00395
[libs/RevoEX/src/nwc24/NWC24Download] below 100: NWC24iCheckDlHeaderConsistency 98.77358
[libs/RevoEX/src/nwc24/NWC24Download] below 100: AddTaskInternal 97.7182
[libs/RevoEX/src/nwc24/NWC24Download] baseline: code 6828/12496 data 80 functions 23 fuzzy 98.2676
[libs/RVL_SDK/src/nup/nup] pool: IDENTICAL
[libs/RVL_SDK/src/nup/nup] objdiff: code 7496/10764 data 1720/1720 functions 19/23 fuzzy 93.4430 linked code 0
[libs/RVL_SDK/src/nup/nup] instruction-exact functions: 19/23
[libs/RVL_SDK/src/nup/nup] section .data size 1592 match 100.0
[libs/RVL_SDK/src/nup/nup] section .rodata size 88 match 100.0
[libs/RVL_SDK/src/nup/nup] section .sbss size 8 match 100.0
[libs/RVL_SDK/src/nup/nup] section .sdata size 32 match 100.0
[libs/RVL_SDK/src/nup/nup] section .text size 10764 match 93.442955
[libs/RVL_SDK/src/nup/nup] below 100: __nupParseServerInfo__FP14NUPContextInfoPcPcUx 98.108406
[libs/RVL_SDK/src/nup/nup] below 100: __nupBase64Encode__FPUcPUcUl 94.20635
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetBootVersion__FP14ESTitleVersion None
[libs/RVL_SDK/src/nup/nup] below 100: __nupGetTitleSize__FP12NUPTitleInfo 99.100716
[libs/RVL_SDK/src/nup/nup] baseline: code 5744/10764 data 1720 functions 18 fuzzy 93.3222
[src/scene/setting/iplSetting] pool: IDENTICAL
[src/scene/setting/iplSetting] objdiff: code 30760/37884 data 1040/5696 functions 106/112 fuzzy 99.1581 linked code 0
[src/scene/setting/iplSetting] instruction-exact functions: 105/112
[src/scene/setting/iplSetting] section .bss size 456 match 100.0
[src/scene/setting/iplSetting] section .data size 4016 match 5.146636
[src/scene/setting/iplSetting] section .rodata size 640 match 32.25412
[src/scene/setting/iplSetting] section .sbss size 16 match 100.0
[src/scene/setting/iplSetting] section .sdata size 504 match 100.0
[src/scene/setting/iplSetting] section .sdata2 size 64 match 100.0
[src/scene/setting/iplSetting] section .text size 37884 match 99.15806
[src/scene/setting/iplSetting] below 100: createBrowser__Q33ipl5scene7SettingFv 98.8505
[src/scene/setting/iplSetting] below 100: draw__Q33ipl5scene7SettingFv 91.525314
[src/scene/setting/iplSetting] below 100: initKeyboard__Q33ipl5scene7SettingFPCc 98.38498
[src/scene/setting/iplSetting] below 100: calcKeyboard__Q33ipl5scene7SettingFv 98.0
[src/scene/setting/iplSetting] below 100: convertRevIP__Q33ipl5scene7SettingFPUcPCc 98.69863
[src/scene/setting/iplSetting] below 100: scanAP__Q33ipl5scene7SettingFv 95.39338
[src/scene/setting/iplSetting] baseline: code 30760/37884 data 1040 functions 106 fuzzy 99.1581
regressions vs baseline: 0
global matched_code_percent: 87.68906 -> 87.79135
global fuzzy_match_percent: 99.36968 -> 99.37380
global complete_code_percent: 61.81448 -> 61.81448
global matched_data_percent: 91.26920 -> 91.26920
forbidden patterns added (net, per file): 0
readability warnings (net, per file; must be 0 in the final result): 0
GATE PASS
```
## Before -> after
| Unit | Instruction exact | Objdiff exact functions | Objdiff exact code bytes | Objdiff data bytes |
| --- | --- | --- | --- | --- |
| libs/RevoEX/src/nwc24/NWC24Download | 23/30 -> 25/30 | 23/30 -> 25/30 | 6828 -> 8140 / 12496 | 80 -> 80 / 80 |
| libs/RVL_SDK/src/nup/nup | 18/23 -> 19/23 | 18/23 -> 19/23 | 5744 -> 7496 / 10764 | 1720 -> 1720 / 1720 |
| src/scene/setting/iplSetting | 105/112 -> 105/112 | 106/112 -> 106/112 | 30760 -> 30760 / 37884 | 1040 -> 1040 / 5696 |
Starting HEAD: `a348c9777aa65410b85f255be2a24363187d83aa`. Fresh start report: `/tmp/sol-med-structural12/start-report.json`; fresh final report: `/tmp/sol-med-structural12/final-report.json`. All 1024 unowned units retain identical measures, function records and section records to the starting report.
## Exact improvements and commits
| Commit | Source | Result | Full gate evidence |
| --- | --- | --- | --- |
| `8913ba0c` | `libs/RevoEX/src/nwc24/NWC24Download.c` | `NWC24ManageDlTaskListForMenu`: 150/152 -> 152/152; objdiff 100.0; ctxdiff 0. Fresh task-pointer assignment separates read and delete lifetimes. | `/tmp/sol-med-structural12/menu-full-gate.txt` |
| `785f85ad` | `libs/RevoEX/src/nwc24/NWC24Download.c` | `NWC24PurgeOldestDlTask`: 167/176 -> 176/176; objdiff 100.0; ctxdiff 0. Real iterator initializer boundary, selected-ID declaration order and successful-iteration read/delete lifetimes. | `/tmp/sol-med-structural12/purge-full-gate.txt` |
| `7cbf242f` | `libs/RVL_SDK/src/nup/nup.cpp` | `__nupOp`: 438/438 with 47 differences -> 438/438 with 0; objdiff 100.0. Width-valid boot output store plus direct context-title access. | `/tmp/sol-med-structural12/op-full-gate.txt` |
Each improvement passed a full clean 43U gate before its local commit. Every pool, including string offsets, remains identical. The final full gate independently rebuilt all three units and confirms zero baseline regressions, zero forbidden additions, zero readability warnings and the original DOL SHA-1. Setting remains unchanged; fuzzy-only experiments were restored.
The boot-version local in `__nupOp` is an output parameter initialized by the successful getter. `ES_GetBoot2Version` writes its output only for `IPC_RESULT_OK` (0); `private/ipc/types.h` defines negative IPC errors. The inline conversion initializes the caller output after width validation and the caller exits on a negative result. This does not read an uninitialized value on the API success/error paths.
## Remaining nonmatching functions
Percentages below describe the retained final source. Better partial candidates are rejected snapshots, not claimed gains. Structural and positional scores come from declsearch; the instruction count comes from disassembly. Every remaining function has at least three successful, distinct logged source attempts and three source snapshots.
| Unit | Exact symbol | Objdiff percent | Instructions; score; attempts | Remaining difference |
| --- | --- | --- | --- | --- |
| libs/RevoEX/src/nwc24/NWC24Download | `NWC24InitDlTask` | 98.923615 | 144/144; (0, 31); 5 attempts, 5 snapshots | 144/144 instructions; cached header, owner halves and home-path zero register allocation differ. Five source forms plus a 71-build declaration search did not change the register plateau. |
| libs/RevoEX/src/nwc24/NWC24Download | `NWC24IterateDlTask` | 99.303795 | 79/79; (0, 10); 3 attempts, 3 snapshots | 79/79 instructions; cached work/header registers are exchanged. Three loop/header/helper forms and a 36-build declaration search did not produce exact allocation. |
| libs/RevoEX/src/nwc24/NWC24Download | `NWC24UpdateDlTask` | 95.003950 | 249/253; (19, 250); 13 attempts, 13 snapshots | 249/253 instructions; permission helper boundaries, retry-header branch and saved-register/frame allocation differ. Thirteen source trials reduced the best rejected candidate to 253/253 and register-only score (0,26), 99.48617%; its declaration search did not improve. |
| libs/RevoEX/src/nwc24/NWC24Download | `NWC24iCheckDlHeaderConsistency` | 98.773580 | 212/212; (2, 3); 3 attempts, 3 snapshots | 212/212 instructions; three prologue instructions initialize the stack-task pointer after the two parameter aliases rather than before them. Two inline-loop argument orders regressed NWC24iOpenDlTaskList and were restored; repair-alias and declaration search also failed. |
| libs/RevoEX/src/nwc24/NWC24Download | `AddTaskInternal` | 97.718200 | 398/401; (20, 323); 3 attempts, 3 snapshots | 398/401 instructions; URL failure/helper boundaries, free-slot narrowing and inline retry bookkeeping differ. A wide free-slot counter reached 400/401, 98.81546%, with structural differences remaining; all three candidates were restored. |
| libs/RVL_SDK/src/nup/nup | `__nupParseServerInfo__FP14NUPContextInfoPcPcUx` | 98.108406 | 452/452; (0, 148); 3 attempts, 3 snapshots | 452/452 instructions; register allocation across repeated inline tag searches differs. Split checks, cursor declarations and output-store temporaries were tried before a 36-build declaration search; no exact candidate. |
| libs/RVL_SDK/src/nup/nup | `__nupBase64Encode__FPUcPUcUl` | 94.206350 | 63/63; (9, 21); 7 attempts, 7 snapshots | 63/63 instructions; first/second sextet extraction, table load/store scheduling and byte-count register differ. Seven distinct source trials plus declaration search did not match; swapping first/second source declarations compiled to the same mismatch. |
| libs/RVL_SDK/src/nup/nup | `__nupGetBootVersion__FP14ESTitleVersion` | None (unpaired) | 163/163; (0, 17); 3 attempts, 3 snapshots | 163/163 instructions after manual alias pairing; 17 register differences in title/content loops. Target symbol omits the context parameter present in the implementation and target ABI. Three title-ID/count/conversion trials were restored. No rename, symbol or configuration change. |
| libs/RVL_SDK/src/nup/nup | `__nupGetTitleSize__FP12NUPTitleInfo` | 99.100716 | 139/139; (0, 22); 3 attempts, 3 snapshots | 139/139 instructions; wide-size addition and installed-content lookup register allocation differ. Progress order, explicit rounded size and helper declarations were tried before declaration search; no exact candidate. |
| src/scene/setting/iplSetting | `createBrowser__Q33ipl5scene7SettingFv` | 98.850500 | 299/301; (15, 114); 3 attempts, 3 snapshots | 299/301 instructions; 0x200 frame versus target 0x210, saved-register allocation and direct-page switch branches differ. The target has explicit case seven and an unreachable default retaining r30; safe default variants retain extra instructions. Three explicit branch/declaration/index trials were restored. |
| src/scene/setting/iplSetting | `draw__Q33ipl5scene7SettingFv` | 91.525314 | 595/632; (82, 570); 15 attempts, 15 snapshots | 595/632 instructions; render-mode initialization emits a block copy instead of target typed assignment, scroll-store branches and side-rectangle integer/float scheduling also differ. Fifteen trials found a rejected 629/632, 98.34335% candidate using ordinary render-mode assignment and corrected branches; rectangle variants remained structural mismatches. |
| src/scene/setting/iplSetting | `initKeyboard__Q33ipl5scene7SettingFPCc` | 98.384980 | 215/213; (4, 195); 3 attempts, 3 snapshots | 215/213 instructions; defined row/string fallback values add instructions and affect frame/register allocation. Default-branch assignments, validation lifetime and dictionary temporaries were tried. No uninitialized fallback values were introduced. |
| src/scene/setting/iplSetting | `calcKeyboard__Q33ipl5scene7SettingFv` | 98.000000 | 292/290; (15, 258); 3 attempts, 3 snapshots | 292/290 instructions; defined form-text defaults and asterisk-loop index/store scheduling differ. Initialized commit pointer, separate store/update and explicit switch defaults were tried. No uninitialized form-text values were introduced. |
| src/scene/setting/iplSetting | `convertRevIP__Q33ipl5scene7SettingFPUcPCc` | 98.698630 | 73/73; (0, 16); 8 attempts, 8 snapshots | 73/73 instructions; ASCII buffer, output cursor, index and terminator register allocation differ. Eight source trials plus a 23-build declaration search left the best rejected candidate at eight register differences, 99.31507%. |
| src/scene/setting/iplSetting | `scanAP__Q33ipl5scene7SettingFv` | 95.393380 | 266/272; (53, 160); 11 attempts, 8 snapshots | 266/272 instructions; animation BOOL materialization, case-seven flag/index order and case-nine layout/index scheduling differ. Eleven distinct source trials reached a rejected 272/272 candidate with seven differences, 99.14706%; three branches use bgt instead of target bne, with four load-order differences. Guarded header experiments regressed other exact functions and were fully restored. |
## Measurement uncertainties
- `__nupGetBootVersion__FP14ESTitleVersion` is unpaired in objdiff because the source symbol includes `NUPContextInfo*`. Manual pairing proves 163/163 instructions and 17 register differences; no percentage was invented and no symbol was renamed.
- `setUpdate_NoUpdateDialog___Q33ipl5scene7SettingFv` is already objdiff 100.0 and its 120 raw code bytes match. The odiff comparator used by the gate interprets the CR operand of two conditional branches as an immediate and subtracts the function address, reporting two false branch differences. This explains instruction exact 105/112 versus objdiff 106/112 in Setting; the function was left untouched.
- Setting data remains 1040/5696: original zero-filled weak vtable/inline sections from DOL extraction prevent complete object data matching. No data padding, symbol-address pinning or link work was attempted. The full gate verifies the unchanged linked DOL, which does not claim this nonmatching unit is linked.
## Files and evidence
- Source: `libs/RevoEX/src/nwc24/NWC24Download.c`, `libs/RVL_SDK/src/nup/nup.cpp`.
- Attempt log: `tools/decomp-assist/sol-med-structural-round12.attempts.md`.
- Full final gate: `tools/decomp-assist/sol-med-structural-round12.final-gate.txt`.
- This report: `tools/decomp-assist/sol-med-structural-round12.report.md`.
- Target assembly, baseline/variant diffs, distinct source snapshots and declaration-search output remain under `/tmp/sol-med-structural12/`.
- Earlier untracked round 8, 9 and 11 records were preserved.