Compare commits

...

58 Commits

Author SHA1 Message Date
coah
ca735ac508 cleanup(CHANSVm): name float/int/string convert helpers
- CHANSVm_8144B1D8 → CHANSVmFloatSign
- CHANSVm_8144B30C → CHANSVmConvertToIntFromFloat
- CHANSVm_8144B430 → CHANSVmConvertToFloatFromUndefined
- CHANSVm_8144B470 → CHANSVmConvertToFloatFromInt
- CHANSVm_8144B4D4 → CHANSVmConvertToFloatFromStr
- CHANSVm_8144B62C → CHANSVmFloatToWString
- CHANSVm_8144B734 → CHANSVmConvertToStrFromFloat

Verified ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 18:44:11 -05:00
coah
df48bc9f76 Restore SD title switch block emission order (#656) 2026-10-01 18:43:05 -05:00
coah
3bd814f042 cleanup(SDMemory): rename iplSDMemory_813EE358 to containsTitleId (#655)
Helper scans a title-id list for a match; unused SDMemory* param kept.
Verified ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 18:42:39 -05:00
coah
51b78ed7da cleanup(iplBalloon): name fade/align/margin fields (#654)
Rename TextBalloon unk_ members and ctor/setPos params.

Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 18:40:27 -05:00
coah
3eb5d8faee cleanup(iplAOSSThread): name stack sentinel like RakuStack (#653)
Replace *(u32*)(mpStackBuffer + 0x3FC0) with AOSSStack::sentinel.

Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 18:40:21 -05:00
coah
d99950fc88 cleanup(tiCandidateBox): drop unused sdata2 float decls (#652)
Removed seven bare extern lbl_81694D* decls that were never referenced.
Verified ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 18:38:09 -05:00
coah
98d03059bd cleanup(iplBoardObject): rename Cos/Sin Ghidra locals (#651)
dVar2 → cosF, dVar3 → sinF in BoardObject::stt_stand.

Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 18:37:42 -05:00
coah
830e2f3920 cleanup(iplSound): name pitch/volume sdata2 float constants (#650)
lbl_816946A8 → scSoundTwoF (2.0f), lbl_816946AC → scSoundOneF (1.0f),
lbl_816946B0 → scSoundThirtyF (30.0f), lbl_816946B4 → scSoundSixtyF (60.0f).
2026-10-01 18:37:35 -05:00
coah
c1b00d8a14 cleanup(Date): drop unused lbl_816948F0 sdata2 decl (#649)
Bare extern was never referenced; scDateZeroF remains.
Verified ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 18:37:29 -05:00
coah
9acdd7f8dc cleanup(WDScan): name OUI sdata/sdata2 padding bytes (#648)
Rename leftover lbl_* pad bytes that sit between the RSN/WPA OUI
triples (and after scWpaFindOui*) so force_active and locals match
the existing sc* naming.
2026-10-01 18:37:02 -05:00
coah
abf047831a cleanup(tiInputForm): rename scInputForm0_7111111F to DegToFIdx (#647)
0.7111111f is 256/360 (degrees → nw4r SinFIdx units). Drop the
digit-heavy name that looked like an address suffix.

Verified: ninja build/43U/ok; fuzzy unchanged; DOL sha1 unchanged.
2026-10-01 18:35:19 -05:00
coah
17be3b014b cleanup(ChannelSelect): name updateDiskState asm labels (#646)
Rename address-suffixed local labels and jumptable_8164DE80 inside the
carefully Equivalent updateDiskState asm to case*/done semantic names.
symbols.txt updated for the jumptable; codegen unchanged.

Verified: ninja build/43U/ok; ~96.37% code / ~99.76% fuzzy; DOL sha1 unchanged.
2026-10-01 18:35:13 -05:00
coah
0d9d3d1081 cleanup(runtime): prefix Matching asm L_* labels with function names (#645)
Rename 65 bare address labels in Runtime helpers (__div2u/__div2i/__mod*,
__cvt_*, __shr2i) to FunctionName_L_<addr> for readability; codegen unchanged.

Verified: ninja build/43U/ok; runtime 100%/100%; DOL sha1 unchanged.
2026-10-01 18:35:07 -05:00
coah
196b14aa58 cleanup(CDBDatabase): prefix Matching asm L_* labels with function names (#644)
Rename 169 bare address labels inside the seven Search* asm functions to
FunctionName_L_<addr>, matching the nand_drv style, so local branches are
readable without changing codegen.

Verified: ninja build/43U/ok; CDBDatabase 100%/100%; DOL sha1 unchanged.
2026-10-01 18:34:25 -05:00
coah
1dde229702 cleanup(sdChannelSelect): drop unused iplSDChannelSelect_813DD240 decl (#643)
The real path is collectTitlesFromNandUsage; this extern was never called.
Build still OK; DOL sha1 unchanged.
2026-10-01 18:33:58 -05:00
coah
94c03497ff cleanup(SDChannelObj): name address-suffixed C helpers (#636)
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:33:42 -05:00
coah
e9dd012c09 cleanup(zmtkey): name Zi8MapKeyCode helper (#642)
Rename Zi8_81484484 (OEM/private-use wchar → key index) to
Zi8MapKeyCode. Byte-identical: ok + sha1
26116613f624061ba99c8d1a299aaa6efa85670d; unit still ~67.1% code /
~99.85% fuzzy.
2026-10-01 18:33:31 -05:00
coah
90e7b0ff2c iplSensitivity: suppress inline Rect dtor weak (#641)
Define IPL_CONTROLLER_TRIVIAL_RECT_DTOR so this TU no longer emits
~nw4r::ut::Rect. Compiled .text becomes byte-identical to the extract
(1112 bytes). Matching still blocked on .sdata2 layout (48 vs 56).

Co-authored-by: linker <linker@users.noreply.github.com>
2026-10-01 18:33:24 -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
49 changed files with 2062 additions and 1802 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.79% | 62.05% | 92.06% |
| 99.38% | 87.96% | 62.33% | 92.07% |
units 918/1027 complete, functions 12216/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

@@ -29,8 +29,8 @@ force_active:
- strspn
- strcspn
- padding__Q23ipl5scene
- lbl_81695063
- lbl_81695067
- scRsnOuiPad
- scWpaOuiPad
- __vt__Q49textinput6extend4memo19NigaoeEventObserver
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.

View File

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

@@ -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
@@ -4866,7 +4866,7 @@ onDialogState9__Q33ipl5scene8SDMemoryFv = .text:0x813EDF04; // type:function siz
onDialogState10__Q33ipl5scene8SDMemoryFv = .text:0x813EDFA8; // type:function size:0x130
onDialogState11__Q33ipl5scene8SDMemoryFv = .text:0x813EE0D8; // type:function size:0xE0
onDialogState12__Q33ipl5scene8SDMemoryFv = .text:0x813EE1B8; // type:function size:0x1A0
iplSDMemory_813EE358 = .text:0x813EE358; // type:function size:0x44
iplSDMemory_containsTitleId = .text:0x813EE358; // type:function size:0x44
onDialogState13__Q33ipl5scene8SDMemoryFv = .text:0x813EE39C; // type:function size:0xEC
onDialogState14__Q33ipl5scene8SDMemoryFv = .text:0x813EE488; // type:function size:0x1C4
onDialogState15__Q33ipl5scene8SDMemoryFv = .text:0x813EE64C; // type:function size:0x12C
@@ -6670,19 +6670,19 @@ CHANSVmStrCpyToU16FromU8 = .text:0x8144B058; // type:function size:0x34
CHANSVmStrCpyToU8FromU16 = .text:0x8144B08C; // type:function size:0x44
CHANSVmStrCpyToU8FromStringObject = .text:0x8144B0D0; // type:function size:0xB4
VmIsNan = .text:0x8144B184; // type:function size:0x54 scope:local
CHANSVm_8144B1D8 = .text:0x8144B1D8; // type:function size:0x20 scope:local
CHANSVmFloatSign = .text:0x8144B1D8; // type:function size:0x20 scope:local
VmIntToFloat = .text:0x8144B1F8; // type:function size:0x50 scope:local
CHANSVmParseInt = .text:0x8144B248; // type:function size:0xC4 scope:local
CHANSVm_8144B30C = .text:0x8144B30C; // type:function size:0xAC scope:local
CHANSVmConvertToIntFromFloat = .text:0x8144B30C; // type:function size:0xAC scope:local
CHANSVmConvertToIntFromStr = .text:0x8144B3B8; // type:function size:0x70
CHANSVmConvertToIntFromArray = .text:0x8144B428; // type:function size:0x8
CHANSVm_8144B430 = .text:0x8144B430; // type:function size:0x40
CHANSVm_8144B470 = .text:0x8144B470; // type:function size:0x64
CHANSVm_8144B4D4 = .text:0x8144B4D4; // type:function size:0x14C
CHANSVmConvertToFloatFromUndefined = .text:0x8144B430; // type:function size:0x40
CHANSVmConvertToFloatFromInt = .text:0x8144B470; // type:function size:0x64
CHANSVmConvertToFloatFromStr = .text:0x8144B4D4; // type:function size:0x14C
CHANSVmConvertToStrFromUndefined = .text:0x8144B620; // type:function size:0xC
CHANSVm_8144B62C = .text:0x8144B62C; // type:function size:0x58 scope:local
CHANSVmFloatToWString = .text:0x8144B62C; // type:function size:0x58 scope:local
CHANSVmConvertToStrFromInt = .text:0x8144B684; // type:function size:0xB0
CHANSVm_8144B734 = .text:0x8144B734; // type:function size:0xDC
CHANSVmConvertToStrFromFloat = .text:0x8144B734; // type:function size:0xDC
CHANSVmConvertToStrFromArray = .text:0x8144B810; // type:function size:0x10
CHANSVmConvertObjectTypeError = .text:0x8144B820; // type:function size:0x50
CHANSVmGetEnumedType = .text:0x8144B870; // type:function size:0x6C scope:local
@@ -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
@@ -7284,7 +7284,7 @@ Zi8_814834AC = .text:0x814834AC; // type:function size:0x55C
Zi8GetKOcandidates = .text:0x81483A08; // type:function size:0xA74
Zi8LogError = .text:0x8148447C; // type:function size:0x4
Zi8ReplaceLastError = .text:0x81484480; // type:function size:0x4
Zi8_81484484 = .text:0x81484484; // type:function size:0x80
Zi8MapKeyCode = .text:0x81484484; // type:function size:0x80
ziNumKeysWithChars = .text:0x81484504; // type:function size:0xC4 scope:local
Zi8getKeyLayout = .text:0x814845C8; // type:function size:0x2D8
Zi8ChangeCharCase = .text:0x814848A0; // type:function size:0x48C
@@ -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
@@ -15942,7 +15942,7 @@ lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
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
updateDiskState_jumptable = .data:0x8164DE80; // type:object size:0x1C scope:local
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
@@ -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
@@ -20243,11 +20243,11 @@ 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
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
lbl_816946B4 = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float
scSoundZeroF = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
scSoundTwoF = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
scSoundOneF = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
scSoundThirtyF = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
scSoundSixtyF = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float
lbl_816946B8 = .sdata2:0x816946B8; // type:object size:0x8 align:8 data:double
lbl_816946C0 = .sdata2:0x816946C0; // type:object size:0x8 align:8 data:double
lbl_816946C8 = .sdata2:0x816946C8; // type:object size:0x8 align:8 data:double
@@ -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
scInputFormDegToFIdxF = .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
@@ -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

View File

@@ -920,7 +920,7 @@ config.libs = [
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
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

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

@@ -14,8 +14,8 @@ namespace ipl {
WAIT_UNTIL_FADE_IN = 15
};
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& unk2,
f32 unk3 = 120.0f, f32 unk4 = 30.0f);
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& initialPos,
f32 margin16x9 = 120.0f, f32 margin4x3 = 30.0f);
~TextBalloon();
void calc();
@@ -31,7 +31,7 @@ namespace ipl {
void fadeout();
void fadeoutForce();
void setPos(const math::VEC3& pos, bool unk0, int unk1);
void setPos(const math::VEC3& pos, bool use16x9X, int hAlign);
void updatePos(const math::VEC3& pos);
void set_translate(const math::VEC3& trans);
@@ -50,7 +50,7 @@ namespace ipl {
undefined4 unk_0x00;
undefined4 unk_0x04;
BOOL unk_0x08;
BOOL mbWaitingFadeIn; // 0x08
layout::Object* mpLayout; // 0x0C
@@ -60,10 +60,10 @@ namespace ipl {
u32 mTextLen; // 0x18
math::VEC3 mBalloonPos; // 0x1C
undefined4 unk_0x28;
undefined unk_0x2C;
f32 unk_0x30;
f32 unk_0x34;
undefined4 mHAlign; // 0x28
undefined mbUse16x9X; // 0x2C
f32 mMargin16x9; // 0x30
f32 mMargin4x3; // 0x34
int mWaitUntilFadeIn; // 0x38

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

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

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

@@ -8,7 +8,7 @@ ziU16 Zi8GetTableCount(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
ziU32 Zi8GetTableAddress(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
ziU8 Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data);
ziBool Zi8_81484484(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
ziBool Zi8MapKeyCode(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
if (character == 0xeffa) {
*output = 0;
} else if ((character >= 0xeff1) && (character <= 0xeff9)) {
@@ -58,7 +58,7 @@ ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, zi
*chars = 0;
if (ZI_WORK->userKeys[language] != 0) {
customTable = ZI_WORK->userKeys[language];
if (!Zi8_81484484(key, &key, __zi8_work_data)) {
if (!Zi8MapKeyCode(key, &key, __zi8_work_data)) {
return 0;
}
keyChars = customTable->lower[key];
@@ -87,7 +87,7 @@ tables_ready:
Zi8ReplaceLastError(0x962, __zi8_work_data);
return 0;
}
if (!Zi8_81484484(key, &key, __zi8_work_data) || (key >= numKeys)) {
if (!Zi8MapKeyCode(key, &key, __zi8_work_data) || (key >= numKeys)) {
Zi8ReplaceLastError(300, __zi8_work_data);
return 0;
}

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

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

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

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

File diff suppressed because it is too large Load Diff

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

@@ -13,22 +13,22 @@
const u8 scRsnOui0 = 0;
const u8 scRsnOui1 = 0x0F;
const u8 scRsnOui2 = 0xAC;
const u8 lbl_81695063 = 0;
const u8 scRsnOuiPad = 0;
const u8 scWpaOui0 = 0;
const u8 scWpaOui1 = 0x50;
const u8 scWpaOui2 = 0xF2;
const u8 lbl_81695067 = 0;
const u8 scWpaOuiPad = 0;
#pragma pop
#pragma push
#pragma section sconst_type ".sdata"
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;
const u8 lbl_81697D76 = 0;
const u8 lbl_81697D77 = 0;
const u8 scWpaFindOuiPad0 = 0;
const u8 scWpaFindOuiPad1 = 0;
const u8 scWpaFindOuiPad2 = 0;
const u8 scWpaFindOuiPad3 = 0;
const u8 scWpaFindOuiPad4 = 0;
#pragma pop
#define scRsnOui0 (*((volatile const u8*)&scRsnOui0))

View File

@@ -313,18 +313,18 @@ asm void __div2u() {
cmpwi r3, 0x0
cntlzw r0, r3
cntlzw r9, r4
bne L_815F9538
bne __div2u_L_815F9538
addi r0, r9, 0x20
L_815F9538:
__div2u_L_815F9538:
cmpwi r5, 0x0
cntlzw r9, r5
cntlzw r10, r6
bne L_815F954C
bne __div2u_L_815F954C
addi r9, r10, 0x20
L_815F954C:
__div2u_L_815F954C:
cmpw r0, r9
subfic r10, r0, 0x40
bgt L_815F9604
bgt __div2u_L_815F9604
addi r9, r9, 0x1
subfic r9, r9, 0x40
add r0, r0, r9
@@ -332,49 +332,49 @@ L_815F954C:
mtctr r9
cmpwi r9, 0x20
subi r7, r9, 0x20
blt L_815F9584
blt __div2u_L_815F9584
srw r8, r3, r7
li r7, 0x0
b L_815F9598
L_815F9584:
b __div2u_L_815F9598
__div2u_L_815F9584:
srw r8, r4, r9
subfic r7, r9, 0x20
slw r7, r3, r7
or r8, r8, r7
srw r7, r3, r9
L_815F9598:
__div2u_L_815F9598:
cmpwi r0, 0x20
subic r9, r0, 0x20
blt L_815F95B0
blt __div2u_L_815F95B0
slw r3, r4, r9
li r4, 0x0
b L_815F95C4
L_815F95B0:
b __div2u_L_815F95C4
__div2u_L_815F95B0:
slw r3, r3, r0
subfic r9, r0, 0x20
srw r9, r4, r9
or r3, r3, r9
slw r4, r4, r0
L_815F95C4:
__div2u_L_815F95C4:
li r10, -0x1
addic r7, r7, 0x0
L_815F95CC:
__div2u_L_815F95CC:
adde r4, r4, r4
adde r3, r3, r3
adde r8, r8, r8
adde r7, r7, r7
subfc r0, r6, r8
subfe. r9, r5, r7
blt L_815F95F4
blt __div2u_L_815F95F4
mr r8, r0
mr r7, r9
addic r0, r10, 0x1
L_815F95F4:
bdnz L_815F95CC
__div2u_L_815F95F4:
bdnz __div2u_L_815F95CC
adde r4, r4, r4
adde r3, r3, r3
blr
L_815F9604:
__div2u_L_815F9604:
li r4, 0x0
li r3, 0x0
blr
@@ -385,32 +385,32 @@ asm void __div2i() {
#ifdef __MWERKS__
stwu r1, -0x10(r1)
clrrwi. r9, r3, 31
beq L_815F9624
beq __div2i_L_815F9624
subfic r4, r4, 0x0
subfze r3, r3
L_815F9624:
__div2i_L_815F9624:
stw r9, 0x8(r1)
clrrwi. r10, r5, 31
beq L_815F9638
beq __div2i_L_815F9638
subfic r6, r6, 0x0
subfze r5, r5
L_815F9638:
__div2i_L_815F9638:
stw r10, 0xc(r1)
cmpwi r3, 0x0
cntlzw r0, r3
cntlzw r9, r4
bne L_815F9650
bne __div2i_L_815F9650
addi r0, r9, 0x20
L_815F9650:
__div2i_L_815F9650:
cmpwi r5, 0x0
cntlzw r9, r5
cntlzw r10, r6
bne L_815F9664
bne __div2i_L_815F9664
addi r9, r10, 0x20
L_815F9664:
__div2i_L_815F9664:
cmpw r0, r9
subfic r10, r0, 0x40
bgt L_815F9738
bgt __div2i_L_815F9738
addi r9, r9, 0x1
subfic r9, r9, 0x40
add r0, r0, r9
@@ -418,60 +418,60 @@ L_815F9664:
mtctr r9
cmpwi r9, 0x20
subi r7, r9, 0x20
blt L_815F969C
blt __div2i_L_815F969C
srw r8, r3, r7
li r7, 0x0
b L_815F96B0
L_815F969C:
b __div2i_L_815F96B0
__div2i_L_815F969C:
srw r8, r4, r9
subfic r7, r9, 0x20
slw r7, r3, r7
or r8, r8, r7
srw r7, r3, r9
L_815F96B0:
__div2i_L_815F96B0:
cmpwi r0, 0x20
subic r9, r0, 0x20
blt L_815F96C8
blt __div2i_L_815F96C8
slw r3, r4, r9
li r4, 0x0
b L_815F96DC
L_815F96C8:
b __div2i_L_815F96DC
__div2i_L_815F96C8:
slw r3, r3, r0
subfic r9, r0, 0x20
srw r9, r4, r9
or r3, r3, r9
slw r4, r4, r0
L_815F96DC:
__div2i_L_815F96DC:
li r10, -0x1
addic r7, r7, 0x0
L_815F96E4:
__div2i_L_815F96E4:
adde r4, r4, r4
adde r3, r3, r3
adde r8, r8, r8
adde r7, r7, r7
subfc r0, r6, r8
subfe. r9, r5, r7
blt L_815F970C
blt __div2i_L_815F970C
mr r8, r0
mr r7, r9
addic r0, r10, 0x1
L_815F970C:
bdnz L_815F96E4
__div2i_L_815F970C:
bdnz __div2i_L_815F96E4
adde r4, r4, r4
adde r3, r3, r3
lwz r9, 0x8(r1)
lwz r10, 0xc(r1)
xor. r7, r9, r10
beq L_815F9734
beq __div2i_L_815F9734
cmpwi r9, 0x0
subfic r4, r4, 0x0
subfze r3, r3
L_815F9734:
b L_815F9740
L_815F9738:
__div2i_L_815F9734:
b __div2i_L_815F9740
__div2i_L_815F9738:
li r4, 0x0
li r3, 0x0
L_815F9740:
__div2i_L_815F9740:
addi r1, r1, 0x10
blr
#endif
@@ -482,18 +482,18 @@ asm void __mod2u() {
cmpwi r3, 0x0
cntlzw r0, r3
cntlzw r9, r4
bne L_815F975C
bne __mod2u_L_815F975C
addi r0, r9, 0x20
L_815F975C:
__mod2u_L_815F975C:
cmpwi r5, 0x0
cntlzw r9, r5
cntlzw r10, r6
bne L_815F9770
bne __mod2u_L_815F9770
addi r9, r10, 0x20
L_815F9770:
__mod2u_L_815F9770:
cmpw r0, r9
subfic r10, r0, 0x40
bgt L_815F9828
bgt __mod2u_L_815F9828
addi r9, r9, 0x1
subfic r9, r9, 0x40
add r0, r0, r9
@@ -501,49 +501,49 @@ L_815F9770:
mtctr r9
cmpwi r9, 0x20
subi r7, r9, 0x20
blt L_815F97A8
blt __mod2u_L_815F97A8
srw r8, r3, r7
li r7, 0x0
b L_815F97BC
L_815F97A8:
b __mod2u_L_815F97BC
__mod2u_L_815F97A8:
srw r8, r4, r9
subfic r7, r9, 0x20
slw r7, r3, r7
or r8, r8, r7
srw r7, r3, r9
L_815F97BC:
__mod2u_L_815F97BC:
cmpwi r0, 0x20
subic r9, r0, 0x20
blt L_815F97D4
blt __mod2u_L_815F97D4
slw r3, r4, r9
li r4, 0x0
b L_815F97E8
L_815F97D4:
b __mod2u_L_815F97E8
__mod2u_L_815F97D4:
slw r3, r3, r0
subfic r9, r0, 0x20
srw r9, r4, r9
or r3, r3, r9
slw r4, r4, r0
L_815F97E8:
__mod2u_L_815F97E8:
li r10, -0x1
addic r7, r7, 0x0
L_815F97F0:
__mod2u_L_815F97F0:
adde r4, r4, r4
adde r3, r3, r3
adde r8, r8, r8
adde r7, r7, r7
subfc r0, r6, r8
subfe. r9, r5, r7
blt L_815F9818
blt __mod2u_L_815F9818
mr r8, r0
mr r7, r9
addic r0, r10, 0x1
L_815F9818:
bdnz L_815F97F0
__mod2u_L_815F9818:
bdnz __mod2u_L_815F97F0
mr r4, r8
mr r3, r7
blr
L_815F9828:
__mod2u_L_815F9828:
blr
#endif
}
@@ -551,30 +551,30 @@ L_815F9828:
asm void __mod2i() {
#ifdef __MWERKS__
cmpwi cr7, r3, 0x0
bge cr7, L_815F983C
bge cr7, __mod2i_L_815F983C
subfic r4, r4, 0x0
subfze r3, r3
L_815F983C:
__mod2i_L_815F983C:
cmpwi r5, 0x0
bge L_815F984C
bge __mod2i_L_815F984C
subfic r6, r6, 0x0
subfze r5, r5
L_815F984C:
__mod2i_L_815F984C:
cmpwi r3, 0x0
cntlzw r0, r3
cntlzw r9, r4
bne L_815F9860
bne __mod2i_L_815F9860
addi r0, r9, 0x20
L_815F9860:
__mod2i_L_815F9860:
cmpwi r5, 0x0
cntlzw r9, r5
cntlzw r10, r6
bne L_815F9874
bne __mod2i_L_815F9874
addi r9, r10, 0x20
L_815F9874:
__mod2i_L_815F9874:
cmpw r0, r9
subfic r10, r0, 0x40
bgt L_815F9928
bgt __mod2i_L_815F9928
addi r9, r9, 0x1
subfic r9, r9, 0x40
add r0, r0, r9
@@ -582,52 +582,52 @@ L_815F9874:
mtctr r9
cmpwi r9, 0x20
subi r7, r9, 0x20
blt L_815F98AC
blt __mod2i_L_815F98AC
srw r8, r3, r7
li r7, 0x0
b L_815F98C0
L_815F98AC:
b __mod2i_L_815F98C0
__mod2i_L_815F98AC:
srw r8, r4, r9
subfic r7, r9, 0x20
slw r7, r3, r7
or r8, r8, r7
srw r7, r3, r9
L_815F98C0:
__mod2i_L_815F98C0:
cmpwi r0, 0x20
subic r9, r0, 0x20
blt L_815F98D8
blt __mod2i_L_815F98D8
slw r3, r4, r9
li r4, 0x0
b L_815F98EC
L_815F98D8:
b __mod2i_L_815F98EC
__mod2i_L_815F98D8:
slw r3, r3, r0
subfic r9, r0, 0x20
srw r9, r4, r9
or r3, r3, r9
slw r4, r4, r0
L_815F98EC:
__mod2i_L_815F98EC:
li r10, -0x1
addic r7, r7, 0x0
L_815F98F4:
__mod2i_L_815F98F4:
adde r4, r4, r4
adde r3, r3, r3
adde r8, r8, r8
adde r7, r7, r7
subfc r0, r6, r8
subfe. r9, r5, r7
blt L_815F991C
blt __mod2i_L_815F991C
mr r8, r0
mr r7, r9
addic r0, r10, 0x1
L_815F991C:
bdnz L_815F98F4
__mod2i_L_815F991C:
bdnz __mod2i_L_815F98F4
mr r4, r8
mr r3, r7
L_815F9928:
bge cr7, L_815F9934
__mod2i_L_815F9928:
bge cr7, __mod2i_L_815F9934
subfic r4, r4, 0x0
subfze r3, r3
L_815F9934:
__mod2i_L_815F9934:
blr
#endif
}
@@ -668,9 +668,9 @@ asm void __shr2i() {
slw r10, r3, r8
or r4, r4, r10
sraw r10, r3, r9
ble L_815F99A0
ble __shr2i_L_815F99A0
or r4, r4, r10
L_815F99A0:
__shr2i_L_815F99A0:
sraw r3, r3, r5
blr
#endif
@@ -680,13 +680,13 @@ asm void __cvt_sll_dbl() {
#ifdef __MWERKS__
stwu r1, -0x10(r1)
clrrwi. r5, r3, 31
beq L_815F99BC
beq __cvt_sll_dbl_L_815F99BC
subfic r4, r4, 0x0
subfze r3, r3
L_815F99BC:
__cvt_sll_dbl_L_815F99BC:
or. r7, r3, r4
li r6, 0x0
beq L_815F9A44
beq __cvt_sll_dbl_L_815F9A44
cntlzw r7, r3
cntlzw r8, r4
extlwi r9, r7, 5, 26
@@ -705,22 +705,22 @@ L_815F99BC:
clrlwi r7, r4, 21
cmpwi r7, 0x400
addi r6, r6, 0x43e
blt L_815F9A2C
bgt L_815F9A20
blt __cvt_sll_dbl_L_815F9A2C
bgt __cvt_sll_dbl_L_815F9A20
rlwinm. r7, r4, 0, 20, 20
beq L_815F9A2C
L_815F9A20:
beq __cvt_sll_dbl_L_815F9A2C
__cvt_sll_dbl_L_815F9A20:
addic r4, r4, 0x800
addze r3, r3
addze r6, r6
L_815F9A2C:
__cvt_sll_dbl_L_815F9A2C:
rotrwi r4, r4, 11
rlwimi r4, r3, 21, 0, 10
extrwi r3, r3, 20, 1
slwi r6, r6, 20
or r3, r6, r3
or r3, r5, r3
L_815F9A44:
__cvt_sll_dbl_L_815F9A44:
stw r3, 0x8(r1)
stw r4, 0xc(r1)
lfd f1, 0x8(r1)
@@ -734,7 +734,7 @@ asm void __cvt_ull_dbl() {
stwu r1, -0x10(r1)
or. r7, r3, r4
li r6, 0x0
beq L_815F9AE0
beq __cvt_ull_dbl_L_815F9AE0
cntlzw r7, r3
cntlzw r8, r4
extlwi r9, r7, 5, 26
@@ -753,21 +753,21 @@ asm void __cvt_ull_dbl() {
clrlwi r7, r4, 21
cmpwi r7, 0x400
addi r6, r6, 0x43e
blt L_815F9ACC
bgt L_815F9AC0
blt __cvt_ull_dbl_L_815F9ACC
bgt __cvt_ull_dbl_L_815F9AC0
rlwinm. r7, r4, 0, 20, 20
beq L_815F9ACC
L_815F9AC0:
beq __cvt_ull_dbl_L_815F9ACC
__cvt_ull_dbl_L_815F9AC0:
addic r4, r4, 0x800
addze r3, r3
addze r6, r6
L_815F9ACC:
__cvt_ull_dbl_L_815F9ACC:
rotrwi r4, r4, 11
rlwimi r4, r3, 21, 0, 10
extrwi r3, r3, 20, 1
slwi r6, r6, 20
or r3, r6, r3
L_815F9AE0:
__cvt_ull_dbl_L_815F9AE0:
stw r3, 0x8(r1)
stw r4, 0xc(r1)
lfd f1, 0x8(r1)
@@ -781,7 +781,7 @@ asm void __cvt_ull_flt() {
stwu r1, -0x10(r1)
or. r7, r3, r4
li r6, 0x0
beq L_815F9B7C
beq __cvt_ull_flt_L_815F9B7C
cntlzw r7, r3
cntlzw r8, r4
extlwi r9, r7, 5, 26
@@ -800,21 +800,21 @@ asm void __cvt_ull_flt() {
clrlwi r7, r4, 21
cmpwi r7, 0x400
addi r6, r6, 0x43e
blt L_815F9B68
bgt L_815F9B5C
blt __cvt_ull_flt_L_815F9B68
bgt __cvt_ull_flt_L_815F9B5C
rlwinm. r7, r4, 0, 20, 20
beq L_815F9B68
L_815F9B5C:
beq __cvt_ull_flt_L_815F9B68
__cvt_ull_flt_L_815F9B5C:
addic r4, r4, 0x800
addze r3, r3
addze r6, r6
L_815F9B68:
__cvt_ull_flt_L_815F9B68:
rotrwi r4, r4, 11
rlwimi r4, r3, 21, 0, 10
extrwi r3, r3, 20, 1
slwi r6, r6, 20
or r3, r6, r3
L_815F9B7C:
__cvt_ull_flt_L_815F9B7C:
stw r3, 0x8(r1)
stw r4, 0xc(r1)
lfd f1, 0x8(r1)
@@ -832,17 +832,17 @@ asm void __cvt_dbl_usll() {
lwz r4, 0xc(r1)
extrwi r5, r3, 11, 1
cmplwi r5, 0x3ff
bge L_815F9BBC
bge __cvt_dbl_usll_L_815F9BBC
li r3, 0x0
li r4, 0x0
b L_815F9C58
L_815F9BBC:
b __cvt_dbl_usll_L_815F9C58
__cvt_dbl_usll_L_815F9BBC:
mr r6, r3
clrlwi r3, r3, 12
oris r3, r3, 0x10
subi r5, r5, 0x433
cmpwi r5, 0x0
bge L_815F9BFC
bge __cvt_dbl_usll_L_815F9BFC
neg r5, r5
subfic r8, r5, 0x20
subic r9, r5, 0x20
@@ -852,21 +852,21 @@ L_815F9BBC:
srw r10, r3, r9
or r4, r4, r10
srw r3, r3, r5
b L_815F9C48
L_815F9BFC:
b __cvt_dbl_usll_L_815F9C48
__cvt_dbl_usll_L_815F9BFC:
cmpwi r5, 0xa
ble+ L_815F9C28
ble+ __cvt_dbl_usll_L_815F9C28
clrrwi. r6, r6, 31
beq L_815F9C18
beq __cvt_dbl_usll_L_815F9C18
lis r3, 0x8000
li r4, 0x0
b L_815F9C58
L_815F9C18:
b __cvt_dbl_usll_L_815F9C58
__cvt_dbl_usll_L_815F9C18:
lis r3, 0x7fff
ori r3, r3, 0xffff
li r4, -0x1
b L_815F9C58
L_815F9C28:
b __cvt_dbl_usll_L_815F9C58
__cvt_dbl_usll_L_815F9C28:
subfic r8, r5, 0x20
subic r9, r5, 0x20
slw r3, r3, r5
@@ -875,12 +875,12 @@ L_815F9C28:
slw r10, r4, r9
or r3, r3, r10
slw r4, r4, r5
L_815F9C48:
__cvt_dbl_usll_L_815F9C48:
clrrwi. r6, r6, 31
beq L_815F9C58
beq __cvt_dbl_usll_L_815F9C58
subfic r4, r4, 0x0
subfze r3, r3
L_815F9C58:
__cvt_dbl_usll_L_815F9C58:
addi r1, r1, 0x10
blr
#endif
@@ -894,19 +894,19 @@ asm void __cvt_dbl_ull() {
lwz r4, 0xc(r1)
extrwi r5, r3, 11, 1
cmplwi r5, 0x3ff
bge L_815F9C88
L_815F9C7C:
bge __cvt_dbl_ull_L_815F9C88
__cvt_dbl_ull_L_815F9C7C:
li r3, 0x0
li r4, 0x0
b L_815F9D00
L_815F9C88:
b __cvt_dbl_ull_L_815F9D00
__cvt_dbl_ull_L_815F9C88:
clrrwi. r6, r3, 31
bne L_815F9C7C
bne __cvt_dbl_ull_L_815F9C7C
clrlwi r3, r3, 12
oris r3, r3, 0x10
subi r5, r5, 0x433
cmpwi r5, 0x0
bge L_815F9CCC
bge __cvt_dbl_ull_L_815F9CCC
neg r5, r5
subfic r8, r5, 0x20
subic r9, r5, 0x20
@@ -916,14 +916,14 @@ L_815F9C88:
srw r10, r3, r9
or r4, r4, r10
srw r3, r3, r5
b L_815F9D00
L_815F9CCC:
b __cvt_dbl_ull_L_815F9D00
__cvt_dbl_ull_L_815F9CCC:
cmpwi r5, 0xb
ble+ L_815F9CE0
ble+ __cvt_dbl_ull_L_815F9CE0
li r3, -0x1
li r4, -0x1
b L_815F9D00
L_815F9CE0:
b __cvt_dbl_ull_L_815F9D00
__cvt_dbl_ull_L_815F9CE0:
subfic r8, r5, 0x20
subic r9, r5, 0x20
slw r3, r3, r5
@@ -932,7 +932,7 @@ L_815F9CE0:
slw r10, r4, r9
or r3, r3, r10
slw r4, r4, r5
L_815F9D00:
__cvt_dbl_ull_L_815F9D00:
addi r1, r1, 0x10
blr
#endif

View File

@@ -604,7 +604,7 @@ vmBoolInt VmIsNan(vmFloat value) {
return isnan(value) || value == VM_NAN;
}
double CHANSVm_8144B1D8(double value) {
double CHANSVmFloatSign(double value) {
// Clamp to -1.0~1.0
return value < 0.0 ? -1.0 : value > 0.0 ? 1.0 : value;
}
@@ -650,14 +650,14 @@ static s32 CHANSVmParseInt(CHANSVmObjHdr* obj, s32 base, u64* out) {
return 0;
}
CHANSVmObjHdr* CHANSVm_8144B30C(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertToIntFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
// Convert to int from float
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_INTEGER, 0);
if (newObj != vmNull) {
if (VmIsNan(object->value.float_v)) {
newObj->value.int_v = 0;
} else {
newObj->value.int_v = (u64)(CHANSVm_8144B1D8(object->value.float_v) * floor(fabs(object->value.float_v)));
newObj->value.int_v = (u64)(CHANSVmFloatSign(object->value.float_v) * floor(fabs(object->value.float_v)));
}
}
return newObj;
@@ -675,7 +675,7 @@ CHANSVmObjHdr* CHANSVmConvertToIntFromArray(CHANSVm* vm, CHANSVmObjType type, CH
return vmNull;
}
CHANSVmObjHdr* CHANSVm_8144B430(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertToFloatFromUndefined(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
if (result != vmNull) {
result->value.float_v = VM_NAN;
@@ -683,7 +683,7 @@ CHANSVmObjHdr* CHANSVm_8144B430(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
return result;
}
CHANSVmObjHdr* CHANSVm_8144B470(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
CHANSVmObjHdr* CHANSVmConvertToFloatFromInt(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
if (result != vmNull) {
result->value.float_v = VmIntToFloat(intObj->value.int_v);
@@ -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;
}
}
@@ -771,7 +771,7 @@ static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
return 0;
}
CHANSVmObjHdr* CHANSVm_8144B4D4(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVmConvertToFloatFromStr(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
// Convert string keyword into float value
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
@@ -785,8 +785,8 @@ CHANSVmObjHdr* CHANSVmConvertToStrFromUndefined(CHANSVm* vm, CHANSVmObjType type
return (CHANSVmObjHdr*)CHANSVmConstStringObjectUndefined_;
}
s32 CHANSVm_8144B62C(vmWString buf, u32 len, vmFloat val) NO_INLINE {
s32 result = snprintf((char*)buf, len / 2, lbl_8169758A, val);
s32 CHANSVmFloatToWString(vmWString buf, u32 len, vmFloat val) NO_INLINE {
s32 result = snprintf((char*)buf, len / 2, scFloatPrintfFmt, val);
CHANSVmStrCpyToU16FromU8(buf, (vmString)buf, result);
return VM_STR_LENGTH(result);
}
@@ -815,7 +815,7 @@ error:
return vmNull;
}
CHANSVmObjHdr* CHANSVm_8144B734(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
CHANSVmObjHdr* CHANSVmConvertToStrFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
const CHANSVmObjHdr* base;
CHANSVmObjHdr* newObj;
s32 result;
@@ -835,7 +835,7 @@ CHANSVmObjHdr* CHANSVm_8144B734(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_STRING, VM_STRING_SIZE);
if (newObj != vmNull) {
result = CHANSVm_8144B62C(newObj->value.wstring_v->spData, VM_STRING_SIZE, value->value.float_v);
result = CHANSVmFloatToWString(newObj->value.wstring_v->spData, VM_STRING_SIZE, value->value.float_v);
newObj->value.wstring_v->len = result;
if (newObj->value.wstring_v->len == 0) {
goto error;
@@ -899,14 +899,14 @@ 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[] = {
{vmNull, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, vmNull, CHANSVm_8144B30C, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
{CHANSVm_8144B430, CHANSVm_8144B470, vmNull, CHANSVm_8144B4D4, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVm_8144B734, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertToIntFromFloat, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
{CHANSVmConvertToFloatFromUndefined, CHANSVmConvertToFloatFromInt, vmNull, CHANSVmConvertToFloatFromStr, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVmConvertToStrFromFloat, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull},
};
@@ -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;
}
}
@@ -2183,7 +2183,7 @@ static u32 VmArrayJoinSub(CHANSVmObjHdr* obj, CHANSVmObjHdr* array, wchar_t* sep
if (offset + 0x80 > bufSize) {
goto error;
}
elemLen = CHANSVm_8144B62C((vmWString)((u8*)(*obj->value.ptr_v) + offset), 0x80, chunk->elements[countInChunk].value.float_v);
elemLen = CHANSVmFloatToWString((vmWString)((u8*)(*obj->value.ptr_v) + offset), 0x80, chunk->elements[countInChunk].value.float_v);
break;
}
case CHANS_VM_TYPE_ARRAY: {
@@ -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;
}
}
@@ -7602,7 +7602,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
break;
}
case CHANS_VM_OBJ_TYPE_FLOAT: {
invertedVal = (s64)(CHANSVm_8144B1D8(pAcc->value.float_v) * floor(fabs(pAcc->value.float_v)));
invertedVal = (s64)(CHANSVmFloatSign(pAcc->value.float_v) * floor(fabs(pAcc->value.float_v)));
break;
}
case CHANS_VM_OBJ_TYPE_STRING: {

View File

@@ -5,13 +5,6 @@
#include <new>
extern "C" const f32 lbl_81694D90;
extern "C" const f32 lbl_81694DA8;
extern "C" const f32 lbl_81694DAC;
extern "C" const f32 lbl_81694DB0;
extern "C" const f32 lbl_81694DB4;
extern "C" const f32 lbl_81694DBC;
extern "C" const double lbl_81694DC8;
extern "C" void _savegpr_24();
extern "C" void _restgpr_24();
extern "C" void GetFont__Q34nw4r3lyt8TextBoxCFv();
@@ -21,22 +14,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 +70,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 +205,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 +215,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 +391,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 +447,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 +460,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 +470,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 +489,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 +498,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 +513,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 +524,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 +581,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 +589,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 +630,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 +699,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 +758,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 +989,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 +1008,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 +1016,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 +1203,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 +1486,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 +1638,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 +1684,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 +1749,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),
@@ -737,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 scInputFormDegToFIdxF = 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 {
@@ -3386,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;
@@ -3470,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;
@@ -3484,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

@@ -486,12 +486,12 @@ namespace ipl {
void BoardObject::stt_stand() {
f32 degrees = mStandData.unk_0x0C * 30.0f + 30.0f;
f32 dVar2 = nw4r::math::CosFIdx(degrees * 0.7111111f);
f32 cosF = nw4r::math::CosFIdx(degrees * 0.7111111f);
degrees = mStandData.unk_0x0C * 30.0f + 30.0f;
f32 dVar3 = nw4r::math::SinFIdx(degrees * 0.7111111f);
f32 sinF = nw4r::math::SinFIdx(degrees * 0.7111111f);
math::VEC2 standPos;
__ct__Q33ipl4math4VEC2Fff(&standPos, dVar3 * 160.0f, dVar2 * 160.0f);
__ct__Q33ipl4math4VEC2Fff(&standPos, sinF * 160.0f, cosF * 160.0f);
mBoardPos = (((mStandData.pos * (f32)(10 - mStandData.unk_0x08)) + (standPos * mStandData.unk_0x08)) / 10.0f);
if ((mStandData.unk_0x08 += 1) > 10) {

View File

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

View File

@@ -640,23 +640,23 @@ namespace ipl {
const char* langGroup = scLangGroups[lang];
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);
}
@@ -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);
@@ -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();
}
}

View File

@@ -92,7 +92,7 @@ namespace ipl {
extern "C" void List_GetNth__Q24nw4r2utFPCQ34nw4r2ut4ListUs();
extern "C" void getChannelBasePane__Q33ipl5scene13ChannelSelectFi();
extern "C" void initPane__Q33ipl3gui11PaneManagerFPQ34nw4r3lyt4Pane();
extern "C" void* jumptable_8164DE80[];
extern "C" void* updateDiskState_jumptable[];
extern "C" void getCurrentChannel__Q33ipl7channel7ManagerFPiPi();
extern "C" void calcNormalRestart__Q33ipl5scene13ChannelSelectFv();
extern "C" void _savegpr_28();
@@ -857,7 +857,7 @@ namespace ipl {
extern "C" char scPaneName_N_GCIcon[] = "N_GCIcon";
extern "C" char scPaneName_N_DiscUpdateIcon[] = "N_DiscUpdateIcon";
extern "C" void* jumptable_8164DE80[7] = {
extern "C" void* updateDiskState_jumptable[7] = {
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C),
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x284),
@@ -1346,18 +1346,18 @@ namespace ipl {
lwz r4, 0xa8(r28)
cmplwi r0, 0x6
lwz r27, 0x4(r4)
bgt updateDiskState_813AD2C8
lis r4, jumptable_8164DE80@ha
bgt updateDiskState_done
lis r4, updateDiskState_jumptable@ha
slwi r0, r0, 2
addi r4, r4, jumptable_8164DE80@l
addi r4, r4, updateDiskState_jumptable@l
lwzx r4, r4, r0
mtctr r4
bctr
updateDiskState_813ACF94:
updateDiskState_case0:
lwz r4, 0xa4(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_813AD2C8
beq updateDiskState_done
lwz r3, 0x94(r3)
lis r29, scPaneName_N_GCIcon@ha
addi r4, r29, scPaneName_N_GCIcon@l
@@ -1381,7 +1381,7 @@ namespace ipl {
li r4, 0x0
bl SetVisible__Q34nw4r3lyt4PaneFb
cmpwi r27, 0x5
bne updateDiskState_813AD078
bne updateDiskState_case0_diskState3
lwz r4, 0xc0(r31)
lwz r3, 0x84(r28)
subi r4, r4, 0xf
@@ -1391,32 +1391,32 @@ namespace ipl {
lwz r0, 0xc0(r31)
mr r27, r3
cmpwi r0, 0xf
bne updateDiskState_813AD03C
bne updateDiskState_case0_afterThumb
lwz r3, 0xa8(r28)
addi r4, r31, 0xf8
addi r5, r31, 0xfc
bl getDiskInfo__Q33ipl3bs27ManagerFPPcPPc
updateDiskState_813AD03C:
updateDiskState_case0_afterThumb:
cmpwi r27, 0x0
beq updateDiskState_813AD050
beq updateDiskState_case0_afterLayout
lwz r3, 0x90(r31)
mr r4, r27
bl createDiskLayout__Q33ipl5scene10ChannelObjFPv
updateDiskState_813AD050:
updateDiskState_case0_afterLayout:
lbz r0, 0xf4(r31)
cmpwi r0, 0x0
bne updateDiskState_813AD064
bne updateDiskState_case0_afterDiskIn
mr r3, r31
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
updateDiskState_813AD064:
updateDiskState_case0_afterDiskIn:
li r3, 0x0
li r0, 0x1
stb r3, 0xf4(r31)
stw r0, 0xf0(r31)
b updateDiskState_813AD2C8
updateDiskState_813AD078:
b updateDiskState_done
updateDiskState_case0_diskState3:
cmpwi r27, 0x3
bne updateDiskState_813AD134
bne updateDiskState_case0_diskState6
lwz r3, 0x84(r28)
li r0, 0x0
addi r4, r29, scPaneName_N_GCIcon@l
@@ -1444,7 +1444,7 @@ namespace ipl {
bl setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object
lwz r3, 0x98(r31)
cmpwi r3, 0x0
beq updateDiskState_813AD10C
beq updateDiskState_case0_state3_afterAnim
li r0, 0x2
stw r0, 0x18(r3)
lwz r28, 0x98(r31)
@@ -1452,45 +1452,45 @@ namespace ipl {
bl initFrame__Q33ipl7utility15FrameControllerFv
li r0, 0x1
stw r0, 0x14(r28)
updateDiskState_813AD10C:
updateDiskState_case0_state3_afterAnim:
lbz r0, 0xf4(r31)
cmpwi r0, 0x0
bne updateDiskState_813AD120
bne updateDiskState_case0_state3_afterDiskIn
mr r3, r31
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
updateDiskState_813AD120:
updateDiskState_case0_state3_afterDiskIn:
li r3, 0x0
li r0, 0x1
stb r3, 0xf4(r31)
stw r0, 0xf0(r31)
b updateDiskState_813AD2C8
updateDiskState_813AD134:
b updateDiskState_done
updateDiskState_case0_diskState6:
cmpwi r27, 0x6
bne updateDiskState_813AD2C8
bne updateDiskState_done
lbz r0, 0xf4(r31)
cmpwi r0, 0x0
bne updateDiskState_813AD150
bne updateDiskState_case0_state6_afterDiskIn
mr r3, r31
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
updateDiskState_813AD150:
updateDiskState_case0_state6_afterDiskIn:
li r3, 0x0
li r0, 0x4
stb r3, 0xf4(r31)
stw r0, 0xf0(r31)
b updateDiskState_813AD2C8
updateDiskState_813AD164:
b updateDiskState_done
updateDiskState_case1:
lwz r4, 0x8c(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_813AD2C8
beq updateDiskState_done
lwz r3, 0x90(r3)
bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv
cmpwi r27, 0x5
bne updateDiskState_813AD1C0
bne updateDiskState_case1_setState3
lwz r3, 0x90(r31)
lwz r3, 0x34(r3)
cmpwi r3, 0x0
beq updateDiskState_813AD1B4
beq updateDiskState_case1_setState2
li r0, 0x2
stw r0, 0x18(r3)
lwz r3, 0x90(r31)
@@ -1499,85 +1499,85 @@ namespace ipl {
bl initFrame__Q33ipl7utility15FrameControllerFv
li r0, 0x1
stw r0, 0x14(r27)
updateDiskState_813AD1B4:
updateDiskState_case1_setState2:
li r0, 0x2
stw r0, 0xf0(r31)
b updateDiskState_813AD2C8
updateDiskState_813AD1C0:
b updateDiskState_done
updateDiskState_case1_setState3:
li r0, 0x3
stw r0, 0xf0(r31)
b updateDiskState_813AD2C8
updateDiskState_813AD1CC:
b updateDiskState_done
updateDiskState_case2:
cmpwi r27, 0x5
bne updateDiskState_813AD1E4
bne updateDiskState_case2_doOut
lwz r4, 0x84(r28)
lbz r0, 0x1b81(r4)
cmpwi r0, 0x0
beq updateDiskState_813AD2C8
updateDiskState_813AD1E4:
beq updateDiskState_done
updateDiskState_case2_doOut:
lwz r3, 0xa0(r3)
lwz r0, 0x14(r3)
cmpwi r0, 0x1
beq updateDiskState_813AD2C8
beq updateDiskState_done
mr r3, r31
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
lwz r3, 0x90(r31)
bl changeDisk__Q33ipl5scene10ChannelObjFv
li r0, 0x6
stw r0, 0xf0(r31)
b updateDiskState_813AD2C8
updateDiskState_813AD210:
b updateDiskState_done
updateDiskState_case3:
cmpwi r27, 0x3
bne updateDiskState_813AD228
bne updateDiskState_case3_doOut
lwz r4, 0x84(r28)
lbz r0, 0x1b81(r4)
cmpwi r0, 0x0
beq updateDiskState_813AD2C8
updateDiskState_813AD228:
beq updateDiskState_done
updateDiskState_case3_doOut:
lwz r3, 0xa0(r3)
lwz r0, 0x14(r3)
cmpwi r0, 0x1
beq updateDiskState_813AD2C8
beq updateDiskState_done
mr r3, r31
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
lwz r3, 0x90(r31)
bl changeDisk__Q33ipl5scene10ChannelObjFv
li r0, 0x6
stw r0, 0xf0(r31)
b updateDiskState_813AD2C8
updateDiskState_813AD254:
b updateDiskState_done
updateDiskState_case4:
lwz r4, 0x8c(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_813AD2C8
beq updateDiskState_done
li r0, 0x5
stw r0, 0xf0(r3)
b updateDiskState_813AD2C8
updateDiskState_813AD270:
b updateDiskState_done
updateDiskState_case5:
cmpwi r27, 0x6
beq updateDiskState_813AD2C8
beq updateDiskState_done
lwz r4, 0xa0(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_813AD2C8
beq updateDiskState_done
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
lwz r3, 0x90(r31)
bl changeDisk__Q33ipl5scene10ChannelObjFv
li r0, 0x6
stw r0, 0xf0(r31)
b updateDiskState_813AD2C8
updateDiskState_813AD2A0:
b updateDiskState_done
updateDiskState_case6:
lwz r4, 0x8c(r3)
lwz r0, 0x14(r4)
cmpwi r0, 0x1
beq updateDiskState_813AD2C8
beq updateDiskState_done
lwz r3, 0x90(r3)
bl destroyDiskLayout__Q33ipl5scene10ChannelObjFv
lwz r3, 0x90(r31)
bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv
li r0, 0x0
stw r0, 0xf0(r31)
updateDiskState_813AD2C8:
updateDiskState_done:
addi r11, r1, 0x20
bl _restgpr_27
lwz r0, 0x24(r1)

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;
}
@@ -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:
@@ -934,7 +934,7 @@ namespace ipl {
}
}
extern "C" bool iplSDMemory_813EE358(const SDMemory* memory,
extern "C" bool iplSDMemory_containsTitleId(const SDMemory* memory,
ESTitleId titleId,
const ESTitleId* titleIds, u32 titleCount) {
for (u32 i = 0; i < titleCount; i++) {
@@ -951,7 +951,7 @@ namespace ipl {
s32 result = mpSDChannelSelect->getWorker()->get_async_result();
if (result == 0) {
ESTitleId titleId = mTitleIds[mCurrentTitle];
if (iplSDMemory_813EE358(this, titleId,
if (iplSDMemory_containsTitleId(this, titleId,
mNandTitleIds, mNandTitleCount)) {
mDialogState = 17;
} else {
@@ -984,8 +984,8 @@ namespace ipl {
swprintf(mCurrentTitleName, 0x107f, L"%ls\n%ls", titleName, message);
System::getDialog()->setTitleForSDMemory(mCurrentTitleName);
if (iplSDMemory_813EE358(this, mTitleIds[mCurrentTitle], mSDTitleIds, mTitleNameCount) ||
iplSDMemory_813EE358(this, mTitleIds[mCurrentTitle], mNandTitleIds, mNandTitleCount)) {
if (iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mSDTitleIds, mTitleNameCount) ||
iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mNandTitleIds, mNandTitleCount)) {
ESTitleId titleId = mTitleIds[mCurrentTitle];
if (iplSDChannelSelect_813DB478(mpSDChannelSelect, titleId)) {
mDialogState = 14;
@@ -1064,7 +1064,7 @@ namespace ipl {
mCurrentTitle++;
if (mTitleCount > mCurrentTitle) {
ESTitleId nextTitleId = mTitleIds[mCurrentTitle];
if (iplSDMemory_813EE358(this, nextTitleId,
if (iplSDMemory_containsTitleId(this, nextTitleId,
mNandTitleIds, mNandTitleCount)) {
mDialogState = 17;
} else {

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

@@ -107,13 +107,8 @@ namespace ipl {
extern "C" bool iplSDChannelSelect_813DD240(
SDChannelSelect* scene, const s32* requiredBytes, const s32* requiredBlocks,
ESTitleId* titleIds, char* titleNames, u32* titleCount);
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 +208,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 +597,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 +840,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 +1032,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 +1744,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 +1830,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 +2054,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 +2081,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 +2149,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 +2157,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 +2291,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 +2386,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 +2413,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 +2629,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 +2977,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 +2999,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 +3061,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 +3078,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 +3203,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 +3212,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 +3292,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 +3328,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 +3427,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;
}

View File

@@ -23,63 +23,63 @@ namespace scene {
class SDTitlePaneEventHandler;
class SDTitleButtonEventHandler;
extern "C" void iplSDChannelTitle_813E8AB4(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E8C08(SDChannelTitle* scene, const nw4r::ut::Rect& bounds, GXColor color);
extern "C" void iplSDChannelTitle_813E81FC(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E6348(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E6424(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E8034(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E8160(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E8360(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E8258(SDChannelTitle* scene, layout::Object* layout,
extern "C" void iplSDChannelTitle_rebootSystem(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_drawDimOverlay(SDChannelTitle* scene, const nw4r::ut::Rect& bounds, GXColor color);
extern "C" void iplSDChannelTitle_bindBannerAnimations(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_createBannerLayout(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_createIconLayout(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_playBannerIntro(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_startBannerSound(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_bindBannerAnims(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_bindRsoAnimations(SDChannelTitle* scene, layout::Object* layout,
layout::Animator** animations, const char* prefix);
extern "C" void iplSDChannelTitle_813E7C0C(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7D14(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7DD0(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7FB0(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateScript(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateScriptIdle(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateScriptLoad(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_destroyScript(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E630C(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E696C(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E6FB4(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E71A4(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E724C(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7418(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7498(SDChannelTitle* scene);
extern "C" bool iplSDChannelTitle_813E79B0(SDChannelTitle* scene);
extern "C" BOOL iplSDChannelTitle_813E847C(SDChannelTitle*, ESTmdView*, ESTitleId titleId);
extern "C" BOOL iplSDChannelTitle_813E84C8();
extern "C" void iplSDChannelTitle_813E86A0(SDChannelTitle* scene, SDChannelObj* channel);
extern "C" void iplSDChannelTitle_813E899C(SDChannelTitle* scene, int nextScene);
extern "C" void iplSDChannelTitle_813E8AB4(SDChannelTitle*);
extern "C" bool iplSDChannelTitle_813E8B1C(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E8B70(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E8C08(SDChannelTitle*, const nw4r::ut::Rect& bounds, GXColor color);
extern "C" void iplSDChannelTitle_813E8D14(SDChannelTitle*, nw4r::lyt::Pane* pane, u32 message, bool allocate);
extern "C" nand::LayoutFile* iplSDChannelTitle_813E8DCC(SDChannelTitle*, ESTitleId title, nand::File** sound);
extern "C" void iplSDChannelTitle_813E8E70(void* argument);
extern "C" BOOL iplSDChannelTitle_813E8F04(SDChannelTitle* scene, ESTmdView* tmd);
extern "C" void iplSDChannelTitle_813E65D4(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E6760(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E69B4(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E6B88(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E6CCC(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E6E24(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7074(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E72B8(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E74EC(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7618(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E76C8(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7780(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7800(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E787C(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7A18(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E7B30(SDChannelTitle* scene, ESTitleId title);
extern "C" void iplSDChannelTitle_813E850C(SDChannelTitle* scene, void* arguments);
extern "C" void iplSDChannelTitle_813E85C0(SDChannelTitle* scene, int page, int index);
extern "C" void iplSDChannelTitle_813E86D8(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E88CC(SDChannelTitle* scene, bool settings);
extern "C" void iplSDChannelTitle_813E8A20(SDChannelTitle* scene, int nextScene);
extern "C" SDMemory::TitleRange* iplSDChannelTitle_813E6FA0(SDMemory::TitleRange*, const SDMemory::TitleRange*);
extern "C" void iplSDChannelTitle_rebuildBannerLayout(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateChangeWait(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateMemoryCalc(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateAfterClearTmp(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateEnqueueNotice(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_showCopyError(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateCopyErrorDialog(SDChannelTitle* scene);
extern "C" bool iplSDChannelTitle_startZoomFade(SDChannelTitle* scene);
extern "C" BOOL iplSDChannelTitle_isNetworkAllowed(SDChannelTitle*, ESTmdView*, ESTitleId titleId);
extern "C" BOOL iplSDChannelTitle_isParentalEnabled();
extern "C" void iplSDChannelTitle_beginLaunch(SDChannelTitle* scene, SDChannelObj* channel);
extern "C" void iplSDChannelTitle_prepareSceneExit(SDChannelTitle* scene, int nextScene);
extern "C" void iplSDChannelTitle_rebootSystem(SDChannelTitle*);
extern "C" bool iplSDChannelTitle_isLaunchDelayDone(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_setStartButtonPressed(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_drawDimOverlay(SDChannelTitle*, const nw4r::ut::Rect& bounds, GXColor color);
extern "C" void iplSDChannelTitle_setPaneMessage(SDChannelTitle*, nw4r::lyt::Pane* pane, u32 message, bool allocate);
extern "C" nand::LayoutFile* iplSDChannelTitle_loadBannerMetaFiles(SDChannelTitle*, ESTitleId title, nand::File** sound);
extern "C" void iplSDChannelTitle_fetchTmdViewTask(void* argument);
extern "C" BOOL iplSDChannelTitle_passesParentalCheck(SDChannelTitle* scene, ESTmdView* tmd);
extern "C" void iplSDChannelTitle_updateIdleState(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateChangeState(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateParentalResult(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateDialogResult(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_startCopyProgress(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateCopyPrepare(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateCopyStart(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateCopyProgress(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_finishProgressHide(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_returnToIdle(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_loadTitleBanner(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateBannerLoad(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_tryLaunchSelected(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_updateTmdReady(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_preparePageRestart(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_loadBannerScript(SDChannelTitle* scene, ESTitleId title);
extern "C" void iplSDChannelTitle_openParentalDialog(SDChannelTitle* scene, void* arguments);
extern "C" void iplSDChannelTitle_setPageAndIndex(SDChannelTitle* scene, int page, int index);
extern "C" void iplSDChannelTitle_cleanupAndLeave(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_confirmLeaveToSettings(SDChannelTitle* scene, bool settings);
extern "C" void iplSDChannelTitle_flushSaveBeforeExit(SDChannelTitle* scene, int nextScene);
extern "C" SDMemory::TitleRange* iplSDChannelTitle_copyTitleRange(SDMemory::TitleRange*, const SDMemory::TitleRange*);
static inline void setMemoryTitleLists(SDMemory* memory, SDMemory::TitleRange sdRange,
SDMemory::TitleRange nandRange) {
@@ -134,11 +134,11 @@ public:
SDChannelTitle* mpScene;
};
extern "C" void iplSDChannelObj_813E3580(layout::Object* layout);
extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int nameIndex);
extern "C" bool iplSDChannelTitle_813E79B0(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E630C(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_813E8D14(SDChannelTitle* scene, nw4r::lyt::Pane* pane, u32 message, bool allocate);
extern "C" void iplSDChannelObj_applyLanguageGroups(layout::Object* layout);
extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int nameIndex);
extern "C" bool iplSDChannelTitle_startZoomFade(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_rebuildBannerLayout(SDChannelTitle* scene);
extern "C" void iplSDChannelTitle_setPaneMessage(SDChannelTitle* scene, nw4r::lyt::Pane* pane, u32 message, bool allocate);
SDChannelTitle::SDChannelTitle(EGG::Heap* heap, SDChannelSelect* channelSelect)
: FaderSceneBase(heap), mState(0), mNextScene(0), mParentalResult(0),
@@ -194,8 +194,8 @@ void SDChannelTitle::create() {
}
}
}
iplSDChannelTitle_813E8D14(this, mpLayout->FindPaneByName(sTextNames[0]), 0xa2, true);
iplSDChannelTitle_813E8D14(this, mpLayout->FindPaneByName(sTextNames[1]), 2, true);
iplSDChannelTitle_setPaneMessage(this, mpLayout->FindPaneByName(sTextNames[0]), 0xa2, true);
iplSDChannelTitle_setPaneMessage(this, mpLayout->FindPaneByName(sTextNames[1]), 2, true);
mStartButtonState = 1;
mpButtonAnimations[0][0] = mpLayout->bindToGroup(sButtonAnimationNames[0], sButtonGroups[0], false, false);
mpButtonAnimations[0][1] = mpLayout->bindToGroup(sButtonAnimationNames[1], sButtonGroups[0], false, true);
@@ -223,7 +223,7 @@ void SDChannelTitle::create() {
mpProgressLayout->finishBinding();
nw4r::lyt::TextBox* comment = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpProgressLayout->FindPaneByName("T_Comment_02"));
comment->SetString(System::getMessage(0xad));
iplSDChannelTitle_813E630C(this);
iplSDChannelTitle_rebuildBannerLayout(this);
mpFade = new math::HermiteIntp<f32>();
static f32 fadeRange[2] = {0.0f, 255.0f};
mpFade->init(fadeRange[0], fadeRange[1], 28.0f, 0.0f, 0.0f);
@@ -241,7 +241,7 @@ void SDChannelTitle::create() {
mScriptDuration = duration;
mState = 2;
mScriptFrame = duration;
iplSDChannelTitle_813E79B0(this);
iplSDChannelTitle_startZoomFade(this);
mpScriptHeaps[0] = EGG::ExpHeap::create(0x80000, System::getMem2App(), 6);
mpScriptHeaps[1] = EGG::ExpHeap::create(0x80000, System::getMem2App(), 6);
mMemory.create(getSceneHeap(), mpLayoutFile, mpChannelSelect);
@@ -251,7 +251,7 @@ void SDChannelTitle::calcCommon() {
mpPaneManager->calc();
mpLayout->calc();
if (mScriptEnabled == 1) {
iplSDChannelTitle_813E7C0C(this);
iplSDChannelTitle_updateScript(this);
}
if ((mState == 1 || mState == 13 || static_cast<u32>(mState - 4) <= 1) &&
!mbBannerStarting && mpBannerAnimations[1] && !mpBannerAnimations[1]->isPlaying()) {
@@ -277,11 +277,11 @@ void SDChannelTitle::calcCommon() {
FaderSceneCommand SDChannelTitle::calcFadein() {
if (mState == 2) {
iplSDChannelTitle_813E79B0(this);
iplSDChannelTitle_startZoomFade(this);
return FADER_SCN_CONTINUE;
}
if (!mpFade->isPlaying()) {
iplSDChannelTitle_813E8034(this);
iplSDChannelTitle_playBannerIntro(this);
SDButton* button = static_cast<SDButton*>(System::getScene(0x24));
button->setEventHandler(mpButtonEventHandler, NULL);
button->animation(13);
@@ -296,37 +296,37 @@ FaderSceneCommand SDChannelTitle::calcFadein() {
FaderSceneCommand SDChannelTitle::calcNormal() {
switch (mState) {
case 1: iplSDChannelTitle_813E65D4(this); break;
case 4: iplSDChannelTitle_813E8A20(this, mNextScene); mState = 5; break;
case 8: iplSDChannelTitle_813E6760(this); break;
case 9: iplSDChannelTitle_813E696C(this); break;
case 10: iplSDChannelTitle_813E7A18(this); break;
case 11: iplSDChannelTitle_813E69B4(this); break;
case 12: iplSDChannelTitle_813E6B88(this); break;
case 13: iplSDChannelTitle_813E787C(this); break;
case 1: iplSDChannelTitle_updateIdleState(this); break;
case 4: iplSDChannelTitle_flushSaveBeforeExit(this, mNextScene); mState = 5; break;
case 8: iplSDChannelTitle_updateChangeState(this); break;
case 9: iplSDChannelTitle_updateChangeWait(this); break;
case 10: iplSDChannelTitle_preparePageRestart(this); break;
case 11: iplSDChannelTitle_updateParentalResult(this); break;
case 12: iplSDChannelTitle_updateDialogResult(this); break;
case 13: iplSDChannelTitle_updateTmdReady(this); break;
case 14: return FADER_SCN_CONTINUE;
case 15: iplSDChannelTitle_813E7074(this); break;
case 16: iplSDChannelTitle_813E71A4(this); break;
case 15: iplSDChannelTitle_updateCopyStart(this); break;
case 16: iplSDChannelTitle_updateAfterClearTmp(this); break;
case 17: SCSetTmpTitleID(mTitleId); SCFlushAsync(NULL); mState = 18; break;
case 18: if (SCCheckStatus() != 1) { mState = 21; } break;
case 19: iplSDChannelTitle_813E6CCC(this); break;
case 20: iplSDChannelTitle_813E6E24(this); break;
case 21: iplSDChannelTitle_813E724C(this); break;
case 22: iplSDChannelTitle_813E72B8(this); break;
case 23: iplSDChannelTitle_813E6FB4(this); break;
case 24: iplSDChannelTitle_813E76C8(this); break;
case 25: iplSDChannelTitle_813E7780(this); break;
case 26: iplSDChannelTitle_813E7418(this); break;
case 27: iplSDChannelTitle_813E7498(this); break;
case 28: iplSDChannelTitle_813E7800(this); break;
case 29: iplSDChannelTitle_813E74EC(this); break;
case 30: iplSDChannelTitle_813E7618(this); break;
case 19: iplSDChannelTitle_startCopyProgress(this); break;
case 20: iplSDChannelTitle_updateCopyPrepare(this); break;
case 23: iplSDChannelTitle_updateMemoryCalc(this); break;
case 21: iplSDChannelTitle_updateEnqueueNotice(this); break;
case 22: iplSDChannelTitle_updateCopyProgress(this); break;
case 24: iplSDChannelTitle_loadTitleBanner(this); break;
case 25: iplSDChannelTitle_updateBannerLoad(this); break;
case 26: iplSDChannelTitle_showCopyError(this); break;
case 27: iplSDChannelTitle_updateCopyErrorDialog(this); break;
case 28: iplSDChannelTitle_tryLaunchSelected(this); break;
case 29: iplSDChannelTitle_finishProgressHide(this); break;
case 30: iplSDChannelTitle_returnToIdle(this); break;
}
if (mState == 5) {
mbStopScript = true;
++mLaunchFrame;
System::getPointer()->setVisible(false);
return static_cast<FaderSceneCommand>(iplSDChannelTitle_813E8B1C(this));
return static_cast<FaderSceneCommand>(iplSDChannelTitle_isLaunchDelayDone(this));
}
if (mState == 6 || mState == 7 || mState == 31) {
mbStopScript = true;
@@ -360,7 +360,7 @@ FaderSceneCommand SDChannelTitle::calcFadeout() {
if (mNextScene == 17) {
if (!nandwall::checkNandCapacityAppBootable()) {
OSReport("Nand full! OSRebootSystem.\n");
iplSDChannelTitle_813E8AB4(this);
iplSDChannelTitle_rebootSystem(this);
}
while (WPADGetStatus() != 0 || System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8 ||
!System::getSaveData()->isFinished(mpSaveFile) ||
@@ -369,7 +369,7 @@ FaderSceneCommand SDChannelTitle::calcFadeout() {
System::getBS2Manager()->update();
VIWaitForRetrace();
if (mScriptEnabled == 1) {
iplSDChannelTitle_813E7C0C(this);
iplSDChannelTitle_updateScript(this);
}
if (WPADGetStatus() != 0) {
OSReport("wait for WPAD\n");
@@ -401,8 +401,8 @@ FaderSceneCommand SDChannelTitle::calcFadeout() {
} title;
title.id = channel->mAppMeta.titleId;
wchar_t names[2][21];
memcpy(names[0], iplSDChannelObj_813E4060(channel, 0), sizeof(names[0]));
memcpy(names[1], iplSDChannelObj_813E4060(channel, 1), sizeof(names[1]));
memcpy(names[0], iplSDChannelObj_getLocalizedName(channel, 0), sizeof(names[0]));
memcpy(names[1], iplSDChannelObj_getLocalizedName(channel, 1), sizeof(names[1]));
union MakerCode {
u16 code;
char bytes[2];
@@ -454,7 +454,7 @@ void SDChannelTitle::draw() {
GXColor color = {255, 255, 255, static_cast<u8>(mpFade->get())};
utility::Graphics::drawTexture(bounds, mpScreenCapture->getGXTex(), color, 1);
GXColor mask = {0, 0, 0, static_cast<u8>(mpFade->get())};
iplSDChannelTitle_813E8C08(this, bounds, mask);
iplSDChannelTitle_drawDimOverlay(this, bounds, mask);
} else {
if (mpIconLayout) {
utility::Graphics::setOrthoProjection(0);
@@ -522,14 +522,14 @@ BOOL SDChannelTitle::isResetAcceptable() {
return FALSE;
}
extern "C" void iplSDChannelTitle_813E630C(SDChannelTitle* scene) {
iplSDChannelTitle_813E6348(scene);
extern "C" void iplSDChannelTitle_rebuildBannerLayout(SDChannelTitle* scene) {
iplSDChannelTitle_createBannerLayout(scene);
if (scene->mpBannerLayout) {
scene->mpBannerLayout->finishBinding();
}
}
extern "C" void iplSDChannelTitle_813E6348(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_createBannerLayout(SDChannelTitle* scene) {
if (scene->mpIconLayout) {
scene->mpIconLayout->destroyHeap();
scene->mpIconLayout = NULL;
@@ -537,30 +537,30 @@ extern "C" void iplSDChannelTitle_813E6348(SDChannelTitle* scene) {
if (scene->mpBannerFiles[scene->mLoadedIndex] && scene->mpBannerFiles[scene->mLoadedIndex]->checkData() == 1) {
scene->mpBannerLayout = layout::Object::create(scene->mpBannerHeap, 0x40000,
scene->mpBannerFiles[scene->mLoadedIndex], "arc", "banner.brlyt");
iplSDChannelObj_813E3580(scene->mpBannerLayout);
iplSDChannelTitle_813E81FC(scene);
iplSDChannelObj_applyLanguageGroups(scene->mpBannerLayout);
iplSDChannelTitle_bindBannerAnimations(scene);
} else {
scene->mpBannerLayout = NULL;
for (int index = 0; index < 3; ++index) {
scene->mpBannerAnimations[index] = NULL;
}
iplSDChannelTitle_813E6424(scene);
iplSDChannelTitle_createIconLayout(scene);
}
}
extern "C" void iplSDChannelTitle_813E6424(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_createIconLayout(SDChannelTitle* scene) {
SDChannelObj* channel = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex);
if (channel) {
scene->mpIconLayout = layout::Object::create(scene->mpIconHeap, 0x8000,
iplSDChannelObj_813E3128(channel), "arc", "icon.brlyt");
iplSDChannelObj_813E3580(scene->mpIconLayout);
iplSDChannelObj_getOrAllocThumbnailData(channel), "arc", "icon.brlyt");
iplSDChannelObj_applyLanguageGroups(scene->mpIconLayout);
if (scene->mpIconLayout->searchFile("icon.brlan")) {
scene->mpIconLayout->bind("icon.brlan")->play();
} else if (scene->mpIconLayout->searchFile("icon_Whole.brlan")) {
scene->mpIconLayout->bind("icon_Whole.brlan")->play();
}
if (channel->mStateFlags == 0) {
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(iplSDChannelObj_813E4060(channel, 0));
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(iplSDChannelObj_getLocalizedName(channel, 0));
} else {
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(sMissingTitle);
}
@@ -570,7 +570,7 @@ extern "C" void iplSDChannelTitle_813E6424(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E65D4(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateIdleState(SDChannelTitle* scene) {
SDButton* button = static_cast<SDButton*>(System::getScene(0x24));
if (button && button->isActive()) {
button->update();
@@ -578,18 +578,18 @@ extern "C" void iplSDChannelTitle_813E65D4(SDChannelTitle* scene) {
if (scene->mState == 1) {
if (static_cast<u32>(scene->mpChannelSelect->mCurrentSDState - 1) <= 1) {
scene->mState = 10;
iplSDChannelTitle_813E7A18(scene);
iplSDChannelTitle_preparePageRestart(scene);
} else {
controller::Interface* controller = System::getMasterController();
int page;
int index;
if (controller->down(0x30001000)) {
scene->mpChannelSelect->findAdjacentChannel(1, &page, &index);
iplSDChannelTitle_813E85C0(scene, page, index);
iplSDChannelTitle_setPageAndIndex(scene, page, index);
snd::getSystem()->startSE("WSD_SELECT");
} else if (controller->down(0x6000010)) {
scene->mpChannelSelect->findAdjacentChannel(0, &page, &index);
iplSDChannelTitle_813E85C0(scene, page, index);
iplSDChannelTitle_setPageAndIndex(scene, page, index);
snd::getSystem()->startSE("WSD_SELECT");
} else {
scene->mpPaneManager->update();
@@ -603,7 +603,7 @@ extern "C" void iplSDChannelTitle_813E65D4(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E6760(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateChangeState(SDChannelTitle* scene) {
if (static_cast<u32>(scene->mpChannelSelect->mCurrentSDState - 1) <= 1) {
scene->mState = 1;
} else {
@@ -611,7 +611,7 @@ extern "C" void iplSDChannelTitle_813E6760(SDChannelTitle* scene) {
++scene->mChangeFrame;
if ((!scene->mpBannerFiles[1 - scene->mLoadedIndex] || scene->mpBannerFiles[1 - scene->mLoadedIndex]->isFinished()) &&
(!scene->mpSoundFiles[1 - scene->mLoadedIndex] || scene->mpSoundFiles[1 - scene->mLoadedIndex]->isFinished()) &&
iplSDChannelObj_813E3330(channel) && scene->mChangeFrame > 10 &&
iplSDChannelObj_hasAppMeta(channel) && scene->mChangeFrame > 10 &&
(!scene->mScriptEnabled || scene->mScriptState == 4)) {
if (scene->mpBannerFiles[scene->mLoadedIndex]) {
delete scene->mpBannerFiles[scene->mLoadedIndex];
@@ -630,21 +630,21 @@ extern "C" void iplSDChannelTitle_813E6760(SDChannelTitle* scene) {
}
scene->mpSoundFiles[scene->mLoadedIndex] = NULL;
scene->mLoadedIndex = 1 - scene->mLoadedIndex;
iplSDChannelTitle_813E630C(scene);
iplSDChannelTitle_813E8B70(scene);
iplSDChannelTitle_rebuildBannerLayout(scene);
iplSDChannelTitle_setStartButtonPressed(scene);
scene->mState = 9;
}
}
}
extern "C" void iplSDChannelTitle_813E696C(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateChangeWait(SDChannelTitle* scene) {
if (++scene->mChangeFrame > 20) {
iplSDChannelTitle_813E8034(scene);
iplSDChannelTitle_playBannerIntro(scene);
scene->mState = 1;
}
}
extern "C" void iplSDChannelTitle_813E69B4(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateParentalResult(SDChannelTitle* scene) {
ParentalDialog* parental = static_cast<ParentalDialog*>(System::getScene(0x1b));
if (!parental && !System::getReservedScene()) {
if (scene->mParentalResult == 1) {
@@ -674,7 +674,7 @@ extern "C" void iplSDChannelTitle_813E69B4(SDChannelTitle* scene) {
switch (result) {
case 1:
if (!scene->mParentalResult) {
iplSDChannelTitle_813E899C(scene, scene->mNextScene);
iplSDChannelTitle_prepareSceneExit(scene, scene->mNextScene);
scene->mParentalResult = 1;
}
break;
@@ -688,7 +688,7 @@ extern "C" void iplSDChannelTitle_813E69B4(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E6B88(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateDialogResult(SDChannelTitle* scene) {
int result = System::getDialog()->getLastResult();
switch (result) {
case 2: {
@@ -708,8 +708,8 @@ extern "C" void iplSDChannelTitle_813E6B88(SDChannelTitle* scene) {
break;
}
case 1: {
if (iplSDChannelTitle_813E84C8()) {
iplSDChannelTitle_813E850C(scene, reinterpret_cast<void*>(1));
if (iplSDChannelTitle_isParentalEnabled()) {
iplSDChannelTitle_openParentalDialog(scene, reinterpret_cast<void*>(1));
} else {
scene->reserveAllSceneDestruction(0x12, reinterpret_cast<void*>(1));
scene->mState = 7;
@@ -719,7 +719,7 @@ extern "C" void iplSDChannelTitle_813E6B88(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E6CCC(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_startCopyProgress(SDChannelTitle* scene) {
if (scene->mpChannelSelect->getWorker()->is_working() || scene->mpProgressLayout->isPlaying(0) ||
scene->mpButtonAnimations[3][2]->isPlaying()) {
return;
@@ -747,7 +747,7 @@ extern "C" void iplSDChannelTitle_813E6CCC(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E6E24(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateCopyPrepare(SDChannelTitle* scene) {
if (scene->mpChannelSelect->getWorker()->is_working() || scene->mpProgressLayout->isPlaying(1)) {
return;
}
@@ -762,9 +762,9 @@ extern "C" void iplSDChannelTitle_813E6E24(SDChannelTitle* scene) {
if (static_cast<u32>(scene->mTitleRange.mByteSize) < 0x3800000) {
nandRange.mByteSize = 0x3800000;
nandRange.mCount = scene->mTitleRange.mCount;
iplSDChannelTitle_813E6FA0(&sdRange, &scene->mTitleRange);
iplSDChannelTitle_copyTitleRange(&sdRange, &scene->mTitleRange);
} else {
iplSDChannelTitle_813E6FA0(&nandRange, iplSDChannelTitle_813E6FA0(&sdRange, &scene->mTitleRange));
iplSDChannelTitle_copyTitleRange(&nandRange, iplSDChannelTitle_copyTitleRange(&sdRange, &scene->mTitleRange));
}
SDMemory* memory = &scene->mMemory;
setMemoryTitleLists(memory, sdRange, nandRange);
@@ -786,7 +786,7 @@ extern "C" void iplSDChannelTitle_813E6E24(SDChannelTitle* scene) {
}
}
extern "C" SDMemory::TitleRange* iplSDChannelTitle_813E6FA0(
extern "C" SDMemory::TitleRange* iplSDChannelTitle_copyTitleRange(
SDMemory::TitleRange* target, const SDMemory::TitleRange* source) {
s32 bytes = source->mByteSize;
target->mCount = source->mCount;
@@ -794,7 +794,7 @@ extern "C" SDMemory::TitleRange* iplSDChannelTitle_813E6FA0(
return target;
}
extern "C" void iplSDChannelTitle_813E6FB4(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateMemoryCalc(SDChannelTitle* scene) {
if (!scene->mMemory.calc()) {
return;
}
@@ -818,7 +818,7 @@ extern "C" void iplSDChannelTitle_813E6FB4(SDChannelTitle* scene) {
scene->mState = 15;
}
extern "C" void iplSDChannelTitle_813E7074(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateCopyStart(SDChannelTitle* scene) {
if (!scene->mpChannelSelect->getWorker()->is_working()) {
if (scene->mbCopiedTitle && !scene->mpProgressLayout->isPlaying(3)) {
scene->mpProgressLayout->getAnim(3)->play();
@@ -843,7 +843,7 @@ extern "C" void iplSDChannelTitle_813E7074(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E71A4(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateAfterClearTmp(SDChannelTitle* scene) {
if (!scene->mpChannelSelect->getWorker()->is_working()) {
SCSetTmpTitleID(0);
System::getChannelManager()->clearTmpChannel();
@@ -862,7 +862,7 @@ extern "C" void iplSDChannelTitle_813E71A4(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E724C(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateEnqueueNotice(SDChannelTitle* scene) {
if (!scene->mpChannelSelect->getWorker()->is_working()) {
if (scene->mpChannelSelect->enqueueResultNotice(static_cast<u32>(scene->mTitleId))) {
scene->mState = 22;
@@ -873,7 +873,7 @@ extern "C" void iplSDChannelTitle_813E724C(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E72B8(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateCopyProgress(SDChannelTitle* scene) {
scene->mpProgressLayout->getAnim(2)->initAnmFrame(NandSDWorker::getCompletionPct());
if (!scene->mpChannelSelect->getWorker()->is_working()) {
int result = scene->mpChannelSelect->getWorker()->get_async_result();
@@ -883,7 +883,7 @@ extern "C" void iplSDChannelTitle_813E72B8(SDChannelTitle* scene) {
snd::getSystem()->stopSE(scene->mpCopySound, 0);
scene->mpCopySound = NULL;
snd::getSystem()->startSE("WIPL_SE_COPY_FINISH");
System::getTask1()->request(iplSDChannelTitle_813E8E70, scene, NULL);
System::getTask1()->request(iplSDChannelTitle_fetchTmdViewTask, scene, NULL);
scene->mState = 24;
} else {
SCSetTmpTitleID(0);
@@ -900,7 +900,7 @@ extern "C" void iplSDChannelTitle_813E72B8(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E7418(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_showCopyError(SDChannelTitle* scene) {
scene->mpProgressLayout->getAnim(3)->stop();
snd::getSystem()->stopSE(scene->mpCopySound, 0);
scene->mpCopySound = NULL;
@@ -908,13 +908,13 @@ extern "C" void iplSDChannelTitle_813E7418(SDChannelTitle* scene) {
scene->mState = 27;
}
extern "C" void iplSDChannelTitle_813E7498(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateCopyErrorDialog(SDChannelTitle* scene) {
if (SCCheckStatus() != 1 && System::getDialog()->getLastResult() != -1) {
scene->mState = 29;
}
}
extern "C" void iplSDChannelTitle_813E74EC(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_finishProgressHide(SDChannelTitle* scene) {
if (!scene->mpProgressLayout->isPlaying(1) && !scene->mpButtonAnimations[1][0]->isPlaying() &&
!scene->mpButtonAnimations[6][5]->isPlaying()) {
scene->mbResetAcceptable = true;
@@ -934,7 +934,7 @@ extern "C" void iplSDChannelTitle_813E74EC(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E7618(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_returnToIdle(SDChannelTitle* scene) {
if (!scene->mpProgressLayout->isPlaying(1) && !scene->mpButtonAnimations[6][5]->isPlaying()) {
for (int button = 0; button < 2; ++button) {
scene->mHoverCounts[button] = 0;
@@ -944,11 +944,11 @@ extern "C" void iplSDChannelTitle_813E7618(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E76C8(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_loadTitleBanner(SDChannelTitle* scene) {
int page;
int index;
if (System::getChannelManager()->isLoadedTmp() || System::getChannelManager()->hasChannel(scene->mTitleId, &page, &index)) {
scene->mpBannerFiles[scene->mLoadedIndex] = iplSDChannelTitle_813E8DCC(scene, scene->mTitleId,
scene->mpBannerFiles[scene->mLoadedIndex] = iplSDChannelTitle_loadBannerMetaFiles(scene, scene->mTitleId,
&scene->mpSoundFiles[scene->mLoadedIndex]);
if (scene->mbCopiedTitle) {
scene->mState = 13;
@@ -958,44 +958,44 @@ extern "C" void iplSDChannelTitle_813E76C8(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E7780(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateBannerLoad(SDChannelTitle* scene) {
if (!scene->mpBannerFiles[scene->mLoadedIndex] || scene->mpBannerFiles[scene->mLoadedIndex]->isFinished()) {
iplSDChannelTitle_813E7B30(scene, scene->mTitleId);
iplSDChannelTitle_813E630C(scene);
iplSDChannelTitle_loadBannerScript(scene, scene->mTitleId);
iplSDChannelTitle_rebuildBannerLayout(scene);
scene->mState = 4;
iplSDChannelTitle_813E8034(scene);
iplSDChannelTitle_playBannerIntro(scene);
}
}
extern "C" void iplSDChannelTitle_813E7800(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_tryLaunchSelected(SDChannelTitle* scene) {
if (static_cast<u32>(scene->mpChannelSelect->mCurrentSDState - 1) <= 1) {
scene->mState = 1;
} else {
SDChannelObj* channel = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex);
if (iplSDChannelObj_813E3330(channel)) {
iplSDChannelTitle_813E86A0(scene, channel);
if (iplSDChannelObj_hasAppMeta(channel)) {
iplSDChannelTitle_beginLaunch(scene, channel);
}
}
}
extern "C" void iplSDChannelTitle_813E787C(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateTmdReady(SDChannelTitle* scene) {
if (scene->mbTmdReady) {
if (!System::getChannelManager()->isMissingTicket(scene->mTitleId) && !utility::ESMisc::CheckTmdCountryCode(scene->mpTmd)) {
System::getErrorHandler()->set(ErrorHandler::DEFAULT, 3, NULL, 0, -1);
}
scene->mMakerCode = scene->mpTmd->head.groupId;
if (!iplSDChannelTitle_813E847C(scene, scene->mpTmd, scene->mTitleId)) {
iplSDChannelTitle_813E88CC(scene, false);
if (!iplSDChannelTitle_isNetworkAllowed(scene, scene->mpTmd, scene->mTitleId)) {
iplSDChannelTitle_confirmLeaveToSettings(scene, false);
scene->mNextScene = 18;
} else if (iplSDChannelTitle_813E8F04(scene, scene->mpTmd)) {
iplSDChannelTitle_813E899C(scene, scene->mNextScene);
} else if (iplSDChannelTitle_passesParentalCheck(scene, scene->mpTmd)) {
iplSDChannelTitle_prepareSceneExit(scene, scene->mNextScene);
if (scene->mbCopiedTitle) {
scene->mState = 25;
} else {
scene->mState = 15;
}
} else {
iplSDChannelTitle_813E850C(scene, NULL);
iplSDChannelTitle_openParentalDialog(scene, NULL);
}
if (scene->mpTmd) {
scene->mpBannerHeap->free(scene->mpTmd);
@@ -1003,7 +1003,7 @@ extern "C" void iplSDChannelTitle_813E787C(SDChannelTitle* scene) {
}
}
extern "C" bool iplSDChannelTitle_813E79B0(SDChannelTitle* scene) {
extern "C" bool iplSDChannelTitle_startZoomFade(SDChannelTitle* scene) {
if (!scene->mpChannelSelect->tellStartingZoomAnm()) {
return false;
}
@@ -1012,7 +1012,7 @@ extern "C" bool iplSDChannelTitle_813E79B0(SDChannelTitle* scene) {
return true;
}
extern "C" void iplSDChannelTitle_813E7A18(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_preparePageRestart(SDChannelTitle* scene) {
if (!scene->mScriptEnabled || scene->mScriptState == 4) {
if (scene->mpChannelSelect->prepareRestarting(scene->mPage)) {
scene->mpChannelSelect->startPageTransition(scene->mPage, scene->mIndex);
@@ -1034,7 +1034,7 @@ extern "C" void iplSDChannelTitle_813E7A18(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E7B30(SDChannelTitle* scene, ESTitleId title) {
extern "C" void iplSDChannelTitle_loadBannerScript(SDChannelTitle* scene, ESTitleId title) {
if (!System::isSafeMode()) {
if (scene->mScriptEnabled) {
delete scene->mpScriptFile;
@@ -1052,7 +1052,7 @@ extern "C" void iplSDChannelTitle_813E7B30(SDChannelTitle* scene, ESTitleId titl
}
}
extern "C" void iplSDChannelTitle_813E7C0C(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateScript(SDChannelTitle* scene) {
if (scene->mScriptEnabled != 1) {
return;
}
@@ -1061,16 +1061,16 @@ extern "C" void iplSDChannelTitle_813E7C0C(SDChannelTitle* scene) {
}
switch (scene->mScriptState) {
case 0:
iplSDChannelTitle_813E7D14(scene);
iplSDChannelTitle_updateScriptIdle(scene);
break;
case 1:
iplSDChannelTitle_813E7DD0(scene);
iplSDChannelTitle_updateScriptLoad(scene);
break;
case 2:
System::getCSManager()->calc();
if (scene->mpRsoThread->IsThreadTerminated()) {
if (System::getCSManager()->getAltSoundState() == 1) {
iplSDChannelTitle_813E8160(scene);
iplSDChannelTitle_startBannerSound(scene);
System::getCSManager()->setAltSoundState(0);
}
System::getCSManager()->finish();
@@ -1078,12 +1078,12 @@ extern "C" void iplSDChannelTitle_813E7C0C(SDChannelTitle* scene) {
}
break;
case 3:
iplSDChannelTitle_813E7FB0(scene);
iplSDChannelTitle_destroyScript(scene);
break;
}
}
extern "C" void iplSDChannelTitle_813E7D14(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateScriptIdle(SDChannelTitle* scene) {
if (scene->mbStopScript) {
scene->mbStopScript = false;
scene->mScriptFrame = 0;
@@ -1101,7 +1101,7 @@ extern "C" void iplSDChannelTitle_813E7D14(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E7DD0(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_updateScriptLoad(SDChannelTitle* scene) {
if (!scene->mpScriptFile->isFinished()) {
return;
}
@@ -1132,7 +1132,7 @@ extern "C" void iplSDChannelTitle_813E7DD0(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E7FB0(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_destroyScript(SDChannelTitle* scene) {
scene->mbScriptFailed = true;
System::getCSManager()->destroy();
scene->mScriptFrame = 0;
@@ -1142,7 +1142,7 @@ extern "C" void iplSDChannelTitle_813E7FB0(SDChannelTitle* scene) {
scene->mScriptState = 0;
}
extern "C" void iplSDChannelTitle_813E8034(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_playBannerIntro(SDChannelTitle* scene) {
if (scene->mpBannerAnimations[1]) {
scene->mpBannerAnimations[1]->play();
scene->mbBannerStarting = false;
@@ -1153,7 +1153,7 @@ extern "C" void iplSDChannelTitle_813E8034(SDChannelTitle* scene) {
}
if (scene->mState != 6) {
if (!System::getChannelManager()->usesAltSound(scene->mTitleId) || !scene->mScriptEnabled) {
iplSDChannelTitle_813E8160(scene);
iplSDChannelTitle_startBannerSound(scene);
}
if (!scene->mpBannerLayout) {
scene->mpProgressLayout->getAnim(0)->initAnmFrame();
@@ -1163,7 +1163,7 @@ extern "C" void iplSDChannelTitle_813E8034(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E8160(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_startBannerSound(SDChannelTitle* scene) {
if (scene->mpSoundFiles[scene->mLoadedIndex] && scene->mpSoundFiles[scene->mLoadedIndex]->checkData() == 1) {
void* sound = scene->mpSoundFiles[scene->mLoadedIndex]->getBuffer();
u32 size = System::getChannelManager()->getSoundSize(scene->mTitleId);
@@ -1171,15 +1171,15 @@ extern "C" void iplSDChannelTitle_813E8160(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E81FC(SDChannelTitle* scene) {
iplSDChannelTitle_813E8360(scene);
extern "C" void iplSDChannelTitle_bindBannerAnimations(SDChannelTitle* scene) {
iplSDChannelTitle_bindBannerAnims(scene);
if (scene->mScriptEnabled) {
memset(scene->mpScriptAnimations, 0, sizeof(scene->mpScriptAnimations));
iplSDChannelTitle_813E8258(scene, scene->mpBannerLayout, scene->mpScriptAnimations, "banner");
iplSDChannelTitle_bindRsoAnimations(scene, scene->mpBannerLayout, scene->mpScriptAnimations, "banner");
}
}
extern "C" void iplSDChannelTitle_813E8258(SDChannelTitle*, layout::Object* layout,
extern "C" void iplSDChannelTitle_bindRsoAnimations(SDChannelTitle*, layout::Object* layout,
layout::Animator** animations, const char* prefix) {
char groupName[8];
char animationName[20];
@@ -1203,7 +1203,7 @@ extern "C" void iplSDChannelTitle_813E8258(SDChannelTitle*, layout::Object* layo
}
}
extern "C" void iplSDChannelTitle_813E8360(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_bindBannerAnims(SDChannelTitle* scene) {
for (int index = 0; index < 3; ++index) {
if (scene->mpBannerLayout->searchFile(sBannerAnimationNames[index])) {
if (index == 0) {
@@ -1226,14 +1226,14 @@ extern "C" void iplSDChannelTitle_813E8360(SDChannelTitle* scene) {
}
}
extern "C" BOOL iplSDChannelTitle_813E847C(SDChannelTitle*, ESTmdView*, ESTitleId titleId) {
extern "C" BOOL iplSDChannelTitle_isNetworkAllowed(SDChannelTitle*, ESTmdView*, ESTitleId titleId) {
if (!System::getChannelManager()->needsNetSetting(titleId) || ncd::NCDSetting::getConnectEnableFlag()) {
return TRUE;
}
return FALSE;
}
extern "C" BOOL iplSDChannelTitle_813E84C8() {
extern "C" BOOL iplSDChannelTitle_isParentalEnabled() {
SCParentalControlsInfo parental;
if (SCGetParentalControl(&parental) && (parental.enable & SC_PARENTAL_FLAG_ENABLED)) {
return TRUE;
@@ -1241,7 +1241,7 @@ extern "C" BOOL iplSDChannelTitle_813E84C8() {
return FALSE;
}
extern "C" void iplSDChannelTitle_813E850C(SDChannelTitle* scene, void* arguments) {
extern "C" void iplSDChannelTitle_openParentalDialog(SDChannelTitle* scene, void* arguments) {
System::getHomeButtonMenu()->enable();
scene->mbResetAcceptable = true;
if (static_cast<SDButton*>(System::getScene(0x24))->isLeftArrowVisible()) {
@@ -1253,7 +1253,7 @@ extern "C" void iplSDChannelTitle_813E850C(SDChannelTitle* scene, void* argument
scene->mState = 11;
}
extern "C" void iplSDChannelTitle_813E85C0(SDChannelTitle* scene, int page, int index) {
extern "C" void iplSDChannelTitle_setPageAndIndex(SDChannelTitle* scene, int page, int index) {
SDChannelObj* keep = NULL;
if (scene->mpIconLayout) {
keep = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex);
@@ -1264,14 +1264,14 @@ extern "C" void iplSDChannelTitle_813E85C0(SDChannelTitle* scene, int page, int
SDChannelObj* channel = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex);
scene->mPosition.x = SDChannelSelect::getChannelPanePosition(scene->mpChannelSelect, scene->mIndex).x;
scene->mPosition.y = SDChannelSelect::getChannelPanePosition(scene->mpChannelSelect, scene->mIndex).y;
if (iplSDChannelObj_813E3330(channel)) {
iplSDChannelTitle_813E86A0(scene, channel);
if (iplSDChannelObj_hasAppMeta(channel)) {
iplSDChannelTitle_beginLaunch(scene, channel);
} else {
scene->mState = 28;
}
}
extern "C" void iplSDChannelTitle_813E86A0(SDChannelTitle* scene, SDChannelObj* channel) {
extern "C" void iplSDChannelTitle_beginLaunch(SDChannelTitle* scene, SDChannelObj* channel) {
scene->mTitleId = channel->mAppMeta.titleId;
if (scene->mScriptEnabled) {
scene->mbStopScript = true;
@@ -1280,7 +1280,7 @@ extern "C" void iplSDChannelTitle_813E86A0(SDChannelTitle* scene, SDChannelObj*
scene->mState = 8;
}
extern "C" void iplSDChannelTitle_813E86D8(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_cleanupAndLeave(SDChannelTitle* scene) {
scene->mParentalResult = 0;
scene->mbStartAnimation = false;
static_cast<SDButton*>(System::getScene(0x24))->animation(15);
@@ -1311,7 +1311,7 @@ extern "C" void iplSDChannelTitle_813E86D8(SDChannelTitle* scene) {
System::getHomeButtonMenu()->disable();
System::stopReceiveSchedule();
if (hasTitle || hasTemporaryTitle) {
System::getTask1()->request(iplSDChannelTitle_813E8E70, scene, NULL);
System::getTask1()->request(iplSDChannelTitle_fetchTmdViewTask, scene, NULL);
scene->mbCopiedTitle = false;
scene->mState = 13;
} else {
@@ -1322,7 +1322,7 @@ extern "C" void iplSDChannelTitle_813E86D8(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_813E88CC(SDChannelTitle* scene, bool settings) {
extern "C" void iplSDChannelTitle_confirmLeaveToSettings(SDChannelTitle* scene, bool settings) {
if (settings) {
scene->reserveAllSceneDestruction(0x12, reinterpret_cast<void*>(1));
scene->mState = 7;
@@ -1338,7 +1338,7 @@ extern "C" void iplSDChannelTitle_813E88CC(SDChannelTitle* scene, bool settings)
}
}
extern "C" void iplSDChannelTitle_813E899C(SDChannelTitle* scene, int nextScene) {
extern "C" void iplSDChannelTitle_prepareSceneExit(SDChannelTitle* scene, int nextScene) {
for (int index = 0; index < 4; ++index) {
controller::Interface* controller = System::getController(index);
if (controller) {
@@ -1351,7 +1351,7 @@ extern "C" void iplSDChannelTitle_813E899C(SDChannelTitle* scene, int nextScene)
}
}
extern "C" void iplSDChannelTitle_813E8A20(SDChannelTitle* scene, int nextScene) {
extern "C" void iplSDChannelTitle_flushSaveBeforeExit(SDChannelTitle* scene, int nextScene) {
int page;
int index;
if (System::getChannelManager()->hasChannel(scene->mTitleId, &page, &index)) {
@@ -1363,7 +1363,7 @@ extern "C" void iplSDChannelTitle_813E8A20(SDChannelTitle* scene, int nextScene)
__WPADReconnect(TRUE);
}
extern "C" void iplSDChannelTitle_813E8AB4(SDChannelTitle*) {
extern "C" void iplSDChannelTitle_rebootSystem(SDChannelTitle*) {
snd::getSystem()->stopAllSound(0);
snd::getSystem()->calc();
VISetBlack(TRUE);
@@ -1374,11 +1374,11 @@ extern "C" void iplSDChannelTitle_813E8AB4(SDChannelTitle*) {
OSRebootSystem();
}
extern "C" bool iplSDChannelTitle_813E8B1C(SDChannelTitle* scene) {
extern "C" bool iplSDChannelTitle_isLaunchDelayDone(SDChannelTitle* scene) {
return static_cast<u32>(120.0f / System::getAnimDelta()) < scene->mLaunchFrame;
}
extern "C" void iplSDChannelTitle_813E8B70(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_setStartButtonPressed(SDChannelTitle* scene) {
if (!scene->mStartButtonState) {
scene->mpButtonAnimations[5][3]->stop();
scene->mpButtonAnimations[5][4]->play();
@@ -1388,7 +1388,7 @@ extern "C" void iplSDChannelTitle_813E8B70(SDChannelTitle* scene) {
scene->mStartButtonState = 1;
}
extern "C" void iplSDChannelTitle_813E8C08(SDChannelTitle*, const nw4r::ut::Rect& bounds, GXColor color) {
extern "C" void iplSDChannelTitle_drawDimOverlay(SDChannelTitle*, const nw4r::ut::Rect& bounds, GXColor color) {
nw4r::ut::Rect screen;
System::getProjectionRect(&screen);
nw4r::ut::Rect rectangles[4];
@@ -1413,7 +1413,7 @@ extern "C" void iplSDChannelTitle_813E8C08(SDChannelTitle*, const nw4r::ut::Rect
}
}
extern "C" void iplSDChannelTitle_813E8D14(SDChannelTitle*, nw4r::lyt::Pane* pane, u32 message, bool allocate) {
extern "C" void iplSDChannelTitle_setPaneMessage(SDChannelTitle*, nw4r::lyt::Pane* pane, u32 message, bool allocate) {
wchar_t text[256];
wcsncpy(text, System::getMessage(message), 256);
text[255] = 0;
@@ -1425,13 +1425,13 @@ extern "C" void iplSDChannelTitle_813E8D14(SDChannelTitle*, nw4r::lyt::Pane* pan
textBox->SetString(text);
}
extern "C" nand::LayoutFile* iplSDChannelTitle_813E8DCC(SDChannelTitle*, ESTitleId title, nand::File** sound) {
extern "C" nand::LayoutFile* iplSDChannelTitle_loadBannerMetaFiles(SDChannelTitle*, ESTitleId title, nand::File** sound) {
*sound = System::getChannelManager()->readSoundMetaAsync(System::getMem2App(), title);
nand::MetaFile* banner = System::getChannelManager()->readBannerMetaAsync(System::getMem2App(), title);
return new (System::getMem2App(), 4) nand::LayoutFile(banner, NULL);
}
extern "C" void iplSDChannelTitle_813E8E70(void* argument) {
extern "C" void iplSDChannelTitle_fetchTmdViewTask(void* argument) {
SDChannelTitle* scene = static_cast<SDChannelTitle*>(argument);
ESError result = utility::ESMisc::GetTmdView(scene->mpBannerHeap, scene->mTitleId, &scene->mpTmd);
if (result) {
@@ -1441,7 +1441,7 @@ extern "C" void iplSDChannelTitle_813E8E70(void* argument) {
scene->mbTmdReady = true;
}
extern "C" BOOL iplSDChannelTitle_813E8F04(SDChannelTitle* scene, ESTmdView* tmd) {
extern "C" BOOL iplSDChannelTitle_passesParentalCheck(SDChannelTitle* scene, ESTmdView* tmd) {
if (!utility::ESMisc::__IsPCEnable()) {
return TRUE;
}
@@ -1467,7 +1467,7 @@ extern "C" BOOL iplSDChannelTitle_813E8F04(SDChannelTitle* scene, ESTmdView* tmd
return TRUE;
}
extern "C" void iplSDChannelTitle_813E9004(SDTitlePaneEventHandler* handler, u32 component,
extern "C" void iplSDChannelTitle_onTitlePaneEvent(SDTitlePaneEventHandler* handler, u32 component,
u32 event, const controller::Interface* controller) {
const char* paneName = handler->getPane(component)->GetName();
switch (event) {
@@ -1477,12 +1477,12 @@ extern "C" void iplSDChannelTitle_813E9004(SDTitlePaneEventHandler* handler, u32
handler->mpScene->mpButtonAnimations[2][2]->play();
snd::getSystem()->startSE("WIPL_SE_BT_PUSH");
handler->mpScene->mState = 10;
iplSDChannelTitle_813E7A18(handler->mpScene);
iplSDChannelTitle_preparePageRestart(handler->mpScene);
} else if (strcmp(paneName, sButtonNames[1]) == 0) {
if (handler->mpScene->mStartButtonState != 2) {
snd::getSystem()->startSE("WIPL_SE_GRAY_BUTTON");
} else {
iplSDChannelTitle_813E86D8(handler->mpScene);
iplSDChannelTitle_cleanupAndLeave(handler->mpScene);
handler->mpScene->mpButtonAnimations[3][2]->play();
snd::getSystem()->stopSE(handler->mpScene->mpSoundHandle, 30);
snd::getSystem()->startSE("WIPL_SE_DECIDE");
@@ -1526,7 +1526,7 @@ extern "C" void iplSDChannelTitle_813E9004(SDTitlePaneEventHandler* handler, u32
}
}
extern "C" void iplSDChannelTitle_813E92EC(SDTitleButtonEventHandler* handler, u32 component,
extern "C" void iplSDChannelTitle_onTitleButtonEvent(SDTitleButtonEventHandler* handler, u32 component,
u32 event, const controller::Interface* controller) {
const char* name = handler->getPane(component)->GetName();
switch (event) {
@@ -1538,14 +1538,14 @@ extern "C" void iplSDChannelTitle_813E92EC(SDTitleButtonEventHandler* handler, u
int index;
handler->mpScene->mpChannelSelect->findAdjacentChannel(1, &page, &index);
button->animation(7);
iplSDChannelTitle_813E85C0(handler->mpScene, page, index);
iplSDChannelTitle_setPageAndIndex(handler->mpScene, page, index);
snd::getSystem()->startSE("WSD_SELECT");
} else if (strcmp(name, SDButton::getButtonName(SDButton::BTN_ARROW_RIGHT)) == 0) {
int page;
int index;
handler->mpScene->mpChannelSelect->findAdjacentChannel(0, &page, &index);
button->animation(8);
iplSDChannelTitle_813E85C0(handler->mpScene, page, index);
iplSDChannelTitle_setPageAndIndex(handler->mpScene, page, index);
snd::getSystem()->startSE("WSD_SELECT");
}
}
@@ -1558,11 +1558,11 @@ void SDChannelTitle::startResetting() {
}
void SDTitleButtonEventHandler::onEventDerived(u32 component, u32 event, const controller::Interface* controller) {
iplSDChannelTitle_813E92EC(this, component, event, controller);
iplSDChannelTitle_onTitleButtonEvent(this, component, event, controller);
}
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
iplSDChannelTitle_813E9004(this, component, event, static_cast<const controller::Interface*>(data));
iplSDChannelTitle_onTitlePaneEvent(this, component, event, static_cast<const controller::Interface*>(data));
}
}

View File

@@ -64,6 +64,11 @@ namespace ipl {
static s32 sAOSSState;
static s32 sAOSSUnk;
struct AOSSStack {
u32 storage[4080];
u32 sentinel;
};
class AOSSThread : public utility::ut_thread {
public:
AOSSThread(EGG::Heap* heap);
@@ -84,7 +89,7 @@ namespace ipl {
private:
s32 mState; // 0x32C
s32 mThreadPriority; // 0x330
u8* mpStackBuffer; // 0x334
AOSSStack* mpStack; // 0x334
u8* mpHeapBuffer; // 0x338
MEMHeapHandle mpExpHeap; // 0x33C
AOSSConfig mAoss; // 0x340
@@ -94,7 +99,7 @@ namespace ipl {
mpExpHeap = NULL;
sAOSSState = 0;
mpHeapBuffer = (u8*)heap->alloc(0x40000, 0x20);
mpStackBuffer = (u8*)heap->alloc(0x1000, 0x20);
mpStack = (AOSSStack*)heap->alloc(0x1000, 0x20);
}
void AOSSThread::destroy(int flag) {
@@ -137,8 +142,8 @@ namespace ipl {
mThreadPriority = OSGetThreadPriority(OSGetCurrentThread()) - 2;
sAOSSState = 1;
SOInit(&config);
memset(mpStackBuffer, 0, 4);
Create(mpStackBuffer, 0x1000, mThreadPriority, TRUE);
memset(mpStack, 0, 4);
Create(mpStack, 0x1000, mThreadPriority, TRUE);
OSRestoreInterrupts(level);
return 1;
@@ -178,7 +183,7 @@ namespace ipl {
mAoss.unk_0x04 = 4;
NETGetWirelessMacAddress(mAoss.mac);
*(u32*)(mpStackBuffer + 0x3FC0) = 0x97654321;
mpStack->sentinel = 0x97654321;
mState = AOSSi_Init(&mAoss);
AOSSi_EndLocal();

View File

@@ -1,3 +1,7 @@
#define IPL_CONTROLLER_TRIVIAL_RECT_DTOR
#include <nw4r/ut/Rect.h>
#undef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
#include "system/iplSystem.h"
#include "system/iplNand.h"
#include "utility/iplGraphics.h"

View File

@@ -10,9 +10,9 @@
namespace ipl {
namespace scene {
TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& unk2,
f32 unk3, f32 unk4)
: unk_0x08(FALSE), mpText(NULL), mTextLen(0), mBalloonPos(unk2), unk_0x28(0), unk_0x2C(1), unk_0x30(unk3), unk_0x34(unk4),
TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& initialPos,
f32 margin16x9, f32 margin4x3)
: mbWaitingFadeIn(FALSE), mpText(NULL), mTextLen(0), mBalloonPos(initialPos), mHAlign(0), mbUse16x9X(1), mMargin16x9(margin16x9), mMargin4x3(margin4x3),
mWaitUntilFadeIn(0) {
mpLayout = new (heap, 4) layout::Object(heap, layoutFile, directory, fileName);
mpLayout->bind("my_IplTopBalloon_a_BalloonInOut.brlan");
@@ -31,7 +31,7 @@ namespace ipl {
void TextBalloon::calc() {
mpLayout->calc();
switch (unk_0x08) {
switch (mbWaitingFadeIn) {
case TRUE: {
break;
}
@@ -73,7 +73,7 @@ namespace ipl {
balloonPane->SetVisible(false);
unk_0x08 = FALSE;
mbWaitingFadeIn = FALSE;
}
void TextBalloon::fadein() {
@@ -81,7 +81,7 @@ namespace ipl {
mpLayout->FindPaneByName("N_Balloon")->SetVisible(false);
mWaitUntilFadeIn = 0;
unk_0x08 = TRUE;
mbWaitingFadeIn = TRUE;
set_textbox(mpText);
set_translate(mBalloonPos);
@@ -91,17 +91,17 @@ namespace ipl {
void TextBalloon::fadeinNoSetTextbox() {
if (mpText != NULL) {
mWaitUntilFadeIn = 0;
unk_0x08 = TRUE;
mbWaitingFadeIn = TRUE;
set_translate(mBalloonPos);
}
}
void TextBalloon::setPos(const math::VEC3& pos, bool unk0, int unk1) {
void TextBalloon::setPos(const math::VEC3& pos, bool use16x9X, int hAlign) {
mBalloonPos = pos;
unk_0x28 = unk1;
unk_0x2C = unk0;
mHAlign = hAlign;
mbUse16x9X = use16x9X;
nw4r::ut::Rect proj16x9;
nw4r::ut::Rect proj4x3;
@@ -109,7 +109,7 @@ namespace ipl {
System::getProjectionRect(&proj16x9);
System::getProjectionRect4x3(&proj4x3);
if (unk_0x2C == 0) {
if (mbUse16x9X == 0) {
mBalloonPos.x *= proj4x3.GetWidth() / proj16x9.GetWidth();
}
}
@@ -122,7 +122,7 @@ namespace ipl {
System::getProjectionRect(&proj16x9);
System::getProjectionRect4x3(&proj4x3);
if (unk_0x2C == 0) {
if (mbUse16x9X == 0) {
mBalloonPos.x *= proj4x3.GetWidth() / proj16x9.GetWidth();
}
@@ -133,27 +133,27 @@ namespace ipl {
if (mWaitUntilFadeIn++ > WAIT_UNTIL_FADE_IN) {
anm_fadein();
snd::getSystem()->startSE("WIPL_SE_BALLOON");
unk_0x08 = FALSE;
mbWaitingFadeIn = FALSE;
}
}
void TextBalloon::fadeout() {
if (!unk_0x08) {
if (!mbWaitingFadeIn) {
mpLayout->setAnmType(ANIM_TYPE_BACKWARD);
mpLayout->start();
}
unk_0x08 = FALSE;
mbWaitingFadeIn = FALSE;
}
void TextBalloon::fadeoutForce() {
if (!unk_0x08) {
if (!mbWaitingFadeIn) {
if (mpLayout->getAnim()->getAnmType() == ANIM_TYPE_FORWARD) {
mpLayout->getAnim()->setAnmType(ANIM_TYPE_BACKWARD);
mpLayout->getAnim()->restart();
}
} else if (unk_0x08 == TRUE) {
} else if (mbWaitingFadeIn == TRUE) {
mWaitUntilFadeIn = 0;
unk_0x08 = FALSE;
mbWaitingFadeIn = FALSE;
}
}
@@ -167,9 +167,9 @@ namespace ipl {
f32 temp0;
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
temp0 = unk_0x30;
temp0 = mMargin16x9;
} else {
temp0 = unk_0x34;
temp0 = mMargin4x3;
}
nw4r::lyt::Pane* balloonPane = mpLayout->FindPaneByName("N_Balloon");
@@ -181,7 +181,7 @@ namespace ipl {
System::getProjectionRect(&proj16x9);
System::getProjectionRect4x3(&proj4x3);
switch (unk_0x28) {
switch (mHAlign) {
case 1: {
temp1 = get_size("W_Base")->width / 2;
break;
@@ -192,7 +192,7 @@ namespace ipl {
}
}
if (unk_0x2C == 0) {
if (mbUse16x9X == 0) {
temp1 *= proj4x3.GetWidth() / proj16x9.GetWidth();
}

View File

@@ -19,11 +19,11 @@ extern "C" {
}
extern "C" void _seBlk__Q23ipl3snd();
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
extern "C" const f32 lbl_816946A4;
extern "C" const f32 lbl_816946AC;
extern "C" const f32 lbl_816946A8;
extern "C" const f32 lbl_816946B0;
extern "C" const f32 lbl_816946B4;
extern "C" const f32 scSoundZeroF;
extern "C" const f32 scSoundOneF;
extern "C" const f32 scSoundTwoF;
extern "C" const f32 scSoundThirtyF;
extern "C" const f32 scSoundSixtyF;
extern "C" {
void _savegpr_29();
void pauseOffSE__Q33ipl3snd6SystemFv();
@@ -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);
@@ -500,21 +500,21 @@ namespace snd {
if (block->handle.detail_GetAttachedSound() != NULL) {
block->handle.detail_GetAttachedSound()->SetPan(pan);
}
f32 pitch = lbl_816946A8 * y / rect.right;
if (lbl_816946AC < pitch) {
pitch = lbl_816946AC;
f32 pitch = scSoundTwoF * y / rect.right;
if (scSoundOneF < pitch) {
pitch = scSoundOneF;
}
if (block->handle.detail_GetAttachedSound() != NULL) {
block->handle.detail_GetAttachedSound()->SetVolume(pitch, 0);
}
if (lbl_816946B0 < y) {
f32 pitch2 = y / lbl_816946B0;
if (scSoundThirtyF < y) {
f32 pitch2 = y / scSoundThirtyF;
if (block->handle.detail_GetAttachedSound() != NULL) {
block->handle.detail_GetAttachedSound()->SetPitch(pitch2);
}
} else if (lbl_816946B4 < y) {
} else if (scSoundSixtyF < y) {
if (block->handle.detail_GetAttachedSound() != NULL) {
block->handle.detail_GetAttachedSound()->SetPitch(lbl_816946A8);
block->handle.detail_GetAttachedSound()->SetPitch(scSoundTwoF);
}
}
return (int)block;

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() {

View File

@@ -674,7 +674,7 @@ int Rvl_decode_ash(u8* out, u8* in) {
shifted = shifted - nodeVal;
tmp15 = nodeVal >> 3;
if (tmp15 == 0) {
goto LAB_813325b8;
goto copy_lit_tail;
}
do {
*out = litPtr[-1];
@@ -690,7 +690,7 @@ int Rvl_decode_ash(u8* out, u8* in) {
tmp15 = tmp15 - 1;
} while (tmp15 != 0);
for (nodeVal = nodeVal & 7; nodeVal != 0; nodeVal = nodeVal - 1) {
LAB_813325b8:
copy_lit_tail:
dst = litPtr - 1;
litPtr = litPtr + 1;
*out = *dst;

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.