Compare commits

..

1 Commits

Author SHA1 Message Date
coah
dda2484afb cleanup(tiInputForm): name pane/string labels
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:16 -05:00
29 changed files with 1030 additions and 1039 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.38% | 87.96% | 62.33% | 92.07% |
| 99.37% | 87.87% | 62.36% | 92.06% |
units 919/1027 complete, functions 12224/12563 matched.
units 920/1027 complete, functions 12221/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

@@ -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
markTmdReadyTask__Q33ipl5scene12ChannelTitleFPv = .text:0x813BA684; // type:function size:0xC
iplChannelTitle_813BA684__Q33ipl5scene12ChannelTitleFPv = .text:0x813BA684; // type:function size:0xC
getTicketLimitTask__Q33ipl5scene12ChannelTitleFPv = .text:0x813BA690; // type:function size:0xF4
deleteTmpTitleContentTask__Q33ipl5scene12ChannelTitleFPv = .text:0x813BA784; // type:function size:0xE0
iplChannelTitle_813BA784__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
onNatDetectionDone = .text:0x813D54F8; // type:function size:0x6C
iplContest_813D54F8 = .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_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
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
getTranslate__Q33ipl5scene12SDChannelObjCFv = .text:0x813E3320; // type:function size:0x10
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
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
__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_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
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
startResetting__Q33ipl5scene14SDChannelTitleFv = .text:0x813E9468; // type:function size:0xC
@20@__dt__Q33ipl5scene14SDChannelTitleFv = .text:0x813E9474; // type:function size:0x8
__ct__Q33ipl5scene8SDButtonFPQ23EGG4Heap = .text:0x813E947C; // type:function size:0x9C
@@ -7270,9 +7270,9 @@ ZiDAWGgetEOWattribute = .text:0x81481098; // type:function size:0x30
ZiDAWGgetCHARattribute = .text:0x814810C8; // type:function size:0xF0
ZiDAWGGetGraph = .text:0x814811B8; // type:function size:0x2C
ZiDAWGGetGraphInfo = .text:0x814811E4; // type:function size:0x218
Zi8LookupKoreanChar = .text:0x814813FC; // type:function size:0xC4
Zi8_814813FC = .text:0x814813FC; // type:function size:0xC4
Zi8GetKoreanCandidates = .text:0x814814C0; // type:function size:0x9AC
Zi8MatchKoreanSequence = .text:0x81481E6C; // type:function size:0x9D4
Zi8_81481E6C = .text:0x81481E6C; // type:function size:0x9D4
Zi8IsWordW = .text:0x81482840; // type:function size:0x680
Zi8ConvertUC2UserKey = .text:0x81482EC0; // type:function size:0x16C
Zi8_8148302C = .text:0x8148302C; // type:function size:0xEC
@@ -8879,8 +8879,8 @@ TMCJPEGDEC_move_ptr = .text:0x814EAD28; // type:function size:0xE4
TMCJPEGDEC_load_buff = .text:0x814EAE0C; // type:function size:0x124
TMCJPEGDEC_get_position = .text:0x814EAF30; // type:function size:0x10
TMCJPEGDEC_chk_possible_size = .text:0x814EAF40; // type:function size:0x10
refillJpegBufferAfterFF = .text:0x814EAF50; // type:function size:0x1B8 scope:local
refillJpegBuffer = .text:0x814EB108; // type:function size:0x198 scope:local
TMCJPEG_814EAF50 = .text:0x814EAF50; // type:function size:0x1B8 scope:local
TMCJPEG_814EB108 = .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
@@ -17938,7 +17938,7 @@ __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
scHwKeyboardConvertWCCodeJumpTable = .data:0x81668EF8; // type:object size:0xFC scope:local
jumptable_81668EF8 = .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
@@ -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
scInputFormZeroF = .sdata2:0x81694D28; // type:object size:0x4 align:4 data:float
scInputForm640F = .sdata2:0x81694D2C; // type:object size:0x4 align:4 data:float
scInputFormF32ConvertMagic = .sdata2:0x81694D30; // type:object size:0x8 align:8 data:double
scInputFormOneF = .sdata2:0x81694D38; // type:object size:0x4 align:4 data:float
scInputFormHalfF = .sdata2:0x81694D3C; // type:object size:0x4 align:4 data:float
scInputForm0_7111111F = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
scInputForm150F = .sdata2:0x81694D44; // type:object size:0x4 align:4 data:float
scInputForm30F = .sdata2:0x81694D48; // type:object size:0x4 align:4 data:float
scInputForm50F = .sdata2:0x81694D4C; // type:object size:0x4 align:4 data:float
scInputForm10F = .sdata2:0x81694D50; // type:object size:0x4 align:4 data:float
scInputForm52F = .sdata2:0x81694D54; // type:object size:0x4 align:4 data:float
scInputFormTwoF = .sdata2:0x81694D58; // type:object size:0x4 align:4 data:float
scInputForm140F = .sdata2:0x81694D5C; // type:object size:0x4 align:4 data:float
scInputForm90F = .sdata2:0x81694D60; // type:object size:0x4 align:4 data:float
scInputForm253F = .sdata2:0x81694D64; // type:object size:0x4 align:4 data:float
scInputForm20F = .sdata2:0x81694D68; // type:object size:0x4 align:4 data:float
scInputFormColorRU8 = .sdata2:0x81694D6C; // type:object size:0x1 data:byte
scInputFormColorGU8 = .sdata2:0x81694D6D; // type:object size:0x1 data:byte
scInputFormColorBU8 = .sdata2:0x81694D6E; // type:object size:0x1 data:byte
scInputFormColorAU8 = .sdata2:0x81694D6F; // type:object size:0x1 data:byte
scInputForm255F = .sdata2:0x81694D70; // type:object size:0x4 align:4 data:float
scInputForm127F = .sdata2:0x81694D74; // type:object size:0x4 align:4 data:float
scInputForm14592F = .sdata2:0x81694D78; // type:object size:0x4 align:4 data:float
scInputFormF64ConvertMagic = .sdata2:0x81694D80; // type:object size:0x8 align:8 data:double
scInputForm15F = .sdata2:0x81694D88; // type:object size:0x4 align:4 data:float
lbl_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
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

View File

@@ -247,7 +247,7 @@ config.asflags = [
"-I include",
f"-I build/{config.version}/include",
f"--defsym BUILD_VERSION={version_num}",
f"--defsym VERSION_{config.version}",
f"--defsym VERSION_{config.version}=1",
]
config.ldflags = [
"-fp hardware",
@@ -1218,7 +1218,7 @@ config.libs = [
Object(NonMatching, "texturecvtr/Texture_MCUtoRGB565.c"),
Object(NonMatching, "texturecvtr/Texture_MCUtoRGBA8.c"),
Object(NonMatching, "b65/iqdec_b65_frv32.c"),
Object(Matching, "b65/iqdec_b65_frv32.c", source="b65/iqdec_b65_frv32.s"),
]
),
# NW4R

View File

@@ -293,8 +293,8 @@ namespace ipl {
LOCKED_DIALOG_ANIM_MAX,
};
static void markTmdReadyTask(void* work);
static void deleteTmpTitleContentTask(void* work);
static void iplChannelTitle_813BA684(void* work);
static void iplChannelTitle_813BA784(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_activateIfIdle(SDChannelObj* channel);
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel);
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
EGG::ExpHeap* secondHeap);
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);
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);
union SDChannelSelectCommandArguments {
u32 values[3];

View File

@@ -26,18 +26,6 @@ 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,3 +1,4 @@
// Matching build uses iqdec_b65_frv32.s (retail extract); keep C for reference.
#include <string.h>
#include <tmc_jpeg_internal.h>

View File

@@ -0,0 +1,315 @@
.include "macros.inc"
.file "iqdec_b65_frv32.c"
# 0x814F6BD4..0x814F7024 | size: 0x450
.text
.balign 4
# .text:0x0 | 0x814F6BD4 | size: 0x450
.fn TMCJPEGDEC_decode_iquant, global
/* 814F6BD4 001C70F4 94 21 FF B0 */ stwu r1, -0x50(r1)
/* 814F6BD8 001C70F8 7C 08 02 A6 */ mflr r0
/* 814F6BDC 001C70FC 90 01 00 54 */ stw r0, 0x54(r1)
/* 814F6BE0 001C7100 BE A1 00 24 */ stmw r21, 0x24(r1)
/* 814F6BE4 001C7104 7C 75 1B 78 */ mr r21, r3
/* 814F6BE8 001C7108 7C 96 23 78 */ mr r22, r4
/* 814F6BEC 001C710C 7C B8 2B 78 */ mr r24, r5
/* 814F6BF0 001C7110 7C D7 33 78 */ mr r23, r6
/* 814F6BF4 001C7114 80 06 00 04 */ lwz r0, 0x4(r6)
/* 814F6BF8 001C7118 83 26 04 98 */ lwz r25, 0x498(r6)
/* 814F6BFC 001C711C 2C 00 00 08 */ cmpwi r0, 0x8
/* 814F6C00 001C7120 41 81 00 18 */ bgt .L_814F6C18
/* 814F6C04 001C7124 7E E3 BB 78 */ mr r3, r23
/* 814F6C08 001C7128 4B FF 42 05 */ bl TMCJPEGDEC_load_buff
/* 814F6C0C 001C712C 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6C10 001C7130 40 80 00 08 */ bge .L_814F6C18
/* 814F6C14 001C7134 48 00 03 FC */ b .L_814F7010
.L_814F6C18:
/* 814F6C18 001C7138 80 97 00 04 */ lwz r4, 0x4(r23)
/* 814F6C1C 001C713C 80 77 00 00 */ lwz r3, 0x0(r23)
/* 814F6C20 001C7140 38 04 FF F8 */ subi r0, r4, 0x8
/* 814F6C24 001C7144 7C 60 04 30 */ srw r0, r3, r0
/* 814F6C28 001C7148 54 00 15 BA */ clrlslwi r0, r0, 24, 2
/* 814F6C2C 001C714C 7C 79 02 14 */ add r3, r25, r0
/* 814F6C30 001C7150 7C 19 02 2E */ lhzx r0, r25, r0
/* 814F6C34 001C7154 A3 23 00 02 */ lhz r25, 0x2(r3)
/* 814F6C38 001C7158 2C 00 00 00 */ cmpwi r0, 0x0
/* 814F6C3C 001C715C B0 01 00 1C */ sth r0, 0x1c(r1)
/* 814F6C40 001C7160 B3 21 00 1E */ sth r25, 0x1e(r1)
/* 814F6C44 001C7164 41 82 00 10 */ beq .L_814F6C54
/* 814F6C48 001C7168 7C 00 20 50 */ subf r0, r0, r4
/* 814F6C4C 001C716C 90 17 00 04 */ stw r0, 0x4(r23)
/* 814F6C50 001C7170 48 00 00 C8 */ b .L_814F6D18
.L_814F6C54:
/* 814F6C54 001C7174 2C 04 00 11 */ cmpwi r4, 0x11
/* 814F6C58 001C7178 83 B7 04 A0 */ lwz r29, 0x4a0(r23)
/* 814F6C5C 001C717C 83 37 04 9C */ lwz r25, 0x49c(r23)
/* 814F6C60 001C7180 41 81 00 18 */ bgt .L_814F6C78
/* 814F6C64 001C7184 7E E3 BB 78 */ mr r3, r23
/* 814F6C68 001C7188 4B FF 41 A5 */ bl TMCJPEGDEC_load_buff
/* 814F6C6C 001C718C 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6C70 001C7190 40 80 00 08 */ bge .L_814F6C78
/* 814F6C74 001C7194 48 00 00 94 */ b .L_814F6D08
.L_814F6C78:
/* 814F6C78 001C7198 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6C7C 001C719C 38 F9 00 24 */ addi r7, r25, 0x24
/* 814F6C80 001C71A0 80 17 00 00 */ lwz r0, 0x0(r23)
/* 814F6C84 001C71A4 38 A0 00 09 */ li r5, 0x9
/* 814F6C88 001C71A8 38 63 FF F7 */ subi r3, r3, 0x9
/* 814F6C8C 001C71AC 7C 00 1C 30 */ srw r0, r0, r3
/* 814F6C90 001C71B0 90 77 00 04 */ stw r3, 0x4(r23)
/* 814F6C94 001C71B4 54 06 05 FE */ clrlwi r6, r0, 23
/* 814F6C98 001C71B8 48 00 00 3C */ b .L_814F6CD4
.L_814F6C9C:
/* 814F6C9C 001C71BC 38 A5 00 01 */ addi r5, r5, 0x1
/* 814F6CA0 001C71C0 38 E7 00 04 */ addi r7, r7, 0x4
/* 814F6CA4 001C71C4 28 05 00 10 */ cmplwi r5, 0x10
/* 814F6CA8 001C71C8 40 81 00 0C */ ble .L_814F6CB4
/* 814F6CAC 001C71CC 38 60 FF 9C */ li r3, -0x64
/* 814F6CB0 001C71D0 48 00 00 58 */ b .L_814F6D08
.L_814F6CB4:
/* 814F6CB4 001C71D4 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6CB8 001C71D8 54 C6 08 3C */ slwi r6, r6, 1
/* 814F6CBC 001C71DC 80 17 00 00 */ lwz r0, 0x0(r23)
/* 814F6CC0 001C71E0 38 63 FF FF */ subi r3, r3, 0x1
/* 814F6CC4 001C71E4 7C 00 1C 30 */ srw r0, r0, r3
/* 814F6CC8 001C71E8 90 77 00 04 */ stw r3, 0x4(r23)
/* 814F6CCC 001C71EC 54 00 07 FE */ clrlwi r0, r0, 31
/* 814F6CD0 001C71F0 7C C6 03 78 */ or r6, r6, r0
.L_814F6CD4:
/* 814F6CD4 001C71F4 A0 87 00 00 */ lhz r4, 0x0(r7)
/* 814F6CD8 001C71F8 A0 67 00 02 */ lhz r3, 0x2(r7)
/* 814F6CDC 001C71FC B0 81 00 14 */ sth r4, 0x14(r1)
/* 814F6CE0 001C7200 B0 61 00 16 */ sth r3, 0x16(r1)
/* 814F6CE4 001C7204 80 01 00 14 */ lwz r0, 0x14(r1)
/* 814F6CE8 001C7208 90 01 00 18 */ stw r0, 0x18(r1)
/* 814F6CEC 001C720C A0 01 00 18 */ lhz r0, 0x18(r1)
/* 814F6CF0 001C7210 7C 06 00 40 */ cmplw r6, r0
/* 814F6CF4 001C7214 41 81 FF A8 */ bgt .L_814F6C9C
/* 814F6CF8 001C7218 7C 04 30 50 */ subf r0, r4, r6
/* 814F6CFC 001C721C 7C 00 1A 14 */ add r0, r0, r3
/* 814F6D00 001C7220 54 00 06 3E */ clrlwi r0, r0, 24
/* 814F6D04 001C7224 7C 7D 00 AE */ lbzx r3, r29, r0
.L_814F6D08:
/* 814F6D08 001C7228 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6D0C 001C722C 7C 79 1B 78 */ mr r25, r3
/* 814F6D10 001C7230 40 80 00 08 */ bge .L_814F6D18
/* 814F6D14 001C7234 48 00 02 FC */ b .L_814F7010
.L_814F6D18:
/* 814F6D18 001C7238 2C 19 00 00 */ cmpwi r25, 0x0
/* 814F6D1C 001C723C 83 76 00 00 */ lwz r27, 0x0(r22)
/* 814F6D20 001C7240 41 82 00 64 */ beq .L_814F6D84
/* 814F6D24 001C7244 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6D28 001C7248 7C 00 C8 00 */ cmpw r0, r25
/* 814F6D2C 001C724C 41 81 00 18 */ bgt .L_814F6D44
/* 814F6D30 001C7250 7E E3 BB 78 */ mr r3, r23
/* 814F6D34 001C7254 4B FF 40 D9 */ bl TMCJPEGDEC_load_buff
/* 814F6D38 001C7258 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6D3C 001C725C 40 80 00 08 */ bge .L_814F6D44
/* 814F6D40 001C7260 48 00 02 D0 */ b .L_814F7010
.L_814F6D44:
/* 814F6D44 001C7264 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6D48 001C7268 38 80 00 01 */ li r4, 0x1
/* 814F6D4C 001C726C 80 77 00 00 */ lwz r3, 0x0(r23)
/* 814F6D50 001C7270 7C 86 C8 30 */ slw r6, r4, r25
/* 814F6D54 001C7274 7C 99 00 50 */ subf r4, r25, r0
/* 814F6D58 001C7278 38 A6 FF FF */ subi r5, r6, 0x1
/* 814F6D5C 001C727C 7C C0 0E 70 */ srawi r0, r6, 1
/* 814F6D60 001C7280 7C 63 24 30 */ srw r3, r3, r4
/* 814F6D64 001C7284 90 97 00 04 */ stw r4, 0x4(r23)
/* 814F6D68 001C7288 7C A3 18 38 */ and r3, r5, r3
/* 814F6D6C 001C728C 7C 00 18 00 */ cmpw r0, r3
/* 814F6D70 001C7290 40 81 00 08 */ ble .L_814F6D78
/* 814F6D74 001C7294 7C 65 18 50 */ subf r3, r5, r3
.L_814F6D78:
/* 814F6D78 001C7298 80 18 00 00 */ lwz r0, 0x0(r24)
/* 814F6D7C 001C729C 7C 00 1A 14 */ add r0, r0, r3
/* 814F6D80 001C72A0 90 18 00 00 */ stw r0, 0x0(r24)
.L_814F6D84:
/* 814F6D84 001C72A4 80 18 00 00 */ lwz r0, 0x0(r24)
/* 814F6D88 001C72A8 38 75 00 04 */ addi r3, r21, 0x4
/* 814F6D8C 001C72AC 38 80 00 00 */ li r4, 0x0
/* 814F6D90 001C72B0 38 A0 00 FC */ li r5, 0xfc
/* 814F6D94 001C72B4 7C 00 D9 D6 */ mullw r0, r0, r27
/* 814F6D98 001C72B8 90 15 00 00 */ stw r0, 0x0(r21)
/* 814F6D9C 001C72BC 83 97 04 A8 */ lwz r28, 0x4a8(r23)
/* 814F6DA0 001C72C0 83 37 04 AC */ lwz r25, 0x4ac(r23)
/* 814F6DA4 001C72C4 83 17 04 B0 */ lwz r24, 0x4b0(r23)
/* 814F6DA8 001C72C8 4B E3 95 8D */ bl memset
/* 814F6DAC 001C72CC 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6DB0 001C72D0 3B 60 00 01 */ li r27, 0x1
/* 814F6DB4 001C72D4 2C 00 00 08 */ cmpwi r0, 0x8
/* 814F6DB8 001C72D8 41 81 00 18 */ bgt .L_814F6DD0
/* 814F6DBC 001C72DC 7E E3 BB 78 */ mr r3, r23
/* 814F6DC0 001C72E0 4B FF 40 4D */ bl TMCJPEGDEC_load_buff
/* 814F6DC4 001C72E4 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6DC8 001C72E8 40 80 00 08 */ bge .L_814F6DD0
/* 814F6DCC 001C72EC 48 00 02 44 */ b .L_814F7010
.L_814F6DD0:
/* 814F6DD0 001C72F0 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6DD4 001C72F4 3F A0 81 62 */ lis r29, TMCJPEGDEC_Zigzag_data@ha
/* 814F6DD8 001C72F8 80 97 00 00 */ lwz r4, 0x0(r23)
/* 814F6DDC 001C72FC 3B BD E1 B0 */ addi r29, r29, TMCJPEGDEC_Zigzag_data@l
/* 814F6DE0 001C7300 38 03 FF F8 */ subi r0, r3, 0x8
/* 814F6DE4 001C7304 3B E0 00 01 */ li r31, 0x1
/* 814F6DE8 001C7308 7C 80 04 30 */ srw r0, r4, r0
/* 814F6DEC 001C730C 54 00 15 BA */ clrlslwi r0, r0, 24, 2
/* 814F6DF0 001C7310 7C 9C 02 14 */ add r4, r28, r0
/* 814F6DF4 001C7314 7C 7C 02 2E */ lhzx r3, r28, r0
/* 814F6DF8 001C7318 A0 04 00 02 */ lhz r0, 0x2(r4)
/* 814F6DFC 001C731C B0 61 00 08 */ sth r3, 0x8(r1)
/* 814F6E00 001C7320 B0 01 00 0A */ sth r0, 0xa(r1)
.L_814F6E04:
/* 814F6E04 001C7324 A0 81 00 08 */ lhz r4, 0x8(r1)
/* 814F6E08 001C7328 2C 04 00 00 */ cmpwi r4, 0x0
/* 814F6E0C 001C732C 41 82 00 18 */ beq .L_814F6E24
/* 814F6E10 001C7330 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6E14 001C7334 A0 61 00 0A */ lhz r3, 0xa(r1)
/* 814F6E18 001C7338 7C 04 00 50 */ subf r0, r4, r0
/* 814F6E1C 001C733C 90 17 00 04 */ stw r0, 0x4(r23)
/* 814F6E20 001C7340 48 00 00 C0 */ b .L_814F6EE0
.L_814F6E24:
/* 814F6E24 001C7344 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6E28 001C7348 2C 00 00 11 */ cmpwi r0, 0x11
/* 814F6E2C 001C734C 41 81 00 18 */ bgt .L_814F6E44
/* 814F6E30 001C7350 7E E3 BB 78 */ mr r3, r23
/* 814F6E34 001C7354 4B FF 3F D9 */ bl TMCJPEGDEC_load_buff
/* 814F6E38 001C7358 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6E3C 001C735C 40 80 00 08 */ bge .L_814F6E44
/* 814F6E40 001C7360 48 00 00 94 */ b .L_814F6ED4
.L_814F6E44:
/* 814F6E44 001C7364 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6E48 001C7368 38 F9 00 24 */ addi r7, r25, 0x24
/* 814F6E4C 001C736C 80 17 00 00 */ lwz r0, 0x0(r23)
/* 814F6E50 001C7370 38 A0 00 09 */ li r5, 0x9
/* 814F6E54 001C7374 38 63 FF F7 */ subi r3, r3, 0x9
/* 814F6E58 001C7378 7C 00 1C 30 */ srw r0, r0, r3
/* 814F6E5C 001C737C 90 77 00 04 */ stw r3, 0x4(r23)
/* 814F6E60 001C7380 54 06 05 FE */ clrlwi r6, r0, 23
/* 814F6E64 001C7384 48 00 00 3C */ b .L_814F6EA0
.L_814F6E68:
/* 814F6E68 001C7388 38 A5 00 01 */ addi r5, r5, 0x1
/* 814F6E6C 001C738C 38 E7 00 04 */ addi r7, r7, 0x4
/* 814F6E70 001C7390 28 05 00 10 */ cmplwi r5, 0x10
/* 814F6E74 001C7394 40 81 00 0C */ ble .L_814F6E80
/* 814F6E78 001C7398 38 60 FF 9C */ li r3, -0x64
/* 814F6E7C 001C739C 48 00 00 58 */ b .L_814F6ED4
.L_814F6E80:
/* 814F6E80 001C73A0 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6E84 001C73A4 54 C6 08 3C */ slwi r6, r6, 1
/* 814F6E88 001C73A8 80 17 00 00 */ lwz r0, 0x0(r23)
/* 814F6E8C 001C73AC 38 63 FF FF */ subi r3, r3, 0x1
/* 814F6E90 001C73B0 7C 00 1C 30 */ srw r0, r0, r3
/* 814F6E94 001C73B4 90 77 00 04 */ stw r3, 0x4(r23)
/* 814F6E98 001C73B8 54 00 07 FE */ clrlwi r0, r0, 31
/* 814F6E9C 001C73BC 7C C6 03 78 */ or r6, r6, r0
.L_814F6EA0:
/* 814F6EA0 001C73C0 A0 87 00 00 */ lhz r4, 0x0(r7)
/* 814F6EA4 001C73C4 A0 67 00 02 */ lhz r3, 0x2(r7)
/* 814F6EA8 001C73C8 B0 81 00 0C */ sth r4, 0xc(r1)
/* 814F6EAC 001C73CC B0 61 00 0E */ sth r3, 0xe(r1)
/* 814F6EB0 001C73D0 80 01 00 0C */ lwz r0, 0xc(r1)
/* 814F6EB4 001C73D4 90 01 00 10 */ stw r0, 0x10(r1)
/* 814F6EB8 001C73D8 A0 01 00 10 */ lhz r0, 0x10(r1)
/* 814F6EBC 001C73DC 7C 06 00 40 */ cmplw r6, r0
/* 814F6EC0 001C73E0 41 81 FF A8 */ bgt .L_814F6E68
/* 814F6EC4 001C73E4 7C 04 30 50 */ subf r0, r4, r6
/* 814F6EC8 001C73E8 7C 00 1A 14 */ add r0, r0, r3
/* 814F6ECC 001C73EC 54 00 06 3E */ clrlwi r0, r0, 24
/* 814F6ED0 001C73F0 7C 78 00 AE */ lbzx r3, r24, r0
.L_814F6ED4:
/* 814F6ED4 001C73F4 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6ED8 001C73F8 40 80 00 08 */ bge .L_814F6EE0
/* 814F6EDC 001C73FC 48 00 01 34 */ b .L_814F7010
.L_814F6EE0:
/* 814F6EE0 001C7400 54 7A 07 3F */ clrlwi. r26, r3, 28
/* 814F6EE4 001C7404 41 82 00 AC */ beq .L_814F6F90
/* 814F6EE8 001C7408 7C 60 26 70 */ srawi r0, r3, 4
/* 814F6EEC 001C740C 7F 7B 02 14 */ add r27, r27, r0
/* 814F6EF0 001C7410 2C 1B 00 40 */ cmpwi r27, 0x40
/* 814F6EF4 001C7414 41 80 00 0C */ blt .L_814F6F00
/* 814F6EF8 001C7418 38 60 FF 9C */ li r3, -0x64
/* 814F6EFC 001C741C 48 00 01 14 */ b .L_814F7010
.L_814F6F00:
/* 814F6F00 001C7420 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6F04 001C7424 38 1A 00 08 */ addi r0, r26, 0x8
/* 814F6F08 001C7428 7F DD D8 AE */ lbzx r30, r29, r27
/* 814F6F0C 001C742C 7C 03 00 00 */ cmpw r3, r0
/* 814F6F10 001C7430 41 81 00 18 */ bgt .L_814F6F28
/* 814F6F14 001C7434 7E E3 BB 78 */ mr r3, r23
/* 814F6F18 001C7438 4B FF 3E F5 */ bl TMCJPEGDEC_load_buff
/* 814F6F1C 001C743C 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6F20 001C7440 40 80 00 08 */ bge .L_814F6F28
/* 814F6F24 001C7444 48 00 00 EC */ b .L_814F7010
.L_814F6F28:
/* 814F6F28 001C7448 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6F2C 001C744C 7F E3 D0 30 */ slw r3, r31, r26
/* 814F6F30 001C7450 80 B7 00 00 */ lwz r5, 0x0(r23)
/* 814F6F34 001C7454 38 C3 FF FF */ subi r6, r3, 0x1
/* 814F6F38 001C7458 7C 9A 00 50 */ subf r4, r26, r0
/* 814F6F3C 001C745C 7C 60 0E 70 */ srawi r0, r3, 1
/* 814F6F40 001C7460 38 64 FF F8 */ subi r3, r4, 0x8
/* 814F6F44 001C7464 90 97 00 04 */ stw r4, 0x4(r23)
/* 814F6F48 001C7468 7C A3 1C 30 */ srw r3, r5, r3
/* 814F6F4C 001C746C 7C A5 24 30 */ srw r5, r5, r4
/* 814F6F50 001C7470 54 63 15 BA */ clrlslwi r3, r3, 24, 2
/* 814F6F54 001C7474 57 C7 15 BA */ clrlslwi r7, r30, 24, 2
/* 814F6F58 001C7478 7C 9C 1A 14 */ add r4, r28, r3
/* 814F6F5C 001C747C 7C C5 28 38 */ and r5, r6, r5
/* 814F6F60 001C7480 7C 7C 1A 2E */ lhzx r3, r28, r3
/* 814F6F64 001C7484 7C 00 28 00 */ cmpw r0, r5
/* 814F6F68 001C7488 A0 04 00 02 */ lhz r0, 0x2(r4)
/* 814F6F6C 001C748C B0 61 00 08 */ sth r3, 0x8(r1)
/* 814F6F70 001C7490 7C 76 38 2E */ lwzx r3, r22, r7
/* 814F6F74 001C7494 B0 01 00 0A */ sth r0, 0xa(r1)
/* 814F6F78 001C7498 40 81 00 08 */ ble .L_814F6F80
/* 814F6F7C 001C749C 7C A6 28 50 */ subf r5, r6, r5
.L_814F6F80:
/* 814F6F80 001C74A0 7C 05 19 D6 */ mullw r0, r5, r3
/* 814F6F84 001C74A4 3B 7B 00 01 */ addi r27, r27, 0x1
/* 814F6F88 001C74A8 7C 15 39 2E */ stwx r0, r21, r7
/* 814F6F8C 001C74AC 48 00 00 58 */ b .L_814F6FE4
.L_814F6F90:
/* 814F6F90 001C74B0 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6F94 001C74B4 41 82 00 58 */ beq .L_814F6FEC
/* 814F6F98 001C74B8 80 17 00 04 */ lwz r0, 0x4(r23)
/* 814F6F9C 001C74BC 2C 00 00 08 */ cmpwi r0, 0x8
/* 814F6FA0 001C74C0 41 81 00 18 */ bgt .L_814F6FB8
/* 814F6FA4 001C74C4 7E E3 BB 78 */ mr r3, r23
/* 814F6FA8 001C74C8 4B FF 3E 65 */ bl TMCJPEGDEC_load_buff
/* 814F6FAC 001C74CC 2C 03 00 00 */ cmpwi r3, 0x0
/* 814F6FB0 001C74D0 40 80 00 08 */ bge .L_814F6FB8
/* 814F6FB4 001C74D4 48 00 00 5C */ b .L_814F7010
.L_814F6FB8:
/* 814F6FB8 001C74D8 80 77 00 04 */ lwz r3, 0x4(r23)
/* 814F6FBC 001C74DC 3B 7B 00 10 */ addi r27, r27, 0x10
/* 814F6FC0 001C74E0 80 97 00 00 */ lwz r4, 0x0(r23)
/* 814F6FC4 001C74E4 38 03 FF F8 */ subi r0, r3, 0x8
/* 814F6FC8 001C74E8 7C 80 04 30 */ srw r0, r4, r0
/* 814F6FCC 001C74EC 54 00 15 BA */ clrlslwi r0, r0, 24, 2
/* 814F6FD0 001C74F0 7C 9C 02 14 */ add r4, r28, r0
/* 814F6FD4 001C74F4 7C 7C 02 2E */ lhzx r3, r28, r0
/* 814F6FD8 001C74F8 A0 04 00 02 */ lhz r0, 0x2(r4)
/* 814F6FDC 001C74FC B0 61 00 08 */ sth r3, 0x8(r1)
/* 814F6FE0 001C7500 B0 01 00 0A */ sth r0, 0xa(r1)
.L_814F6FE4:
/* 814F6FE4 001C7504 2C 1B 00 40 */ cmpwi r27, 0x40
/* 814F6FE8 001C7508 41 80 FE 1C */ blt .L_814F6E04
.L_814F6FEC:
/* 814F6FEC 001C750C 2C 1B 00 40 */ cmpwi r27, 0x40
/* 814F6FF0 001C7510 40 81 00 0C */ ble .L_814F6FFC
/* 814F6FF4 001C7514 38 60 FF 9C */ li r3, -0x64
/* 814F6FF8 001C7518 48 00 00 18 */ b .L_814F7010
.L_814F6FFC:
/* 814F6FFC 001C751C 38 1B FF FF */ subi r0, r27, 0x1
/* 814F7000 001C7520 3C 60 81 62 */ lis r3, TMCJPEGDEC_Zigzag_loop@ha
/* 814F7004 001C7524 54 00 10 3A */ slwi r0, r0, 2
/* 814F7008 001C7528 38 63 E1 F0 */ addi r3, r3, TMCJPEGDEC_Zigzag_loop@l
/* 814F700C 001C752C 7C 63 00 2E */ lwzx r3, r3, r0
.L_814F7010:
/* 814F7010 001C7530 BA A1 00 24 */ lmw r21, 0x24(r1)
/* 814F7014 001C7534 80 01 00 54 */ lwz r0, 0x54(r1)
/* 814F7018 001C7538 7C 08 03 A6 */ mtlr r0
/* 814F701C 001C753C 38 21 00 50 */ addi r1, r1, 0x50
/* 814F7020 001C7540 4E 80 00 20 */ blr
.endfn TMCJPEGDEC_decode_iquant

View File

@@ -1,7 +1,7 @@
#include <tmc_jpeg_internal.h>
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work);
static s32 refillJpegBuffer(TMCCJPEGDecWork* work);
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work);
static s32 TMCJPEG_814EB108(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 = refillJpegBuffer(work);
s32 r = TMCJPEG_814EB108(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 = refillJpegBuffer(work);
s32 r = TMCJPEG_814EB108(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 = refillJpegBuffer(work);
r = TMCJPEG_814EB108(work);
if (r < 0) {
goto br;
} else {
@@ -119,7 +119,7 @@ s32 TMCJPEGDEC_get_wbyte(u16* dst, TMCCJPEGDecWork* work) {
}
if (work->remaining != 0) {
r = refillJpegBuffer(work);
r = TMCJPEG_814EB108(work);
if (r >= 0) {
goto o1;
}
@@ -144,7 +144,7 @@ p2:
goto r2;
}
if (work->remaining != 0) {
r = refillJpegBuffer(work);
r = TMCJPEG_814EB108(work);
if (r < 0)
goto ez;
else {
@@ -166,7 +166,7 @@ r2:
}
if (work->remaining != 0) {
r = refillJpegBuffer(work);
r = TMCJPEG_814EB108(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 = refillJpegBuffer(work);
r = TMCJPEG_814EB108(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 = refillJpegBuffer(work);
r = TMCJPEG_814EB108(work);
if (r >= 0) {
goto r0;
}
@@ -251,7 +251,7 @@ lp:
if (work->remaining == 0) {
goto er1;
}
r = refillJpegBuffer(work);
r = TMCJPEG_814EB108(work);
if (r >= 0) {
goto lc;
}
@@ -271,7 +271,7 @@ lc:
if (work->remaining == 0) {
goto er2;
}
r = refillJpegBuffer(work);
r = TMCJPEG_814EB108(work);
if (r >= 0) {
goto ret0;
}
@@ -320,7 +320,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
if (work->remaining == 0) {
break;
}
r = refillJpegBufferAfterFF(work);
r = TMCJPEG_814EAF50(work);
if (r < 0) {
return r;
}
@@ -345,7 +345,7 @@ s32 TMCJPEGDEC_load_buff(TMCCJPEGDecWork* work) {
if (work->remaining == 0) {
break;
}
r = refillJpegBufferAfterFF(work);
r = TMCJPEG_814EAF50(work);
if (r < 0) {
return r;
}
@@ -364,7 +364,7 @@ s32 TMCJPEGDEC_chk_possible_size(TMCCJPEGDecWork* work) {
return work->pBufEnd - work->pBufCur;
}
static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work) {
static s32 TMCJPEG_814EAF50(TMCCJPEGDecWork* work) {
u8 marker;
u32 readSize;
u8* dest;
@@ -410,7 +410,7 @@ static s32 refillJpegBufferAfterFF(TMCCJPEGDecWork* work) {
return 0;
}
static s32 refillJpegBuffer(TMCCJPEGDecWork* work) {
static s32 TMCJPEG_814EB108(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 Zi8LookupKoreanChar(ziWChar character, ziU8* result, ziU16* index, ziPtr workData) {
ziU8 Zi8_814813FC(ziWChar character, ziU8* result, ziU16* index, ziPtr workData) {
ziU16 i;
ziU8* table;
@@ -23,7 +23,7 @@ ziU8 Zi8LookupKoreanChar(ziWChar character, ziU8* result, ziU16* index, ziPtr wo
return 0;
}
ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData);
ziU8 Zi8_81481E6C(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 (Zi8LookupKoreanChar(buffer[currentCharacter], &state.characterIndex,
if (Zi8_814813FC(buffer[currentCharacter], &state.characterIndex,
&state.inputIndex, workData) != 0) {
state.matched = Zi8MatchKoreanSequence(&state.nextIndex,
state.matched = Zi8_81481E6C(&state.nextIndex,
buffer + currentCharacter + 1,
state.characterIndex,
(state.elementIndex - currentCharacter) - 1,
@@ -235,7 +235,7 @@ ziU32 Zi8GetKoreanCandidates(ziGetParam* params, ziU8* argument,
return result;
}
ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData) {
ziU8 Zi8_81481E6C(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 count, ziPtr workData) {
ziU16 nestedScratch;
ziU16 nestedIndexStorage;
ziU16 index1;
@@ -375,8 +375,8 @@ ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 c
}
if ((index3 >= tableCount) || (firstCharacter != (table + index3 * 4)[2]) ||
(input[1] != (table + index3 * 4)[1]) || (input[0] != table[index3 * 4])) {
if ((Zi8LookupKoreanChar(input[1], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 2, mappedCharacter, 1, workData) != 0)) {
if ((Zi8_814813FC(input[1], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8_81481E6C(&nestedIndexStorage, input + 2, mappedCharacter, 1, workData) != 0)) {
*resultIndex = index1;
return 1;
}
@@ -397,8 +397,8 @@ ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 c
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 ((Zi8LookupKoreanChar(input[2], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 3, mappedCharacter, 1, workData) != 0)) {
if ((Zi8_814813FC(input[2], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8_81481E6C(&nestedIndexStorage, input + 3, mappedCharacter, 1, workData) != 0)) {
*resultIndex = index2;
return 2;
}
@@ -409,8 +409,8 @@ ziU8 Zi8MatchKoreanSequence(ziU16* resultIndex, ziU16* input, ziU8 type, ziU16 c
*resultIndex = index4;
return 4;
}
if ((Zi8LookupKoreanChar(input[3], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8MatchKoreanSequence(&nestedIndexStorage, input + 4, mappedCharacter, 1, workData) != 0)) {
if ((Zi8_814813FC(input[3], &mappedCharacter, &nestedScratch, workData) != 0) &&
(Zi8_81481E6C(&nestedIndexStorage, input + 4, mappedCharacter, 1, workData) != 0)) {
*resultIndex = index3;
return 3;
}

View File

@@ -267,14 +267,6 @@ 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;
@@ -1578,7 +1570,7 @@ void KPADInit(void) {
objectInterval = kp_obj_interval;
enabled = OSDisableInterrupts();
kp_obj_interval = objectInterval;
distanceValue = object_interval_distance(objectInterval);
distanceValue = objectInterval / 0.383864f;
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;
u16 serverBootVersion = 0;
u16 bootTitleVersion;
u16 systemMenuVersion;
ESTitleId currentTitleId;
@@ -1350,11 +1350,12 @@ extern "C" void* __nupOp(void* argument) {
OSUnlockMutex(&context->mutex);
for (i = 0; i < context->titleCount; i++) {
NUPTitleInfo* title = &context->titles[i];
if (context->titles[i].titleId == 0x0000000100000001ULL) {
ESTitleId titleId = title->titleId;
if (titleId == 0x0000000100000001ULL) {
bootTitle = title;
} else if (context->titles[i].titleId == 0x0000000100000002ULL) {
} else if (titleId == 0x0000000100000002ULL) {
menuTitle = title;
} else if (context->titles[i].titleId == currentTitleId) {
} else if (titleId == currentTitleId) {
systemTitle = title;
}
if (bootTitle != 0 && menuTitle != 0 && systemTitle != 0) {

View File

@@ -2947,7 +2947,6 @@ 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;
@@ -3006,6 +3005,7 @@ 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,10 +3019,11 @@ 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) {
OSLockMutex(&transfer.mutex[bufferIndex ^ 1]);
OSMutex* otherMutex = &transfer.mutex[bufferIndex ^ 1];
OSLockMutex(otherMutex);
OSCancelThread(&thread);
OSJoinThread(&thread, 0);
OSUnlockMutex(&transfer.mutex[bufferIndex ^ 1]);
OSUnlockMutex(otherMutex);
OSUnlockMutex(mutex);
result = -3005;
goto done;

View File

@@ -91,7 +91,7 @@ extern CDBErr CDBDatabaseInit();
extern CDBErr CDBDatabaseOpen();
extern CDBErr CDBDatabaseClose();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize);
extern CDBErr CDBDatabaseCreateRecordAtOnce();
extern CDBErr CDBDatabaseCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx();
extern CDBErr CDBDatabasePrivateCreateRecordAtOnceEx_(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, int year, int month, int day, int hour, int min, int sec, u8* recordData, u32 recordDataSize, char* makerCode, char* gameCode);
@@ -206,19 +206,47 @@ CDBErr CDBDatabasePrivateCreateRecordAtOnce(CDBDatabase* database, CDBRecord* re
return result;
}
CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize) {
OSTime time;
u32 gameCode;
u16 makerCode;
CDBErr result;
makerCode = database->makerCode;
gameCode = database->gameCode;
time = OSGetTime();
CDBLock();
result = CDBDatabaseCreateRecordImAtOnce_(database, record, typeStr, fileTypeStr, time, gameCode, makerCode, recordData, recordDataSize);
CDBUnlock();
return result;
asm CDBErr CDBDatabaseCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x40(r1)
mflr r0
stw r0, 0x44(r1)
addi r11, r1, 0x40
bl _savegpr_22
lhz r28, 0x0(r3)
mr r22, r3
lwz r29, 0x4(r3)
mr r23, r4
mr r24, r5
mr r25, r6
mr r26, r7
mr r27, r8
bl OSGetTime
mr r30, r4
mr r31, r3
bl CDBLock
stw r26, 0x8(r1)
mr r3, r22
mr r4, r23
mr r5, r24
stw r27, 0xc(r1)
mr r6, r25
mr r8, r30
mr r7, r31
mr r9, r29
mr r10, r28
bl CDBDatabaseCreateRecordImAtOnce_
mr r28, r3
bl CDBUnlock
addi r11, r1, 0x40
mr r3, r28
bl _restgpr_22
lwz r0, 0x44(r1)
mtlr r0
addi r1, r1, 0x40
blr
#endif
}
CDBErr CDBDatabaseCreateRecordAtOnceEx(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, int year, int month, int day, int hour, int min, int sec) {

View File

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

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 scHwKeyboardConvertWCCodeJumpTable[0x3f] = {
extern "C" KeyboardDataFunction const jumptable_81668EF8[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, scHwKeyboardConvertWCCodeJumpTable@ha
lis r3, jumptable_81668EF8@ha
slwi r0, r0, 2
addi r3, r3, scHwKeyboardConvertWCCodeJumpTable@l
addi r3, r3, jumptable_81668EF8@l
lwzx r3, r3, r0
mtctr r3
bctr

View File

@@ -154,7 +154,7 @@ 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 scInputFormZeroF;
extern "C" const f32 lbl_81694D28;
extern "C" void _savegpr_20();
extern "C" void _restgpr_20();
extern "C" void _savegpr_27();
@@ -386,31 +386,31 @@ extern "C" const wchar_t pppURLCheck[2][10] = {L"http://", L"https://"};
#pragma pop
extern "C" const f32 scInputFormZeroF = 0.0f;
extern "C" const f32 scInputForm640F = 640.0f;
extern "C" const f64 scInputFormF32ConvertMagic = 4503601774854144.0;
extern "C" const f32 scInputFormOneF = 1.0f;
extern "C" const f32 scInputFormHalfF = 0.5f;
extern "C" const f32 scInputForm0_7111111F = 0.7111111f;
extern "C" const f32 scInputForm150F = 150.0f;
extern "C" const f32 scInputForm30F = 30.0f;
extern "C" const f32 scInputForm50F = 50.0f;
extern "C" const f32 scInputForm10F = 10.0f;
extern "C" const f32 scInputForm52F = 52.0f;
extern "C" const f32 scInputFormTwoF = 2.0f;
extern "C" const f32 scInputForm140F = 140.0f;
extern "C" const f32 scInputForm90F = 90.0f;
extern "C" const f32 scInputForm253F = 253.0f;
extern "C" const f32 scInputForm20F = 20.0f;
extern "C" const u8 scInputFormColorRU8 = 0xff;
extern "C" const u8 scInputFormColorGU8 = 0x32;
extern "C" const u8 scInputFormColorBU8 = 0x32;
extern "C" const u8 scInputFormColorAU8 = 0;
extern "C" const f32 scInputForm255F = 255.0f;
extern "C" const f32 scInputForm127F = 127.0f;
extern "C" const f32 scInputForm14592F = 14592.0f;
extern "C" const f64 scInputFormF64ConvertMagic = 4503599627370496.0;
extern "C" const f32 scInputForm15F = 15.0f;
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;
f32 sfColorPhase;
bool mbHyphen = true;
@@ -509,13 +509,13 @@ void Base::setLanguage(Language language) {
case UK:
setPredictMode(PM_En);
break;
case DE:
case FR:
setPredictMode(PM_De);
break;
case IT:
case DE:
setPredictMode(PM_It);
break;
case NL:
case IT:
setPredictMode(PM_Nl);
break;
case SP:
@@ -525,7 +525,7 @@ void Base::setLanguage(Language language) {
setPredictMode(PM_USSp);
}
break;
case FR:
case NL:
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 = {scInputFormColorRU8, scInputFormColorGU8, scInputFormColorBU8, scInputFormColorAU8};
GXColor color = {lbl_81694D6C, lbl_81694D6D, lbl_81694D6E, lbl_81694D6F};
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_FadeIn:
case ANM_FocusOut:
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_FocusOut:
case ANM_FadeIn:
if (event == PE_4) changeAnimation(ANM_Normal);
if (event == PE_1) changeAnimation(ANM_FocusIn);
break;

View File

@@ -2289,7 +2289,7 @@ namespace ipl {
unk_0x360 = false;
System::getTask1()->request(markTmdReadyTask, this, NULL);
System::getTask1()->request(iplChannelTitle_813BA684, this, NULL);
mState = STATE_WAIT_TMD;
} else {
@@ -2301,7 +2301,7 @@ namespace ipl {
unk_0x360 = false;
System::getTask1()->request(markTmdReadyTask, this, NULL);
System::getTask1()->request(iplChannelTitle_813BA684, this, NULL);
mState = STATE_WAIT_TMD;
}
@@ -2408,7 +2408,7 @@ namespace ipl {
if (mTmpTitleID != 0) {
SCSetTmpTitleID(0);
System::getTask1()->request(deleteTmpTitleContentTask, this, NULL);
System::getTask1()->request(iplChannelTitle_813BA784, this, NULL);
} else {
unk_0x370 = true;
}
@@ -2673,7 +2673,7 @@ namespace ipl {
chanTtl->unk_0x360 = true;
}
void ChannelTitle::markTmdReadyTask(void* work) {
void ChannelTitle::iplChannelTitle_813BA684(void* work) {
ChannelTitle* chanTtl = static_cast<ChannelTitle*>(work);
chanTtl->unk_0x360 = true;
}
@@ -2699,7 +2699,7 @@ namespace ipl {
}
#pragma pop
void ChannelTitle::deleteTmpTitleContentTask(void* work) {
void ChannelTitle::iplChannelTitle_813BA784(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;
default:
case 0x15:
return;
process_complete:
@@ -758,18 +758,6 @@ 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 onNatDetectionDone(BOOL success, NAT nat);
void iplContest_813D54F8(BOOL success, NAT nat);
void* IPLContestAlloc(int size);
void IPLContestFree(void* block, u32 _unused);
@@ -227,7 +227,7 @@ int IPLContestProcess() {
break;
}
case 2: {
NNStartNatDetection(onNatDetectionDone);
NNStartNatDetection(iplContest_813D54F8);
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 onNatDetectionDone(gsi_bool success, NAT nat) {
void iplContest_813D54F8(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 19:
case 13:
onDialogState13();
break;
case 13:
case 14:
onDialogState14();
break;
case 14:
case 15:
onDialogState15();
break;
case 15:
case 16:
onDialogState16();
break;
case 16:
case 17:
onDialogState17();
break;
case 17:
case 18:
onDialogState18();
break;
case 18:
case 19:
onDialogState19();
break;
case 20:

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_activateIfIdle(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel) NO_INLINE;
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
EGG::ExpHeap* secondHeap) 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;
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;
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_activateIfIdle(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel) {
if (channel->mState == 0)
channel->mState = 2;
}
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
EGG::ExpHeap* secondHeap) {
channel->mpDialogHeap = firstHeap;
channel->mpChannelHeap = secondHeap;
}
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel) {
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel) {
if (channel->mpThumbnailData == NULL)
channel->mpThumbnailData = new (channel->mpHeap, 32) u8[0x19000];
return channel->mpThumbnailData;
}
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane) {
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane) {
channel->mpPane = pane;
}
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile) {
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile) {
if (!SDChannelSelect::isChannelReady(channel)) {
channel->mpLayoutFile = layoutFile;
if (channel->mpPageLayout == NULL)
iplSDChannelObj_createPageLayout(channel);
iplSDChannelObj_813E3BA0(channel);
if (channel->mpDialogLayout == NULL)
iplSDChannelObj_createDialogLayout(channel);
iplSDChannelObj_813E3F74(channel);
if (channel->mState == 2 || channel->mState == 1 && channel->mpPaneAnimator->isFinished()) {
iplSDChannelObj_createBaseLayout(channel);
iplSDChannelObj_813E3858(channel);
channel->mState = 3;
}
}
}
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel) {
switch (channel->mState) {
case 0:
channel->mState = 2;
@@ -157,25 +157,25 @@ namespace ipl {
break;
channel->mState = 2;
case 2:
iplSDChannelObj_createBaseLayout(channel);
iplSDChannelObj_813E3858(channel);
channel->mState = 3;
break;
case 3:
iplSDChannelObj_syncLayoutsToPane(channel);
iplSDChannelObj_813E3B1C(channel);
break;
}
}
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel) {
if (SDChannelSelect::isChannelReady(channel))
channel->mpBaseLayout->draw();
}
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel) {
channel->mpPageLayout->draw();
}
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_813E330C(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_hasAppMeta(SDChannelObj* channel) {
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel) {
if (channel->mStateFlags == 0 || channel->mStateFlags == 3)
return true;
else
return false;
}
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int request) {
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int request) {
if (request & 0x10000U) {
channel->mAnimationState = 0;
} else if (request & 0x20000U) {
@@ -201,14 +201,14 @@ namespace ipl {
}
if (!(request & 1)) {
iplSDChannelObj_setPageAnim(channel, 1);
iplSDChannelObj_813E3C9C(channel, 1);
}
if (!(request & 2)) {
iplSDChannelObj_setDialogAnim(channel, 1);
iplSDChannelObj_813E4558(channel, 1);
}
}
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int request) {
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int request) {
if (request & 0x10000U) {
channel->mAnimationState = 0;
} else if (request & 0x20000U) {
@@ -218,44 +218,44 @@ namespace ipl {
}
if (!(request & 1)) {
iplSDChannelObj_setPageAnim(channel, 3);
iplSDChannelObj_813E3C9C(channel, 3);
}
if (!(request & 2)) {
iplSDChannelObj_setDialogAnim(channel, 4);
iplSDChannelObj_813E4558(channel, 4);
}
}
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool request) {
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool request) {
if (request) {
iplSDChannelObj_setPageAnim(channel, 1);
iplSDChannelObj_813E3C9C(channel, 1);
channel->mAnimationState = 1;
} else {
iplSDChannelObj_setPageAnim(channel, 0);
iplSDChannelObj_813E3C9C(channel, 0);
channel->mAnimationState = 0;
}
iplSDChannelObj_setDialogAnim(channel, 0);
iplSDChannelObj_813E4558(channel, 0);
}
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) {
iplSDChannelObj_setPageAnim(channel, 4);
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel) {
iplSDChannelObj_813E3C9C(channel, 4);
}
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) {
iplSDChannelObj_setPageAnim(channel, 0);
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int request) {
iplSDChannelObj_813E3C9C(channel, 0);
if (request) {
channel->mAnimationState = 0;
}
}
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) {
iplSDChannelObj_setDialogAnim(channel, 0);
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, bool request) {
iplSDChannelObj_813E4558(channel, 0);
if (request) {
channel->mAnimationState = 0;
}
}
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) {
extern "C" void iplSDChannelObj_813E3580(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_createBaseLayout(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_813E3858(SDChannelObj* channel) {
bool adjust = false;
if (channel->mpDialogLayout == NULL)
iplSDChannelObj_createDialogLayout(channel);
iplSDChannelObj_813E3F74(channel);
f32 frame;
if (iplSDChannelObj_hasAppMeta(channel))
frame = iplSDChannelObj_createIconLayout(channel);
if (iplSDChannelObj_813E3330(channel))
frame = iplSDChannelObj_813E3920(channel);
else {
frame = iplSDChannelObj_createMenuLayout(channel);
frame = iplSDChannelObj_813E3A84(channel);
adjust = true;
}
iplSDChannelObj_syncLayoutsToPane(channel);
iplSDChannelObj_813E3B1C(channel);
if (channel->mpBaseAnimator != NULL)
channel->mpBaseAnimator->play();
channel->mpBaseLayout->finishBinding();
@@ -340,11 +340,11 @@ namespace ipl {
channel->mpBaseLayout->adjustHeap();
}
extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) {
extern "C" f32 iplSDChannelObj_813E3920(SDChannelObj* channel) {
f32 frame = 0.0f;
channel->mpBaseLayout =
layout::Object::create(channel->mpHeap, 0x8000, channel->mpThumbnailData, "arc", "icon.brlyt");
iplSDChannelObj_applyLanguageGroups(channel->mpBaseLayout);
iplSDChannelObj_813E3580(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_findNewMessageGroup(channel, channel->mpBaseLayout);
iplSDChannelObj_813E481C(channel, channel->mpBaseLayout);
channel->mNewMessageState = 1;
}
return frame;
}
extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) {
extern "C" f32 iplSDChannelObj_813E3A84(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_syncLayoutsToPane(SDChannelObj* channel) {
iplSDChannelObj_updateNewMessage(channel);
extern "C" void iplSDChannelObj_813E3B1C(SDChannelObj* channel) {
iplSDChannelObj_813E49A8(channel);
nw4r::math::VEC3 position(0, 0, 0);
MTXMultVec(channel->mpPane->GetGlobalMtx(), position, position);
channel->mpBaseLayout->GetRootPane()->SetTranslate(position);
channel->mpBaseLayout->calc();
iplSDChannelObj_setPageTranslate(channel, position);
iplSDChannelObj_positionDialog(channel, position);
iplSDChannelObj_813E3C58(channel, position);
iplSDChannelObj_813E4410(channel, position);
}
extern "C" void iplSDChannelObj_createPageLayout(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_813E3BA0(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_setPageAnim(channel, 0);
iplSDChannelObj_813E3C9C(channel, 0);
channel->mpPageLayout->finishBinding();
}
extern "C" void iplSDChannelObj_setPageTranslate(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
extern "C" void iplSDChannelObj_813E3C58(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
channel->mpPageLayout->GetRootPane()->SetTranslate(vec);
iplSDChannelObj_updatePageAnim(channel);
iplSDChannelObj_813E3E38(channel);
channel->mpPageLayout->calc();
}
extern "C" void iplSDChannelObj_setPageAnim(SDChannelObj* channel, int request) {
extern "C" void iplSDChannelObj_813E3C9C(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_playPageAnimator(channel, 2);
iplSDChannelObj_813E3F28(channel, 2);
} else {
switch (channel->mPageAnimation) {
case 0: {
if (request == 1) {
channel->mPageAnimation = 1;
channel->mpPageLayout->GetRootPane()->SetVisible(true);
iplSDChannelObj_playPageAnimator(channel, 1);
iplSDChannelObj_813E3F28(channel, 1);
}
break;
}
@@ -437,7 +437,7 @@ namespace ipl {
case 2: {
if (request == 3) {
channel->mPageAnimation = 3;
iplSDChannelObj_playPageAnimator(channel, 0);
iplSDChannelObj_813E3F28(channel, 0);
}
break;
}
@@ -453,7 +453,7 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_updatePageAnim(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_813E3E38(SDChannelObj* channel) {
switch (channel->mPageAnimation) {
case 1: {
if (!channel->mpPageAnimators[1]->isPlaying()) {
@@ -472,7 +472,7 @@ namespace ipl {
break;
}
if (prev == 3) {
iplSDChannelObj_setPageAnim(channel, 3);
iplSDChannelObj_813E3C9C(channel, 3);
channel->mPageAnimationFrame = 0;
}
}
@@ -481,46 +481,46 @@ namespace ipl {
case 3: {
if (!channel->mpPageAnimators[0]->isPlaying()) {
int prev = channel->mPageAnimationFrame;
iplSDChannelObj_setPageAnim(channel, 0);
iplSDChannelObj_813E3C9C(channel, 0);
if (prev == 1) {
iplSDChannelObj_setPageAnim(channel, 1);
iplSDChannelObj_813E3C9C(channel, 1);
}
}
break;
}
case 4: {
if (!channel->mpPageAnimators[2]->isPlaying()) {
iplSDChannelObj_setPageAnim(channel, 0);
iplSDChannelObj_813E3C9C(channel, 0);
}
break;
}
}
}
extern "C" void iplSDChannelObj_playPageAnimator(SDChannelObj* channel, int request) {
extern "C" void iplSDChannelObj_813E3F28(SDChannelObj* channel, int request) {
channel->mpPageAnimators[request]->setAnmType(ANIM_TYPE_FORWARD);
channel->mpPageAnimators[request]->play();
}
extern "C" void iplSDChannelObj_createDialogLayout(SDChannelObj* channel) {
if (!iplSDChannelObj_hasAppMeta(channel)) {
extern "C" void iplSDChannelObj_813E3F74(SDChannelObj* channel) {
if (!iplSDChannelObj_813E3330(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_setBalloonText(channel, iplSDChannelObj_getLocalizedName(channel, 0));
iplSDChannelObj_813E413C(channel, iplSDChannelObj_813E4060(channel, 0));
else if (channel->mStateFlags == 3)
iplSDChannelObj_setBalloonText(channel, scUnknownName);
iplSDChannelObj_813E413C(channel, scUnknownName);
else
iplSDChannelObj_setBalloonText(channel, L"");
iplSDChannelObj_813E413C(channel, L"");
channel->mpDialogAnimator = channel->mpDialogLayout->bind("my_IplTopBalloon_a_BalloonInOut.brlan");
iplSDChannelObj_setDialogAnim(channel, 0);
iplSDChannelObj_813E4558(channel, 0);
channel->mpDialogLayout->finishBinding();
}
extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int index) {
extern "C" const wchar_t* iplSDChannelObj_813E4060(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_setBalloonText(SDChannelObj* channel, const wchar_t* text) {
extern "C" void iplSDChannelObj_813E413C(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_positionDialog(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
extern "C" void iplSDChannelObj_813E4410(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_updateDialogAnim(channel);
iplSDChannelObj_813E4704(channel);
channel->mpDialogLayout->calc();
}
}
extern "C" void iplSDChannelObj_setDialogAnim(SDChannelObj* channel, int request) {
extern "C" void iplSDChannelObj_813E4558(SDChannelObj* channel, int request) {
if (channel->mpDialogLayout != NULL) {
if (request == 0) {
channel->mDialogState = 0;
@@ -676,11 +676,11 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_updateDialogAnim(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_813E4704(SDChannelObj* channel) {
switch (channel->mDialogState) {
case 1: {
if ((reinterpret_cast<u32&>(channel->mDialogTimer) += 1) >= 20.0f) {
iplSDChannelObj_setDialogAnim(channel, 2);
iplSDChannelObj_813E4558(channel, 2);
break;
}
}
@@ -690,9 +690,9 @@ namespace ipl {
case 2: {
if (!channel->mpDialogLayout->isPlaying(0)) {
int prev = channel->mDialogFrame;
iplSDChannelObj_setDialogAnim(channel, 3);
iplSDChannelObj_813E4558(channel, 3);
if (prev == 4) {
iplSDChannelObj_setDialogAnim(channel, 4);
iplSDChannelObj_813E4558(channel, 4);
channel->mDialogFrame = 0;
}
}
@@ -701,9 +701,9 @@ namespace ipl {
case 4: {
if (!channel->mpDialogLayout->isPlaying(0)) {
int prev = channel->mDialogFrame;
iplSDChannelObj_setDialogAnim(channel, 0);
iplSDChannelObj_813E4558(channel, 0);
if (prev == 1) {
iplSDChannelObj_setDialogAnim(channel, 1);
iplSDChannelObj_813E4558(channel, 1);
}
}
break;
@@ -711,7 +711,7 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_findNewMessageGroup(SDChannelObj* channel, layout::Object* layout) {
extern "C" void iplSDChannelObj_813E481C(SDChannelObj* channel, layout::Object* layout) {
char groupName[20];
char** lookup;
nw4r::lyt::Group* group;
@@ -752,11 +752,11 @@ namespace ipl {
}
}
extern "C" void iplSDChannelObj_updateNewMessage(SDChannelObj* channel) {
extern "C" void iplSDChannelObj_813E49A8(SDChannelObj* channel) {
if (System::getNwc24Manager() != NULL) {
switch (channel->mNewMessageState) {
case 1: {
if (iplSDChannelObj_checkNewMessage(channel)) {
if (iplSDChannelObj_813E4A54(channel)) {
channel->mNewMessageState = 2;
channel->mNewMessageFrame = 0;
}
@@ -772,7 +772,7 @@ namespace ipl {
}
}
extern "C" BOOL iplSDChannelObj_checkNewMessage(SDChannelObj* channel) {
extern "C" BOOL iplSDChannelObj_813E4A54(SDChannelObj* channel) {
if (System::getNwc24Manager() == NULL || !System::getNwc24Manager()->getNewTitleTbl(NULL)) {
return FALSE;
}

View File

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

View File

@@ -23,63 +23,63 @@ namespace scene {
class SDTitlePaneEventHandler;
class SDTitleButtonEventHandler;
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,
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,
layout::Animator** animations, const char* prefix);
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_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_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*);
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*);
static inline void setMemoryTitleLists(SDMemory* memory, SDMemory::TitleRange sdRange,
SDMemory::TitleRange nandRange) {
@@ -134,11 +134,11 @@ public:
SDChannelTitle* mpScene;
};
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);
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);
SDChannelTitle::SDChannelTitle(EGG::Heap* heap, SDChannelSelect* channelSelect)
: FaderSceneBase(heap), mState(0), mNextScene(0), mParentalResult(0),
@@ -194,8 +194,8 @@ void SDChannelTitle::create() {
}
}
}
iplSDChannelTitle_setPaneMessage(this, mpLayout->FindPaneByName(sTextNames[0]), 0xa2, true);
iplSDChannelTitle_setPaneMessage(this, mpLayout->FindPaneByName(sTextNames[1]), 2, true);
iplSDChannelTitle_813E8D14(this, mpLayout->FindPaneByName(sTextNames[0]), 0xa2, true);
iplSDChannelTitle_813E8D14(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_rebuildBannerLayout(this);
iplSDChannelTitle_813E630C(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_startZoomFade(this);
iplSDChannelTitle_813E79B0(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_updateScript(this);
iplSDChannelTitle_813E7C0C(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_startZoomFade(this);
iplSDChannelTitle_813E79B0(this);
return FADER_SCN_CONTINUE;
}
if (!mpFade->isPlaying()) {
iplSDChannelTitle_playBannerIntro(this);
iplSDChannelTitle_813E8034(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_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 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 14: return FADER_SCN_CONTINUE;
case 15: iplSDChannelTitle_updateCopyStart(this); break;
case 16: iplSDChannelTitle_updateAfterClearTmp(this); break;
case 15: iplSDChannelTitle_813E7074(this); break;
case 16: iplSDChannelTitle_813E71A4(this); break;
case 17: SCSetTmpTitleID(mTitleId); SCFlushAsync(NULL); mState = 18; break;
case 18: if (SCCheckStatus() != 1) { mState = 21; } break;
case 19: iplSDChannelTitle_startCopyProgress(this); break;
case 20: iplSDChannelTitle_updateCopyPrepare(this); break;
case 21: iplSDChannelTitle_updateEnqueueNotice(this); break;
case 22: iplSDChannelTitle_updateCopyProgress(this); break;
case 23: iplSDChannelTitle_updateMemoryCalc(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;
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;
}
if (mState == 5) {
mbStopScript = true;
++mLaunchFrame;
System::getPointer()->setVisible(false);
return static_cast<FaderSceneCommand>(iplSDChannelTitle_isLaunchDelayDone(this));
return static_cast<FaderSceneCommand>(iplSDChannelTitle_813E8B1C(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_rebootSystem(this);
iplSDChannelTitle_813E8AB4(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_updateScript(this);
iplSDChannelTitle_813E7C0C(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_getLocalizedName(channel, 0), sizeof(names[0]));
memcpy(names[1], iplSDChannelObj_getLocalizedName(channel, 1), sizeof(names[1]));
memcpy(names[0], iplSDChannelObj_813E4060(channel, 0), sizeof(names[0]));
memcpy(names[1], iplSDChannelObj_813E4060(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_drawDimOverlay(this, bounds, mask);
iplSDChannelTitle_813E8C08(this, bounds, mask);
} else {
if (mpIconLayout) {
utility::Graphics::setOrthoProjection(0);
@@ -522,14 +522,14 @@ BOOL SDChannelTitle::isResetAcceptable() {
return FALSE;
}
extern "C" void iplSDChannelTitle_rebuildBannerLayout(SDChannelTitle* scene) {
iplSDChannelTitle_createBannerLayout(scene);
extern "C" void iplSDChannelTitle_813E630C(SDChannelTitle* scene) {
iplSDChannelTitle_813E6348(scene);
if (scene->mpBannerLayout) {
scene->mpBannerLayout->finishBinding();
}
}
extern "C" void iplSDChannelTitle_createBannerLayout(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E6348(SDChannelTitle* scene) {
if (scene->mpIconLayout) {
scene->mpIconLayout->destroyHeap();
scene->mpIconLayout = NULL;
@@ -537,30 +537,30 @@ extern "C" void iplSDChannelTitle_createBannerLayout(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_applyLanguageGroups(scene->mpBannerLayout);
iplSDChannelTitle_bindBannerAnimations(scene);
iplSDChannelObj_813E3580(scene->mpBannerLayout);
iplSDChannelTitle_813E81FC(scene);
} else {
scene->mpBannerLayout = NULL;
for (int index = 0; index < 3; ++index) {
scene->mpBannerAnimations[index] = NULL;
}
iplSDChannelTitle_createIconLayout(scene);
iplSDChannelTitle_813E6424(scene);
}
}
extern "C" void iplSDChannelTitle_createIconLayout(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E6424(SDChannelTitle* scene) {
SDChannelObj* channel = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex);
if (channel) {
scene->mpIconLayout = layout::Object::create(scene->mpIconHeap, 0x8000,
iplSDChannelObj_getOrAllocThumbnailData(channel), "arc", "icon.brlyt");
iplSDChannelObj_applyLanguageGroups(scene->mpIconLayout);
iplSDChannelObj_813E3128(channel), "arc", "icon.brlyt");
iplSDChannelObj_813E3580(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_getLocalizedName(channel, 0));
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(iplSDChannelObj_813E4060(channel, 0));
} else {
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(sMissingTitle);
}
@@ -570,7 +570,7 @@ extern "C" void iplSDChannelTitle_createIconLayout(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_updateIdleState(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E65D4(SDChannelTitle* scene) {
SDButton* button = static_cast<SDButton*>(System::getScene(0x24));
if (button && button->isActive()) {
button->update();
@@ -578,18 +578,18 @@ extern "C" void iplSDChannelTitle_updateIdleState(SDChannelTitle* scene) {
if (scene->mState == 1) {
if (static_cast<u32>(scene->mpChannelSelect->mCurrentSDState - 1) <= 1) {
scene->mState = 10;
iplSDChannelTitle_preparePageRestart(scene);
iplSDChannelTitle_813E7A18(scene);
} else {
controller::Interface* controller = System::getMasterController();
int page;
int index;
if (controller->down(0x30001000)) {
scene->mpChannelSelect->findAdjacentChannel(1, &page, &index);
iplSDChannelTitle_setPageAndIndex(scene, page, index);
iplSDChannelTitle_813E85C0(scene, page, index);
snd::getSystem()->startSE("WSD_SELECT");
} else if (controller->down(0x6000010)) {
scene->mpChannelSelect->findAdjacentChannel(0, &page, &index);
iplSDChannelTitle_setPageAndIndex(scene, page, index);
iplSDChannelTitle_813E85C0(scene, page, index);
snd::getSystem()->startSE("WSD_SELECT");
} else {
scene->mpPaneManager->update();
@@ -603,7 +603,7 @@ extern "C" void iplSDChannelTitle_updateIdleState(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_updateChangeState(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E6760(SDChannelTitle* scene) {
if (static_cast<u32>(scene->mpChannelSelect->mCurrentSDState - 1) <= 1) {
scene->mState = 1;
} else {
@@ -611,7 +611,7 @@ extern "C" void iplSDChannelTitle_updateChangeState(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_hasAppMeta(channel) && scene->mChangeFrame > 10 &&
iplSDChannelObj_813E3330(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_updateChangeState(SDChannelTitle* scene) {
}
scene->mpSoundFiles[scene->mLoadedIndex] = NULL;
scene->mLoadedIndex = 1 - scene->mLoadedIndex;
iplSDChannelTitle_rebuildBannerLayout(scene);
iplSDChannelTitle_setStartButtonPressed(scene);
iplSDChannelTitle_813E630C(scene);
iplSDChannelTitle_813E8B70(scene);
scene->mState = 9;
}
}
}
extern "C" void iplSDChannelTitle_updateChangeWait(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E696C(SDChannelTitle* scene) {
if (++scene->mChangeFrame > 20) {
iplSDChannelTitle_playBannerIntro(scene);
iplSDChannelTitle_813E8034(scene);
scene->mState = 1;
}
}
extern "C" void iplSDChannelTitle_updateParentalResult(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E69B4(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_updateParentalResult(SDChannelTitle* scene) {
switch (result) {
case 1:
if (!scene->mParentalResult) {
iplSDChannelTitle_prepareSceneExit(scene, scene->mNextScene);
iplSDChannelTitle_813E899C(scene, scene->mNextScene);
scene->mParentalResult = 1;
}
break;
@@ -688,7 +688,7 @@ extern "C" void iplSDChannelTitle_updateParentalResult(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_updateDialogResult(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E6B88(SDChannelTitle* scene) {
int result = System::getDialog()->getLastResult();
switch (result) {
case 2: {
@@ -708,8 +708,8 @@ extern "C" void iplSDChannelTitle_updateDialogResult(SDChannelTitle* scene) {
break;
}
case 1: {
if (iplSDChannelTitle_isParentalEnabled()) {
iplSDChannelTitle_openParentalDialog(scene, reinterpret_cast<void*>(1));
if (iplSDChannelTitle_813E84C8()) {
iplSDChannelTitle_813E850C(scene, reinterpret_cast<void*>(1));
} else {
scene->reserveAllSceneDestruction(0x12, reinterpret_cast<void*>(1));
scene->mState = 7;
@@ -719,7 +719,7 @@ extern "C" void iplSDChannelTitle_updateDialogResult(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_startCopyProgress(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E6CCC(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_startCopyProgress(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_updateCopyPrepare(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E6E24(SDChannelTitle* scene) {
if (scene->mpChannelSelect->getWorker()->is_working() || scene->mpProgressLayout->isPlaying(1)) {
return;
}
@@ -762,9 +762,9 @@ extern "C" void iplSDChannelTitle_updateCopyPrepare(SDChannelTitle* scene) {
if (static_cast<u32>(scene->mTitleRange.mByteSize) < 0x3800000) {
nandRange.mByteSize = 0x3800000;
nandRange.mCount = scene->mTitleRange.mCount;
iplSDChannelTitle_copyTitleRange(&sdRange, &scene->mTitleRange);
iplSDChannelTitle_813E6FA0(&sdRange, &scene->mTitleRange);
} else {
iplSDChannelTitle_copyTitleRange(&nandRange, iplSDChannelTitle_copyTitleRange(&sdRange, &scene->mTitleRange));
iplSDChannelTitle_813E6FA0(&nandRange, iplSDChannelTitle_813E6FA0(&sdRange, &scene->mTitleRange));
}
SDMemory* memory = &scene->mMemory;
setMemoryTitleLists(memory, sdRange, nandRange);
@@ -786,7 +786,7 @@ extern "C" void iplSDChannelTitle_updateCopyPrepare(SDChannelTitle* scene) {
}
}
extern "C" SDMemory::TitleRange* iplSDChannelTitle_copyTitleRange(
extern "C" SDMemory::TitleRange* iplSDChannelTitle_813E6FA0(
SDMemory::TitleRange* target, const SDMemory::TitleRange* source) {
s32 bytes = source->mByteSize;
target->mCount = source->mCount;
@@ -794,7 +794,7 @@ extern "C" SDMemory::TitleRange* iplSDChannelTitle_copyTitleRange(
return target;
}
extern "C" void iplSDChannelTitle_updateMemoryCalc(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E6FB4(SDChannelTitle* scene) {
if (!scene->mMemory.calc()) {
return;
}
@@ -818,7 +818,7 @@ extern "C" void iplSDChannelTitle_updateMemoryCalc(SDChannelTitle* scene) {
scene->mState = 15;
}
extern "C" void iplSDChannelTitle_updateCopyStart(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7074(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_updateCopyStart(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_updateAfterClearTmp(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E71A4(SDChannelTitle* scene) {
if (!scene->mpChannelSelect->getWorker()->is_working()) {
SCSetTmpTitleID(0);
System::getChannelManager()->clearTmpChannel();
@@ -862,7 +862,7 @@ extern "C" void iplSDChannelTitle_updateAfterClearTmp(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_updateEnqueueNotice(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E724C(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_updateEnqueueNotice(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_updateCopyProgress(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E72B8(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_updateCopyProgress(SDChannelTitle* scene) {
snd::getSystem()->stopSE(scene->mpCopySound, 0);
scene->mpCopySound = NULL;
snd::getSystem()->startSE("WIPL_SE_COPY_FINISH");
System::getTask1()->request(iplSDChannelTitle_fetchTmdViewTask, scene, NULL);
System::getTask1()->request(iplSDChannelTitle_813E8E70, scene, NULL);
scene->mState = 24;
} else {
SCSetTmpTitleID(0);
@@ -900,7 +900,7 @@ extern "C" void iplSDChannelTitle_updateCopyProgress(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_showCopyError(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7418(SDChannelTitle* scene) {
scene->mpProgressLayout->getAnim(3)->stop();
snd::getSystem()->stopSE(scene->mpCopySound, 0);
scene->mpCopySound = NULL;
@@ -908,13 +908,13 @@ extern "C" void iplSDChannelTitle_showCopyError(SDChannelTitle* scene) {
scene->mState = 27;
}
extern "C" void iplSDChannelTitle_updateCopyErrorDialog(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7498(SDChannelTitle* scene) {
if (SCCheckStatus() != 1 && System::getDialog()->getLastResult() != -1) {
scene->mState = 29;
}
}
extern "C" void iplSDChannelTitle_finishProgressHide(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E74EC(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_finishProgressHide(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_returnToIdle(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7618(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_returnToIdle(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_loadTitleBanner(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E76C8(SDChannelTitle* scene) {
int page;
int index;
if (System::getChannelManager()->isLoadedTmp() || System::getChannelManager()->hasChannel(scene->mTitleId, &page, &index)) {
scene->mpBannerFiles[scene->mLoadedIndex] = iplSDChannelTitle_loadBannerMetaFiles(scene, scene->mTitleId,
scene->mpBannerFiles[scene->mLoadedIndex] = iplSDChannelTitle_813E8DCC(scene, scene->mTitleId,
&scene->mpSoundFiles[scene->mLoadedIndex]);
if (scene->mbCopiedTitle) {
scene->mState = 13;
@@ -958,44 +958,44 @@ extern "C" void iplSDChannelTitle_loadTitleBanner(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_updateBannerLoad(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7780(SDChannelTitle* scene) {
if (!scene->mpBannerFiles[scene->mLoadedIndex] || scene->mpBannerFiles[scene->mLoadedIndex]->isFinished()) {
iplSDChannelTitle_loadBannerScript(scene, scene->mTitleId);
iplSDChannelTitle_rebuildBannerLayout(scene);
iplSDChannelTitle_813E7B30(scene, scene->mTitleId);
iplSDChannelTitle_813E630C(scene);
scene->mState = 4;
iplSDChannelTitle_playBannerIntro(scene);
iplSDChannelTitle_813E8034(scene);
}
}
extern "C" void iplSDChannelTitle_tryLaunchSelected(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7800(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_hasAppMeta(channel)) {
iplSDChannelTitle_beginLaunch(scene, channel);
if (iplSDChannelObj_813E3330(channel)) {
iplSDChannelTitle_813E86A0(scene, channel);
}
}
}
extern "C" void iplSDChannelTitle_updateTmdReady(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E787C(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_isNetworkAllowed(scene, scene->mpTmd, scene->mTitleId)) {
iplSDChannelTitle_confirmLeaveToSettings(scene, false);
if (!iplSDChannelTitle_813E847C(scene, scene->mpTmd, scene->mTitleId)) {
iplSDChannelTitle_813E88CC(scene, false);
scene->mNextScene = 18;
} else if (iplSDChannelTitle_passesParentalCheck(scene, scene->mpTmd)) {
iplSDChannelTitle_prepareSceneExit(scene, scene->mNextScene);
} else if (iplSDChannelTitle_813E8F04(scene, scene->mpTmd)) {
iplSDChannelTitle_813E899C(scene, scene->mNextScene);
if (scene->mbCopiedTitle) {
scene->mState = 25;
} else {
scene->mState = 15;
}
} else {
iplSDChannelTitle_openParentalDialog(scene, NULL);
iplSDChannelTitle_813E850C(scene, NULL);
}
if (scene->mpTmd) {
scene->mpBannerHeap->free(scene->mpTmd);
@@ -1003,7 +1003,7 @@ extern "C" void iplSDChannelTitle_updateTmdReady(SDChannelTitle* scene) {
}
}
extern "C" bool iplSDChannelTitle_startZoomFade(SDChannelTitle* scene) {
extern "C" bool iplSDChannelTitle_813E79B0(SDChannelTitle* scene) {
if (!scene->mpChannelSelect->tellStartingZoomAnm()) {
return false;
}
@@ -1012,7 +1012,7 @@ extern "C" bool iplSDChannelTitle_startZoomFade(SDChannelTitle* scene) {
return true;
}
extern "C" void iplSDChannelTitle_preparePageRestart(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7A18(SDChannelTitle* scene) {
if (!scene->mScriptEnabled || scene->mScriptState == 4) {
if (scene->mpChannelSelect->prepareRestarting(scene->mPage)) {
scene->mpChannelSelect->startPageTransition(scene->mPage, scene->mIndex);
@@ -1034,7 +1034,7 @@ extern "C" void iplSDChannelTitle_preparePageRestart(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_loadBannerScript(SDChannelTitle* scene, ESTitleId title) {
extern "C" void iplSDChannelTitle_813E7B30(SDChannelTitle* scene, ESTitleId title) {
if (!System::isSafeMode()) {
if (scene->mScriptEnabled) {
delete scene->mpScriptFile;
@@ -1052,7 +1052,7 @@ extern "C" void iplSDChannelTitle_loadBannerScript(SDChannelTitle* scene, ESTitl
}
}
extern "C" void iplSDChannelTitle_updateScript(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7C0C(SDChannelTitle* scene) {
if (scene->mScriptEnabled != 1) {
return;
}
@@ -1061,16 +1061,16 @@ extern "C" void iplSDChannelTitle_updateScript(SDChannelTitle* scene) {
}
switch (scene->mScriptState) {
case 0:
iplSDChannelTitle_updateScriptIdle(scene);
iplSDChannelTitle_813E7D14(scene);
break;
case 1:
iplSDChannelTitle_updateScriptLoad(scene);
iplSDChannelTitle_813E7DD0(scene);
break;
case 2:
System::getCSManager()->calc();
if (scene->mpRsoThread->IsThreadTerminated()) {
if (System::getCSManager()->getAltSoundState() == 1) {
iplSDChannelTitle_startBannerSound(scene);
iplSDChannelTitle_813E8160(scene);
System::getCSManager()->setAltSoundState(0);
}
System::getCSManager()->finish();
@@ -1078,12 +1078,12 @@ extern "C" void iplSDChannelTitle_updateScript(SDChannelTitle* scene) {
}
break;
case 3:
iplSDChannelTitle_destroyScript(scene);
iplSDChannelTitle_813E7FB0(scene);
break;
}
}
extern "C" void iplSDChannelTitle_updateScriptIdle(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7D14(SDChannelTitle* scene) {
if (scene->mbStopScript) {
scene->mbStopScript = false;
scene->mScriptFrame = 0;
@@ -1101,7 +1101,7 @@ extern "C" void iplSDChannelTitle_updateScriptIdle(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_updateScriptLoad(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7DD0(SDChannelTitle* scene) {
if (!scene->mpScriptFile->isFinished()) {
return;
}
@@ -1132,7 +1132,7 @@ extern "C" void iplSDChannelTitle_updateScriptLoad(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_destroyScript(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E7FB0(SDChannelTitle* scene) {
scene->mbScriptFailed = true;
System::getCSManager()->destroy();
scene->mScriptFrame = 0;
@@ -1142,7 +1142,7 @@ extern "C" void iplSDChannelTitle_destroyScript(SDChannelTitle* scene) {
scene->mScriptState = 0;
}
extern "C" void iplSDChannelTitle_playBannerIntro(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E8034(SDChannelTitle* scene) {
if (scene->mpBannerAnimations[1]) {
scene->mpBannerAnimations[1]->play();
scene->mbBannerStarting = false;
@@ -1153,7 +1153,7 @@ extern "C" void iplSDChannelTitle_playBannerIntro(SDChannelTitle* scene) {
}
if (scene->mState != 6) {
if (!System::getChannelManager()->usesAltSound(scene->mTitleId) || !scene->mScriptEnabled) {
iplSDChannelTitle_startBannerSound(scene);
iplSDChannelTitle_813E8160(scene);
}
if (!scene->mpBannerLayout) {
scene->mpProgressLayout->getAnim(0)->initAnmFrame();
@@ -1163,7 +1163,7 @@ extern "C" void iplSDChannelTitle_playBannerIntro(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_startBannerSound(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E8160(SDChannelTitle* scene) {
if (scene->mpSoundFiles[scene->mLoadedIndex] && scene->mpSoundFiles[scene->mLoadedIndex]->checkData() == 1) {
void* sound = scene->mpSoundFiles[scene->mLoadedIndex]->getBuffer();
u32 size = System::getChannelManager()->getSoundSize(scene->mTitleId);
@@ -1171,15 +1171,15 @@ extern "C" void iplSDChannelTitle_startBannerSound(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_bindBannerAnimations(SDChannelTitle* scene) {
iplSDChannelTitle_bindBannerAnims(scene);
extern "C" void iplSDChannelTitle_813E81FC(SDChannelTitle* scene) {
iplSDChannelTitle_813E8360(scene);
if (scene->mScriptEnabled) {
memset(scene->mpScriptAnimations, 0, sizeof(scene->mpScriptAnimations));
iplSDChannelTitle_bindRsoAnimations(scene, scene->mpBannerLayout, scene->mpScriptAnimations, "banner");
iplSDChannelTitle_813E8258(scene, scene->mpBannerLayout, scene->mpScriptAnimations, "banner");
}
}
extern "C" void iplSDChannelTitle_bindRsoAnimations(SDChannelTitle*, layout::Object* layout,
extern "C" void iplSDChannelTitle_813E8258(SDChannelTitle*, layout::Object* layout,
layout::Animator** animations, const char* prefix) {
char groupName[8];
char animationName[20];
@@ -1203,7 +1203,7 @@ extern "C" void iplSDChannelTitle_bindRsoAnimations(SDChannelTitle*, layout::Obj
}
}
extern "C" void iplSDChannelTitle_bindBannerAnims(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E8360(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_bindBannerAnims(SDChannelTitle* scene) {
}
}
extern "C" BOOL iplSDChannelTitle_isNetworkAllowed(SDChannelTitle*, ESTmdView*, ESTitleId titleId) {
extern "C" BOOL iplSDChannelTitle_813E847C(SDChannelTitle*, ESTmdView*, ESTitleId titleId) {
if (!System::getChannelManager()->needsNetSetting(titleId) || ncd::NCDSetting::getConnectEnableFlag()) {
return TRUE;
}
return FALSE;
}
extern "C" BOOL iplSDChannelTitle_isParentalEnabled() {
extern "C" BOOL iplSDChannelTitle_813E84C8() {
SCParentalControlsInfo parental;
if (SCGetParentalControl(&parental) && (parental.enable & SC_PARENTAL_FLAG_ENABLED)) {
return TRUE;
@@ -1241,7 +1241,7 @@ extern "C" BOOL iplSDChannelTitle_isParentalEnabled() {
return FALSE;
}
extern "C" void iplSDChannelTitle_openParentalDialog(SDChannelTitle* scene, void* arguments) {
extern "C" void iplSDChannelTitle_813E850C(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_openParentalDialog(SDChannelTitle* scene, void
scene->mState = 11;
}
extern "C" void iplSDChannelTitle_setPageAndIndex(SDChannelTitle* scene, int page, int index) {
extern "C" void iplSDChannelTitle_813E85C0(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_setPageAndIndex(SDChannelTitle* scene, int pag
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_hasAppMeta(channel)) {
iplSDChannelTitle_beginLaunch(scene, channel);
if (iplSDChannelObj_813E3330(channel)) {
iplSDChannelTitle_813E86A0(scene, channel);
} else {
scene->mState = 28;
}
}
extern "C" void iplSDChannelTitle_beginLaunch(SDChannelTitle* scene, SDChannelObj* channel) {
extern "C" void iplSDChannelTitle_813E86A0(SDChannelTitle* scene, SDChannelObj* channel) {
scene->mTitleId = channel->mAppMeta.titleId;
if (scene->mScriptEnabled) {
scene->mbStopScript = true;
@@ -1280,7 +1280,7 @@ extern "C" void iplSDChannelTitle_beginLaunch(SDChannelTitle* scene, SDChannelOb
scene->mState = 8;
}
extern "C" void iplSDChannelTitle_cleanupAndLeave(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E86D8(SDChannelTitle* scene) {
scene->mParentalResult = 0;
scene->mbStartAnimation = false;
static_cast<SDButton*>(System::getScene(0x24))->animation(15);
@@ -1311,7 +1311,7 @@ extern "C" void iplSDChannelTitle_cleanupAndLeave(SDChannelTitle* scene) {
System::getHomeButtonMenu()->disable();
System::stopReceiveSchedule();
if (hasTitle || hasTemporaryTitle) {
System::getTask1()->request(iplSDChannelTitle_fetchTmdViewTask, scene, NULL);
System::getTask1()->request(iplSDChannelTitle_813E8E70, scene, NULL);
scene->mbCopiedTitle = false;
scene->mState = 13;
} else {
@@ -1322,7 +1322,7 @@ extern "C" void iplSDChannelTitle_cleanupAndLeave(SDChannelTitle* scene) {
}
}
extern "C" void iplSDChannelTitle_confirmLeaveToSettings(SDChannelTitle* scene, bool settings) {
extern "C" void iplSDChannelTitle_813E88CC(SDChannelTitle* scene, bool settings) {
if (settings) {
scene->reserveAllSceneDestruction(0x12, reinterpret_cast<void*>(1));
scene->mState = 7;
@@ -1338,7 +1338,7 @@ extern "C" void iplSDChannelTitle_confirmLeaveToSettings(SDChannelTitle* scene,
}
}
extern "C" void iplSDChannelTitle_prepareSceneExit(SDChannelTitle* scene, int nextScene) {
extern "C" void iplSDChannelTitle_813E899C(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_prepareSceneExit(SDChannelTitle* scene, int ne
}
}
extern "C" void iplSDChannelTitle_flushSaveBeforeExit(SDChannelTitle* scene, int nextScene) {
extern "C" void iplSDChannelTitle_813E8A20(SDChannelTitle* scene, int nextScene) {
int page;
int index;
if (System::getChannelManager()->hasChannel(scene->mTitleId, &page, &index)) {
@@ -1363,7 +1363,7 @@ extern "C" void iplSDChannelTitle_flushSaveBeforeExit(SDChannelTitle* scene, int
__WPADReconnect(TRUE);
}
extern "C" void iplSDChannelTitle_rebootSystem(SDChannelTitle*) {
extern "C" void iplSDChannelTitle_813E8AB4(SDChannelTitle*) {
snd::getSystem()->stopAllSound(0);
snd::getSystem()->calc();
VISetBlack(TRUE);
@@ -1374,11 +1374,11 @@ extern "C" void iplSDChannelTitle_rebootSystem(SDChannelTitle*) {
OSRebootSystem();
}
extern "C" bool iplSDChannelTitle_isLaunchDelayDone(SDChannelTitle* scene) {
extern "C" bool iplSDChannelTitle_813E8B1C(SDChannelTitle* scene) {
return static_cast<u32>(120.0f / System::getAnimDelta()) < scene->mLaunchFrame;
}
extern "C" void iplSDChannelTitle_setStartButtonPressed(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E8B70(SDChannelTitle* scene) {
if (!scene->mStartButtonState) {
scene->mpButtonAnimations[5][3]->stop();
scene->mpButtonAnimations[5][4]->play();
@@ -1388,7 +1388,7 @@ extern "C" void iplSDChannelTitle_setStartButtonPressed(SDChannelTitle* scene) {
scene->mStartButtonState = 1;
}
extern "C" void iplSDChannelTitle_drawDimOverlay(SDChannelTitle*, const nw4r::ut::Rect& bounds, GXColor color) {
extern "C" void iplSDChannelTitle_813E8C08(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_drawDimOverlay(SDChannelTitle*, const nw4r::ut
}
}
extern "C" void iplSDChannelTitle_setPaneMessage(SDChannelTitle*, nw4r::lyt::Pane* pane, u32 message, bool allocate) {
extern "C" void iplSDChannelTitle_813E8D14(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_setPaneMessage(SDChannelTitle*, nw4r::lyt::Pan
textBox->SetString(text);
}
extern "C" nand::LayoutFile* iplSDChannelTitle_loadBannerMetaFiles(SDChannelTitle*, ESTitleId title, nand::File** sound) {
extern "C" nand::LayoutFile* iplSDChannelTitle_813E8DCC(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_fetchTmdViewTask(void* argument) {
extern "C" void iplSDChannelTitle_813E8E70(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_fetchTmdViewTask(void* argument) {
scene->mbTmdReady = true;
}
extern "C" BOOL iplSDChannelTitle_passesParentalCheck(SDChannelTitle* scene, ESTmdView* tmd) {
extern "C" BOOL iplSDChannelTitle_813E8F04(SDChannelTitle* scene, ESTmdView* tmd) {
if (!utility::ESMisc::__IsPCEnable()) {
return TRUE;
}
@@ -1467,7 +1467,7 @@ extern "C" BOOL iplSDChannelTitle_passesParentalCheck(SDChannelTitle* scene, EST
return TRUE;
}
extern "C" void iplSDChannelTitle_onTitlePaneEvent(SDTitlePaneEventHandler* handler, u32 component,
extern "C" void iplSDChannelTitle_813E9004(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_onTitlePaneEvent(SDTitlePaneEventHandler* hand
handler->mpScene->mpButtonAnimations[2][2]->play();
snd::getSystem()->startSE("WIPL_SE_BT_PUSH");
handler->mpScene->mState = 10;
iplSDChannelTitle_preparePageRestart(handler->mpScene);
iplSDChannelTitle_813E7A18(handler->mpScene);
} else if (strcmp(paneName, sButtonNames[1]) == 0) {
if (handler->mpScene->mStartButtonState != 2) {
snd::getSystem()->startSE("WIPL_SE_GRAY_BUTTON");
} else {
iplSDChannelTitle_cleanupAndLeave(handler->mpScene);
iplSDChannelTitle_813E86D8(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_onTitlePaneEvent(SDTitlePaneEventHandler* hand
}
}
extern "C" void iplSDChannelTitle_onTitleButtonEvent(SDTitleButtonEventHandler* handler, u32 component,
extern "C" void iplSDChannelTitle_813E92EC(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_onTitleButtonEvent(SDTitleButtonEventHandler*
int index;
handler->mpScene->mpChannelSelect->findAdjacentChannel(1, &page, &index);
button->animation(7);
iplSDChannelTitle_setPageAndIndex(handler->mpScene, page, index);
iplSDChannelTitle_813E85C0(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_setPageAndIndex(handler->mpScene, page, index);
iplSDChannelTitle_813E85C0(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_onTitleButtonEvent(this, component, event, controller);
iplSDChannelTitle_813E92EC(this, component, event, controller);
}
void SDTitlePaneEventHandler::onEvent(u32 component, u32 event, void* data) {
iplSDChannelTitle_onTitlePaneEvent(this, component, event, static_cast<const controller::Interface*>(data));
iplSDChannelTitle_813E9004(this, component, event, static_cast<const controller::Interface*>(data));
}
}

View File

@@ -230,29 +230,34 @@ namespace ipl {
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;
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
}
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 copy_lit_tail;
goto LAB_813325b8;
}
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) {
copy_lit_tail:
LAB_813325b8:
dst = litPtr - 1;
litPtr = litPtr + 1;
*out = *dst;

View File

@@ -1,139 +0,0 @@
# 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

@@ -1,53 +0,0 @@
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

@@ -1,126 +0,0 @@
# 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.