Compare commits

..

1 Commits

Author SHA1 Message Date
coah
201c182666 cleanup(CDBDatabase): name error message string labels
Rename Matching lbl_* CDBReportError messages to scCdbMsg_*.
2026-10-01 18:01:27 -05:00
108 changed files with 2675 additions and 3692 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.38% | 88.09% | 62.52% | 92.12% |
| 99.37% | 87.79% | 62.05% | 92.06% |
units 921/1027 complete, functions 12232/12563 matched.
units 918/1027 complete, functions 12216/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

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

View File

@@ -688,13 +688,13 @@ src/scene/memoryCard/iplMemoryCard.cpp:
.text start:0x813C9DCC end:0x813CC1FC
.rodata start:0x81610368 end:0x81610480
.data start:0x81651D30 end:0x81652640
.sdata2 start:0x81694A68 end:0x81694A78
.sdata2 start:0x81694A68 end:0x81694A80
.sdata start:0x81696C78 end:0x81696CA0
src/scene/memoryCard/iplMemoryCardBase.cpp:
.text start:0x813CC1FC end:0x813CD034
.data start:0x81652640 end:0x816526D0
.sdata2 start:0x81694A78 end:0x81694A88
.sdata2 start:0x81694A80 end:0x81694A88
src/scene/memoryCard/iplMemoryCardManager.cpp:
.text start:0x813CD034 end:0x813CE548
@@ -1054,7 +1054,7 @@ src/keyboard/tiNw4rManager.cpp:
.data start:0x8165F818 end:0x8165F8F0
.sdata2 start:0x81694E10 end:0x81694E28
src/keyboard/tiKeyboard.cpp:
src/keyboard/tiManager.cpp:
.text start:0x81437558 end:0x81439608
.ctors start:0x8160D208 end:0x8160D20C
.data start:0x8165F8F0 end:0x81660378
@@ -3551,12 +3551,12 @@ libs/RVL_SDK/src/bte/l2c_csm.c:
libs/RVL_SDK/src/bte/l2c_link.c:
.text start:0x815AC630 end:0x815AD7BC
.data start:0x8168E930 end:0x8168EBA0
.data start:0x8168E930 end:0x8168EB68
libs/RVL_SDK/src/bte/l2c_main.c:
.bss start:0x811725E0 end:0x81172DC8
.text start:0x815AD7BC end:0x815AE7EC
.data start:0x8168EBA0 end:0x8168EEA0
.data start:0x8168EB68 end:0x8168EEA0
libs/RVL_SDK/src/bte/l2c_utils.c:
.text start:0x815AE7EC end:0x815B06B0

View File

@@ -27,7 +27,7 @@ BS2Allocator = .bss:0x8108B6E0; // type:object size:0x10 scope:global
BS2StateFlags = .bss:0x8108B6F0; // type:object size:0x20
Block = .bss:0x8108B720; // type:object size:0x30 align:32
PartitionInfoBuf = .bss:0x8108B760; // type:object size:0x800 align:32 data:4byte
CoverBlock = .bss:0x8108BF60; // type:object size:0x30 data:4byte
lbl_8108BF60 = .bss:0x8108BF60; // type:object size:0x30 data:4byte
BS2CacheFileInfo = .bss:0x8108BF90; // type:object size:0x8C
BS2NandBlock = .bss:0x8108C01C; // type:object size:0xBC
PartitionParams = .bss:0x8108C0E0; // type:object size:0x1DE00 scope:local align:32
@@ -37,7 +37,7 @@ GameTOCBuf = .bss:0x810A9F20; // type:object size:0x20 align:32
bi3 = .bss:0x810A9F40; // type:object size:0x2000 align:32 data:4byte
AppLoaderHdr = .bss:0x810ABF40; // type:object size:0x20 align:32 data:4byte
bi2 = .bss:0x810ABF60; // type:object size:0x2000 align:32 data:4byte
UpdateDiskID = .bss:0x810ADF60; // type:object size:0x20 align:32 data:4byte
lbl_810ADF60 = .bss:0x810ADF60; // type:object size:0x20 align:32 data:4byte
TicketViewsBuf = .bss:0x810ADF80; // type:object size:0x3600 scope:local align:32
Flags0 = .bss:0x810B1580; // type:object size:0x800 scope:local
Flags1 = .bss:0x810B1D80; // type:object size:0x800 scope:local
@@ -81,11 +81,11 @@ usbapStack = .bss:0x810BC460; // type:object size:0x1000
usbapMessageQ = .bss:0x810BD460; // type:object size:0x20
usbapNickname = .bss:0x810BD480; // type:object size:0x18
m_allocator__Q23ipl5scene = .bss:0x810BD498; // type:object size:0x10
AOSSi_NcdIfConfig = .bss:0x810BD4A8; // type:object size:0x160 data:byte
AOSSi_NcdIpConfig = .bss:0x810BD608; // type:object size:0x7C8 data:4byte
sRakuAllocator = .bss:0x810BDDD0; // type:object size:0x10
sRakuStatus = .bss:0x810BDDE0; // type:object size:0xF4 data:4byte
sRakuMsgQueue = .bss:0x810BDED4; // type:object size:0x24
AOSS_810BD4A8 = .bss:0x810BD4A8; // type:object size:0x160 data:byte
AOSS_810BD608 = .bss:0x810BD608; // type:object size:0x7C8 data:4byte
RakuRakuThread_810BDDD0 = .bss:0x810BDDD0; // type:object size:0x10
RakuRakuThread_810BDDE0 = .bss:0x810BDDE0; // type:object size:0xF4 data:4byte
RakuRakuThread_810BDED4 = .bss:0x810BDED4; // type:object size:0x24
AOSS_810BDEF8 = .bss:0x810BDEF8; // type:object size:0x20 data:4byte
AOSS_810BDF18 = .bss:0x810BDF18; // type:object size:0x6A0
AOSS_810BE5B8 = .bss:0x810BE5B8; // type:object size:0x280
@@ -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
@@ -4290,7 +4290,7 @@ __dt__Q43ipl5scene10MemoryBase9AnmButtonFv = .text:0x813CCF34; // type:function
__dt__Q43ipl5scene10MemoryBase6ButtonFv = .text:0x813CCF74; // type:function size:0x40
__dt__Q43ipl5scene10MemoryBase3AnmFv = .text:0x813CCFB4; // type:function size:0x40
__dt__Q33ipl5scene15MemoryBaseEventFv = .text:0x813CCFF4; // type:function size:0x40
compareMemoryCardSortEntries = .text:0x813CD034; // type:function size:0x78
iplMemoryCardManager_813CD034 = .text:0x813CD034; // type:function size:0x78
calc__Q33ipl5scene17MemoryCardManagerFv = .text:0x813CD0AC; // type:function size:0x4C
isSlotReady__Q33ipl5scene17MemoryCardManagerFUc = .text:0x813CD0F8; // type:function size:0x44
isSlotNoCard__Q33ipl5scene17MemoryCardManagerFUc = .text:0x813CD13C; // type:function size:0x40
@@ -4399,31 +4399,31 @@ getCardSlotState__Q23ipl10memorycardFv = .text:0x813D2024; // type:function size
getCardLastSrcSlot__Q23ipl10memorycardFv = .text:0x813D202C; // type:function size:0x10
getCardLastSendCmd__Q23ipl10memorycardFv = .text:0x813D203C; // type:function size:0x10
getCardLastCMDFCmdResult__Q23ipl10memorycardFv = .text:0x813D204C; // type:function size:0x10
sendCardUnmountCmd = .text:0x813D205C; // type:function size:0x44
CardSequence_813D205C = .text:0x813D205C; // type:function size:0x44
sendCardFormatCmd__Q23ipl10memorycardFUc = .text:0x813D20A0; // type:function size:0x50
sendCardCopyCmd__Q23ipl10memorycardFUcs = .text:0x813D20F0; // type:function size:0x54
sendCardMoveCmd__Q23ipl10memorycardFUcs = .text:0x813D2144; // type:function size:0x54
sendCardDeleteCmd__Q23ipl10memorycardFUcs = .text:0x813D2198; // type:function size:0x54
sendCardThreadStopCmd__Q23ipl10memorycardFv = .text:0x813D21EC; // type:function size:0x40
pollCardSlot = .text:0x813D222C; // type:function size:0x110
mapCardErrorCode = .text:0x813D233C; // type:function size:0x9C
CardSequence_813D222C = .text:0x813D222C; // type:function size:0x110
CardSequence_813D233C = .text:0x813D233C; // type:function size:0x9C
probeCard__Q23ipl10memorycardFv = .text:0x813D23D8; // type:function size:0x288
initCardThread__Q23ipl10memorycardFv = .text:0x813D2660; // type:function size:0x29C
shutdownCardThread__Q23ipl10memorycardFv = .text:0x813D28FC; // type:function size:0x148
getIconStateArray__Q23ipl10memorycardFv = .text:0x813D2A44; // type:function size:0x10
getIconComment__Q23ipl10memorycardFUcs = .text:0x813D2A54; // type:function size:0x20
clearCardFileEntry = .text:0x813D2A74; // type:function size:0xCC
refreshCardSlotInfo = .text:0x813D2B40; // type:function size:0x14C
cardThreadMain = .text:0x813D2C8C; // type:function size:0x4B4
markAllCardFilesDirty = .text:0x813D3140; // type:function size:0xCC
handleCardMountResult = .text:0x813D320C; // type:function size:0x9C
reportCardThreadError = .text:0x813D32A8; // type:function size:0xD8
sendCardSlotState = .text:0x813D3380; // type:function size:0x58
clearAllCardFileEntries = .text:0x813D33D8; // type:function size:0x4C
loadCardFileIcons = .text:0x813D3424; // type:function size:0x800
clearCardWritePending = .text:0x813D3C24; // type:function size:0x14
checkCardFileDuplicate = .text:0x813D3C38; // type:function size:0xDC
runCardMoveOrCopy = .text:0x813D3D14; // type:function size:0x980
CardSequence_813D2A74 = .text:0x813D2A74; // type:function size:0xCC
CardSequence_813D2B40 = .text:0x813D2B40; // type:function size:0x14C
CardSequence_813D2C8C = .text:0x813D2C8C; // type:function size:0x4B4
CardSequence_813D3140 = .text:0x813D3140; // type:function size:0xCC
CardSequence_813D320C = .text:0x813D320C; // type:function size:0x9C
CardSequence_813D32A8 = .text:0x813D32A8; // type:function size:0xD8
CardSequence_813D3380 = .text:0x813D3380; // type:function size:0x58
CardSequence_813D33D8 = .text:0x813D33D8; // type:function size:0x4C
CardSequence_813D3424 = .text:0x813D3424; // type:function size:0x800
CardSequence_813D3C24 = .text:0x813D3C24; // type:function size:0x14
CardSequence_813D3C38 = .text:0x813D3C38; // type:function size:0xDC
CardSequence_813D3D14 = .text:0x813D3D14; // type:function size:0x980
IPLContestInitialize = .text:0x813D4694; // type:function size:0xBC
IPLContestStart = .text:0x813D4750; // type:function size:0x14
IPLContestProcess = .text:0x813D4764; // type:function size:0x6E8
@@ -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
@@ -4866,7 +4866,7 @@ onDialogState9__Q33ipl5scene8SDMemoryFv = .text:0x813EDF04; // type:function siz
onDialogState10__Q33ipl5scene8SDMemoryFv = .text:0x813EDFA8; // type:function size:0x130
onDialogState11__Q33ipl5scene8SDMemoryFv = .text:0x813EE0D8; // type:function size:0xE0
onDialogState12__Q33ipl5scene8SDMemoryFv = .text:0x813EE1B8; // type:function size:0x1A0
iplSDMemory_containsTitleId = .text:0x813EE358; // type:function size:0x44
iplSDMemory_813EE358 = .text:0x813EE358; // type:function size:0x44
onDialogState13__Q33ipl5scene8SDMemoryFv = .text:0x813EE39C; // type:function size:0xEC
onDialogState14__Q33ipl5scene8SDMemoryFv = .text:0x813EE488; // type:function size:0x1C4
onDialogState15__Q33ipl5scene8SDMemoryFv = .text:0x813EE64C; // type:function size:0x12C
@@ -5133,11 +5133,11 @@ cancel__Q33ipl5scene10AOSSThreadFv = .text:0x813FCE20; // type:function size:0x5
finish__Q33ipl5scene10AOSSThreadFP13NCDAossConfigPi = .text:0x813FCE70; // type:function size:0x2FC
printInfo__Q33ipl5scene10AOSSThreadFv = .text:0x813FD16C; // type:function size:0x4
AOSSi_Cancel = .text:0x813FD170; // type:function size:0xC
AOSSi_SleepAlarmHandler = .text:0x813FD17C; // type:function size:0x10
AOSSi_SleepMs = .text:0x813FD18C; // type:function size:0x88
AOSS_813FD17C = .text:0x813FD17C; // type:function size:0x10
AOSS_813FD18C = .text:0x813FD18C; // type:function size:0x88
AOSSi_Alloc = .text:0x813FD214; // type:function size:0x24
AOSSi_Free = .text:0x813FD238; // type:function size:0x24
AOSSi_StoreIpv4Octets = .text:0x813FD25C; // type:function size:0x2C
AOSS_813FD25C = .text:0x813FD25C; // type:function size:0x2C
AOSSi_SetNCDIPAddr = .text:0x813FD288; // type:function size:0x7C
AOSSi_InitLocal = .text:0x813FD304; // type:function size:0x68
AOSSi_EndLocal = .text:0x813FD36C; // type:function size:0x34
@@ -5146,62 +5146,62 @@ AOSSi_WLANConnect = .text:0x813FD72C; // type:function size:0x26C
AOSSi_Sleep = .text:0x813FD998; // type:function size:0x4
AOSSi_Status = .text:0x813FD99C; // type:function size:0x34
AOSS_SetCallback = .text:0x813FD9D0; // type:function size:0x34
syncRakuProgress__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDA04; // type:function size:0x6C scope:local
RakuRakuThread_813FDA04__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDA04; // type:function size:0x6C scope:local
__ct__Q33ipl5scene14RakuRakuThreadFPQ23EGG4Heap = .text:0x813FDA70; // type:function size:0xD8
__dt__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDB48; // type:function size:0xA4
destroy__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDBEC; // type:function size:0xD8
start__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDCC4; // type:function size:0x180
Run__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDE44; // type:function size:0xAC
RakuSocketAlloc = .text:0x813FDEF0; // type:function size:0xC scope:local
RakuSocketFree = .text:0x813FDEFC; // type:function size:0xC scope:local
RakuAtermAlloc = .text:0x813FDF08; // type:function size:0x10 scope:local
RakuAtermFree = .text:0x813FDF18; // type:function size:0x10 scope:local
RakuRakuThread_813FDEF0 = .text:0x813FDEF0; // type:function size:0xC scope:local
RakuRakuThread_813FDEFC = .text:0x813FDEFC; // type:function size:0xC scope:local
RakuRakuThread_813FDF08 = .text:0x813FDF08; // type:function size:0x10 scope:local
RakuRakuThread_813FDF18 = .text:0x813FDF18; // type:function size:0x10 scope:local
getState__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FDF28; // type:function size:0x128
cancel__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FE050; // type:function size:0x14
finish__Q33ipl5scene14RakuRakuThreadFP11NCDApConfigPi = .text:0x813FE064; // type:function size:0x214
printInfo__Q33ipl5scene14RakuRakuThreadFv = .text:0x813FE278; // type:function size:0x4
AOSSi_Init = .text:0x813FE27C; // type:function size:0x22C
AOSS_Init_old = .text:0x813FE4A8; // type:function size:0x18C0
AOSSValidateInitConfig = .text:0x813FFD68; // type:function size:0x36C
AOSS_813FFD68 = .text:0x813FFD68; // type:function size:0x36C
AOSS_CheckAP = .text:0x814000D4; // type:function size:0xE0
AOSSDispatchReceiveState = .text:0x814001B4; // type:function size:0x13C
AOSSHandleDiscoverReply = .text:0x814002F0; // type:function size:0x1E0
AOSSHandleAuthReply = .text:0x814004D0; // type:function size:0x1D4
AOSSHandleFinalReply = .text:0x814006A4; // type:function size:0x18C
AOSSDecryptMessage = .text:0x81400830; // type:function size:0x504
AOSSCheckAccessPointName = .text:0x81400D34; // type:function size:0xD8
AOSSParseNetworkSettings = .text:0x81400E0C; // type:function size:0x2F8
AOSSParseWepConfig = .text:0x81401104; // type:function size:0x180
AOSSParsePskConfig = .text:0x81401284; // type:function size:0x128
AOSSApplyAuthOptions = .text:0x814013AC; // type:function size:0x1C8
AOSSSendDiscoveryRequest = .text:0x81401574; // type:function size:0x204
AOSSSendHelloRequest = .text:0x81401778; // type:function size:0x444
AOSSBuildInterfaceOption = .text:0x81401BBC; // type:function size:0xE0
AOSSInitKeySchedule = .text:0x81401C9C; // type:function size:0x124
AOSSInitCrc32Table = .text:0x81401DC0; // type:function size:0xC0
AOSSXorBufferWithKey = .text:0x81401E80; // type:function size:0x24C
AOSSConnectAndAwaitHost = .text:0x814020CC; // type:function size:0xF0
ATERMStartNetworkStack = .text:0x814021BC; // type:function size:0x268
ATERMScanAccessPoints = .text:0x81402424; // type:function size:0x348
ATERMFindChangedApRecord = .text:0x8140276C; // type:function size:0x2B8
ATERMDiscoverAccessPoints = .text:0x81402A24; // type:function size:0x41C
ATERMBuildEncryptedMessage = .text:0x81402E40; // type:function size:0x180
ATERMParsePacket = .text:0x81402FC0; // type:function size:0x21C
ATERMBuildAssociationRequest = .text:0x814031DC; // type:function size:0x214
ATERMParseAssociationResponse = .text:0x814033F0; // type:function size:0x224
ATERMParseHexBytes = .text:0x81403614; // type:function size:0xC4
ATERMApplyScanSecuritySettings = .text:0x814036D8; // type:function size:0x1F0
ATERMRunConfigProtocol = .text:0x814038C8; // type:function size:0xEDC
AOSS_814001B4 = .text:0x814001B4; // type:function size:0x13C
AOSS_814002F0 = .text:0x814002F0; // type:function size:0x1E0
AOSS_814004D0 = .text:0x814004D0; // type:function size:0x1D4
AOSS_814006A4 = .text:0x814006A4; // type:function size:0x18C
AOSS_81400830 = .text:0x81400830; // type:function size:0x504
AOSS_81400D34 = .text:0x81400D34; // type:function size:0xD8
AOSS_81400E0C = .text:0x81400E0C; // type:function size:0x2F8
AOSS_81401104 = .text:0x81401104; // type:function size:0x180
AOSS_81401284 = .text:0x81401284; // type:function size:0x128
AOSS_814013AC = .text:0x814013AC; // type:function size:0x1C8
AOSS_81401574 = .text:0x81401574; // type:function size:0x204
AOSS_81401778 = .text:0x81401778; // type:function size:0x444
AOSS_81401BBC = .text:0x81401BBC; // type:function size:0xE0
AOSS_81401C9C = .text:0x81401C9C; // type:function size:0x124
AOSS_81401DC0 = .text:0x81401DC0; // type:function size:0xC0
AOSS_81401E80 = .text:0x81401E80; // type:function size:0x24C
AOSS_814020CC = .text:0x814020CC; // type:function size:0xF0
ATERM_814021BC = .text:0x814021BC; // type:function size:0x268
ATERM_81402424 = .text:0x81402424; // type:function size:0x348
ATERM_8140276C = .text:0x8140276C; // type:function size:0x2B8
ATERM_81402A24 = .text:0x81402A24; // type:function size:0x41C
ATERM_81402E40 = .text:0x81402E40; // type:function size:0x180
ATERM_81402FC0 = .text:0x81402FC0; // type:function size:0x21C
ATERM_814031DC = .text:0x814031DC; // type:function size:0x214
ATERM_814033F0 = .text:0x814033F0; // type:function size:0x224
ATERM_81403614 = .text:0x81403614; // type:function size:0xC4
ATERM_814036D8 = .text:0x814036D8; // type:function size:0x1F0
ATERM_814038C8 = .text:0x814038C8; // type:function size:0xEDC
ATERMi_AutoConfigThread = .text:0x814047A4; // type:function size:0xA0
ATERMAesKeyWrap = .text:0x81404844; // type:function size:0x1D4
ATERMAesKeyUnwrap = .text:0x81404A18; // type:function size:0x1E4
ATERMAesExpandEncryptKey = .text:0x81404BFC; // type:function size:0x430
ATERMAesExpandDecryptKey = .text:0x8140502C; // type:function size:0x228
ATERMAesEncryptBlock = .text:0x81405254; // type:function size:0x43C
ATERMAesDecryptBlock = .text:0x81405690; // type:function size:0x43C
ATERMMd5Update = .text:0x81405ACC; // type:function size:0x240
ATERMMd5Transform = .text:0x81405D0C; // type:function size:0xB40
ATERMAlarmWakeQueue = .text:0x8140684C; // type:function size:0x10
ATERM_81404844 = .text:0x81404844; // type:function size:0x1D4
ATERM_81404A18 = .text:0x81404A18; // type:function size:0x1E4
ATERM_81404BFC = .text:0x81404BFC; // type:function size:0x430
ATERM_8140502C = .text:0x8140502C; // type:function size:0x228
ATERM_81405254 = .text:0x81405254; // type:function size:0x43C
ATERM_81405690 = .text:0x81405690; // type:function size:0x43C
ATERM_81405ACC = .text:0x81405ACC; // type:function size:0x240
ATERM_81405D0C = .text:0x81405D0C; // type:function size:0xB40
ATERM_8140684C = .text:0x8140684C; // type:function size:0x10
ATERMi_ApConfigStart = .text:0x8140685C; // type:function size:0x19C
ATERMi_ApConfigEnd = .text:0x814069F8; // type:function size:0x204
ATERMi_ApConfigGetState = .text:0x81406BFC; // type:function size:0x8C
@@ -6670,19 +6670,19 @@ CHANSVmStrCpyToU16FromU8 = .text:0x8144B058; // type:function size:0x34
CHANSVmStrCpyToU8FromU16 = .text:0x8144B08C; // type:function size:0x44
CHANSVmStrCpyToU8FromStringObject = .text:0x8144B0D0; // type:function size:0xB4
VmIsNan = .text:0x8144B184; // type:function size:0x54 scope:local
CHANSVmFloatSign = .text:0x8144B1D8; // type:function size:0x20 scope:local
CHANSVm_8144B1D8 = .text:0x8144B1D8; // type:function size:0x20 scope:local
VmIntToFloat = .text:0x8144B1F8; // type:function size:0x50 scope:local
CHANSVmParseInt = .text:0x8144B248; // type:function size:0xC4 scope:local
CHANSVmConvertToIntFromFloat = .text:0x8144B30C; // type:function size:0xAC scope:local
CHANSVm_8144B30C = .text:0x8144B30C; // type:function size:0xAC scope:local
CHANSVmConvertToIntFromStr = .text:0x8144B3B8; // type:function size:0x70
CHANSVmConvertToIntFromArray = .text:0x8144B428; // type:function size:0x8
CHANSVmConvertToFloatFromUndefined = .text:0x8144B430; // type:function size:0x40
CHANSVmConvertToFloatFromInt = .text:0x8144B470; // type:function size:0x64
CHANSVmConvertToFloatFromStr = .text:0x8144B4D4; // type:function size:0x14C
CHANSVm_8144B430 = .text:0x8144B430; // type:function size:0x40
CHANSVm_8144B470 = .text:0x8144B470; // type:function size:0x64
CHANSVm_8144B4D4 = .text:0x8144B4D4; // type:function size:0x14C
CHANSVmConvertToStrFromUndefined = .text:0x8144B620; // type:function size:0xC
CHANSVmFloatToWString = .text:0x8144B62C; // type:function size:0x58 scope:local
CHANSVm_8144B62C = .text:0x8144B62C; // type:function size:0x58 scope:local
CHANSVmConvertToStrFromInt = .text:0x8144B684; // type:function size:0xB0
CHANSVmConvertToStrFromFloat = .text:0x8144B734; // type:function size:0xDC
CHANSVm_8144B734 = .text:0x8144B734; // type:function size:0xDC
CHANSVmConvertToStrFromArray = .text:0x8144B810; // type:function size:0x10
CHANSVmConvertObjectTypeError = .text:0x8144B820; // type:function size:0x50
CHANSVmGetEnumedType = .text:0x8144B870; // type:function size:0x6C scope:local
@@ -6804,14 +6804,14 @@ VmStringSplice = .text:0x8144FDD8; // type:function size:0x1E4
VmStringSplit = .text:0x8144FFBC; // type:function size:0x378
VmStringToLowerCase = .text:0x81450334; // type:function size:0xB4
VmStringToUpperCase = .text:0x814503E8; // type:function size:0xB4
CHANSVmFormatString = .text:0x8145049C; // type:function size:0x6BC
CHANSVm_8145049C = .text:0x8145049C; // type:function size:0x6BC
VmStringFormat = .text:0x81450B58; // type:function size:0x4C
VmGetStrFromObjHdr = .text:0x81450BA4; // type:function size:0x24
VmGetIntFromObjHdr = .text:0x81450BC8; // type:function size:0x24
VmBlobInitValue = .text:0x81450BEC; // type:function size:0x20 scope:local
VmBlobCreateDirect = .text:0x81450C0C; // type:function size:0xAC scope:local
VmBlobGetDataBufferDirect = .text:0x81450CB8; // type:function size:0x5C scope:local
CHANSVmBlobResolveOffset = .text:0x81450D14; // type:function size:0xB8
CHANSVm_81450D14 = .text:0x81450D14; // type:function size:0xB8
VmBlobCtor = .text:0x81450DCC; // type:function size:0xA8 scope:local
VmBlobDtor = .text:0x81450E74; // type:function size:0x28 scope:local
VmBlobGetOffset = .text:0x81450E9C; // type:function size:0x68
@@ -6820,8 +6820,8 @@ VmBlobSkip = .text:0x81450FC8; // type:function size:0xF0
VmBlobGetLength = .text:0x814510B8; // type:function size:0x68
VmBlobSetLength = .text:0x81451120; // type:function size:0xF8
VmBlobFill = .text:0x81451218; // type:function size:0xFC
CHANSVmBlobGetCount = .text:0x81451314; // type:function size:0x34
CHANSVmBlobHasSpace = .text:0x81451348; // type:function size:0x50
CHANSVm_81451314 = .text:0x81451314; // type:function size:0x34
CHANSVm_81451348 = .text:0x81451348; // type:function size:0x50
VmBlobGetString = .text:0x81451398; // type:function size:0xC8
VmBlobSetString = .text:0x81451460; // type:function size:0x12C
VmBlobGetWString = .text:0x8145158C; // type:function size:0xE0
@@ -6857,7 +6857,7 @@ VmBlobSetS32 = .text:0x814532E4; // type:function size:0xD8
VmBlobSetS64 = .text:0x814533BC; // type:function size:0xE4
vmBlobParsePackFormatString = .text:0x814534A0; // type:function size:0x1D0
VmBlobPackCommon = .text:0x81453670; // type:function size:0xA70 scope:local
CHANSVmMakeU64 = .text:0x814540E0; // type:function size:0x6C
CHANSVm_814540E0 = .text:0x814540E0; // type:function size:0x6C
VmBlobCreate = .text:0x8145414C; // type:function size:0x8
VmBlobPack = .text:0x81454154; // type:function size:0x8
VmBlobUnpack = .text:0x8145415C; // type:function size:0x814
@@ -6875,7 +6875,7 @@ CHANSVmGetFreeExeSize = .text:0x81455198; // type:function size:0x28
CHANSVmAddExe = .text:0x814551C0; // type:function size:0x3F8
VmOffsU32ToPtr = .text:0x814555B8; // type:function size:0x18 scope:local
CHANSConvertModuleOfsToPtr = .text:0x814555D0; // type:function size:0x84
CHANSVmLookupScopedObject = .text:0x81455654; // type:function size:0x8C
CHANSVm_81455654 = .text:0x81455654; // type:function size:0x8C
VmPushFuncReturnInfo = .text:0x814556E0; // type:function size:0x1AC scope:local
VmReturnWithValue = .text:0x8145588C; // type:function size:0x1D4 scope:local
CHANSVmLinkModules = .text:0x81455A60; // type:function size:0x2F4
@@ -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
@@ -7284,7 +7284,7 @@ Zi8_814834AC = .text:0x814834AC; // type:function size:0x55C
Zi8GetKOcandidates = .text:0x81483A08; // type:function size:0xA74
Zi8LogError = .text:0x8148447C; // type:function size:0x4
Zi8ReplaceLastError = .text:0x81484480; // type:function size:0x4
Zi8MapKeyCode = .text:0x81484484; // type:function size:0x80
Zi8_81484484 = .text:0x81484484; // type:function size:0x80
ziNumKeysWithChars = .text:0x81484504; // type:function size:0xC4 scope:local
Zi8getKeyLayout = .text:0x814845C8; // type:function size:0x2D8
Zi8ChangeCharCase = .text:0x814848A0; // type:function size:0x48C
@@ -8879,8 +8879,8 @@ TMCJPEGDEC_move_ptr = .text:0x814EAD28; // type:function size:0xE4
TMCJPEGDEC_load_buff = .text:0x814EAE0C; // type:function size:0x124
TMCJPEGDEC_get_position = .text:0x814EAF30; // type:function size:0x10
TMCJPEGDEC_chk_possible_size = .text:0x814EAF40; // type:function size:0x10
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
@@ -13990,13 +13990,13 @@ scCountryMap_EU = .rodata:0x81616BD8; // type:object size:0xC
scCountryMap_NonEU = .rodata:0x81616BE4; // type:object size:0xC
lbl_81616BF0 = .rodata:0x81616BF0; // type:object size:0x88
CHANSVmConstStringObjectUndefined = .rodata:0x81616C78; // type:object size:0x10
CHANSVmConstStringObjectNaN = .rodata:0x81616C88; // type:object size:0x10
CHANSVmConstStringObjectInfinity = .rodata:0x81616C98; // type:object size:0x10
CHANSVmConstStringObjectMinusInfinity = .rodata:0x81616CA8; // type:object size:0x10
CHANSVmConstStringObjectComma = .rodata:0x81616CB8; // type:object size:0x10 data:4byte
lbl_81616C88 = .rodata:0x81616C88; // type:object size:0x10
lbl_81616C98 = .rodata:0x81616C98; // type:object size:0x10
lbl_81616CA8 = .rodata:0x81616CA8; // type:object size:0x10
lbl_81616CB8 = .rodata:0x81616CB8; // type:object size:0x10 data:4byte
CHANSVmConstStringDataEmpty = .rodata:0x81616CC8; // type:object size:0x10
CHANSVmConstStringObjectUndefined_ = .rodata:0x81616CD8; // type:object size:0x50
scFloatConstantList = .rodata:0x81616D28; // type:object size:0x20
lbl_81616D28 = .rodata:0x81616D28; // type:object size:0x20
VmTypeConvertFuncTbl = .rodata:0x81616D48; // type:object size:0x90
VmResultTypeTbl = .rodata:0x81616DD8; // type:object size:0xB4
VmArrayPropertyTbl = .rodata:0x81616E8C; // type:object size:0xC data:4byte
@@ -14198,7 +14198,7 @@ ca_ppki = .rodata:0x8162DBB8; // type:object size:0x400 noreloc
ms_dpki = .rodata:0x8162DFB8; // type:object size:0x240 noreloc
ms_ppki = .rodata:0x8162E1F8; // type:object size:0x240 noreloc
@1272 = .rodata:0x8162E438; // type:object size:0x278 scope:local data:4byte
pf_valid_fn_char = .rodata:0x8162E6B0; // type:object size:0x60 noreloc
pf_valid_fn_char = .rodata:0x8162E6B0; // type:object size:0x60 scope:local noreloc
fat_special_values = .rodata:0x8162E710; // type:object size:0x3C
cp932_to_unicode = .rodata:0x8162E750; // type:object size:0x4272 data:2byte
fa_nand_func = .rodata:0x816329C8; // type:object size:0x20
@@ -15942,7 +15942,7 @@ lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
updateDiskState_jumptable = .data:0x8164DE80; // type:object size:0x1C scope:local
jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
lbl_8164DEA7 = .data:0x8164DEA7; // type:object size:0x10 data:string
lbl_8164DEB7 = .data:0x8164DEB7; // type:object size:0x114
@@ -17456,19 +17456,19 @@ __vt__Q49textinput8keyboard13cellphonetype23CellPhoneControlAnmPane = .data:0x81
__vt__Q49textinput8keyboard13cellphonetype16CellPhoneAnmPane = .data:0x8165C730; // type:object size:0x28
__vt__Q49textinput8keyboard13cellphonetype12EventHandler = .data:0x8165C758; // type:object size:0x20
__vt__Q49textinput8keyboard13cellphonetype4Base = .data:0x8165C778; // type:object size:0xA8
scP_txtScrll_UP = .data:0x8165C820; // type:object size:0xE data:string
scP_txtScrll_DOWN = .data:0x8165C830; // type:object size:0x10 data:string
lbl_8165C820 = .data:0x8165C820; // type:object size:0xE data:string
lbl_8165C830 = .data:0x8165C830; // type:object size:0x10 data:string
lbl_8165C840 = .data:0x8165C840; // type:object size:0x80
scN_JPNUSAEUR = .data:0x8165C8C0; // type:object size:0xC data:string
scN_separateBarAll = .data:0x8165C8CC; // type:object size:0x11 data:string
scT_2l_TextBox = .data:0x8165C8E0; // type:object size:0xD data:string
scT_title_textJPN = .data:0x8165C8F0; // type:object size:0x10 data:string
scN_separateBarKOR = .data:0x8165C900; // type:object size:0x11 data:string
scT_2l_TextBoxKOR = .data:0x8165C918; // type:object size:0x10 data:string
scT_title_textKOR = .data:0x8165C928; // type:object size:0x10 data:string
scN_separateBarCHN = .data:0x8165C938; // type:object size:0x11 data:string
scT_2l_TextBoxCHN = .data:0x8165C950; // type:object size:0x10 data:string
scT_title_textCHN = .data:0x8165C960; // type:object size:0x10 data:string
lbl_8165C8C0 = .data:0x8165C8C0; // type:object size:0xC data:string
lbl_8165C8CC = .data:0x8165C8CC; // type:object size:0x11 data:string
lbl_8165C8E0 = .data:0x8165C8E0; // type:object size:0xD data:string
lbl_8165C8F0 = .data:0x8165C8F0; // type:object size:0x10 data:string
lbl_8165C900 = .data:0x8165C900; // type:object size:0x11 data:string
lbl_8165C918 = .data:0x8165C918; // type:object size:0x10 data:string
lbl_8165C928 = .data:0x8165C928; // type:object size:0x10 data:string
lbl_8165C938 = .data:0x8165C938; // type:object size:0x11 data:string
lbl_8165C950 = .data:0x8165C950; // type:object size:0x10 data:string
lbl_8165C960 = .data:0x8165C960; // type:object size:0x10 data:string
lbl_8165C970 = .data:0x8165C970; // type:object size:0x20 data:2byte
jumptable_8165C990 = .data:0x8165C990; // type:object size:0xA0 scope:local
jumptable_8165CA30 = .data:0x8165CA30; // type:object size:0x28 scope:local
@@ -17491,14 +17491,14 @@ __vt__Q29textinput4Base = .data:0x8165D228; // type:object size:0x30
__vt__Q39textinput4util9Animation = .data:0x8165D258; // type:object size:0x24
lbl_8165D258 = .data:0x8165D27C; // type:object size:0xD data:string
@STRING@GetTextColor__Q34nw4r3lyt7TextBoxCFUl = .data:0x8165D28C; // type:object size:0x44
scT_prdc_Text_00 = .data:0x8165D2D0; // type:object size:0xF data:string
scP_prdc_scrl_Left = .data:0x8165D2E0; // type:object size:0x11 data:string
scCandidatePaneData = .data:0x8165D2F8; // type:object size:0x68C
scPaneNameTable = .data:0x8165D984; // type:object size:0x84
scW_predictWindow = .data:0x8165DA08; // type:object size:0x10 data:string
scN_predictInput = .data:0x8165DA18; // type:object size:0xF data:string
scW_OnOff_Area = .data:0x8165DA28; // type:object size:0xD data:string
scN_prdc_Texts = .data:0x8165DA38; // type:object size:0xD data:string
lbl_8165D2D0 = .data:0x8165D2D0; // type:object size:0xF data:string
lbl_8165D2E0 = .data:0x8165D2E0; // type:object size:0x11 data:string
lbl_8165D2F8 = .data:0x8165D2F8; // type:object size:0x68C
lbl_8165D984 = .data:0x8165D984; // type:object size:0x84
lbl_8165DA08 = .data:0x8165DA08; // type:object size:0x10 data:string
lbl_8165DA18 = .data:0x8165DA18; // type:object size:0xF data:string
lbl_8165DA28 = .data:0x8165DA28; // type:object size:0xD data:string
lbl_8165DA38 = .data:0x8165DA38; // type:object size:0xD data:string
jumptable_8165DA48 = .data:0x8165DA48; // type:object size:0x1C scope:local
lbl_8165DA64 = .data:0x8165DA64; // type:object size:0xF data:string
lbl_8165DA74 = .data:0x8165DA74; // type:object size:0xF data:string
@@ -17938,20 +17938,20 @@ __vt__Q39textinput3gui11PaneManager = .data:0x81668DD4; // type:object size:0x5C
__vt__Q39textinput3gui10GUIManager = .data:0x81668E30; // type:object size:0x48
__vt__Q39textinput3gui12GUIComponent = .data:0x81668E78; // type:object size:0x68
__vt__Q49textinput5input10HKBManager14KBDListenerOwn = .data:0x81668EE0; // type:object size:0x18
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
scUndefinedUtf16 = .data:0x81669070; // type:object size:0x13
scInfinityUtf16 = .data:0x81669083; // type:object size:0x11
scMinusInfinityUtf16 = .data:0x81669094; // type:object size:0x13
lbl_81669070 = .data:0x81669070; // type:object size:0x13
lbl_81669083 = .data:0x81669083; // type:object size:0x11
lbl_81669094 = .data:0x81669094; // type:object size:0x13
lbl_816690A7 = .data:0x816690A7; // type:object size:0x9 data:string
lbl_816690B0 = .data:0x816690B0; // type:object size:0xA data:string
lbl_816690BA = .data:0x816690BA; // type:object size:0xA data:string
lbl_816690C4 = .data:0x816690C4; // type:object size:0x1E data:string
lbl_816690E2 = .data:0x816690E2; // type:object size:0x1B data:string
jumptable_81669100 = .data:0x81669100; // type:object size:0x28 scope:local
scVmGetResultType = .data:0x81669128; // type:object size:0x10 data:string
lbl_81669128 = .data:0x81669128; // type:object size:0x10 data:string
jumptable_81669138 = .data:0x81669138; // type:object size:0x24 scope:local
jumptable_8166915C = .data:0x8166915C; // type:object size:0x24 scope:local
jumptable_81669180 = .data:0x81669180; // type:object size:0x28 scope:local
@@ -18055,7 +18055,7 @@ lbl_81669DC3 = .data:0x81669DC3; // type:object size:0xE data:string
lbl_81669DD1 = .data:0x81669DD1; // type:object size:0xC data:string
lbl_81669DDD = .data:0x81669DDD; // type:object size:0xC data:string
lbl_81669DE9 = .data:0x81669DE9; // type:object size:0xC data:string
scHexDigits = .data:0x81669DF5; // type:object size:0x11 data:string
lbl_81669DF5 = .data:0x81669DF5; // type:object size:0x11 data:string
vmBlobPackFormatList = .data:0x81669E08; // type:object size:0x190 scope:local data:4byte
lbl_81669F98 = .data:0x81669F98; // type:object size:0xA data:string
lbl_81669FA2 = .data:0x81669FA2; // type:object size:0xA data:string
@@ -20243,11 +20243,11 @@ lbl_81694654 = .sdata2:0x81694654; // type:object size:0x4 align:4 data:float
@10043 = .sdata2:0x81694698; // type:object size:0x4 scope:local align:4 data:float
@10044 = .sdata2:0x8169469C; // type:object size:0x4 scope:local align:4 data:float
lbl_816946A0 = .sdata2:0x816946A0; // type:object size:0x4 align:4 data:float
scSoundZeroF = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
scSoundTwoF = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
scSoundOneF = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
scSoundThirtyF = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
scSoundSixtyF = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float
lbl_816946A4 = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
lbl_816946A8 = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
lbl_816946AC = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
lbl_816946B0 = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
lbl_816946B4 = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float
lbl_816946B8 = .sdata2:0x816946B8; // type:object size:0x8 align:8 data:double
lbl_816946C0 = .sdata2:0x816946C0; // type:object size:0x8 align:8 data:double
lbl_816946C8 = .sdata2:0x816946C8; // type:object size:0x8 align:8 data:double
@@ -20617,31 +20617,31 @@ lbl_81694D18 = .sdata2:0x81694D18; // type:object size:0x4 data:4byte
lbl_81694D1C = .sdata2:0x81694D1C; // type:object size:0x4 data:4byte
lbl_81694D20 = .sdata2:0x81694D20; // type:object size:0x1 data:byte
lbl_81694D24 = .sdata2:0x81694D24; // type:object size:0x1 data:byte
scInputFormZeroF = .sdata2:0x81694D28; // type:object size:0x4 align:4 data:float
scInputForm640F = .sdata2:0x81694D2C; // type:object size:0x4 align:4 data:float
scInputFormF32ConvertMagic = .sdata2:0x81694D30; // type:object size:0x8 align:8 data:double
scInputFormOneF = .sdata2:0x81694D38; // type:object size:0x4 align:4 data:float
scInputFormHalfF = .sdata2:0x81694D3C; // type:object size:0x4 align:4 data:float
scInputFormDegToFIdxF = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
scInputForm150F = .sdata2:0x81694D44; // type:object size:0x4 align:4 data:float
scInputForm30F = .sdata2:0x81694D48; // type:object size:0x4 align:4 data:float
scInputForm50F = .sdata2:0x81694D4C; // type:object size:0x4 align:4 data:float
scInputForm10F = .sdata2:0x81694D50; // type:object size:0x4 align:4 data:float
scInputForm52F = .sdata2:0x81694D54; // type:object size:0x4 align:4 data:float
scInputFormTwoF = .sdata2:0x81694D58; // type:object size:0x4 align:4 data:float
scInputForm140F = .sdata2:0x81694D5C; // type:object size:0x4 align:4 data:float
scInputForm90F = .sdata2:0x81694D60; // type:object size:0x4 align:4 data:float
scInputForm253F = .sdata2:0x81694D64; // type:object size:0x4 align:4 data:float
scInputForm20F = .sdata2:0x81694D68; // type:object size:0x4 align:4 data:float
scInputFormColorRU8 = .sdata2:0x81694D6C; // type:object size:0x1 data:byte
scInputFormColorGU8 = .sdata2:0x81694D6D; // type:object size:0x1 data:byte
scInputFormColorBU8 = .sdata2:0x81694D6E; // type:object size:0x1 data:byte
scInputFormColorAU8 = .sdata2:0x81694D6F; // type:object size:0x1 data:byte
scInputForm255F = .sdata2:0x81694D70; // type:object size:0x4 align:4 data:float
scInputForm127F = .sdata2:0x81694D74; // type:object size:0x4 align:4 data:float
scInputForm14592F = .sdata2:0x81694D78; // type:object size:0x4 align:4 data:float
scInputFormF64ConvertMagic = .sdata2:0x81694D80; // type:object size:0x8 align:8 data:double
scInputForm15F = .sdata2:0x81694D88; // type:object size:0x4 align:4 data:float
lbl_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
@@ -21694,7 +21694,7 @@ Tick = .sdata:0x81696520; // type:object size:0x4 scope:local data:4byte
@2844 = .sdata:0x81696562; // type:object size:0x5 scope:local data:string
@2845 = .sdata:0x81696567; // type:object size:0x8 scope:local data:string
@3032 = .sdata:0x8169656F; // type:object size:0x8 scope:local data:string
TicketViews = .sdata:0x81696578; // type:object size:0x4 data:4byte
lbl_81696578 = .sdata:0x81696578; // type:object size:0x4 data:4byte
lbl_8169657C = .sdata:0x8169657C; // type:object size:0x8 data:string
lbl_81696584 = .sdata:0x81696584; // type:object size:0x7
lbl_8169658B = .sdata:0x8169658B; // type:object size:0x5 data:string
@@ -22275,17 +22275,17 @@ lbl_81697394 = .sdata:0x81697394; // type:object size:0x4 data:wstring
lbl_81697398 = .sdata:0x81697398; // type:object size:0x4
lbl_8169739C = .sdata:0x8169739C; // type:object size:0x4
lbl_816973A0 = .sdata:0x816973A0; // type:object size:0x4 data:4byte
scN_KOR = .sdata:0x816973A4; // type:object size:0x6 data:string
scN_CHN = .sdata:0x816973AC; // type:object size:0x6 data:string
lbl_816973A4 = .sdata:0x816973A4; // type:object size:0x6 data:string
lbl_816973AC = .sdata:0x816973AC; // type:object size:0x6 data:string
sbCompatibleFilterEnabled__Q39textinput9inputform13DeadKeyStream = .sdata:0x816973B2; // type:object size:0x1 data:byte
mbHyphen__Q29textinput9inputform = .sdata:0x816973B3; // type:object size:0x1 data:byte
lbl_816973B4 = .sdata:0x816973B4; // type:object size:0x4
lbl_816973B8 = .sdata:0x816973B8; // type:object size:0x8 data:string
scCommonTextAnimName = .sdata:0x816973C0; // type:object size:0x4 data:4byte
scCommonScrollAnimName = .sdata:0x816973C4; // type:object size:0x4 data:4byte
scEmptyWChars = .sdata:0x816973C8; // type:object size:0x8
scP_OnBtn = .sdata:0x816973D0; // type:object size:0x8 data:string
scB_OnBtn = .sdata:0x816973D8; // type:object size:0x8 data:string
lbl_816973C0 = .sdata:0x816973C0; // type:object size:0x4 data:4byte
lbl_816973C4 = .sdata:0x816973C4; // type:object size:0x4 data:4byte
lbl_816973C8 = .sdata:0x816973C8; // type:object size:0x8
lbl_816973D0 = .sdata:0x816973D0; // type:object size:0x8 data:string
lbl_816973D8 = .sdata:0x816973D8; // type:object size:0x8 data:string
COMMON_BUTTON_ANIM__Q29textinput7toolbar = .sdata:0x816973E0; // type:object size:0x4 scope:local data:4byte
COMMON_CHG_ANIM__Q29textinput7toolbar = .sdata:0x816973E4; // type:object size:0x4 scope:local data:4byte
@6901 = .sdata:0x816973E8; // type:object size:0x5 scope:local data:string
@@ -22347,7 +22347,7 @@ lbl_8169757F = .sdata:0x8169757F; // type:object size:0x3
lbl_81697582 = .sdata:0x81697582; // type:object size:0x1
lbl_81697583 = .sdata:0x81697583; // type:object size:0x3 data:string
lbl_81697586 = .sdata:0x81697586; // type:object size:0x4 data:string
scFloatPrintfFmt = .sdata:0x8169758A; // type:object size:0x7 data:string
lbl_8169758A = .sdata:0x8169758A; // type:object size:0x7 data:string
lbl_81697591 = .sdata:0x81697591; // type:object size:0x5 data:string
lbl_81697596 = .sdata:0x81697596; // type:object size:0x7 data:string
lbl_8169759D = .sdata:0x8169759D; // type:object size:0x5 data:string
@@ -22413,8 +22413,8 @@ lbl_816976C4 = .sdata:0x816976C4; // type:object size:0x8 data:string
lbl_816976CC = .sdata:0x816976CC; // type:object size:0x8 data:string
lbl_816976D4 = .sdata:0x816976D4; // type:object size:0x7 data:string
lbl_816976DB = .sdata:0x816976DB; // type:object size:0x6 data:string
scHexDigitsPtr = .sdata:0x816976E4; // type:object size:0x4 data:4byte
scHexDigitsPtr2 = .sdata:0x816976E8; // type:object size:0x4 data:4byte
lbl_816976E4 = .sdata:0x816976E4; // type:object size:0x4 data:4byte
lbl_816976E8 = .sdata:0x816976E8; // type:object size:0x4 data:4byte
lbl_816976EC = .sdata:0x816976EC; // type:object size:0x7 data:string
lbl_816976F3 = .sdata:0x816976F3; // type:object size:0x8 data:string
lbl_816976FB = .sdata:0x816976FB; // type:object size:0x5 data:string
@@ -22439,15 +22439,15 @@ lbl_81697770 = .sdata:0x81697770; // type:object size:0x8 data:string
lbl_81697778 = .sdata:0x81697778; // type:object size:0x8 data:string
lbl_81697780 = .sdata:0x81697780; // type:object size:0x5 data:string
lbl_81697785 = .sdata:0x81697785; // type:object size:0x7 data:string
scImageClassName = .sdata:0x8169778C; // type:object size:0x6 data:string
lbl_8169778C = .sdata:0x8169778C; // type:object size:0x6 data:string
lbl_81697792 = .sdata:0x81697792; // type:object size:0x6 data:string
lbl_81697798 = .sdata:0x81697798; // type:object size:0x7 data:string
lbl_8169779F = .sdata:0x8169779F; // type:object size:0x7 data:string
lbl_816977A6 = .sdata:0x816977A6; // type:object size:0x6 data:string
scDateClassName = .sdata:0x816977AC; // type:object size:0x5 data:string
scMathInternalName = .sdata:0x816977B1; // type:object size:0x6 data:string
scMathClassName = .sdata:0x816977B7; // type:object size:0x5 data:string
scWinEmuInternalName = .sdata:0x816977BC; // type:object size:0x8 data:string
lbl_816977AC = .sdata:0x816977AC; // type:object size:0x5 data:string
lbl_816977B1 = .sdata:0x816977B1; // type:object size:0x6 data:string
lbl_816977B7 = .sdata:0x816977B7; // type:object size:0x5 data:string
lbl_816977BC = .sdata:0x816977BC; // type:object size:0x8 data:string
lbl_816977C4 = .sdata:0x816977C4; // type:object size:0x5 data:string
lbl_816977D0 = .sdata:0x816977D0; // type:object size:0x5 data:string
lbl_816977D5 = .sdata:0x816977D5; // type:object size:0x8 data:string
@@ -23349,60 +23349,60 @@ BS2BootType = .sbss:0x816989FC; // type:object size:0x4 scope:global data:4byte
BS2VideoMode = .sbss:0x81698A00; // type:object size:0x4 data:4byte
InvalidSram = .sbss:0x81698A04; // type:object size:0x4 data:4byte
State = .sbss:0x81698A08; // type:object size:0x4 scope:local data:4byte
DvdReadPending = .sbss:0x81698A0C; // type:object size:0x4 scope:local data:4byte
BannerAllocation = .sbss:0x81698A10; // type:object size:0x4 scope:local data:4byte
BannerBuffer = .sbss:0x81698A14; // type:object size:0x4 scope:local data:4byte
BannerAvailable = .sbss:0x81698A18; // type:object size:0x4 scope:local data:4byte
Allocator = .sbss:0x81698A1C; // type:object size:0x4 scope:local data:4byte
lbl_81698A0C = .sbss:0x81698A0C; // type:object size:0x4 scope:local data:4byte
lbl_81698A10 = .sbss:0x81698A10; // type:object size:0x4 scope:local data:4byte
lbl_81698A14 = .sbss:0x81698A14; // type:object size:0x4 scope:local data:4byte
lbl_81698A18 = .sbss:0x81698A18; // type:object size:0x4 scope:local data:4byte
lbl_81698A1C = .sbss:0x81698A1C; // type:object size:0x4 scope:local data:4byte
StartingGame = .sbss:0x81698A20; // type:object size:0x4 data:4byte
RestartRequested = .sbss:0x81698A24; // type:object size:0x4 scope:local data:4byte
PartitionOpen = .sbss:0x81698A28; // type:object size:0x4 scope:local data:4byte
CacheSeekComplete = .sbss:0x81698A2C; // type:object size:0x4 scope:local data:4byte
LoadingTitle = .sbss:0x81698A30; // type:object size:0x4 scope:local data:4byte
lbl_81698A24 = .sbss:0x81698A24; // type:object size:0x4 scope:local data:4byte
lbl_81698A28 = .sbss:0x81698A28; // type:object size:0x4 scope:local data:4byte
lbl_81698A2C = .sbss:0x81698A2C; // type:object size:0x4 scope:local data:4byte
lbl_81698A30 = .sbss:0x81698A30; // type:object size:0x4 scope:local data:4byte
FatalErrorFlag = .sbss:0x81698A34; // type:object size:0x4 data:4byte
RetryErrorFlag = .sbss:0x81698A38; // type:object size:0x4 data:4byte
UpdateErrorFlag = .sbss:0x81698A3C; // type:object size:0x4 data:4byte
AbortFlag = .sbss:0x81698A40; // type:object size:0x4 data:4byte
CacheFailed = .sbss:0x81698A44; // type:object size:0x4 data:4byte
RegionValid = .sbss:0x81698A48; // type:object size:0x4 data:4byte
NandPending = .sbss:0x81698A4C; // type:object size:0x4 scope:local data:4byte
CancelNand = .sbss:0x81698A50; // type:object size:0x4 scope:local data:4byte
LowReadResult = .sbss:0x81698A54; // type:object size:0x4 scope:local data:4byte
CacheCommandComplete = .sbss:0x81698A58; // type:object size:0x4 scope:local data:4byte
AudioBufferUnconfigured = .sbss:0x81698A5C; // type:object size:0x4 scope:local data:4byte
ResetTime = .sbss:0x81698A60; // type:object size:0x8 scope:local data:4byte
SpinupDeadline = .sbss:0x81698A68; // type:object size:0x8 scope:local data:4byte
CoverPollTime = .sbss:0x81698A70; // type:object size:0x8 data:4byte
DriveWasReset = .sbss:0x81698A78; // type:object size:0x4 data:4byte
TitleTicketView = .sbss:0x81698A7C; // type:object size:0x4 scope:local data:4byte
CurrentTmd = .sbss:0x81698A80; // type:object size:0x4 scope:local data:4byte
TitleCode = .sbss:0x81698A84; // type:object size:0x4 data:4byte
RequiredIosHigh = .sbss:0x81698A88; // type:object size:0x4 data:4byte
RequiredIosLow = .sbss:0x81698A8C; // type:object size:0x4 data:4byte
GamePartition = .sbss:0x81698A90; // type:object size:0x4 data:4byte
UpdatePartition = .sbss:0x81698A94; // type:object size:0x4 data:4byte
PartitionCursor = .sbss:0x81698A98; // type:object size:0x4 data:4byte
DataToc = .sbss:0x81698A9C; // type:object size:0x4 data:4byte
GameToc = .sbss:0x81698AA0; // type:object size:0x8 data:4byte
CoverOpenTimeHigh = .sbss:0x81698AA8; // type:object size:0x4 data:4byte
CoverOpenTimeLow = .sbss:0x81698AAC; // type:object size:0x4 data:4byte
NandTransferred = .sbss:0x81698AB0; // type:object size:0x4 data:4byte
NandLength = .sbss:0x81698AB4; // type:object size:0x4 data:4byte
NandBuffer = .sbss:0x81698AB8; // type:object size:0x4 data:4byte
NandFile = .sbss:0x81698ABC; // type:object size:0x4 data:4byte
NandOperation = .sbss:0x81698AC0; // type:object size:0x4 data:4byte
NandCompletion = .sbss:0x81698AC4; // type:object size:0x4 data:4byte
LoaderOffset = .sbss:0x81698AC8; // type:object size:0x4 data:4byte
LoaderLength = .sbss:0x81698ACC; // type:object size:0x4 data:4byte
LoaderAddress = .sbss:0x81698AD0; // type:object size:0x4 data:4byte
CacheLength = .sbss:0x81698AD4; // type:object size:0x4 data:4byte
BannerLength = .sbss:0x81698AD8; // type:object size:0x4 scope:local data:4byte
DvdTransferLength = .sbss:0x81698ADC; // type:object size:0x4 scope:local data:4byte
DvdTransferred = .sbss:0x81698AE0; // type:object size:0x4 scope:local data:4byte
DvdProgress = .sbss:0x81698AE4; // type:object size:0x4 scope:local data:4byte
LoaderClose = .sbss:0x81698AE8; // type:object size:0x4 scope:local data:4byte
LoaderMain = .sbss:0x81698AEC; // type:object size:0x4 scope:local data:4byte
LoaderInit = .sbss:0x81698AF0; // type:object size:0x4 scope:local data:4byte
lbl_81698A44 = .sbss:0x81698A44; // type:object size:0x4 data:4byte
lbl_81698A48 = .sbss:0x81698A48; // type:object size:0x4 data:4byte
lbl_81698A4C = .sbss:0x81698A4C; // type:object size:0x4 scope:local data:4byte
lbl_81698A50 = .sbss:0x81698A50; // type:object size:0x4 scope:local data:4byte
lbl_81698A54 = .sbss:0x81698A54; // type:object size:0x4 scope:local data:4byte
lbl_81698A58 = .sbss:0x81698A58; // type:object size:0x4 scope:local data:4byte
lbl_81698A5C = .sbss:0x81698A5C; // type:object size:0x4 scope:local data:4byte
lbl_81698A60 = .sbss:0x81698A60; // type:object size:0x8 scope:local data:4byte
lbl_81698A68 = .sbss:0x81698A68; // type:object size:0x8 scope:local data:4byte
lbl_81698A70 = .sbss:0x81698A70; // type:object size:0x8 data:4byte
lbl_81698A78 = .sbss:0x81698A78; // type:object size:0x4 data:4byte
lbl_81698A7C = .sbss:0x81698A7C; // type:object size:0x4 scope:local data:4byte
lbl_81698A80 = .sbss:0x81698A80; // type:object size:0x4 scope:local data:4byte
lbl_81698A84 = .sbss:0x81698A84; // type:object size:0x4 data:4byte
lbl_81698A88 = .sbss:0x81698A88; // type:object size:0x4 data:4byte
lbl_81698A8C = .sbss:0x81698A8C; // type:object size:0x4 data:4byte
lbl_81698A90 = .sbss:0x81698A90; // type:object size:0x4 data:4byte
lbl_81698A94 = .sbss:0x81698A94; // type:object size:0x4 data:4byte
lbl_81698A98 = .sbss:0x81698A98; // type:object size:0x4 data:4byte
lbl_81698A9C = .sbss:0x81698A9C; // type:object size:0x4 data:4byte
lbl_81698AA0 = .sbss:0x81698AA0; // type:object size:0x8 data:4byte
lbl_81698AA8 = .sbss:0x81698AA8; // type:object size:0x4 data:4byte
lbl_81698AAC = .sbss:0x81698AAC; // type:object size:0x4 data:4byte
lbl_81698AB0 = .sbss:0x81698AB0; // type:object size:0x4 data:4byte
lbl_81698AB4 = .sbss:0x81698AB4; // type:object size:0x4 data:4byte
lbl_81698AB8 = .sbss:0x81698AB8; // type:object size:0x4 data:4byte
lbl_81698ABC = .sbss:0x81698ABC; // type:object size:0x4 data:4byte
lbl_81698AC0 = .sbss:0x81698AC0; // type:object size:0x4 data:4byte
lbl_81698AC4 = .sbss:0x81698AC4; // type:object size:0x4 data:4byte
lbl_81698AC8 = .sbss:0x81698AC8; // type:object size:0x4 data:4byte
lbl_81698ACC = .sbss:0x81698ACC; // type:object size:0x4 data:4byte
lbl_81698AD0 = .sbss:0x81698AD0; // type:object size:0x4 data:4byte
lbl_81698AD4 = .sbss:0x81698AD4; // type:object size:0x4 data:4byte
lbl_81698AD8 = .sbss:0x81698AD8; // type:object size:0x4 scope:local data:4byte
lbl_81698ADC = .sbss:0x81698ADC; // type:object size:0x4 scope:local data:4byte
lbl_81698AE0 = .sbss:0x81698AE0; // type:object size:0x4 scope:local data:4byte
lbl_81698AE4 = .sbss:0x81698AE4; // type:object size:0x4 scope:local data:4byte
lbl_81698AE8 = .sbss:0x81698AE8; // type:object size:0x4 scope:local data:4byte
lbl_81698AEC = .sbss:0x81698AEC; // type:object size:0x4 scope:local data:4byte
lbl_81698AF0 = .sbss:0x81698AF0; // type:object size:0x4 scope:local data:4byte
pEntries = .sbss:0x81698AF8; // type:object size:0x4 scope:local data:4byte
EntriesCount = .sbss:0x81698AFC; // type:object size:0x4 scope:local data:4byte
pFlags = .sbss:0x81698B00; // type:object size:0x4 scope:local data:4byte
@@ -23750,7 +23750,7 @@ flushFlag3in1 = .sbss:0x816991CC; // type:object size:0x4 scope:local data:4byte
flushFlag = .sbss:0x816991D0; // type:object size:0x4 scope:local data:4byte
retraceCount = .sbss:0x816991D4; // type:object size:0x4 scope:local data:4byte
__i2c_ident_first = .sbss:0x816991D8; // type:object size:0x4 scope:local data:4byte
Vdac_Flag_Changed = .sbss:0x816991E0; // type:object size:0x4 data:4byte
Vdac_Flag_Changed = .sbss:0x816991E0; // type:object size:0x4 scope:local data:4byte
__level = .sbss:0x816991E4; // type:object size:0x4 scope:local data:4byte
__gamma = .sbss:0x816991E8; // type:object size:0x4 scope:local data:4byte
__type = .sbss:0x816991EC; // type:object size:0x4 scope:local data:4byte
@@ -24048,7 +24048,7 @@ g_detach_func = .sbss:0x8169970C; // type:object size:0x4 scope:local data:4byte
st_uhs_msc_status = .sbss:0x81699710; // type:object size:0x4 scope:local data:4byte
st_uhs_msc_msgid = .sbss:0x81699714; // type:object size:0x4 scope:local data:4byte
st_uhs_msc_tskid = .sbss:0x81699718; // type:object size:0x4 scope:local data:4byte
uhg_msc_memid = .sbss:0x8169971C; // type:object size:0x4 data:4byte
uhg_msc_memid = .sbss:0x8169971C; // type:object size:0x4 scope:local data:4byte
st_uhs_msc_blk_buf = .sbss:0x81699720; // type:object size:0x4 scope:local data:4byte
__sdCardStatus = .sbss:0x81699728; // type:object size:0x4 scope:local data:4byte
__sdReq = .sbss:0x8169972C; // type:object size:0x4 scope:local data:4byte

View File

@@ -920,7 +920,7 @@ config.libs = [
Object(NonMatching, "keyboard/tiZiString.cpp", extra_cflags=["-O4,p"]), # for 4.3U and 4.3E
Object(Matching, "keyboard/tiTextDrawer.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiNw4rManager.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiKeyboard.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiManager.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiUtil.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiCpData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
Object(Matching, "keyboard/tiSwData.cpp", extra_cflags=["-O4,p"], shift_jis=False),
@@ -934,7 +934,7 @@ config.libs = [
Object(Matching, "keyboard/tiDebug.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiGUIManager.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiHKBManager.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiHwKeyboard.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiLayout.cpp", extra_cflags=["-O4,p"]),
Object(Matching, "keyboard/tiLayoutGather.cpp", extra_cflags=["-O4,p"]),
Object(NonMatching, "keyboard/tiKoreanInput.cpp", extra_cflags=["-O4,p"]), # for 4.3K
@@ -1063,7 +1063,7 @@ config.libs = [
Object(NonMatching, "nhttp/NHTTP_socket_RVL.c"),
Object(NonMatching, "nhttp/NHTTP_stdlib_RVL.c"),
Object(NonMatching, "nhttp/NHTTP_thread.c"),
Object(Matching, "nhttp/d_nhttp_private.c"),
Object(NonMatching, "nhttp/d_nhttp_private.c"),
Object(Matching, "nhttp/d_nhttp.c"),
Object(Matching, "nhttp/d_nhttp_common.c"),
]

View File

@@ -149,7 +149,6 @@ namespace textinput {
void Update();
u32 GetModifierState() const;
void SetCountry(u8 country);
void SetModifierState(u32, u32);
#if defined(TI_CELLPHONE_HKB_KEYSET)

View File

@@ -20,7 +20,7 @@ namespace textinput {
#else
~HWKeyboard();
#endif
#if defined(TIMANAGER_IMPLEMENTATION) || defined(TIHWKEYBOARD_IMPLEMENTATION)
#ifdef TIMANAGER_IMPLEMENTATION
void setLanguage(Destination destination, Language language);
#endif

View File

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

View File

@@ -162,14 +162,14 @@ namespace ipl {
class {
public:
void init() {
mAngleIdx = -1;
unk_0x0C = -1;
pos.x = 0.0f;
pos.y = 0.0f;
}
math::VEC2 pos; // pos
int mStep;
int mAngleIdx;
int unk_0x08;
int unk_0x0C;
} mStandData; // 0xE4
picture mPicture; // 0xF4

View File

@@ -309,8 +309,8 @@ namespace ipl {
return mbArrowVisible[i];
}
void setSuppressNewMailAnm(bool flag) {
mbSuppressNewMailAnm = flag;
void setUnk_0x105(bool flag) {
unk_0x105 = flag;
}
protected:
@@ -354,7 +354,7 @@ namespace ipl {
ANIM_MAX,
};
int mAnimWait;
int unk_0x54;
layout::Object* mpLayout; // 0x58
nand::LayoutFile* mpLayoutFile; // 0x5C
@@ -373,8 +373,8 @@ namespace ipl {
BOOL mbHovered[BTN_MAX]; // 0xD8
bool mbNewMailAnm;
bool mbSuppressNewMailAnm;
bool unk_0x104;
bool unk_0x105;
utility::timer mTimer; // 0x108
bool mbEnabled; // 0x110

View File

@@ -95,9 +95,9 @@ namespace ipl {
public:
nw4r::ut::List mDateList; // 0x84
nw4r::ut::List mDrawList;
nw4r::ut::List unk_0x90;
bool mbScrolling; // 0x9C
vBOOL mbSearchTaskRunning;
vBOOL unk_0xA0;
BOOL mbTaskCanceled; // 0xA4
vBOOL mbBackToBoardAlt; // 0xA8
bool mbAsian; // 0xAC

View File

@@ -68,8 +68,8 @@ namespace ipl {
vBOOL mbAppearMsg; // 0x0C
private:
u32 mFocusState;
int mPendingFocusCmd;
u32 unk_0x10;
int unk_0x14;
layout::Object* mpLayout; // 0x18
gui::PaneManager* mpGui; // 0x1C
layout::PaneAnimator* mpCurrentPaneAnim; // 0x20
@@ -77,7 +77,7 @@ namespace ipl {
public:
utility::Date* mpDate; // 0x38
u32 mPointCount;
u32 unk_0x3C;
static const char* mscAnimPanes[ANIM_PANE_MAX];

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

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

View File

@@ -42,7 +42,7 @@ namespace ipl {
};
virtual BOOL isResetAcceptable() const {
return mbResetAcceptable;
return unk_0x7D;
}
virtual void prepare();
@@ -108,7 +108,7 @@ namespace ipl {
static const int mToFace_Duration = 20;
bool mbClosing; // 0x7C
bool mbResetAcceptable;
bool unk_0x7D;
wchar_t* mWCString; // 0x80

View File

@@ -152,7 +152,7 @@ namespace ipl {
BOOL is_working();
#ifdef IPL_SD_CHANNEL_SELECT_CPP
void requestCancel() { mbCancel = true; }
void requestCancel() { unk_0x04 = true; }
#endif
WIISaveBannerFile* get_cached_nand_save_banner(ESTitleId titleId);
@@ -531,7 +531,7 @@ namespace ipl {
static void wad_backup_progress_callback(u32 completed, u32 total, BOOL done);
Work* myWork; // 0x00
bool mbCancel; // 0x04
bool unk_0x04; // 0x04
static const char* c_banner_file_name;
static const char* c_nocopy_folder_name;

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

@@ -64,8 +64,8 @@ typedef struct {
u16 mcuYCount; // 0x10
u16 mcuXCount2; // 0x12
u32 unk_0x14;
u8 remX; // 0x18
u8 remY; // 0x19
u8 unk_0x18;
u8 unk_0x19;
u8 compCount; // 0x1A
u8 scanCompCount; // 0x1B
u8 blockCount[4]; // 0x1C
@@ -143,8 +143,8 @@ struct TMCCJPEGDecWork_t {
u16 mcuYCount; // 0x1800
u16 mcuXCount2; // 0x1802
u32 unk_0x1804;
u8 remX; // 0x1808
u8 remY; // 0x1809
u8 unk_0x1808;
u8 unk_0x1809;
u8 compCount; // 0x180A
u8 scanCompCount; // 0x180B
u8 blockCount[4]; // 0x180C

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

@@ -59,8 +59,8 @@ s32 TMCJPEGDEC_Setsize(TMCCJPEGDecWork* work) {
state->stepY = (state->scaleFactor + work->mcuXRem - 1) / state->scaleFactor;
state->jpegWidth = ((s32)(work->frameWidth + state->scaleFactor) - 1) / state->scaleFactor;
state->jpegHeight = (state->scaleFactor + work->frameHeight - 1) / state->scaleFactor;
state->stepXExt = (state->scaleFactor + work->remX - 1) / state->scaleFactor;
state->stepYExt = (state->scaleFactor + work->remY - 1) / state->scaleFactor;
state->stepXExt = (state->scaleFactor + work->unk_0x1808 - 1) / state->scaleFactor;
state->stepYExt = (state->scaleFactor + work->unk_0x1809 - 1) / state->scaleFactor;
state->dataSizeX = (state->stepXExt != 0) ? (state->maxX - 1) * state->stepX : (state->maxX + 1) * state->stepX;
state->dataSizeY = (state->stepYExt != 0) ? (state->maxY - 1) * state->stepY : (state->maxY + 1) * state->stepY;

View File

@@ -562,8 +562,8 @@ s32 TMCJPEGDEC_scan_varinit(TMCCJPEGDecWork* work) {
remX = p->frameWidth % p->mcuXCount;
remY = p->frameHeight % p->mcuXRem;
p->remX = remX;
p->remY = remY;
p->unk_0x18 = remX;
p->unk_0x19 = remY;
p->mcuYCount = p->mcuYCount + ((u8)remX != 0 ? 1 : 0);
p->mcuXCount2 = p->mcuXCount2 + ((u8)remY != 0 ? 1 : 0);
@@ -1919,8 +1919,8 @@ static s32 TMCJPEGDEC_parse_sof(TMCCJPEGDecWork* work) {
remX = fw - mcuCountX * mcuX;
remY = fh - mcuCountY * mcuY;
work->remX = remX;
work->remY = remY;
work->unk_0x1808 = remX;
work->unk_0x1809 = remY;
{
u16 xr = (remX != 0) ? 1 : 0;

View File

@@ -215,9 +215,9 @@ struct __zi8_work_data_s {
ziU32 unk_0x0C;
ziU32 unk_0x10;
ziU16 unk_0x14;
ziU8 cangjieEnabled; // 0x16
ziU8 unk_0x16;
ziU8 unk_0x17;
ziU8 subLanguage; // 0x18
ziU8 unk_0x18;
ziU8 unk_0x19;
ziU16 unk_0x1A;
ziU8 unk_0x1C[3];
@@ -258,7 +258,7 @@ struct __zi8_work_data_s {
ziU8 unk_0x330[8];
ziU32 unk_0x338;
ziU8 unk_0x33C[0x1FC];
ziU8 language; // 0x538
ziU8 unk_0x538;
ziU8 unk_0x539;
ziU8 unk_0x53A[0x40];
ziWChar unk_0x57A[0x641];

View File

@@ -55,7 +55,7 @@ ziU32 Zi8GetTableData(ziU8 lang, ziU8 tableIdx, ziU8 memberId ZI_NEED_WORK) {
if (langIdx-- != 0) {
tableData = ZI_WORK->langEntries[langIdx].tableData;
if ((lang == ZI8_LANG_ZH) && (tableData[3] >= 4) &&
((ZI_WORK->subLanguage == 1) || (ZI_WORK->subLanguage == 0x80) || (ZI_WORK->subLanguage == 0x40))) {
((ZI_WORK->unk_0x18 == 1) || (ZI_WORK->unk_0x18 == 0x80) || (ZI_WORK->unk_0x18 == 0x40))) {
offset = ((tableData[0x8B] << 0x10) + (tableData[0x8C] << 8) + tableData[0x8D]);
if (offset != 0) {
tableData += offset;

View File

@@ -430,7 +430,7 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
if (getMode != 7 && getMode != 10 && getMode != 8 && getMode != 9) {
Zi8PrepareMatch(request, &match, 0, work);
} else {
if (!((struct __zi8_work_data_s*)work)->cangjieEnabled || request->elementCount > 6) {
if (!((struct __zi8_work_data_s*)work)->unk_0x16 || request->elementCount > 6) {
resultFallback = 0;
goto engine_finish;
}
@@ -1151,7 +1151,7 @@ context_word_lookup:
if (ordinalIndex == 0xFFFF) goto context_results_done;
record = records + ordinalIndex * 12;
phoneticGroups = phraseTable + ((record[9] & 15) << 16 | (record[11] | record[10] << 8));
if (((struct __zi8_work_data_s*)work)->cangjieEnabled) {
if (((struct __zi8_work_data_s*)work)->unk_0x16) {
switch (phoneticGroups[0] & 7) {
case 2: phoneticGroups += 2; break;
case 3: case 4: phoneticGroups += 3; break;
@@ -1965,7 +1965,7 @@ component_retry:
((ZiChineseWork*)work)->duplicateOrdinals[((ZiChineseWork*)work)->duplicateIndex] = ordinalIndex;
relatedRecord = records + ordinalIndex * 12;
phoneticGroups = phraseTable + ((relatedRecord[9] & 15) << 16 | (relatedRecord[11] | relatedRecord[10] << 8));
if (((struct __zi8_work_data_s*)work)->cangjieEnabled) {
if (((struct __zi8_work_data_s*)work)->unk_0x16) {
switch (phoneticGroups[0] & 7) {
case 2: phoneticGroups += 2; break;
case 3: case 4: phoneticGroups += 3; break;

View File

@@ -164,7 +164,7 @@ static ziBool Zi8AlphaSignature(ziGetParam* parameters, ziBool countOnly ZI_NEED
if (parameters->maxCandidates < length) length = parameters->maxCandidates;
parameters->letters = length;
if ((parameters->getOptions & 0x80) == 0) {
ZI_WORK->language = parameters->language;
ZI_WORK->unk_0x538 = parameters->language;
parameters->candidates[0] = 0xfff0;
output = (ziWChar*)&ZI_WORK->unk_0x338;
}
@@ -490,8 +490,8 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
ZI_WORK->unk_0x00 = '\0';
}
}
ZI_WORK->subLanguage = parameters->subLanguage;
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1,ZI_WORK) & 2;
ZI_WORK->unk_0x18 = parameters->subLanguage;
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1,ZI_WORK) & 2;
options->maxCount = ZI_WORK->unk_0x10;
options->maxWordLength = ZI_WORK->unk_0x0A;
ZI_WORK->unk_0x0A = -1;
@@ -558,7 +558,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
}
else if ((parameters->language == 1) &&
((((parameters->getMode == 7 || (parameters->getMode == 8)) || (parameters->getMode == 10)) || (parameters->getMode == 9)))) {
if (ZI_WORK->cangjieEnabled != '\0') {
if (ZI_WORK->unk_0x16 != '\0') {
candidateCount = Zi8GetChineseCandidates(parameters,options,ZI_WORK);
} else {
error = 0x708;
@@ -582,7 +582,7 @@ ziU32 Zi8GetCandidatesOrCount(ziGetParam* parameters, ZiCandidateOptions* option
}
}
else {
ZI_WORK->language = parameters->language;
ZI_WORK->unk_0x538 = parameters->language;
if ((parameters->getOptions & 0x80) == 0) {
saved.restoreCandidates = 1;
saved.savedOptions = parameters->getOptions;

View File

@@ -42,13 +42,13 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
return 0;
}
ZI_WORK->unk_0x1874 = 0x2D;
ZI_WORK->language = 0;
ZI_WORK->unk_0x538 = 0;
ZI_WORK->unk_0x1C[3] = 0;
ZI_WORK->unk_0x141A = 0x100;
Zi8SetLatinSearchOrder(0, 0, ZI_WORK);
ZADP_Zi8SetPDremoveOpt(1, ZI_WORK);
ZI_WORK->unk_0x17 = 5;
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, ZI_WORK) & 2;
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, ZI_WORK) & 2;
ZI_WORK->unk_0x1B28.bits.msb = 1;
ZI_WORK->unk_0x1B2C.bits.msb = 1;
zyFuzzy = ZI_WORK->unk_0x1B2C.word;

View File

@@ -24,17 +24,17 @@ ziU8 Zi8GetZHCharSet(ziPtr workData) {
return 0;
}
if (Zi8GetTableCount(1, 10, workData) != 0) {
bak = ((struct __zi8_work_data_s*)workData)->subLanguage;
((struct __zi8_work_data_s*)workData)->subLanguage = 1;
bak = ((struct __zi8_work_data_s*)workData)->unk_0x18;
((struct __zi8_work_data_s*)workData)->unk_0x18 = 1;
addr = Zi8GetTableAddress(1, 10, workData);
p = (ziU8*)addr;
v0 = (ziU16)((ziU16)p[0] | ((ziU16)p[1] << 8));
((struct __zi8_work_data_s*)workData)->subLanguage = 0;
((struct __zi8_work_data_s*)workData)->unk_0x18 = 0;
addr = Zi8GetTableAddress(1, 10, workData);
p = (ziU8*)addr;
v1 = (ziU16)((ziU16)p[2] | ((ziU16)p[3] << 8));
v2 = (ziU16)((ziU16)p[4] | ((ziU16)p[5] << 8));
((struct __zi8_work_data_s*)workData)->subLanguage = bak;
((struct __zi8_work_data_s*)workData)->unk_0x18 = bak;
if (v0 != 0) {
if (v0 > 0x4E20) {
charSet |= 8;

View File

@@ -139,7 +139,7 @@ ziU32 Zi8SecMatchChar(ziPtr nodeAddress, ziU8* dictionaryAddress, ziMatchParam*
data = (ziU8*)Zi8GetTableAddress(1, 1, ZI_WORK);
data += ((ziU8*)nodeAddress)[0xB] + (((ziU8*)nodeAddress)[0xA] << 8) + ((((ziU8*)nodeAddress)[9] & 0xF) << 16);
if (ZI_WORK->cangjieEnabled != 0) {
if (ZI_WORK->unk_0x16 != 0) {
switch (data[0] & 7) {
case 2:
data += 2;
@@ -346,7 +346,7 @@ match_code:
traversal.soundIndex = initialCode;
}
sound = (ziU8*)(tableAddress + ((node[9] & 0xF) * 0x10000 + (node[0xB] + node[0xA] * 0x100)));
if (ZI_WORK->cangjieEnabled != 0) {
if (ZI_WORK->unk_0x16 != 0) {
switch (sound[0] & 7) {
case 2:
sound += 2;

View File

@@ -37,7 +37,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
p = (ziU8*)(table2 +
(((e[9] & 0xF) << 16) |
(e[0xB] | (e[0xA] << 8))));
if (WORKP->cangjieEnabled != 0) {
if (WORKP->unk_0x16 != 0) {
switch (p[0] & 7) {
case 2:
p += 2;
@@ -65,7 +65,7 @@ ziU16 Zi8Uni2Ptr(ziU16 ch, ziE12* buf ZI_NEED_WORK) {
}
}
e = (ziU8*)table;
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->subLanguage) {
if (WORKP->unk_0x1B18 != ZI8_NULL && WORKP->unk_0x1B24 == WORKP->unk_0x18) {
if ((ziU16)ch >= WORKP->unk_0x1B1C && (ziU16)ch <= WORKP->unk_0x1B1E) {
i = (ziU16)(ch - WORKP->unk_0x1B1C);
goto map;

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

@@ -103,10 +103,10 @@ ziBool Zi8IsWordW(ziWChar* word, ziU8 language ZI_NEED_WORK) {
if (length == 1) return 1;
count = --length;
ordinals[count] |= 0x8000;
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
ZI_WORK->unk_0x16 = Zi8GetFormatVersion(1, __zi8_work_data) & 2;
entry = (ziChineseEntry*)Zi8GetTableAddress(1, 0, __zi8_work_data) + ordinals[0];
data = (ziU8*)Zi8GetTableAddress(1, 1, __zi8_work_data) + ((entry->offsetHigh & 15) << 16 | ((entry->offsetLow[0] << 8) | entry->offsetLow[1]));
if (ZI_WORK->cangjieEnabled != 0) {
if (ZI_WORK->unk_0x16 != 0) {
switch (*data & 7) {
case 2:
offset = 2;

View File

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

View File

@@ -42,7 +42,7 @@ typedef struct UHF_MSC_MESSAGE {
} UHF_MSC_MESSAGE;
extern UHF_MSC_DEVICE uhg_msc_blk_device_tbl[8];
extern s32 uhg_msc_memid;
extern s32 uhg_msc_memid_8169971C;
s32 uhf_ker_set_priority(s32 task_id, s32 priority);
void* uhf_ker_get_memory_block(s32 pool, u32 size, u32 alignment);
s32 uhf_ker_release_memory_block(s32 pool, void* block);

View File

@@ -16,19 +16,19 @@ typedef s32 CXStreamingResult;
#define CX_STREAMING_ERR_BAD_FILE_TABLE -5
typedef struct CXUncompContextRL {
u8* outData; // 0x00
int outDataLen; // 0x04
u8* unk_0x00; // 0x00
int unk_0x04; // 0x04
u32 size; // 0x08
u16 length; // 0x0C
u16 unk_0x0C; // 0x0C
u8 unk_0x0e; // 0x0E
u8 unk_0x0f; // 0x0F
} CXUncompContextRL;
typedef struct CXUncompContextLZ {
u8* outData; // 0x00
int outDataLen; // 0x04
u8* unk_0x00; // 0x00
int unk_0x04; // 0x04
u32 size; // 0x08
int length; // 0x0C
int unk_0x0C; // 0x0C
u8 unk_0x10; // 0x10
u8 unk_0x11; // 0x11
u8 unk_0x12; // 0x12

View File

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

View File

@@ -20,8 +20,8 @@ typedef void (*USBKBDEventCallback)(void*, char*);
typedef void (*USBKBDCmdLEDCallback)(BOOL success, void* cbarg);
typedef struct USBKBDCmdLED {
vu32 device; // 0x00
vu8 ledBits; // 0x04
vu32 unk_0x00;
vu8 unk_0x04;
} USBKBDCmdLED;
typedef struct USBKBDCmdLEDAsync {

View File

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

View File

@@ -67,17 +67,14 @@ BOOL AXFXChorusExpSettings(AXFX_CHORUS_EXP* fx) {
OSRestoreInterrupts(enabled);
return result;
}
static void __FreeDelayLine(AXFX_CHORUS_EXP* fx) {
void AXFXChorusExpShutdown(AXFX_CHORUS_EXP* fx) {
BOOL enabled = OSDisableInterrupts();
u32 channel;
fx->active |= 1;
for (channel = 0; channel < 3; channel++) {
if (fx->delay.line[channel] != NULL) __AXFXFree(fx->delay.line[channel]);
fx->delay.line[channel] = NULL;
}
}
void AXFXChorusExpShutdown(AXFX_CHORUS_EXP* fx) {
BOOL enabled = OSDisableInterrupts();
fx->active |= 1;
__FreeDelayLine(fx);
OSRestoreInterrupts(enabled);
}
void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
@@ -121,11 +118,10 @@ void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
fx->history[0][history] = fx->delay.line[0][source];
fx->history[1][history] = fx->delay.line[1][source];
fx->history[2][history] = fx->delay.line[2][source];
history++;
history &= 3;
history = (history + 1) & 3;
source++;
whole--;
if (source >= fx->delay.size) source = 0;
whole--;
}
fx->delay.lastPos = position & 0xFFFF0000;
coefficients = __AXFXGetSrcCoef((fraction >> 9) & 0x7F);
@@ -133,18 +129,14 @@ void AXFXChorusExpCallback(AXFX_BUFFERUPDATE* update, AXFX_CHORUS_EXP* fx) {
f32 filtered = 0.0f;
f32 dry;
filtered += coefficients[0] * fx->history[channel][history];
history++;
history &= 3;
history = (history + 1) & 3;
filtered += coefficients[1] * fx->history[channel][history];
history++;
history &= 3;
history = (history + 1) & 3;
filtered += coefficients[2] * fx->history[channel][history];
history++;
history &= 3;
history = (history + 1) & 3;
filtered += coefficients[3] * fx->history[channel][history];
history++;
history &= 3;
if (fx->busIn != NULL) dry = *output[channel] + *input[channel]++;
history = (history + 1) & 3;
if (fx->busIn != NULL) dry = *input[channel]++ + *output[channel];
else dry = *output[channel];
fx->delay.line[channel][fx->delay.inPos] = dry + filtered * fx->feedback;
*output[channel]++ = filtered * fx->outGain;

View File

@@ -5,20 +5,20 @@ static inline int CXiReadHeader(u8*, int*, const u8*, int, int);
static inline CXHuffmanDecodeTableEntry* GetNextNode(CXHuffmanDecodeTableEntry*, int);
void CXInitUncompContextRL(CXUncompContextRL* context, u8* data) {
context->outData = data;
context->outDataLen = 0;
context->unk_0x00 = data;
context->unk_0x04 = 0;
context->unk_0x0e = 0;
context->length = 0;
context->unk_0x0C = 0;
context->unk_0x0f = 8;
context->size = 0;
}
void CXInitUncompContextLZ(CXUncompContextLZ* context, u8* data) {
context->outData = data;
context->outDataLen = 0;
context->unk_0x00 = data;
context->unk_0x04 = 0;
context->unk_0x11 = 0;
context->unk_0x12 = 0;
context->length = 0;
context->unk_0x0C = 0;
context->unk_0x10 = 3;
context->unk_0x13 = 8;
context->unk_0x14 = 0;
@@ -54,68 +54,68 @@ CXStreamingResult CXReadUncompRL(CXUncompContextRL* context, const void* src, u3
}
}
a = CXiReadHeader(&context->unk_0x0f, &context->outDataLen, pSrc, size, context->size);
a = CXiReadHeader(&context->unk_0x0f, &context->unk_0x04, pSrc, size, context->size);
pSrc += a;
size -= a;
if (!size) {
return !context->unk_0x0f ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
return !context->unk_0x0f ? context->unk_0x04 : CX_STREAMING_ERR_BAD_FILE_TYPE;
}
}
while (context->outDataLen > 0) {
while (context->unk_0x04 > 0) {
if (!(context->unk_0x0e & 0x80)) {
while (context->length) {
*context->outData++ = *pSrc++;
while (context->unk_0x0C) {
*context->unk_0x00++ = *pSrc++;
context->length--;
context->outDataLen--;
context->unk_0x0C--;
context->unk_0x04--;
size--;
if (!size) {
return context->outDataLen;
return context->unk_0x04;
}
}
} else if (context->length) {
} else if (context->unk_0x0C) {
u8 b = *pSrc++;
size--;
while (context->length) {
*context->outData++ = b;
while (context->unk_0x0C) {
*context->unk_0x00++ = b;
context->length--;
context->outDataLen--;
context->unk_0x0C--;
context->unk_0x04--;
}
if (!size) {
return context->outDataLen;
return context->unk_0x04;
}
}
context->unk_0x0e = *pSrc++;
size--;
context->length = context->unk_0x0e & 0x7f;
context->unk_0x0C = context->unk_0x0e & 0x7f;
if (context->unk_0x0e & 0x80) {
context->length += 3;
context->unk_0x0C += 3;
} else {
context->length += 1;
context->unk_0x0C += 1;
}
if (context->length > context->outDataLen) {
if (context->unk_0x0C > context->unk_0x04) {
if (!context->size) {
return CX_STREAMING_ERR_BAD_FILE_SIZE;
}
context->length = context->outDataLen;
context->unk_0x0C = context->unk_0x04;
}
if (size) {
continue;
}
return context->outDataLen;
return context->unk_0x04;
}
if (!context->size && size > 32) {
@@ -174,27 +174,27 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
}
}
a = CXiReadHeader(&context->unk_0x13, &context->outDataLen, pSrc, size, context->size);
a = CXiReadHeader(&context->unk_0x13, &context->unk_0x04, pSrc, size, context->size);
pSrc += a;
size -= a;
if (!size) {
return !context->unk_0x13 ? context->outDataLen : CX_STREAMING_ERR_BAD_FILE_TYPE;
return !context->unk_0x13 ? context->unk_0x04 : CX_STREAMING_ERR_BAD_FILE_TYPE;
}
}
while (context->outDataLen > 0) {
while (context->unk_0x04 > 0) {
while (context->unk_0x12) {
s32 a;
if (!size) {
return context->outDataLen;
return context->unk_0x04;
}
if (!(context->unk_0x11 & 0x80)) {
*context->outData++ = *pSrc++;
context->outDataLen--;
*context->unk_0x00++ = *pSrc++;
context->unk_0x04--;
size--;
@@ -205,34 +205,34 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
context->unk_0x10--;
if (!context->unk_0x14) {
context->length = *pSrc++;
context->length += 0x30;
context->unk_0x0C = *pSrc++;
context->unk_0x0C += 0x30;
context->unk_0x10 = 0;
} else {
switch (context->unk_0x10) {
case 2: {
context->length = *pSrc++;
context->unk_0x0C = *pSrc++;
if (context->length >> 4 == 1) {
context->length = (context->length & 0x0F) << 16;
context->length += 0x1110;
} else if (context->length >> 4 == 0) {
context->length = (context->length & 0x0F) << 8;
context->length += 0x110;
if (context->unk_0x0C >> 4 == 1) {
context->unk_0x0C = (context->unk_0x0C & 0x0F) << 16;
context->unk_0x0C += 0x1110;
} else if (context->unk_0x0C >> 4 == 0) {
context->unk_0x0C = (context->unk_0x0C & 0x0F) << 8;
context->unk_0x0C += 0x110;
context->unk_0x10 = 1;
} else {
context->length += 0x10;
context->unk_0x0C += 0x10;
context->unk_0x10 = 0;
}
break;
}
case 1: {
context->length += *pSrc++ << 8;
context->unk_0x0C += *pSrc++ << 8;
break;
}
case 0: {
context->length += *pSrc++;
context->unk_0x0C += *pSrc++;
break;
}
}
@@ -240,34 +240,34 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
size--;
if (!size) {
return context->outDataLen;
return context->unk_0x04;
}
}
a = (context->length & 0x0F) << 8;
context->length >>= 4;
a = (context->unk_0x0C & 0x0F) << 8;
context->unk_0x0C >>= 4;
a = (a | *pSrc++) + 1;
size--;
context->unk_0x10 = 3;
if (context->length > context->outDataLen) {
if (context->unk_0x0C > context->unk_0x04) {
if (!context->size) {
return CX_STREAMING_ERR_BAD_FILE_SIZE;
}
context->length = context->outDataLen;
context->unk_0x0C = context->unk_0x04;
}
while (context->length > 0) {
*context->outData = context->outData[-a];
context->outData++;
context->outDataLen--;
context->length--;
while (context->unk_0x0C > 0) {
*context->unk_0x00 = context->unk_0x00[-a];
context->unk_0x00++;
context->unk_0x04--;
context->unk_0x0C--;
}
there:
if (!context->outDataLen) {
if (!context->unk_0x04) {
goto out;
}
@@ -276,7 +276,7 @@ CXStreamingResult CXReadUncompLZ(CXUncompContextLZ* context, const void* src, u3
}
if (!size) {
return context->outDataLen;
return context->unk_0x04;
}
context->unk_0x11 = *pSrc++;

View File

@@ -1,6 +1,6 @@
#include <private/fa/puh_msc.h>
s32 uhg_msc_memid;
s32 uhg_msc_memid_8169971C;
static s32 st_uhs_msc_tskid;
static s32 st_uhs_msc_msgid;
static s32 st_uhs_msc_status;
@@ -47,13 +47,13 @@ static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command
s32 result = 0;
s32 semaphore;
UHF_MSC_MESSAGE* message;
message = uhf_ker_get_memory_block(uhg_msc_memid, sizeof(UHF_MSC_MESSAGE), 4);
message = uhf_ker_get_memory_block(uhg_msc_memid_8169971C, sizeof(UHF_MSC_MESSAGE), 4);
if (message == NULL) {
return -12;
}
semaphore = uhf_ker_create_sem(0, 0);
if (semaphore <= 0) {
uhf_ker_release_memory_block(uhg_msc_memid, message);
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
return -12;
}
message->command = command;
@@ -61,7 +61,7 @@ static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command
message->result = &result;
message->parameters = *parameters;
if (uhf_ker_send_message(st_uhs_msc_msgid, message, 0) != 0) {
uhf_ker_release_memory_block(uhg_msc_memid, message);
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
uhf_ker_delete_sem(semaphore);
return -12;
}

View File

@@ -287,13 +287,13 @@ s32 _uhf_msc_blk_send_message(UHF_MSC_PARAMETERS* parameters, u32 command) {
s32 semaphore;
UHF_MSC_MESSAGE* message;
s32 mailbox = uhf_msc_get_message_id();
message = uhf_ker_get_memory_block(uhg_msc_memid, sizeof(UHF_MSC_MESSAGE), 4);
message = uhf_ker_get_memory_block(uhg_msc_memid_8169971C, sizeof(UHF_MSC_MESSAGE), 4);
if (message == NULL) {
return -1;
}
semaphore = uhf_ker_create_sem(0, 0);
if (semaphore <= 0) {
uhf_ker_release_memory_block(uhg_msc_memid, message);
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
return -1;
}
message->command = command;
@@ -301,7 +301,7 @@ s32 _uhf_msc_blk_send_message(UHF_MSC_PARAMETERS* parameters, u32 command) {
message->result = &result;
message->parameters = *parameters;
if (uhf_ker_send_message(mailbox, message, 0) != 0) {
uhf_ker_release_memory_block(uhg_msc_memid, message);
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
uhf_ker_delete_sem(semaphore);
return -1;
}

View File

@@ -322,8 +322,6 @@ pf_s32 PFCLUSTER_CombineFiles(PFCLUSTER_ENT_ITER* p_first_iter, PFCLUSTER_ENT_IT
pf_u32 first_spare_clusters;
pf_u32 second_spare_clusters;
pf_u32 excess_clusters;
pf_s32 second_allocated_clusters;
pf_u32 capacity_clusters;
pf_u32 first_end_cluster;
pf_u32 first_spare_cluster;
pf_u32 second_spare_cluster;
@@ -372,10 +370,8 @@ pf_s32 PFCLUSTER_CombineFiles(PFCLUSTER_ENT_ITER* p_first_iter, PFCLUSTER_ENT_IT
if (*p_second_iter->ffd.p_start_cluster != 0) {
second_spare_clusters = p_second_iter->ffd.last_cluster.max_chain_index + 1 - second_used_clusters;
}
second_allocated_clusters = second_used_clusters + second_spare_clusters;
capacity_clusters = -1U / cluster_size + 1;
if (capacity_clusters < first_used_clusters + second_allocated_clusters) {
excess_clusters = first_used_clusters + second_allocated_clusters - capacity_clusters;
if (-1U / cluster_size + 1 < (second_used_clusters + second_spare_clusters) + first_used_clusters) {
excess_clusters = (second_used_clusters + second_spare_clusters) + first_used_clusters - (-1U / cluster_size + 1);
err = PFFAT_TraceClustersChain(&p_second_iter->ffd, second_spare_cluster,
cluster_size * ((p_second_iter->ffd.last_cluster.max_chain_index + 1 - excess_clusters) - second_used_clusters),
&end_cluster, &spare_cluster);
@@ -538,7 +534,7 @@ pf_s32 PFCLUSTER_DivideFile(PFCLUSTER_ENT_ITER* p_source_iter, PFCLUSTER_ENT_ITE
pf_s32 PFCLUSTER_InsertCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
pf_u32 cluster_index, pf_u32 num_clusters, pf_u32* p_inserted_clusters) {
pf_u32 requested_size;
pf_s32 err;
pf_u32 previous_cluster;
pf_u32 next_cluster;
pf_u32 success_size;
@@ -548,7 +544,7 @@ pf_s32 PFCLUSTER_InsertCluster(PFCLUSTER_ENT_ITER* p_iter, PF_DIR_ENT* p_ent,
pf_u32 allocated_size;
pf_u32 first_cluster;
pf_u32 last_cluster;
pf_s32 err;
pf_u32 requested_size;
pf_u32 file_clusters;
pf_u32 remainder;
pf_u32 extra_size;

View File

@@ -1,7 +1,7 @@
#include <private/vf/PrFILE2/pf_types.h>
// clang-format off
const pf_u8 pf_valid_fn_char[96] = {
const pf_u8 pf_valid_fn_char_8162E6B0[96] = {
1, 3, 0, 3, 3, 3, 3, 3, 3, 3, 0, 1, 1, 3, 3, 0,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 1, 0, 1, 0, 0,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,

View File

@@ -1282,13 +1282,11 @@ s32 PFFAT_GetSectorSpecified(PFFAT_FFD* file, u32 fileSectorIndex,
error = PFFAT_GetSector(file, fileSectorIndex, clusterIndex != 0, 0,
sector);
switch (error) {
case 0:
error = 0;
break;
default:
break;
if (error != 0) {
goto done;
}
error = 0;
done:
return error;
}

View File

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

View File

@@ -56,7 +56,7 @@ typedef struct PF_PATH_VOLUME_SET {
} PF_PATH_VOLUME_SET;
extern PF_PATH_VOLUME_SET pf_vol_set;
extern const pf_u8 pf_valid_fn_char[96];
extern const pf_u8 pf_valid_fn_char_8162E6B0[96];
extern void PFSTR_SetCodeMode(PF_STR*, pf_u32);
extern pf_u32 PFSTR_GetCodeMode(PF_STR*);
extern pf_s8* PFSTR_GetStrPos(PF_STR*, pf_u32);
@@ -75,9 +75,9 @@ extern pf_u32 PFPATH_CheckExtShortNameSignature(PF_STR*);
extern pf_u32 PFPATH_CheckExtShortName(PF_STR*, pf_u32, pf_bool);
extern void PFCODE_Divide_Width(pf_s32, pf_s16*, pf_s16*);
#define VALID_PATH_CHAR(x, b) ((pf_u8)(x) >= 0x80 || ((pf_u8)(x) >= ' ' && (pf_valid_fn_char[(pf_u8)(x) - ' '] & b)))
#define VALID_PATH_CHAR(x, b) ((pf_u8)(x) >= 0x80 || ((pf_u8)(x) >= ' ' && (pf_valid_fn_char_8162E6B0[(pf_u8)(x) - ' '] & b)))
#define VALID_PATH_WCHAR(x, b) \
((x) >= 0x80 || (pf_u8)(x) >= ' ' && ((pf_u8)(x) & 0xFF00) == 0 && (pf_valid_fn_char[(pf_u8)((x & 0x00FF) - ' ')] & b))
((x) >= 0x80 || (pf_u8)(x) >= ' ' && ((pf_u8)(x) & 0xFF00) == 0 && (pf_valid_fn_char_8162E6B0[(pf_u8)((x & 0x00FF) - ' ')] & b))
pf_s32 PFPATH_DoSplitPath(PF_STR* p_path, PF_STR* p_dir_path, PF_STR* p_filename, pf_u32 wildcard) {
pf_s8* p;

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

@@ -43,7 +43,7 @@ typedef struct __sdCbArg {
SDCallbackFunc cb; // 0x00
void* cbArg; // 0x04
SDDev* dev; // 0x08
u32 cmd; // 0x0C
u32 unk_0x0C;
u32 SDDevRca;
u32* resp; // 0x14
u8* SDSectorSize;
@@ -70,7 +70,7 @@ ISD_Error ISD_GetCardSize(SDDev* dev, u32* outSize, u32* outSize2, u32* outSecto
IOSError __sdCb(s32 result, void* arg) {
__sdCbArg* data = (__sdCbArg*)arg;
switch (data->cmd) {
switch (data->unk_0x0C) {
case 4: {
if (result != 0) {
OSReport(__sdPathData, result);
@@ -196,7 +196,7 @@ static IOSError sduCommandv(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
data->cb = cb;
data->cbArg = cbArg;
data->resp = resp;
data->cmd = cmd;
data->unk_0x0C = cmd;
data->SDSectorSize = (u8*)sdCmd;
ret = IOS_IoctlvAsync(fd, 7, readCount, writeCount, __sdVect, __sdCb, data);
@@ -243,7 +243,7 @@ static ISD_Error sduCommand(s32 fd, u32 cmd, u32 cmdType, u32 respType, u32 arg,
data->cb = cb;
data->cbArg = cbArg;
data->resp = resp;
data->cmd = cmd;
data->unk_0x0C = cmd;
data->SDDevRca = 1;
data->SDSectorSize = (u8*)sdCmd;

View File

@@ -101,8 +101,8 @@ USBKBDErr USBKBDSetLED(u32 device, u8 ledBits, USBKBDCmdLED* cmd) {
return USB_KBD_ERR_NOT_INIT;
}
cmd->ledBits = ledBits;
cmd->device = device;
cmd->unk_0x04 = ledBits;
cmd->unk_0x00 = device;
return IOS_Write(usbKbdFd, cmd, sizeof(USBKBDCmdLED)) != IPC_RESULT_OK ? USB_KBD_ERR_FATAL : USB_KBD_ERR_OK;
}
@@ -118,8 +118,8 @@ USBKBDErr USBKBDSetLEDAsync(u32 device, u8 ledBits, USBKBDCmdLEDAsync* cmd, USBK
if (usbKbdFd < 0) {
return USB_KBD_ERR_NOT_INIT;
}
cmd->base.device = device;
cmd->base.ledBits = ledBits;
cmd->base.unk_0x00 = device;
cmd->base.unk_0x04 = ledBits;
cmd->cb = cb;
cmd->cbArg = cbArg;

View File

@@ -12,7 +12,7 @@
extern void SIRefreshSamplingRate(void);
extern void VISetRGBModeImm(void);
extern void __VISetRevolutionModeSimple(void);
extern volatile u32 Vdac_Flag_Changed;
extern volatile u32 Vdac_Flag_Changed_816991E0;
extern void __VISetYUVSEL(u32 enable);
extern void __VISetFilter4EURGB60(u32 enable);
extern void __VISetCGMS(void);
@@ -324,8 +324,8 @@ position_interrupt:
}
old_tvtype = currentTvType;
if (flushFlag3in1 != 0) {
while (Vdac_Flag_Changed != 0) {
changeBit = 1U << (31 - __cntlzw(Vdac_Flag_Changed));
while (Vdac_Flag_Changed_816991E0 != 0) {
changeBit = 1U << (31 - __cntlzw(Vdac_Flag_Changed_816991E0));
switch (changeBit) {
case 1:
__VISetCGMS();
@@ -352,7 +352,7 @@ position_interrupt:
__VISetRGBModeImm();
break;
}
Vdac_Flag_Changed &= ~changeBit;
Vdac_Flag_Changed_816991E0 &= ~changeBit;
}
flushFlag3in1 = 0;
}

View File

@@ -138,7 +138,7 @@ static s32 Vdac_Flag_Region;
static s32 __type;
static s32 __gamma;
static s32 __level;
volatile u32 Vdac_Flag_Changed;
volatile u32 Vdac_Flag_Changed_816991E0;
static void __VISetCCSEL(u8 flag) {
u8 data[2];
@@ -339,7 +339,7 @@ void VISetCGMS(u8 wd0, u8 wd1, u8 wd2) {
__wd0 = wd0;
__wd1 = wd1;
__wd2 = wd2;
Vdac_Flag_Changed |= 1;
Vdac_Flag_Changed_816991E0 |= 1;
}
}
@@ -382,7 +382,7 @@ void VISetMacrovision(s32 type) {
if ((__type != type) || (__tvType != tvFormat)) {
__type = type;
__tvType = tvFormat;
Vdac_Flag_Changed |= 8;
Vdac_Flag_Changed_816991E0 |= 8;
}
}
@@ -448,7 +448,7 @@ void VISetTrapFilter(BOOL filter) {
return;
}
__filter = filter;
Vdac_Flag_Changed |= 0x20;
Vdac_Flag_Changed_816991E0 |= 0x20;
}
void __VISetRGBOverDrive(void) {
@@ -468,7 +468,7 @@ void __VISetRGBOverDrive(void) {
}
void VISetRGBModeImm(void) {
Vdac_Flag_Changed |= 0x80;
Vdac_Flag_Changed_816991E0 |= 0x80;
}
void __VISetRGBModeImm(void) {
@@ -520,34 +520,34 @@ void __VISetRevolutionMode(void) {
__wd0 = 0;
__wd1 = 0;
__wd2 = 0;
Vdac_Flag_Changed |= 1;
Vdac_Flag_Changed_816991E0 |= 1;
}
if ((__gp1 != 0) || (__gp2 != 0) || (__gp3 != 0) || (__gp4 != 0)) {
__gp1 = 0;
__gp2 = 0;
__gp3 = 0;
__gp4 = 0;
Vdac_Flag_Changed |= 2;
Vdac_Flag_Changed_816991E0 |= 2;
}
if ((__cc1 != 0) || (__cc2 != 0) || (__cc3 != 0) || (__cc4 != 0)) {
__cc1 = 0;
__cc2 = 0;
__cc3 = 0;
__cc4 = 0;
Vdac_Flag_Changed |= 4;
Vdac_Flag_Changed_816991E0 |= 4;
}
VISetMacrovision(1);
if (__filter != 0) {
__filter = 0;
Vdac_Flag_Changed |= 0x20;
Vdac_Flag_Changed_816991E0 |= 0x20;
}
if (__level != 0) {
__level = 0;
Vdac_Flag_Changed |= 0x40;
Vdac_Flag_Changed_816991E0 |= 0x40;
}
if (__gamma != 10) {
__gamma = 10;
Vdac_Flag_Changed |= 0x10;
Vdac_Flag_Changed_816991E0 |= 0x10;
}
VIFlush();
VIWaitForRetrace();
@@ -588,7 +588,7 @@ void VISetWSS(u8 gp1, u8 gp2, u8 gp3, u8 gp4) {
__gp2 = gp2;
__gp3 = gp3;
__gp4 = gp4;
Vdac_Flag_Changed |= 2;
Vdac_Flag_Changed_816991E0 |= 2;
}
}
@@ -598,14 +598,14 @@ void VISetClosedCaption(u8 cc1, u8 cc2, u8 cc3, u8 cc4) {
__cc2 = cc2;
__cc3 = cc3;
__cc4 = cc4;
Vdac_Flag_Changed |= 4;
Vdac_Flag_Changed_816991E0 |= 4;
}
}
void VISetRGBOverDrive(s32 level) {
if (__level != level) {
__level = level;
Vdac_Flag_Changed |= 0x40;
Vdac_Flag_Changed_816991E0 |= 0x40;
}
}

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

@@ -54,9 +54,9 @@ typedef struct _CDBAttrBuf {
typedef struct _CDBAttr {
CDBAttrBuf buf; // 0x00
BOOL dirty; // 0x400
BOOL wiiIdDirty; // 0x404
BOOL wiiIdValid; // 0x408
BOOL unk_0x400; // 0x400
BOOL unk_0x404; // 0x404
BOOL unk_0x408; // 0x408
} CDBAttr;
#pragma pack(pop)

View File

@@ -44,8 +44,8 @@ typedef struct NWC24MsgObjPrivate {
#else
NWC24UserId fromId; // 0x20
#endif
u32 date; // 0x28
u32 receivedDate; // 0x2C
u32 unk_0x28;
u32 unk_0x2C;
NWC24Data unk_0x30;
NWC24Data unk_0x38;
NWC24Data subject; // 0x40

View File

@@ -55,9 +55,9 @@ CDBErr CDBAttrCheckAttrBuf(CDBAttr* attr) {
void CDBAttrInit(CDBAttr* attr) {
memset(&attr->buf, 0, sizeof(CDBAttrBuf));
attr->wiiIdValid = FALSE;
attr->dirty = FALSE;
attr->wiiIdDirty = FALSE;
attr->unk_0x408 = FALSE;
attr->unk_0x400 = FALSE;
attr->unk_0x404 = FALSE;
}
CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate) {
@@ -89,7 +89,7 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
err = CDB_ERROR_OK;
attr->dirty = TRUE;
attr->unk_0x400 = TRUE;
}
if (err != CDB_ERROR_OK) {
@@ -98,11 +98,11 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
attrLastModifiedDate = lastModifiedDate;
memcpy(&attr->buf.lastModifiedDate, &attrLastModifiedDate, sizeof(u32));
attr->dirty = TRUE;
attr->unk_0x400 = TRUE;
attrModifiedCount = 0;
memcpy(&attr->buf.cdbID.modifiedCount, &attrModifiedCount, sizeof(u32));
attr->dirty = TRUE;
attr->unk_0x400 = TRUE;
GenCDBIdNumber(&cdbNum);
attrCdbIDNum = cdbNum;
@@ -110,12 +110,12 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
attrWiiID = CDBGetWiiId();
memcpy(&attr->buf.wiiId, &attrWiiID, sizeof(u64));
attr->wiiIdValid = TRUE;
attr->unk_0x408 = TRUE;
err = CDB_ERROR_OK;
attr->dirty = TRUE;
attr->wiiIdDirty = TRUE;
attr->unk_0x400 = TRUE;
attr->unk_0x404 = TRUE;
return err;
}
@@ -123,7 +123,7 @@ CDBErr CDBAttrCreateOnNAND(CDBAttr* attr, const char* desc, u32 lastModifiedDate
CDBErr CDBAttrSetModifiedDate(CDBAttr* attr, u32 modifiedDate) {
u32 value = modifiedDate;
memcpy(&attr->buf.lastModifiedDate, &value, sizeof(u32));
attr->dirty = TRUE;
attr->unk_0x400 = TRUE;
return CDB_ERROR_OK;
}
@@ -131,7 +131,7 @@ CDBErr CDBAttrSetModifiedDate(CDBAttr* attr, u32 modifiedDate) {
CDBErr CDBAttrSetModifiedCount(CDBAttr* attr, u32 modifiedCount) {
u32 value = modifiedCount;
memcpy(&attr->buf.cdbID.modifiedCount, &value, sizeof(u32));
attr->dirty = TRUE;
attr->unk_0x400 = TRUE;
return CDB_ERROR_OK;
}
@@ -151,7 +151,7 @@ CDBErr CDBAttrGetIDNumber(CDBAttr* attr, CDBId* cdbID) {
CDBErr CDBAttrSetWiiId(CDBAttr* attr, u64 wiiId) {
u64 value = wiiId;
memcpy(&attr->buf.wiiId, &value, sizeof(u64));
attr->wiiIdDirty = TRUE;
attr->unk_0x404 = TRUE;
return CDB_ERROR_OK;
}

File diff suppressed because it is too large Load Diff

View File

@@ -21,7 +21,7 @@ CDBErr CDBRecordFileReadAttrBuf(CDBRecord* record) {
return err;
}
recordFile->attr.wiiIdValid = TRUE;
recordFile->attr.unk_0x408 = TRUE;
return CDB_ERROR_OK;
}
@@ -34,12 +34,12 @@ CDBErr CDBRecordFileWriteAttrBuf(CDBRecord* record) {
return CDB_ERROR_27;
}
if (recordFile->attr.dirty && !recordFile->attr.wiiIdDirty) {
if (recordFile->attr.unk_0x400 && !recordFile->attr.unk_0x404) {
err = CDBFWriteAttrOnlyLeadChunk(&recordFile->bridgeFile, &recordFile->attr, record->key.location);
if (err != CDB_ERROR_OK) {
return err;
}
} else if (recordFile->attr.dirty || recordFile->attr.wiiIdDirty) {
} else if (recordFile->attr.unk_0x400 || recordFile->attr.unk_0x404) {
err = CDBFWriteAttr(&recordFile->bridgeFile, &recordFile->attr, record->key.location);
if (err != CDB_ERROR_OK) {
return err;

View File

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

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

@@ -783,7 +783,7 @@ static NWC24Err DuplicationCheck(MBCHeader* header, const NWC24MsgObjPrivate* ms
continue;
}
if (msg->unk_0x1C != 0 && entry->crc == msg->unk_0x1C && entry->type == msg->type && entry->length == msg->length &&
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->date) {
entry->flags == msg->unk_0x10 && (s32)entry->date == (s32)msg->unk_0x28) {
duplicateId = entry->msgId;
duplicateOffset = offset;
continue;
@@ -962,8 +962,8 @@ static NWC24Err CopyMsgObjToMBCFmt(const NWC24MsgObjPrivate* msg, MBCEntry* entr
entry->crc = msg->unk_0x1C;
entry->fromIdHigh = msg->fromIdHigh;
entry->fromIdLow = msg->fromIdLow;
entry->date = msg->date;
entry->receivedDate = msg->receivedDate;
entry->date = msg->unk_0x28;
entry->receivedDate = msg->unk_0x2C;
entry->numTo = msg->numTo;
entry->numAttached = msg->numAttached;
entry->groupId = msg->groupId;
@@ -1009,8 +1009,8 @@ static NWC24Err CopyMsgObjToPrvFmt(const MBCEntry* entry, NWC24MsgObjPrivate* ms
msg->unk_0x1C = entry->crc;
msg->fromIdHigh = entry->fromIdHigh;
msg->fromIdLow = entry->fromIdLow;
msg->date = entry->date;
msg->receivedDate = entry->receivedDate;
msg->unk_0x28 = entry->date;
msg->unk_0x2C = entry->receivedDate;
msg->numTo = entry->numTo;
msg->numAttached = entry->numAttached;
msg->groupId = entry->groupId;

View File

@@ -158,7 +158,7 @@ static inline NWC24Err WriteMessageIdField(NWC24MsgObjPrivate* msg) {
Mail_memset(buffer, 0, 1024);
Mail_strcpy(buffer, "Message-Id: <");
Mail_memset(idText, 0, 32);
Mail_sprintf(idText, "%05X%08X%08X%08X", msg->msgId, (u32)(myId >> 32), (u32)myId, msg->date);
Mail_sprintf(idText, "%05X%08X%08X%08X", msg->msgId, (u32)(myId >> 32), (u32)myId, msg->unk_0x28);
Mail_strcat(buffer, idText);
Mail_strcat(buffer, domain);
Mail_strcat(buffer, ">\r\n");
@@ -312,7 +312,7 @@ static NWC24Err NWC24CommitMsgInternal(NWC24MsgObjPrivate* msg, NWC24MBoxType ty
}
CHECK_WRITE(WriteExtraFields(msg));
Mail_memset(MultiPartDivider, 0, 40);
Mail_sprintf(MultiPartDivider, "Boundary-NWC24-%08X%05X", msg->date, msg->msgId);
Mail_sprintf(MultiPartDivider, "Boundary-NWC24-%08X%05X", msg->unk_0x28, msg->msgId);
buffer = NWC24WorkP->stringWork;
Mail_memset(buffer, 0, 1024);
Mail_strcpy(buffer, "MIME-Version: 1.0\r\n");
@@ -654,9 +654,9 @@ static NWC24Err WriteDateField(NWC24MsgObjPrivate* msg) {
date.sec = calendar.sec;
if (date.month > 12)
return NWC24_ERR_FORMAT;
NWC24iDateToMinutes(&msg->date, &date);
NWC24iDateToMinutes(&msg->unk_0x28, &date);
if (msg->type & 0x1000000)
NWC24iMinutesToDate(&date, msg->receivedDate);
NWC24iMinutesToDate(&date, msg->unk_0x2C);
buffer = NWC24WorkP->stringWork;
Mail_memset(buffer, 0, 1024);
Mail_sprintf(buffer, "Date: %02d %s %d %02d:%02d:%02d -0000\r\n", date.day, months[date.month - 1], date.year, date.hour, date.min, date.sec);

View File

@@ -46,9 +46,9 @@ NWC24Err NWC24InitMsgObj(NWC24MsgObj* msg, NWC24MsgType type) {
return NWC24_ERR_INVALID_VALUE;
}
msgObj->date = 0;
msgObj->unk_0x28 = 0;
msgObj->type |= 0x200000;
msgObj->receivedDate = 0;
msgObj->unk_0x2C = 0;
NWC24GetMyUserId(&msgObj->fromId);
msgObj->numTo = 0;
@@ -477,7 +477,7 @@ NWC24Err NWC24GetMsgFromId(const NWC24MsgObj* msg, NWC24UserId* fromId) {
NWC24Err NWC24GetMsgDate(const NWC24MsgObj* msg, OSCalendarTime* msgDate) {
const NWC24MsgObjPrivate* msgObj = (const NWC24MsgObjPrivate*)msg;
NWC24iMinutesToOSCalendarTime(msgDate, msgObj->date);
NWC24iMinutesToOSCalendarTime(msgDate, msgObj->unk_0x28);
return NWC24_OK;
}

View File

@@ -258,17 +258,11 @@ char* SOInetNtoA(SOInAddr address) {
int SOInetPtoN(int family, const char* text, void* address) {
s32 rm;
int temporary;
int size;
int result;
int bytes;
int temporary,result,size,bytes;
InetRequest* request;
if((result=SOiPrepareTempRm(NULL,&rm,&temporary))==0) {
bytes=0;
switch (family) {
case 2: bytes=4; break;
default: break;
}
if(family==2) bytes=4;
if(!bytes) result=-5;
else if(!text) result=-28;
else {

View File

@@ -13,22 +13,22 @@
const u8 scRsnOui0 = 0;
const u8 scRsnOui1 = 0x0F;
const u8 scRsnOui2 = 0xAC;
const u8 scRsnOuiPad = 0;
const u8 lbl_81695063 = 0;
const u8 scWpaOui0 = 0;
const u8 scWpaOui1 = 0x50;
const u8 scWpaOui2 = 0xF2;
const u8 scWpaOuiPad = 0;
const u8 lbl_81695067 = 0;
#pragma pop
#pragma push
#pragma section sconst_type ".sdata"
const u8 scWpaFindOui0 = 0;
const u8 scWpaFindOui1 = 0x50;
const u8 scWpaFindOui2 = 0xF2;
const u8 scWpaFindOuiPad0 = 0;
const u8 scWpaFindOuiPad1 = 0;
const u8 scWpaFindOuiPad2 = 0;
const u8 scWpaFindOuiPad3 = 0;
const u8 scWpaFindOuiPad4 = 0;
const u8 lbl_81697D73 = 0;
const u8 lbl_81697D74 = 0;
const u8 lbl_81697D75 = 0;
const u8 lbl_81697D76 = 0;
const u8 lbl_81697D77 = 0;
#pragma pop
#define scRsnOui0 (*((volatile const u8*)&scRsnOui0))

View File

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

View File

@@ -30,8 +30,8 @@ typedef struct AppLoaderHeader {
} AppLoaderHeader;
u8 TicketViewsBuf[OSRoundUp32B(sizeof(ESTicketView) * 64)] ALIGN32;
ESTicketView *TicketViews = (ESTicketView *)TicketViewsBuf;
DVDDiskID UpdateDiskID ALIGN32;
ESTicketView *lbl_81696578 = (ESTicketView *)TicketViewsBuf;
DVDDiskID lbl_810ADF60 ALIGN32;
OSBootInfo2 bi2 ALIGN32;
AppLoaderHeader AppLoaderHdr ALIGN32;
OSBootInfo3 bi3 ALIGN32;
@@ -41,66 +41,118 @@ DVDDiskID DiskID ALIGN32;
DVDPartitionParams PartitionParams ALIGN32;
NANDCommandBlock BS2NandBlock;
NANDFileInfo BS2CacheFileInfo;
DVDCommandBlock CoverBlock;
DVDCommandBlock lbl_8108BF60;
u8 PartitionInfoBuf[OSRoundUp32B(sizeof(DVDPartitionInfo) * 256)] ALIGN32;
DVDCommandBlock Block;
BS2State State = BS2_STT_BEGIN;
vu32 DvdReadPending = 0;
u32 BannerAllocation = 0;
u32 BannerBuffer = 0;
u32 BannerAvailable = 0;
u32 Allocator = 0;
vu32 lbl_81698A0C = 0;
u32 lbl_81698A10 = 0;
u32 lbl_81698A14 = 0;
u32 lbl_81698A18 = 0;
u32 lbl_81698A1C = 0;
BOOL StartingGame = FALSE;
u32 RestartRequested = 0;
u32 PartitionOpen = 0;
u32 CacheSeekComplete = 0;
u32 LoadingTitle = 0;
u32 lbl_81698A24 = 0;
u32 lbl_81698A28 = 0;
u32 lbl_81698A2C = 0;
u32 lbl_81698A30 = 0;
BOOL FatalErrorFlag = FALSE;
BOOL RetryErrorFlag = FALSE;
BOOL UpdateErrorFlag = FALSE;
BOOL AbortFlag = FALSE;
volatile int CacheFailed = 0;
volatile int RegionValid = 0;
volatile int NandPending = 0;
vu32 CancelNand = 0;
u32 LowReadResult = 0;
u32 CacheCommandComplete = 0;
u32 AudioBufferUnconfigured = 0;
u64 ResetTime = 0;
u64 SpinupDeadline = 0;
u64 CoverPollTime = 0;
u32 DriveWasReset = 0;
u32 TitleTicketView = 0;
u32 CurrentTmd = 0;
u32 TitleCode = 0;
u32 RequiredIosHigh = 0;
u32 RequiredIosLow = 0;
u32 GamePartition = 0;
u32 UpdatePartition = 0;
u32 PartitionCursor = 0;
u32 DataToc = 0;
u64 GameToc = 0;
u32 CoverOpenTimeHigh = 0;
u32 CoverOpenTimeLow = 0;
vu32 NandTransferred = 0;
vu32 NandLength = 0;
u8 *NandBuffer = NULL;
NANDFileInfo *NandFile = NULL;
vu32 NandOperation = 0;
volatile NANDCallback NandCompletion = NULL;
u32 LoaderOffset = 0;
vu32 LoaderLength = 0;
u32 LoaderAddress = 0;
vu32 CacheLength = 0;
vu32 BannerLength = 0;
vu32 DvdTransferLength = 0;
vu32 DvdTransferred = 0;
u32 *DvdProgress = 0;
u32 LoaderClose = 0;
u32 LoaderMain = 0;
u32 LoaderInit = 0;
volatile int lbl_81698A44 = 0;
volatile int lbl_81698A48 = 0;
volatile int lbl_81698A4C = 0;
vu32 lbl_81698A50 = 0;
u32 lbl_81698A54 = 0;
u32 lbl_81698A58 = 0;
u32 lbl_81698A5C = 0;
u64 lbl_81698A60 = 0;
u64 lbl_81698A68 = 0;
u64 lbl_81698A70 = 0;
u32 lbl_81698A78 = 0;
u32 lbl_81698A7C = 0;
u32 lbl_81698A80 = 0;
u32 lbl_81698A84 = 0;
u32 lbl_81698A88 = 0;
u32 lbl_81698A8C = 0;
u32 lbl_81698A90 = 0;
u32 lbl_81698A94 = 0;
u32 lbl_81698A98 = 0;
u32 lbl_81698A9C = 0;
u64 lbl_81698AA0 = 0;
u32 lbl_81698AA8 = 0;
u32 lbl_81698AAC = 0;
vu32 lbl_81698AB0 = 0;
vu32 lbl_81698AB4 = 0;
u8 *lbl_81698AB8 = NULL;
NANDFileInfo *lbl_81698ABC = NULL;
vu32 lbl_81698AC0 = 0;
volatile NANDCallback lbl_81698AC4 = NULL;
u32 lbl_81698AC8 = 0;
vu32 lbl_81698ACC = 0;
u32 lbl_81698AD0 = 0;
vu32 lbl_81698AD4 = 0;
vu32 lbl_81698AD8 = 0;
vu32 lbl_81698ADC = 0;
vu32 lbl_81698AE0 = 0;
u32 *lbl_81698AE4 = 0;
u32 lbl_81698AE8 = 0;
u32 lbl_81698AEC = 0;
u32 lbl_81698AF0 = 0;
#define DvdReadPending lbl_81698A0C
#define BannerAllocation lbl_81698A10
#define BannerBuffer lbl_81698A14
#define BannerAvailable lbl_81698A18
#define Allocator lbl_81698A1C
#define RestartRequested lbl_81698A24
#define PartitionOpen lbl_81698A28
#define CacheSeekComplete lbl_81698A2C
#define LoadingTitle lbl_81698A30
#define CacheFailed lbl_81698A44
#define RegionValid lbl_81698A48
#define NandPending lbl_81698A4C
#define CancelNand lbl_81698A50
#define LowReadResult lbl_81698A54
#define CacheCommandComplete lbl_81698A58
#define AudioBufferUnconfigured lbl_81698A5C
#define ResetTime lbl_81698A60
#define SpinupDeadline lbl_81698A68
#define CoverPollTime lbl_81698A70
#define DriveWasReset lbl_81698A78
#define TitleTicketView lbl_81698A7C
#define CurrentTmd lbl_81698A80
#define TitleCode lbl_81698A84
#define RequiredIosHigh lbl_81698A88
#define RequiredIosLow lbl_81698A8C
#define GamePartition lbl_81698A90
#define UpdatePartition lbl_81698A94
#define PartitionCursor lbl_81698A98
#define DataToc lbl_81698A9C
#define GameToc lbl_81698AA0
#define CoverOpenTimeHigh lbl_81698AA8
#define CoverOpenTimeLow lbl_81698AAC
#define NandTransferred lbl_81698AB0
#define NandLength lbl_81698AB4
#define NandBuffer lbl_81698AB8
#define NandFile lbl_81698ABC
#define NandOperation lbl_81698AC0
#define NandCompletion lbl_81698AC4
#define LoaderOffset lbl_81698AC8
#define LoaderLength lbl_81698ACC
#define LoaderAddress lbl_81698AD0
#define CacheLength lbl_81698AD4
#define BannerLength lbl_81698AD8
#define DvdTransferLength lbl_81698ADC
#define DvdTransferred lbl_81698AE0
#define DvdProgress lbl_81698AE4
#define LoaderClose lbl_81698AE8
#define LoaderMain lbl_81698AEC
#define LoaderInit lbl_81698AF0
#define CoverBlock lbl_8108BF60
#define UpdateDiskID lbl_810ADF60
#define TicketViews lbl_81696578
void BS2Report(const char *msg, ...) {
#ifdef ENABLE_BS2_REPORT

View File

@@ -604,7 +604,7 @@ vmBoolInt VmIsNan(vmFloat value) {
return isnan(value) || value == VM_NAN;
}
double CHANSVmFloatSign(double value) {
double CHANSVm_8144B1D8(double value) {
// Clamp to -1.0~1.0
return value < 0.0 ? -1.0 : value > 0.0 ? 1.0 : value;
}
@@ -650,14 +650,14 @@ static s32 CHANSVmParseInt(CHANSVmObjHdr* obj, s32 base, u64* out) {
return 0;
}
CHANSVmObjHdr* CHANSVmConvertToIntFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVm_8144B30C(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
// Convert to int from float
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_INTEGER, 0);
if (newObj != vmNull) {
if (VmIsNan(object->value.float_v)) {
newObj->value.int_v = 0;
} else {
newObj->value.int_v = (u64)(CHANSVmFloatSign(object->value.float_v) * floor(fabs(object->value.float_v)));
newObj->value.int_v = (u64)(CHANSVm_8144B1D8(object->value.float_v) * floor(fabs(object->value.float_v)));
}
}
return newObj;
@@ -675,7 +675,7 @@ CHANSVmObjHdr* CHANSVmConvertToIntFromArray(CHANSVm* vm, CHANSVmObjType type, CH
return vmNull;
}
CHANSVmObjHdr* CHANSVmConvertToFloatFromUndefined(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVm_8144B430(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
if (result != vmNull) {
result->value.float_v = VM_NAN;
@@ -683,7 +683,7 @@ CHANSVmObjHdr* CHANSVmConvertToFloatFromUndefined(CHANSVm* vm, CHANSVmObjType ty
return result;
}
CHANSVmObjHdr* CHANSVmConvertToFloatFromInt(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
CHANSVmObjHdr* CHANSVm_8144B470(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
if (result != vmNull) {
result->value.float_v = VmIntToFloat(intObj->value.int_v);
@@ -692,31 +692,31 @@ CHANSVmObjHdr* CHANSVmConvertToFloatFromInt(CHANSVm* vm, CHANSVmObjType type, CH
}
// The 16-bit strings use a single null byte for termination for some reason. Because of that, L"..." cannot be used.
u8 scUndefinedUtf16[19] = {0x00, 'u', 0x00, 'n', 0x00, 'd', 0x00, 'e', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'e', 0x00, 'd', 0x00};
u8 scInfinityUtf16[17] = {0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
u8 scMinusInfinityUtf16[19] = {0x00, '-', 0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
u8 lbl_81669070[19] = {0x00, 'u', 0x00, 'n', 0x00, 'd', 0x00, 'e', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'e', 0x00, 'd', 0x00};
u8 lbl_81669083[17] = {0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
u8 lbl_81669094[19] = {0x00, '-', 0x00, 'I', 0x00, 'n', 0x00, 'f', 0x00, 'i', 0x00, 'n', 0x00, 'i', 0x00, 't', 0x00, 'y', 0x00};
// clang-format off
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined = {{(wchar_t*)scUndefinedUtf16, 18}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectNaN = {{(wchar_t*)"\0N\0a\0N", 6}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectInfinity = {{(wchar_t*)scInfinityUtf16, 16}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectMinusInfinity = {{(wchar_t*)scMinusInfinityUtf16, 18}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectComma = {{(wchar_t*)"\0,", 2}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined = {{(wchar_t*)lbl_81669070, 18}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616C88 = {{(wchar_t*)"\0N\0a\0N", 6}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616C98 = {{(wchar_t*)lbl_81669083, 16}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616CA8 = {{(wchar_t*)lbl_81669094, 18}, {0}, vmNull};
const CHANSVmObjHdr lbl_81616CB8 = {{(wchar_t*)"\0,", 2}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringDataEmpty = {{(wchar_t*)"", 0}, {0}, vmNull};
const CHANSVmObjHdr CHANSVmConstStringObjectUndefined_[] = {{{(void*)&CHANSVmConstStringObjectUndefined, 0}, 0x03800100, vmNull},
{{(void*)&CHANSVmConstStringObjectNaN, 0}, 0x03800100, vmNull},
{{(void*)&CHANSVmConstStringObjectInfinity, 0}, 0x03800100, vmNull},
{{(void*)&CHANSVmConstStringObjectMinusInfinity, 0}, 0x03800100, vmNull},
{{(void*)&lbl_81616C88, 0}, 0x03800100, vmNull},
{{(void*)&lbl_81616C98, 0}, 0x03800100, vmNull},
{{(void*)&lbl_81616CA8, 0}, 0x03800100, vmNull},
{{vmNull, 0}, 0x00800000, vmNull}};
char VmReportFormat[] = "%s";
const CHANSVmFloatConstantList scFloatConstantList[] = {
const CHANSVmFloatConstantList lbl_81616D28[] = {
{ "Infinity", (double*)&VmInf },
{ "+Infinity", (double*)&VmInf },
{ "-Infinity", (double*)&VmMinusInf },
{ "NaN", (double*)&VmNaN }
};
char scFloatPrintfFmt[] = "%.16lg";
char lbl_8169758A[] = "%.16lg";
// clang-format on
static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
@@ -741,8 +741,8 @@ static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
*bufEnd = '\0';
for (i = 0; i < 4; i++) {
if (strcmp(buf, scFloatConstantList[i].spName) == 0) {
number = *scFloatConstantList[i].pValue;
if (strcmp(buf, lbl_81616D28[i].spName) == 0) {
number = *lbl_81616D28[i].pValue;
goto store;
}
}
@@ -771,7 +771,7 @@ static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
return 0;
}
CHANSVmObjHdr* CHANSVmConvertToFloatFromStr(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
CHANSVmObjHdr* CHANSVm_8144B4D4(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
// Convert string keyword into float value
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
@@ -785,8 +785,8 @@ CHANSVmObjHdr* CHANSVmConvertToStrFromUndefined(CHANSVm* vm, CHANSVmObjType type
return (CHANSVmObjHdr*)CHANSVmConstStringObjectUndefined_;
}
s32 CHANSVmFloatToWString(vmWString buf, u32 len, vmFloat val) NO_INLINE {
s32 result = snprintf((char*)buf, len / 2, scFloatPrintfFmt, val);
s32 CHANSVm_8144B62C(vmWString buf, u32 len, vmFloat val) NO_INLINE {
s32 result = snprintf((char*)buf, len / 2, lbl_8169758A, val);
CHANSVmStrCpyToU16FromU8(buf, (vmString)buf, result);
return VM_STR_LENGTH(result);
}
@@ -815,7 +815,7 @@ error:
return vmNull;
}
CHANSVmObjHdr* CHANSVmConvertToStrFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
CHANSVmObjHdr* CHANSVm_8144B734(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
const CHANSVmObjHdr* base;
CHANSVmObjHdr* newObj;
s32 result;
@@ -835,7 +835,7 @@ CHANSVmObjHdr* CHANSVmConvertToStrFromFloat(CHANSVm* vm, CHANSVmObjType type, CH
newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_STRING, VM_STRING_SIZE);
if (newObj != vmNull) {
result = CHANSVmFloatToWString(newObj->value.wstring_v->spData, VM_STRING_SIZE, value->value.float_v);
result = CHANSVm_8144B62C(newObj->value.wstring_v->spData, VM_STRING_SIZE, value->value.float_v);
newObj->value.wstring_v->len = result;
if (newObj->value.wstring_v->len == 0) {
goto error;
@@ -899,14 +899,14 @@ vmBoolInt CHANSVmGetEnumedType(CHANSVmObjType* eType, vmU32 iType) NO_INLINE {
}
// TODO: Here was a function defined that was inlined into VmStep.
char scVmGetResultType[] = "VmGetResultType";
char lbl_81669128[] = "VmGetResultType";
// clang-format off
const VmConvertEntry VmTypeConvertFuncTbl[] = {
{vmNull, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertToIntFromFloat, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
{CHANSVmConvertToFloatFromUndefined, CHANSVmConvertToFloatFromInt, vmNull, CHANSVmConvertToFloatFromStr, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVmConvertToStrFromFloat, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, vmNull, CHANSVm_8144B30C, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
{CHANSVm_8144B430, CHANSVm_8144B470, vmNull, CHANSVm_8144B4D4, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVm_8144B734, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertObjectTypeError},
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull},
};
@@ -1254,7 +1254,7 @@ CHANSVmErr VmBitXor(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSV
}
CHANSVmErr VmCmpEq(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSVmObjHdr* left, CHANSVmObjHdr* right) {
vmBoolInt stringsMatch;
vmBoolInt bVar1;
vmBoolInt isEqual;
CHANSVmErr err;
@@ -1287,11 +1287,11 @@ CHANSVmErr VmCmpEq(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* ret, CHANSVm
case CHANS_VM_OBJ_TYPE_STRING: {
isEqual = vmFalse;
if (left->value.string_v->len == right->value.string_v->len) {
stringsMatch = vmFalse;
bVar1 = vmFalse;
if (left->value.string_v->len == 0 || memcmp(*left->value.ptr_v, *right->value.ptr_v, left->value.string_v->len) == 0) {
stringsMatch = vmTrue;
bVar1 = vmTrue;
}
if (stringsMatch) {
if (bVar1) {
isEqual = vmTrue;
}
}
@@ -2183,7 +2183,7 @@ static u32 VmArrayJoinSub(CHANSVmObjHdr* obj, CHANSVmObjHdr* array, wchar_t* sep
if (offset + 0x80 > bufSize) {
goto error;
}
elemLen = CHANSVmFloatToWString((vmWString)((u8*)(*obj->value.ptr_v) + offset), 0x80, chunk->elements[countInChunk].value.float_v);
elemLen = CHANSVm_8144B62C((vmWString)((u8*)(*obj->value.ptr_v) + offset), 0x80, chunk->elements[countInChunk].value.float_v);
break;
}
case CHANS_VM_TYPE_ARRAY: {
@@ -2225,7 +2225,7 @@ CHANSVmObjHdr* VmArrayJoinCommon(CHANSVm* vm, u32 retObjAddr, CHANSVmObjHdr* obj
u32 actualLen;
if (separatorAddr == 0) {
separatorAddr = *(u32*)&CHANSVmConstStringObjectComma;
separatorAddr = *(u32*)&lbl_81616CB8;
separatorLen = 2;
}
@@ -3400,7 +3400,7 @@ VmMethodDefine(String, ToUpperCase) {
return vmFalse;
}
CHANSVmObjHdr* CHANSVmFormatString(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
CHANSVmObjHdr* CHANSVm_8145049C(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
u8 pad0[8];
u8 tempBuf[16];
u8 fmtBufData[32];
@@ -3745,7 +3745,7 @@ null_return:
VmMethodDefine(String, Format) {
u32 result;
if (VmParentObj != vmNull && VmParentObj->type == CHANS_VM_TYPE_CLASS_REF) {
result = (u32)CHANSVmFormatString(VmInst, VmReturnObj, 0);
result = (u32)CHANSVm_8145049C(VmInst, VmReturnObj, 0);
return result != 0;
}
return 0;
@@ -3775,10 +3775,10 @@ int VmGetIntFromObjHdr(CHANSVmObjHdr* object) {
return 0;
}
u32 CHANSVmBlobGetCount(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit);
BOOL CHANSVmBlobHasSpace(BlobHeader* blob, s64 size);
u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit);
BOOL CHANSVm_81451348(BlobHeader* blob, s64 size);
CHANSVmObjHdr* CHANSVmNewBlobObject(CHANSVm* VmInst, CHANSVmObjHdr* obj, u32 size, void* src, u32 count);
static u64 CHANSVmMakeU64(u32 upper, u32 lower);
static u64 CHANSVm_814540E0(u32 upper, u32 lower);
static void VmBlobInitValue(BlobHeader* blob, u32 size) {
if (blob != vmNull) {
@@ -3790,9 +3790,9 @@ static void VmBlobInitValue(BlobHeader* blob, u32 size) {
static const char VmBlobClassName[] = "Blob";
char scHexDigits[] = "0123456789abcdef";
char* scHexDigitsPtr = scHexDigits;
char* scHexDigitsPtr2 = scHexDigits;
char lbl_81669DF5[] = "0123456789abcdef";
char* lbl_816976E4 = lbl_81669DF5;
char* lbl_816976E8 = lbl_81669DF5;
static CHANSVmObjHdr* VmBlobCreateDirect(CHANSVm* vm, CHANSVmObjHdr* obj, u32 size) NO_INLINE {
CHANSVmNativeClass* cls;
@@ -3834,7 +3834,7 @@ static u8* VmBlobGetDataBufferDirect(CHANSVmObjHdr* obj) {
return vmNull;
}
BOOL CHANSVmBlobResolveOffset(BlobHeader* blob, s64 val, u32* out) {
BOOL CHANSVm_81450D14(BlobHeader* blob, s64 val, u32* out) {
s64 pos;
if (blob == vmNull) {
@@ -3901,7 +3901,7 @@ VmMethodDefine(Blob, Seek) {
return 0;
}
if (CHANSVmBlobResolveOffset(blob, val->value.int_v, &tmp)) {
if (CHANSVm_81450D14(blob, val->value.int_v, &tmp)) {
blob->offset = tmp;
} else {
return 0;
@@ -3988,9 +3988,9 @@ VmMethodDefine(Blob, Fill) {
return 0;
}
count = blob != vmNull ? CHANSVmBlobGetCount(blob, fill, blob->offset) : 0;
count = blob != vmNull ? CHANSVm_81451314(blob, fill, blob->offset) : 0;
if (CHANSVmBlobHasSpace(blob, count)) {
if (CHANSVm_81451348(blob, count)) {
memset(blob->pData + blob->offset, (u8)val->value.int_v, count);
blob->offset += count;
return 1;
@@ -3999,7 +3999,7 @@ VmMethodDefine(Blob, Fill) {
return 0;
}
u32 CHANSVmBlobGetCount(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
if (ptr != vmNull) {
return *(u32*)((u8*)ptr + 4);
}
@@ -4013,7 +4013,7 @@ u32 CHANSVmBlobGetCount(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
return 0;
}
BOOL CHANSVmBlobHasSpace(BlobHeader* blob, s64 size) {
BOOL CHANSVm_81451348(BlobHeader* blob, s64 size) {
u32 curOff = blob->offset;
return size >= 0 && (s64)(blob->size - curOff) >= size;
}
@@ -4028,7 +4028,7 @@ VmMethodDefine(Blob, GetString) {
}
size = (u32)arg->value.int_v;
if (CHANSVmBlobHasSpace(blob, size)) {
if (CHANSVm_81451348(blob, size)) {
CHANSVmErr err = CHANSVmSetU16StringFromU8(VmInst, VmReturnObj, (char*)(blob->pData + blob->offset), size);
blob->offset += size;
return err == CHANS_VM_OK;
@@ -4058,7 +4058,7 @@ VmMethodDefine(Blob, SetString) {
}
}
if (CHANSVmBlobHasSpace(blob, size)) {
if (CHANSVm_81451348(blob, size)) {
memset(blob->pData + blob->offset, 0, size);
CHANSVmStrCpyToU8FromU16(blob->pData + blob->offset, strData, charCount);
blob->offset += size;
@@ -4076,7 +4076,7 @@ VmMethodDefine(Blob, GetWString) {
return 0;
}
if (CHANSVmBlobHasSpace(blob, VM_STR_LENGTH(arg->value.int_v))) {
if (CHANSVm_81451348(blob, VM_STR_LENGTH(arg->value.int_v))) {
CHANSVmErr err = CHANSVmSetU16String(VmInst, VmReturnObj, (wchar_t*)(blob->pData + blob->offset), (u32)arg->value.int_v << 1);
u32 oldOffset = blob->offset;
u64 length = VM_STR_LENGTH(arg->value.int_v);
@@ -4113,7 +4113,7 @@ VmMethodDefine(Blob, SetWString) {
}
}
if (CHANSVmBlobHasSpace(blob, size)) {
if (CHANSVm_81451348(blob, size)) {
memcpy(blob->pData + blob->offset, strData, strLen);
if (strLen < size) {
memset(blob->pData + blob->offset + strLen, 0, size - strLen);
@@ -4184,8 +4184,8 @@ VmMethodDefine(Blob, CopyRangeFrom) {
srcOff = 0;
destOff = 0;
if (CHANSVmBlobResolveOffset(destBlob, destOffObj->value.int_v, &destOff) != 0 && CHANSVmBlobResolveOffset(srcBlob, srcOffObj->value.int_v, &srcOff) != 0) {
count = CHANSVmBlobGetCount(srcBlob, countObj, srcOff);
if (CHANSVm_81450D14(destBlob, destOffObj->value.int_v, &destOff) != 0 && CHANSVm_81450D14(srcBlob, srcOffObj->value.int_v, &srcOff) != 0) {
count = CHANSVm_81451314(srcBlob, countObj, srcOff);
{
u32 destinationOffset = destOff;
okFlag = (s64)count >= 0 && (s64)(destBlob->size - destinationOffset) >= (s64)count;
@@ -4213,9 +4213,9 @@ VmMethodDefine(Blob, GetBlob) {
if (blob == vmNull)
return 0;
count = blob != vmNull ? CHANSVmBlobGetCount(blob, arg, blob->offset) : 0;
count = blob != vmNull ? CHANSVm_81451314(blob, arg, blob->offset) : 0;
if (CHANSVmBlobHasSpace(blob, count)) {
if (CHANSVm_81451348(blob, count)) {
if (CHANSVmNewBlobObject(VmInst, VmReturnObj, count, blob->offset + blob->pData, count) != vmNull) {
blob->offset += count;
return 1;
@@ -4262,7 +4262,7 @@ VmMethodDefine(Blob, SetBlob) {
}
}
if (CHANSVmBlobHasSpace(destBlob, logicalSize)) {
if (CHANSVm_81451348(destBlob, logicalSize)) {
memmove(destBlob->pData + *(u32*)&destBlob->offset, srcBlob->pData + srcBlob->offset, copySize);
if (copySize < logicalSize) {
memset(destBlob->offset + destBlob->pData + copySize, 0, logicalSize - copySize);
@@ -4284,15 +4284,15 @@ VmMethodDefine(Blob, GetHexString) {
return vmFalse;
}
count = blob != vmNull ? CHANSVmBlobGetCount(blob, arg, blob->offset) : 0;
count = blob != vmNull ? CHANSVm_81451314(blob, arg, blob->offset) : 0;
if (CHANSVmBlobHasSpace(blob, count) && CHANSVmNewObject(VmInst, vmFalse, VmReturnObj, CHANS_VM_OBJ_TYPE_STRING, count * 4) != vmNull) {
if (CHANSVm_81451348(blob, count) && CHANSVmNewObject(VmInst, vmFalse, VmReturnObj, CHANS_VM_OBJ_TYPE_STRING, count * 4) != vmNull) {
wchar_t* dest = (wchar_t*)VmGetStrFromObjHdr(VmReturnObj);
u8* src = blob->pData;
u32 offset = blob->offset;
u32 destOff = 0;
u32 i = 0;
char* hexTbl = scHexDigitsPtr;
char* hexTbl = lbl_816976E4;
u32 loop_i;
src += offset;
@@ -4352,8 +4352,8 @@ VmMethodDefine(Blob, CalcRangeSHA1Digest) {
return 0;
}
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
size = CHANSVmBlobGetCount(blob, arg1, offset);
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
size = CHANSVm_81451314(blob, arg1, offset);
{
u32 off = offset;
@@ -4417,8 +4417,8 @@ VmMethodDefine(Blob, CalcRangeMD5Digest) {
return 0;
}
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
size = CHANSVmBlobGetCount(blob, arg1, offset);
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
size = CHANSVm_81451314(blob, arg1, offset);
{
u32 off = offset;
@@ -4464,8 +4464,8 @@ VmMethodDefine(Blob, CalcRangeCRC16) {
return 0;
}
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
size = CHANSVmBlobGetCount(blob, arg1, offset);
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
size = CHANSVm_81451314(blob, arg1, offset);
{
u32 off = offset;
if (((s64)size >= 0LL && (s64)(blob->size - off) >= (s64)size) != vmFalse) {
@@ -4500,8 +4500,8 @@ VmMethodDefine(Blob, CalcRangeCRC32) {
return 0;
}
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
size = CHANSVmBlobGetCount(blob, arg1, offset);
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
size = CHANSVm_81451314(blob, arg1, offset);
{
u32 off = offset;
@@ -4573,8 +4573,8 @@ VmMethodDefine(Blob, CalcRangeHMAC) {
return 0;
}
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
size = CHANSVmBlobGetCount(blob, arg1, offset);
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
size = CHANSVm_81451314(blob, arg1, offset);
off = offset;
if (((s64)size >= 0LL && (s64)(blob->size - off) >= (s64)size) != vmFalse) {
NETHMACContext ctx;
@@ -5202,7 +5202,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
copySize = paramValue;
}
if (copySize < 0 || !CHANSVmBlobHasSpace(parentBlob, copySize)) {
if (copySize < 0 || !CHANSVm_81451348(parentBlob, copySize)) {
goto error;
}
@@ -5220,7 +5220,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
break;
}
case 5: {
if (paramValue < 0 || !CHANSVmBlobHasSpace(parentBlob, paramValue)) {
if (paramValue < 0 || !CHANSVm_81451348(parentBlob, paramValue)) {
goto error;
}
if (paramValue > 0) {
@@ -5247,7 +5247,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
goto error;
}
if (!CHANSVmBlobHasSpace(parentBlob, elemSize * count)) {
if (!CHANSVm_81451348(parentBlob, elemSize * count)) {
goto error;
}
@@ -5342,7 +5342,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
break;
}
case 8: {
*(u64*)packBuf = CHANSVmMakeU64(packBuf[0], packBuf[1]);
*(u64*)packBuf = CHANSVm_814540E0(packBuf[0], packBuf[1]);
break;
}
}
@@ -5379,7 +5379,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
goto error;
}
if (!CHANSVmBlobHasSpace(parentBlob, elemSize * count)) {
if (!CHANSVm_81451348(parentBlob, elemSize * count)) {
goto error;
}
@@ -5424,7 +5424,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
}
bufSize = (count + 1) / 2;
if (!CHANSVmBlobHasSpace(parentBlob, bufSize)) {
if (!CHANSVm_81451348(parentBlob, bufSize)) {
goto error;
}
@@ -5472,7 +5472,7 @@ error:
return vmFalse;
}
static u64 CHANSVmMakeU64(u32 upper, u32 lower) {
static u64 CHANSVm_814540E0(u32 upper, u32 lower) {
// Read U64 and byte-swap
u64 x = (u64)upper << 32 | lower;
return x >> 56 & 0x00000000000000ffULL | x >> 40 & 0x000000000000ff00ULL | x >> 24 & 0x0000000000ff0000ULL | x >> 8 & 0x00000000ff000000ULL |
@@ -5648,7 +5648,7 @@ VmMethodDefine(Blob, Unpack) {
} else {
count = outVal;
}
if (count < 0 || !CHANSVmBlobHasSpace(srcBlob, count)) {
if (count < 0 || !CHANSVm_81451348(srcBlob, count)) {
goto error;
}
@@ -5663,7 +5663,7 @@ VmMethodDefine(Blob, Unpack) {
break;
}
case 5: {
if (outVal < 0 || !CHANSVmBlobHasSpace(srcBlob, outVal)) {
if (outVal < 0 || !CHANSVm_81451348(srcBlob, outVal)) {
goto error;
}
@@ -5682,7 +5682,7 @@ VmMethodDefine(Blob, Unpack) {
} else {
count = outVal;
}
if (count < 0 || !CHANSVmBlobHasSpace(srcBlob, outSize * count)) {
if (count < 0 || !CHANSVm_81451348(srcBlob, outSize * count)) {
goto error;
}
@@ -5710,7 +5710,7 @@ VmMethodDefine(Blob, Unpack) {
break;
}
case 8: {
unpackBuf.value = CHANSVmMakeU64(unpackBuf.words[0], unpackBuf.words[1]);
unpackBuf.value = CHANSVm_814540E0(unpackBuf.words[0], unpackBuf.words[1]);
break;
}
}
@@ -5794,7 +5794,7 @@ VmMethodDefine(Blob, Unpack) {
}
count = (srcBlob->size - srcBlob->offset) / outSize;
}
if ((s32)count < 0 || !CHANSVmBlobHasSpace(srcBlob, outSize * count)) {
if ((s32)count < 0 || !CHANSVm_81451348(srcBlob, outSize * count)) {
goto error;
}
@@ -5845,7 +5845,7 @@ VmMethodDefine(Blob, Unpack) {
}
bufSize = (s32)(count + 1) / 2;
if (!CHANSVmBlobHasSpace(srcBlob, bufSize)) {
if (!CHANSVm_81451348(srcBlob, bufSize)) {
goto error;
}
@@ -5864,7 +5864,7 @@ VmMethodDefine(Blob, Unpack) {
u8* hexTable;
u8 byte;
u8 nibble;
hexTable = (u8*)scHexDigitsPtr2;
hexTable = (u8*)lbl_816976E8;
srcPos = srcData;
destPos = destStr;
@@ -5992,7 +5992,7 @@ void CHANSVmImageRegisterAllocator(CHANSVmImageAllocatorCallback allocCb, CHANSV
VmImageCtorCallback = ctorCb;
}
char scImageClassName[] = "Image";
char lbl_8169778C[] = "Image";
CHANSVmObjHdr* CHANSVmNewImageObject(CHANSVm* vm, CHANSVmObjHdr* object, vmPtr srcData, vmU16 width, vmU16 height, s32 format) {
u32 bpp;
@@ -6030,7 +6030,7 @@ CHANSVmObjHdr* CHANSVmNewImageObject(CHANSVm* vm, CHANSVmObjHdr* object, vmPtr s
if (object == vmNull) {
goto ret;
}
if (CHANSVmSetObjectAsNativeInstance(vm, object, vmNull, scImageClassName) != CHANS_VM_OK) {
if (CHANSVmSetObjectAsNativeInstance(vm, object, vmNull, lbl_8169778C) != CHANS_VM_OK) {
goto error;
}
image = (CHANSVmImage*)((u32*)object->value.ptr_v)[0];
@@ -6120,10 +6120,10 @@ static vmBoolInt VmWinEmuWrite(CHANSVm* vm, CHANSVmObjHdr* parent, CHANSVmObjHdr
const CHANSVmMethodList VmWinEmuMethodTbl[] = {"write", VmWinEmuWrite};
char scDateClassName[] = "Date";
char scMathInternalName[] = "@Math";
char scMathClassName[] = "Math";
char scWinEmuInternalName[] = "@WinEmu";
char lbl_816977AC[] = "Date";
char lbl_816977B1[] = "@Math";
char lbl_816977B7[] = "Math";
char lbl_816977BC[] = "@WinEmu";
static CHANSVmErr VmPushFuncReturnInfo(CHANSVm* vm, u32 argCount, u32 totalSlots, u32 headerCount);
@@ -6186,7 +6186,7 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
goto class_fail;
/* Date class */
cls = CHANSVmAddNativeClass2(vm, scDateClassName, VmDateCtor, 0, VmDateDtor);
cls = CHANSVmAddNativeClass2(vm, lbl_816977AC, VmDateCtor, 0, VmDateDtor);
if (cls == vmNull) {
ok = vmFalse;
} else {
@@ -6196,7 +6196,7 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
goto class_fail;
/* Math class */
if (CHANSVmNewBuiltinObject(vm, scMathInternalName, vmNull, vmNull, vmNull, scMathClassName, vmNull, VmMathPropertyTbl, CHANSVmPropertyCount(VmMathPropertyTbl),
if (CHANSVmNewBuiltinObject(vm, lbl_816977B1, vmNull, vmNull, vmNull, lbl_816977B7, vmNull, VmMathPropertyTbl, CHANSVmPropertyCount(VmMathPropertyTbl),
VmMathMethodTbl, CHANSVmMethodCount(VmMathMethodTbl)) == 0) {
goto class_fail;
}
@@ -6235,13 +6235,13 @@ CHANSVmErr CHANSVmInit(CHANSVm* vm, vmPtr work, vmU32 size) {
/* Image class */
VmImageAllocCallback = vmNull;
VmImageCtorCallback = vmNull;
if (CHANSVmNewBuiltinObject(vm, scImageClassName, vmNull, VmImageCtor, vmNull, vmNull, vmNull, VmImagePropertyTbl, CHANSVmPropertyCount(VmImagePropertyTbl),
if (CHANSVmNewBuiltinObject(vm, lbl_8169778C, vmNull, VmImageCtor, vmNull, vmNull, vmNull, VmImagePropertyTbl, CHANSVmPropertyCount(VmImagePropertyTbl),
vmNull, 0) == 0) {
goto class_fail;
}
/* Screen (@WinEmu) class */
if (CHANSVmNewBuiltinObject(vm, scWinEmuInternalName, vmNull, vmNull, vmNull, "document", vmNull, vmNull, 0, (CHANSVmMethodList*)&VmWinEmuMethodTbl,
if (CHANSVmNewBuiltinObject(vm, lbl_816977BC, vmNull, vmNull, vmNull, "document", vmNull, vmNull, 0, (CHANSVmMethodList*)&VmWinEmuMethodTbl,
CHANSVmMethodCount(VmWinEmuMethodTbl)) == 0) {
class_fail:
result = CHANS_VM_ERR_NATIVE_METHOD_INIT;
@@ -6466,7 +6466,7 @@ void CHANSConvertModuleOfsToPtr(CHANSVmModule* ptr) {
VmOffsU32ToPtr((void**)&ptr->pLineTbl, ptr);
}
static CHANSVmObjHdr* CHANSVmLookupScopedObject(CHANSVm* vm, s32 id) {
static CHANSVmObjHdr* CHANSVm_81455654(CHANSVm* vm, s32 id) {
CHANSVmObjHdr* data = vmNull;
CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;
CHANSVmExecutionCtx* ctx = pVm->pActiveCtx;
@@ -6755,7 +6755,7 @@ static CHANSVmErr VmReturnWithValue(CHANSVm* vm, u32 val) {
}
} else {
for (i = 0; i < pVm->pActiveCtx->pDbg->moduleCount; i++) {
if (CHANSVmDeleteObject(vm, CHANSVmLookupScopedObject(vm, i)) != CHANS_VM_OK) {
if (CHANSVmDeleteObject(vm, CHANSVm_81455654(vm, i)) != CHANS_VM_OK) {
return CHANS_VM_ERR_RETURN;
}
}
@@ -6873,7 +6873,7 @@ CHANSVmErr CHANSVmLinkModules(CHANSVm* vm, vmS32 unk0) {
CHANSVmObjHdr* obj;
if (idx >= module->moduleCount) {
goto pass3_idx_err;
} else if (obj = CHANSVmLookupScopedObject(vm, idx), obj == vmNull) {
} else if (obj = CHANSVm_81455654(vm, idx), obj == vmNull) {
goto pass3_obj_err;
} else if (obj->type == CHANS_VM_OBJ_TYPE_BLANK) {
goto pass3_success;
@@ -7417,7 +7417,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
}
default: {
// TODO: This is an inlined function called "VmGetResultType"
CHANS_VM_PRINTF_CUSTOM("%s: no table for op '%c'\n", scVmGetResultType, opKind);
CHANS_VM_PRINTF_CUSTOM("%s: no table for op '%c'\n", lbl_81669128, opKind);
goto error_setter;
}
}
@@ -7602,7 +7602,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
break;
}
case CHANS_VM_OBJ_TYPE_FLOAT: {
invertedVal = (s64)(CHANSVmFloatSign(pAcc->value.float_v) * floor(fabs(pAcc->value.float_v)));
invertedVal = (s64)(CHANSVm_8144B1D8(pAcc->value.float_v) * floor(fabs(pAcc->value.float_v)));
break;
}
case CHANS_VM_OBJ_TYPE_STRING: {
@@ -7818,7 +7818,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
result = CHANS_VM_ERR_GET_PROPERTY_NAME;
arrayIdx = 0;
imm16Val = VM_READ_BE_U16(operandBuf, 0);
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
foundObj = CHANSVm_81455654(vm, imm16Val);
accumulator = &pVm->accumulator;
if (foundObj != vmNull && accumulator->type == CHANS_VM_OBJ_TYPE_INTEGER &&
(computedAddr = accumulator->value.data.len, (u64)accumulator->value.int_v <= ~1U)) {
@@ -7954,7 +7954,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
if (operandBuf == vmNull) {
return CHANS_VM_ERR_CODE_RANGE;
}
foundObj = CHANSVmLookupScopedObject(vm, (VM_READ_BE_U16(operandBuf, 0)) & 0x1FFF);
foundObj = CHANSVm_81455654(vm, (VM_READ_BE_U16(operandBuf, 0)) & 0x1FFF);
result = VmDeleteCommon(vm, foundObj);
break;
}
@@ -7982,12 +7982,12 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
imm16Val = (opcodeVal << 8 | operandBuf[1]) & 0x1FFF;
switch (opcodeVal & CHANS_VM_OP_SYMBOL_STORE) {
case 0: {
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
foundObj = CHANSVm_81455654(vm, imm16Val);
result = VmStore(vm, &pVm->accumulator, foundObj);
break;
}
case CHANS_VM_OP_SYMBOL_STORE: {
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
foundObj = CHANSVm_81455654(vm, imm16Val);
result = VmStore(vm, foundObj, &pVm->accumulator);
break;
}

View File

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

View File

@@ -5,6 +5,8 @@
#include "keyboard/tiHKBManager.h"
#include "keyboard/tiLayoutGather.h"
extern "C" void SetCountry__Q39textinput5input10HKBManagerFUc();
extern "C" textinput::input::HKBManager sInstance__Q39textinput5input10HKBManager;
extern "C" void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw();
extern "C" bool updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
extern "C" void __dt__Q49textinput8keyboard5hwkey10HWKeyboardFv();
@@ -17,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),
@@ -109,55 +111,6 @@ namespace textinput {
extern "C" bool updateTriggerKey___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
extern "C" bool updateTappingShift___Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
extern "C" void updateShift__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager();
HWKeyboard::HWKeyboard(Manager* manager) : mpManager(manager), field_0x14(0), field_0x15(0), field_0x16(0) {
}
struct NavigationCommand { u32 command; u32 modifiers; };
struct KeyInputData {
wchar_t character;
u16 flags;
u32 modifier;
u8 direct;
u8 repeated;
u16 reserved;
u32 data;
};
extern const u8 controlKeys[];
void HWKeyboard::init() {
LayoutGather::Singleton::getInstance().setHWPressedShift(false);
u32 state = input::HKBManager::getInstance().GetModifierState();
input::HKBManager::getInstance().SetModifierState(state | 0x100, 0x700);
field_0x15 = 0;
field_0x16 = 0;
}
void HWKeyboard::updateShift(input::HKBManager& hkbManager) {
LayoutGather &gather = LayoutGather::Singleton::getInstance();
u32 state = hkbManager.GetModifierState();
if (!mgr()->getToolBar()->isQwerty() && !mgr()->getToolBar()->isEnableKeytopChange()) {
return;
}
bool previousShift = gather.isHoldingShift();
if (state & 0x2) {
gather.setHWPressedShift(true);
if (!previousShift) {
mgr()->getPCKeyboard()->onPressedShift(true);
}
} else {
gather.setHWPressedShift(false);
if (previousShift) {
if (!gather.isHoldingShift()) {
mgr()->getPCKeyboard()->onReleasedShift();
}
}
}
}
extern "C" asm bool updateInput__Q49textinput8keyboard5hwkey10HWKeyboardFRQ39textinput5input10HKBManager() {
nofralloc
stwu r1, -0x40(r1)
@@ -293,6 +246,17 @@ extern const u8 controlKeys[];
blr
}
struct NavigationCommand { u32 command; u32 modifiers; };
struct KeyInputData {
wchar_t character;
u16 flags;
u32 modifier;
u8 direct;
u8 repeated;
u16 reserved;
u32 data;
};
extern const u8 controlKeys[];
bool HWKeyboard::updateRepeatKey_(input::HKBManager& hkbManager) {
u32 modifierState = hkbManager.GetModifierState();
input::HKBManager::KeySet currentKeySet;
@@ -611,12 +575,50 @@ extern const u8 controlKeys[];
return false;
}
HWKeyboard::HWKeyboard(Manager* manager) : mpManager(manager), field_0x14(0), field_0x15(0), field_0x16(0) {
}
void HWKeyboard::init() {
LayoutGather::Singleton::getInstance().setHWPressedShift(false);
u32 state = input::HKBManager::getInstance().GetModifierState();
input::HKBManager::getInstance().SetModifierState(state | 0x100, 0x700);
field_0x15 = 0;
field_0x16 = 0;
}
void HWKeyboard::updateInput(int chan, f32 x, f32 y, u32 trig, u32 hold, u32 release, void* data) {
if (trig != 0) {
field_0x14 = 0;
}
}
void HWKeyboard::updateShift(input::HKBManager& hkbManager) {
LayoutGather &gather = LayoutGather::Singleton::getInstance();
u32 state = hkbManager.GetModifierState();
if (!mgr()->getToolBar()->isQwerty() && !mgr()->getToolBar()->isEnableKeytopChange()) {
return;
}
bool previousShift = gather.isHoldingShift();
if (state & 0x2) {
gather.setHWPressedShift(true);
if (!previousShift) {
mgr()->getPCKeyboard()->onPressedShift(true);
}
} else {
gather.setHWPressedShift(false);
if (previousShift) {
if (!gather.isHoldingShift()) {
mgr()->getPCKeyboard()->onReleasedShift();
}
}
}
}
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
@@ -635,6 +637,25 @@ const u8 controlKeys[] = {
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
extern "C" asm void setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language() {
nofralloc
cmpwi r4, 2
bne setLanguage_L1
lis r4, scCountryMap_EU@ha
lis r3, sInstance__Q39textinput5input10HKBManager@ha
addi r4, r4, scCountryMap_EU@l
lbzx r4, r4, r5
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
b SetCountry__Q39textinput5input10HKBManagerFUc
setLanguage_L1:
lis r4, scCountryMap_NonEU@ha
lis r3, sInstance__Q39textinput5input10HKBManager@ha
addi r4, r4, scCountryMap_NonEU@l
lbzx r4, r4, r5
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
b SetCountry__Q39textinput5input10HKBManagerFUc
}
extern "C" asm void convertWCCode__Q49textinput8keyboard5hwkey10HWKeyboardCFw() {
nofralloc
stwu r1, -0x10(r1)
@@ -716,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
@@ -794,14 +815,6 @@ const u8 controlKeys[] = {
addi r1, r1, 0x10
blr
}
void HWKeyboard::setLanguage(Destination destination, Language language) {
if (destination == DST_EU) {
input::HKBManager::getInstance().SetCountry(scCountryMap_EU[language]);
} else {
input::HKBManager::getInstance().SetCountry(scCountryMap_NonEU[language]);
}
}
} // namespace hwkey
} // namespace keyboard

View File

@@ -139,22 +139,22 @@ extern "C" asm void draw__Q39textinput11nw4rmanager6LayoutFv();
extern "C" asm void searchPaneComponent__Q39textinput3gui11PaneManagerFPCc();
#pragma push
#pragma section const_type ".data"
extern "C" const char scP_txtScrll_UP[];
extern "C" const char scP_txtScrll_DOWN[];
extern "C" const char scN_JPNUSAEUR[];
extern "C" const char scN_separateBarAll[];
extern "C" const char scT_2l_TextBox[];
extern "C" const char scT_title_textJPN[];
extern "C" const char scN_separateBarKOR[];
extern "C" const char scT_2l_TextBoxKOR[];
extern "C" const char scT_title_textKOR[];
extern "C" const char scN_separateBarCHN[];
extern "C" const char scT_2l_TextBoxCHN[];
extern "C" const char scT_title_textCHN[];
extern "C" const char scN_KOR[];
extern "C" const char scN_CHN[];
extern "C" const char lbl_8165C820[];
extern "C" const char lbl_8165C830[];
extern "C" const char lbl_8165C8C0[];
extern "C" const char lbl_8165C8CC[];
extern "C" const char lbl_8165C8E0[];
extern "C" const char lbl_8165C8F0[];
extern "C" const char lbl_8165C900[];
extern "C" const char lbl_8165C918[];
extern "C" const char lbl_8165C928[];
extern "C" const char lbl_8165C938[];
extern "C" const char lbl_8165C950[];
extern "C" const char lbl_8165C960[];
extern "C" const char 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();
@@ -314,7 +314,7 @@ void Base::resetContextPredict_() {
static GXColor kanaBackground = {128, 255, 128, 255};
static GXColor candidateBackground = {255, 210, 12, 255};
const char* csScrollButtonAnimationTarget = scP_txtScrll_UP;
const char* csScrollButtonAnimationTarget = lbl_8165C820;
struct InputFormAnimationFile {
u32 id;
@@ -337,14 +337,14 @@ extern "C" const InputFormAnimationFile csAninationFile__Q29textinput9inputform[
#pragma section data_type ".rodata"
extern "C" const VisiblePanes csVisiblePaneUEJ__Q29textinput9inputform = {
1, 2,
{scN_JPNUSAEUR, NULL, NULL, NULL},
{lbl_8165C8C0, NULL, NULL, NULL},
{"N_KOR", "N_CHN", NULL, NULL},
};
extern "C" const VisiblePanes csVisiblePaneKOR__Q29textinput9inputform = {
1, 2,
{"N_KOR", NULL, NULL, NULL},
{"N_CHN", scN_JPNUSAEUR, NULL, NULL},
{"N_CHN", lbl_8165C8C0, NULL, NULL},
};
extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
@@ -354,7 +354,7 @@ extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
0,
0,
"N_KOR",
scN_JPNUSAEUR,
lbl_8165C8C0,
0,
0,
0,
@@ -362,23 +362,23 @@ extern "C" const void* csVisiblePaneCHN__Q29textinput9inputform[10] = {
extern "C" const LanguagePaneData csLanguageDependencyDataUEJ__Q29textinput9inputform = {
&csVisiblePaneUEJ__Q29textinput9inputform,
scN_separateBarAll,
scT_2l_TextBox,
scT_title_textJPN,
lbl_8165C8CC,
lbl_8165C8E0,
lbl_8165C8F0,
};
extern "C" const LanguagePaneData csLanguageDependencyDataKOR__Q29textinput9inputform = {
&csVisiblePaneKOR__Q29textinput9inputform,
scN_separateBarKOR,
scT_2l_TextBoxKOR,
scT_title_textKOR,
lbl_8165C900,
lbl_8165C918,
lbl_8165C928,
};
extern "C" const LanguagePaneData csLanguageDependencyDataCHN__Q29textinput9inputform = {
reinterpret_cast<const VisiblePanes*>(csVisiblePaneCHN__Q29textinput9inputform),
scN_separateBarCHN,
scT_2l_TextBoxCHN,
scT_title_textCHN,
lbl_8165C938,
lbl_8165C950,
lbl_8165C960,
};
#pragma section data_type ".data"
@@ -386,39 +386,39 @@ extern "C" const wchar_t pppURLCheck[2][10] = {L"http://", L"https://"};
#pragma pop
extern "C" const f32 scInputFormZeroF = 0.0f;
extern "C" const f32 scInputForm640F = 640.0f;
extern "C" const f64 scInputFormF32ConvertMagic = 4503601774854144.0;
extern "C" const f32 scInputFormOneF = 1.0f;
extern "C" const f32 scInputFormHalfF = 0.5f;
extern "C" const f32 scInputFormDegToFIdxF = 0.7111111f;
extern "C" const f32 scInputForm150F = 150.0f;
extern "C" const f32 scInputForm30F = 30.0f;
extern "C" const f32 scInputForm50F = 50.0f;
extern "C" const f32 scInputForm10F = 10.0f;
extern "C" const f32 scInputForm52F = 52.0f;
extern "C" const f32 scInputFormTwoF = 2.0f;
extern "C" const f32 scInputForm140F = 140.0f;
extern "C" const f32 scInputForm90F = 90.0f;
extern "C" const f32 scInputForm253F = 253.0f;
extern "C" const f32 scInputForm20F = 20.0f;
extern "C" const u8 scInputFormColorRU8 = 0xff;
extern "C" const u8 scInputFormColorGU8 = 0x32;
extern "C" const u8 scInputFormColorBU8 = 0x32;
extern "C" const u8 scInputFormColorAU8 = 0;
extern "C" const f32 scInputForm255F = 255.0f;
extern "C" const f32 scInputForm127F = 127.0f;
extern "C" const f32 scInputForm14592F = 14592.0f;
extern "C" const f64 scInputFormF64ConvertMagic = 4503599627370496.0;
extern "C" const f32 scInputForm15F = 15.0f;
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;
#pragma push
#pragma section const_type ".data"
extern "C" const char scP_txtScrll_UP[] = "P_txtScrll_UP";
extern "C" const char scP_txtScrll_DOWN[] = "P_txtScrll_DOWN";
extern "C" const char lbl_8165C820[] = "P_txtScrll_UP";
extern "C" const char lbl_8165C830[] = "P_txtScrll_DOWN";
struct ButtonAnimations {
KeyType type;
const char* paneName;
@@ -428,27 +428,27 @@ struct ButtonAnimations {
};
const ButtonAnimations csButtonAnimations[] = {
{KT_NormalButton, scP_txtScrll_UP, 8, NULL, {
{KT_NormalButton, lbl_8165C820, 8, NULL, {
&csAninationFile__Q29textinput9inputform[0], &csAninationFile__Q29textinput9inputform[1],
&csAninationFile__Q29textinput9inputform[2], &csAninationFile__Q29textinput9inputform[3],
&csAninationFile__Q29textinput9inputform[4], &csAninationFile__Q29textinput9inputform[5],
&csAninationFile__Q29textinput9inputform[6], &csAninationFile__Q29textinput9inputform[7]}},
{KT_NormalButton, scP_txtScrll_DOWN, 8, csScrollButtonAnimationTarget, {
{KT_NormalButton, lbl_8165C830, 8, csScrollButtonAnimationTarget, {
&csAninationFile__Q29textinput9inputform[0], &csAninationFile__Q29textinput9inputform[1],
&csAninationFile__Q29textinput9inputform[2], &csAninationFile__Q29textinput9inputform[3],
&csAninationFile__Q29textinput9inputform[4], &csAninationFile__Q29textinput9inputform[5],
&csAninationFile__Q29textinput9inputform[6], &csAninationFile__Q29textinput9inputform[7]}}
};
extern "C" const char scN_JPNUSAEUR[] = "N_JPNUSAEUR";
extern "C" const char scN_separateBarAll[] = "N_separateBarAll";
extern "C" const char scT_2l_TextBox[] = "T_2l_TextBox";
extern "C" const char scT_title_textJPN[] = "T_title_textJPN";
extern "C" const char scN_separateBarKOR[] = "N_separateBarKOR";
extern "C" const char scT_2l_TextBoxKOR[] = "T_2l_TextBoxKOR";
extern "C" const char scT_title_textKOR[] = "T_title_textKOR";
extern "C" const char scN_separateBarCHN[] = "N_separateBarCHN";
extern "C" const char scT_2l_TextBoxCHN[] = "T_2l_TextBoxCHN";
extern "C" const char scT_title_textCHN[] = "T_title_textCHN";
extern "C" const char lbl_8165C8C0[] = "N_JPNUSAEUR";
extern "C" const char lbl_8165C8CC[] = "N_separateBarAll";
extern "C" const char lbl_8165C8E0[] = "T_2l_TextBox";
extern "C" const char lbl_8165C8F0[] = "T_title_textJPN";
extern "C" const char lbl_8165C900[] = "N_separateBarKOR";
extern "C" const char lbl_8165C918[] = "T_2l_TextBoxKOR";
extern "C" const char lbl_8165C928[] = "T_title_textKOR";
extern "C" const char lbl_8165C938[] = "N_separateBarCHN";
extern "C" const char lbl_8165C950[] = "T_2l_TextBoxCHN";
extern "C" const char lbl_8165C960[] = "T_title_textCHN";
bool DeadKeyStream::sbCompatibleFilterEnabled = true;
inline bool DeadKeyStream::isCompatible(wchar_t character) {
@@ -509,13 +509,13 @@ void Base::setLanguage(Language language) {
case UK:
setPredictMode(PM_En);
break;
case 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

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

View File

@@ -1499,18 +1499,14 @@ namespace textinput {
return mKeyState.getWCCode(paneName);
}
inline u32 FindControlKey(const Base::KeyState& state, char* paneName) {
u32 Base::getControlKey(char* paneName) {
for (u16 i = 0; i < 23; i++) {
if (util::strcmp(state.data->controls[i].paneName, paneName))
return state.data->controls[i].key;
if (util::strcmp(mKeyState.data->controls[i].paneName, paneName))
return mKeyState.data->controls[i].key;
}
return 27;
}
u32 Base::getControlKey(char* paneName) {
return FindControlKey(mKeyState, paneName);
}
void Base::changeABCInputMode(InputMode mode) {
switch (mode) {
case IM_Direct:
@@ -2543,14 +2539,11 @@ namespace textinput {
u32 koreanCode = code;
if (caps)
koreanCode = util::reverseLetterCaseW(koreanCode);
u16 mapped;
if (koreanCode >= L'a' && koreanCode <= L'z')
mapped = KOREAN_LOWER[static_cast<u16>(koreanCode) - L'a'];
koreanCode = KOREAN_LOWER[static_cast<u16>(koreanCode) - L'a'];
else if (koreanCode >= L'A' && koreanCode <= L'Z')
mapped = KOREAN_UPPER[static_cast<u16>(koreanCode) - L'A'];
else
mapped = koreanCode;
code = mapped;
koreanCode = KOREAN_UPPER[static_cast<u16>(koreanCode) - L'A'];
code = koreanCode;
}
}
animation = searchAnmPane(code);

View File

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

View File

@@ -185,7 +185,7 @@ namespace ipl {
};
// clang-format on
Button::Button(EGG::Heap* heap) : Base(heap), mAnimWait(0), mOptOutBtn(), mSdMenuBtn(), mbNewMailAnm(false), mbSuppressNewMailAnm(false), mReservedCmd() {
Button::Button(EGG::Heap* heap) : Base(heap), unk_0x54(0), mOptOutBtn(), mSdMenuBtn(), unk_0x104(false), unk_0x105(false), mReservedCmd() {
for (int i = 0; i < ARROW_BTN_MAX; i++) {
mbArrowVisible[i] = true;
}
@@ -293,7 +293,7 @@ namespace ipl {
}
void Button::calc() {
switch (mAnimWait) {
switch (unk_0x54) {
case 0: {
if (mReservedCmd.get_current_index() != 0) {
Command popped = mReservedCmd.get_popped_item();
@@ -312,7 +312,7 @@ namespace ipl {
if (!mpButtonAnim[ANIM_SCENE_CHANGE]->isPlaying() && !mpButtonAnim[ANIM_CALENDAR_EXIT]->isPlaying() &&
!mpButtonAnim[ANIM_COMMON_BUTTON]->isPlaying() && !mpButtonAnim[ANIM_TRASH_DELETE]->isPlaying() &&
!mOptOutBtn.mpLayout->isPlaying()) {
mAnimWait = 0;
unk_0x54 = 0;
}
break;
}
@@ -335,7 +335,7 @@ namespace ipl {
mpBalloons[i]->calc();
}
if (mbNewMailAnm && !mbSuppressNewMailAnm && mTimer()) {
if (unk_0x104 && !unk_0x105 && mTimer()) {
startNewMailAnm_();
}
}
@@ -457,7 +457,7 @@ namespace ipl {
bool Button::isActive() const {
bool result = false;
if (isSceneCreated() && mAnimWait != 1) {
if (isSceneCreated() && unk_0x54 != 1) {
result = true;
}
return result;
@@ -668,7 +668,7 @@ namespace ipl {
}
}
mAnimWait = 1;
unk_0x54 = 1;
}
void Button::initArrowAppearance(int arrowType, bool bAppear) {
@@ -752,8 +752,8 @@ namespace ipl {
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMinFrame(scLoopAnmFrame.start);
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMaxFrame(scLoopAnmFrame.end);
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setSpeed(1.0f);
mbNewMailAnm = true;
if (!mbSuppressNewMailAnm) {
unk_0x104 = true;
if (!unk_0x105) {
startNewMailAnm_();
}
}
@@ -773,7 +773,7 @@ namespace ipl {
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setMaxFrame(1.0f);
mpButtonAnim[ANIM_BOARD_BBS_NEW]->setSpeed(0.0f);
mpButtonAnim[ANIM_BOARD_BBS_NEW]->play();
mbNewMailAnm = false;
unk_0x104 = false;
}
void Button::enableBtn() {

View File

@@ -236,10 +236,10 @@ namespace ipl {
Calendar::Calendar(EGG::Heap* heap)
: FaderSceneBase(heap), ButtonEventHandlerBase(), mState(STATE_NORMAL), mPrevState(STATE_NORMAL), mpLayout(NULL), mpLayoutFile(NULL),
mpGroupAnim(NULL), mpInitAnim(NULL), mpBoardDate(NULL), mpSelectDate(NULL), mbScrolling(false), mbSearchTaskRunning(FALSE), mbTaskCanceled(FALSE),
mpGroupAnim(NULL), mpInitAnim(NULL), mpBoardDate(NULL), mpSelectDate(NULL), mbScrolling(false), unk_0xA0(FALSE), mbTaskCanceled(FALSE),
mbBackToBoardAlt(FALSE) {
nw4r::ut::List_Init(&mDateList, offsetof(Date, mNode1));
nw4r::ut::List_Init(&mDrawList, offsetof(Date, mNode2));
nw4r::ut::List_Init(&unk_0x90, offsetof(Date, mNode2));
mbAsian = System::getRegion() == SC_PRODUCT_AREA_JPN || (u32)System::getRegion() == SC_PRODUCT_AREA_KOR ||
(u32)System::getRegion() == SC_PRODUCT_AREA_CHN;
@@ -262,7 +262,7 @@ namespace ipl {
for (int i = 0; i < (DATE_COUNT * 2); i++) {
Date* date = new Date(getSceneHeap(), mpLayoutFile, "arc", "my_IplTop_f.brlyt");
if (i < DATE_COUNT) {
nw4r::ut::List_Append(&mDrawList, date);
nw4r::ut::List_Append(&unk_0x90, date);
}
nw4r::ut::List_Append(&mDateList, date);
}
@@ -382,10 +382,10 @@ namespace ipl {
}
} else {
for (u32 i = 0; i < DATE_COUNT; i++) {
((Date*)nw4r::ut::List_GetNth(&mDrawList, i))->draw(false);
((Date*)nw4r::ut::List_GetNth(&unk_0x90, i))->draw(false);
}
for (u32 i = 0; i < DATE_COUNT; i++) {
((Date*)nw4r::ut::List_GetNth(&mDrawList, i))->draw(true);
((Date*)nw4r::ut::List_GetNth(&unk_0x90, i))->draw(true);
}
}
}
@@ -425,8 +425,8 @@ namespace ipl {
}
void Calendar::onPointDate(Date* date) {
nw4r::ut::List_Remove(&mDrawList, date);
nw4r::ut::List_Append(&mDrawList, date);
nw4r::ut::List_Remove(&unk_0x90, date);
nw4r::ut::List_Append(&unk_0x90, date);
}
void Calendar::onTrigDate(Date* date) {
@@ -503,7 +503,7 @@ namespace ipl {
}
void Calendar::on_wait_task() {
if (mbSearchTaskRunning == FALSE) {
if (unk_0xA0 == FALSE) {
switch (mPrevState) {
case STATE_SCROLL_RIGHT: {
do_scroll_r();
@@ -535,7 +535,7 @@ namespace ipl {
mPrevState = mState;
mState = STATE_SCROLL_RIGHT;
if (mbSearchTaskRunning == TRUE) {
if (unk_0xA0 == TRUE) {
mbTaskCanceled = TRUE;
mPrevState = STATE_SCROLL_RIGHT;
mState = STATE_WAIT_TASK;
@@ -577,7 +577,7 @@ namespace ipl {
mPrevState = mState;
mState = STATE_SCROLL_LEFT;
if (mbSearchTaskRunning) {
if (unk_0xA0) {
mbTaskCanceled = TRUE;
mPrevState = STATE_SCROLL_LEFT;
mState = STATE_WAIT_TASK;
@@ -616,7 +616,7 @@ namespace ipl {
mPrevState = mState;
mState = STATE_DONE;
if (mbSearchTaskRunning == TRUE) {
if (unk_0xA0 == TRUE) {
OSReport("検索タスク終了要求\n"); // "Search task termination requested"
mbTaskCanceled = TRUE;
mPrevState = mState;
@@ -863,14 +863,14 @@ namespace ipl {
OSReport("タスク終了\n"); // Task end
calendar->mbSearchTaskRunning = FALSE;
calendar->unk_0xA0 = FALSE;
calendar->mbTaskCanceled = FALSE;
}
}
void Calendar::exec_search_task() {
OSReport("検索開始\n"); // Start search
mbSearchTaskRunning = TRUE;
unk_0xA0 = TRUE;
System::getTask1()->requestJam(search_task_, this, NULL);
}

View File

@@ -67,7 +67,7 @@ namespace ipl {
DECOMP_FORCE_ACTIVE(iplDate_cpp, padding);
Date::Date(EGG::Heap* heap, nand::LayoutFile* file, const char* layoutFolder, const char* layoutFileName)
: ::gui::EventHandler(), mbAppearMsg(0), mFocusState(0), mPendingFocusCmd(0), mpLayout(NULL), mpCurrentPaneAnim(0), mPointCount(0) {
: ::gui::EventHandler(), mbAppearMsg(0), unk_0x10(0), unk_0x14(0), mpLayout(NULL), mpCurrentPaneAnim(0), unk_0x3C(0) {
// Layout
mpLayout = new layout::Object(heap, file, layoutFolder, layoutFileName);
@@ -103,16 +103,16 @@ namespace ipl {
onCmdRecv(3);
}
onCmdRecv(mPendingFocusCmd);
onCmdRecv(unk_0x14);
}
void Date::draw(bool unk) {
if (unk) {
if (mPointCount != 0) {
if (unk_0x3C != 0) {
mpLayout->draw();
}
} else {
if (mPointCount == 0) {
if (unk_0x3C == 0) {
mpLayout->draw();
}
}
@@ -210,7 +210,7 @@ namespace ipl {
void Date::start_point_event(const char* paneName, controller::Interface* con) {
if (strcmp(paneName, scB_Cal) == 0) {
if (mPointCount == 0) {
if (unk_0x3C == 0) {
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
onCmdRecv(1);
@@ -221,16 +221,16 @@ namespace ipl {
}
}
}
mPointCount++;
unk_0x3C++;
}
}
void Date::start_left_event(const char* paneName) {
if (strcmp(paneName, scB_Cal) == 0) {
if (mPointCount == 1) {
if (unk_0x3C == 1) {
onCmdRecv(2);
}
mPointCount--;
unk_0x3C--;
}
}
@@ -268,35 +268,35 @@ namespace ipl {
void Date::onCmdRecv(int cmd) {
if (cmd == 1 || cmd == 2) {
mPendingFocusCmd = cmd;
unk_0x14 = cmd;
}
switch (mFocusState) {
switch (unk_0x10) {
case 0: {
if (cmd == 1) {
mpCurrentPaneAnim = doAnim(IDANIM_FOCUS_IN);
mFocusState = 1;
unk_0x10 = 1;
} else if (cmd == 2) {
mpCurrentPaneAnim = doAnim(IDANIM_FOCUS_OUT);
mFocusState = 2;
unk_0x10 = 2;
}
break;
}
case 1: {
if (cmd == 3) {
if (mPendingFocusCmd == 1) {
mPendingFocusCmd = 0;
if (unk_0x14 == 1) {
unk_0x14 = 0;
}
mFocusState = 0;
unk_0x10 = 0;
}
break;
}
case 2: {
if (cmd == 3) {
if (mPendingFocusCmd == 2) {
mPendingFocusCmd = 0;
if (unk_0x14 == 2) {
unk_0x14 = 0;
}
mFocusState = 0;
unk_0x10 = 0;
}
break;
}
@@ -306,13 +306,14 @@ namespace ipl {
void Date::initEvent() {
mpGui->init();
mpPaneAnims[ANIM_PANE_BTN_HOVER]->initAnmFrame(0.0f);
mPointCount = 0;
unk_0x3C = 0;
onCmdRecv(3);
}
#pragma push
#pragma section sconst_type ".sdata2"
extern "C" const f32 scDateZeroF = 0.0f;
extern "C" const f32 lbl_816948F0;
#pragma pop
} // namespace scene
} // namespace ipl

View File

@@ -45,7 +45,7 @@ struct CardThreadState {
MEMAllocator sAllocator_;
static CardThreadState* sThread;
extern "C" void* cardThreadMain();
extern "C" void* CardSequence_813D2C8C();
static char sCardSlotName[3] = "AB";
FileInfo* getCardDirState() {
@@ -68,7 +68,7 @@ long getCardLastCMDFCmdResult() {
return sThread->completionResult;
}
extern "C" s32 sendCardUnmountCmd(u8 slot) {
extern "C" s32 CardSequence_813D205C(u8 slot) {
sThread->sourceSlot = slot;
sThread->lastCommand = 9;
sThread->lastResult = -21;
@@ -114,12 +114,12 @@ void sendCardDeleteCmd(u8 slot, s16 fileNo) {
}
void sendCardThreadStopCmd() NO_INLINE {
sendCardUnmountCmd(0);
sendCardUnmountCmd(1);
CardSequence_813D205C(0);
CardSequence_813D205C(1);
OSSendMessage(&sThread->requests, (OSMessage)0xB, 0);
}
extern "C" void pollCardSlot(u8 slot) {
extern "C" void CardSequence_813D222C(u8 slot) {
s32 result;
if (sThread->valid == 1) {
@@ -139,7 +139,7 @@ extern "C" void pollCardSlot(u8 slot) {
}
}
if (result == 0) {
if (sThread->slots[slot].state > 2 && sendCardUnmountCmd(slot)) {
if (sThread->slots[slot].state > 2 && CardSequence_813D205C(slot)) {
sThread->slots[slot].changed = 0;
}
}
@@ -148,7 +148,7 @@ done:
return;
}
extern "C" s32 mapCardErrorCode(s32 result) {
extern "C" s32 CardSequence_813D233C(s32 result) {
switch (result) {
case 0:
return 0;
@@ -186,8 +186,8 @@ extern "C" s32 mapCardErrorCode(s32 result) {
void probeCard() {
OSMessage message;
pollCardSlot(0);
pollCardSlot(1);
CardSequence_813D222C(0);
CardSequence_813D222C(1);
while (OSReceiveMessage(&sThread->responses, &message, 0)) {
s16 slot = (s16)(((u32)message >> 16) & 1);
s8 command = (u8)(u32)message;
@@ -251,9 +251,9 @@ checkCommand:
break;
}
sThread->lastResult = mapCardErrorCode((s8)(((u32)message << 16) >> 24));
sThread->lastResult = CardSequence_813D233C((s8)(((u32)message << 16) >> 24));
if ((s8)(u8)(u32)message != 0 && (s8)(u8)(u32)message != 9) {
sThread->completionResult = mapCardErrorCode((s8)(((u32)message << 16) >> 24));
sThread->completionResult = CardSequence_813D233C((s8)(((u32)message << 16) >> 24));
if (sThread->sourceSlot != (s16)(((u32)message >> 16) & 1)) {
sThread->destinationFileNo = (u32)message >> 24;
}
@@ -302,7 +302,7 @@ void initCardThread() {
OSInitMessageQueue(&sThread->responses, sThread->responseMessages, 0x10);
OSInitMessageQueue(&sThread->requests, sThread->requestMessages, 0x10);
OSCreateThread(&sThread->thread, (void* (*)(void*))cardThreadMain, 0,
OSCreateThread(&sThread->thread, (void* (*)(void*))CardSequence_813D2C8C, 0,
sThread->stack + sizeof(sThread->stack), 0x8000, 0x11, 0);
OSResumeThread(&sThread->thread);
OSSendMessage(&sThread->requests, (OSMessage)10, 0);
@@ -348,7 +348,7 @@ const char* getIconComment(u8 slot, s16 index) {
return sThread->comments[slot][index];
}
extern "C" void clearCardFileEntry(s32 slot, s32 index) {
extern "C" void CardSequence_813D2A74(s32 slot, s32 index) {
BOOL interrupts = OSDisableInterrupts();
sThread->files[slot][index].fileNo = 0;
sThread->files[slot][index].size = 0;
@@ -360,7 +360,7 @@ extern "C" void clearCardFileEntry(s32 slot, s32 index) {
OSRestoreInterrupts(interrupts);
}
extern "C" void refreshCardSlotInfo(s32 slot) {
extern "C" void CardSequence_813D2B40(s32 slot) {
u16 memSize;
u32 sectorSize;
s32 freeBytes;
@@ -391,12 +391,12 @@ extern "C" void refreshCardSlotInfo(s32 slot) {
}
}
extern "C" s32 handleCardMountResult(s32 slot, s32 result);
extern "C" s32 reportCardThreadError(s32 slot, s32 state, s32 result);
extern "C" void sendCardSlotState(s32 slot, s32 state, s32 fileNo);
extern "C" void clearAllCardFileEntries(s32 slot);
extern "C" s32 loadCardFileIcons(s32 slot, s32 fileNo, CARDDir* dir);
extern "C" void runCardMoveOrCopy(s32 slot, s16 fileNo, s32 command);
extern "C" s32 CardSequence_813D320C(s32 slot, s32 result);
extern "C" s32 CardSequence_813D32A8(s32 slot, s32 state, s32 result);
extern "C" void CardSequence_813D3380(s32 slot, s32 state, s32 fileNo);
extern "C" void CardSequence_813D33D8(s32 slot);
extern "C" s32 CardSequence_813D3424(s32 slot, s32 fileNo, CARDDir* dir);
extern "C" void CardSequence_813D3D14(s32 slot, s16 fileNo, s32 command);
static inline void sendValidityResponse(u32 command, u32 valid) {
union {
@@ -408,7 +408,7 @@ static inline void sendValidityResponse(u32 command, u32 valid) {
OSSendMessage(&sThread->responses, (OSMessage)reply.value, 1);
}
extern "C" void* cardThreadMain() {
extern "C" void* CardSequence_813D2C8C() {
struct CardThreadLocals {
u8 compareName[6];
u32 message;
@@ -455,7 +455,7 @@ loopStart:
command = (local.message >> 14) & 4;
result = CARDMount(slot, sThread->mountBuffers[command / 4], 0);
if (result < 0) {
result = handleCardMountResult(slot, result);
result = CardSequence_813D320C(slot, result);
if (result != 0) {
goto mountContinue;
}
@@ -467,11 +467,11 @@ loopStart:
}
mountContinue:
clearAllCardFileEntries(slot);
CardSequence_813D33D8(slot);
for (file = 0; file < 0x7F; ++file) {
result = __CARDGetStatusEx(slot, (s16)file, &local.mountDir);
if (result < 0) {
result = handleCardMountResult(slot, result);
result = CardSequence_813D320C(slot, result);
if (result != 0) {
continue;
}
@@ -496,16 +496,16 @@ loopStart:
goto mountError;
}
} else {
result = loadCardFileIcons(slot, (s16)file, &local.mountDir);
result = CardSequence_813D3424(slot, (s16)file, &local.mountDir);
if (result < 0) {
goto mountError;
}
}
}
}
refreshCardSlotInfo(slot);
CardSequence_813D2B40(slot);
sThread->mounted[command / 4] = 1;
sendCardSlotState(slot, 0, 0);
CardSequence_813D3380(slot, 0, 0);
OSReport("Slot %c\n", sCardSlotName[slot]);
for (listingFile = 0; listingFile < 0x7F; ++listingFile) {
if (__CARDGetStatusEx(slot, (u16)listingFile, &local.listingDir) == 0) {
@@ -519,30 +519,30 @@ loopStart:
mountError:
OSReport("MountError\n");
reportCardThreadError(slot, 0, result);
CardSequence_813D32A8(slot, 0, result);
break;
}
case 9:
reportCardThreadError((local.message >> 16) & 1, 9, -3);
CardSequence_813D32A8((local.message >> 16) & 1, 9, -3);
break;
case 1: {
slot = (local.message >> 16) & 1;
result = CARDFormat(slot);
if (result < 0) {
reportCardThreadError(slot, 1, result);
CardSequence_813D32A8(slot, 1, result);
} else {
sThread->mounted[slot] = 1;
refreshCardSlotInfo(slot);
sendCardSlotState(slot, 1, 0);
CardSequence_813D2B40(slot);
CardSequence_813D3380(slot, 1, 0);
}
break;
}
case 2:
runCardMoveOrCopy((local.message >> 16) & 1,
CardSequence_813D3D14((local.message >> 16) & 1,
(s16)(u8)(local.message >> 24), (s8)command);
break;
case 3:
runCardMoveOrCopy((local.message >> 16) & 1,
CardSequence_813D3D14((local.message >> 16) & 1,
(s16)(u8)(local.message >> 24), (s8)command);
break;
case 4: {
@@ -550,11 +550,11 @@ loopStart:
fileNo = (s16)(local.message >> 24);
result = CARDFastDelete(slot, fileNo);
if (result < 0) {
reportCardThreadError(slot, 4, result);
CardSequence_813D32A8(slot, 4, result);
} else {
clearCardFileEntry(slot, fileNo);
refreshCardSlotInfo(slot);
sendCardSlotState(slot, 4, (u8)fileNo);
CardSequence_813D2A74(slot, fileNo);
CardSequence_813D2B40(slot);
CardSequence_813D3380(slot, 4, (u8)fileNo);
}
break;
}
@@ -581,7 +581,7 @@ loopStart:
++outerSlot;
} while (outerSlot < 2);
sendCardSlotState(0, 0xC, 0);
CardSequence_813D3380(0, 0xC, 0);
break;
default:
break;
@@ -593,9 +593,9 @@ loopCheck:
return 0;
}
extern "C" s32 checkCardFileDuplicate(s32 slot, s16 fileNo);
extern "C" s32 CardSequence_813D3C38(s32 slot, s16 fileNo);
extern "C" void markAllCardFilesDirty() {
extern "C" void CardSequence_813D3140() {
u32 slot = 0;
s32 fileNo;
@@ -607,7 +607,7 @@ extern "C" void markAllCardFilesDirty() {
sThread->files[slot][fileNo].unk_0x06 = 0;
if (sThread->mounted[slot] != 0 &&
sThread->mounted[slot ^ 1] != 0 &&
checkCardFileDuplicate((u8)slot, (s16)fileNo) < 0) {
CardSequence_813D3C38((u8)slot, (s16)fileNo) < 0) {
sThread->files[slot][fileNo].unk_0x06 = flagValue;
}
++fileNo;
@@ -618,7 +618,7 @@ extern "C" void markAllCardFilesDirty() {
} while ((s32)slot < 2);
}
extern "C" s32 handleCardMountResult(s32 slot, s32 result) {
extern "C" s32 CardSequence_813D320C(s32 slot, s32 result) {
if (result == -5) {
goto reportError;
}
@@ -640,32 +640,32 @@ repairedCard:
{
result = CARDCheck(slot);
if (result < 0) {
return reportCardThreadError(slot, 0, result);
return CardSequence_813D32A8(slot, 0, result);
}
OSReport("CardThread:Broken Card Repaired\n");
return 1;
}
reportError:
return reportCardThreadError(slot, 0, result);
return CardSequence_813D32A8(slot, 0, result);
}
extern "C" s32 reportCardThreadError(s32 slot, s32 state, s32 result) {
extern "C" s32 CardSequence_813D32A8(s32 slot, s32 state, s32 result) {
if (result != -7 && result != -27 && result != -8 && result != -9 &&
(clearAllCardFileEntries(slot), result != -6) && result != -13) {
(CardSequence_813D33D8(slot), result != -6) && result != -13) {
OSReport("DEBUG: UnmountCard %d \n", slot);
CARDUnmount(slot);
sThread->mounted[slot & 0xFF] = 0;
}
OSReport("DEBUG: CardThread error %d %d\n", state, result);
markAllCardFilesDirty();
CardSequence_813D3140();
OSSendMessage(&sThread->responses,
(OSMessage)(((slot & 1) << 16) | ((result & 0xFF) << 8) | (state & 0xFF)), 1);
return 0;
}
extern "C" void sendCardSlotState(s32 slot, s32 state, s32 fileNo) {
markAllCardFilesDirty();
extern "C" void CardSequence_813D3380(s32 slot, s32 state, s32 fileNo) {
CardSequence_813D3140();
OSMessageQueue* queue = &sThread->responses;
union CardThreadMessage {
u32 value;
@@ -683,15 +683,15 @@ extern "C" void sendCardSlotState(s32 slot, s32 state, s32 fileNo) {
OSSendMessage(queue, (OSMessage)message.value, 1);
}
extern "C" void clearAllCardFileEntries(s32 slot) {
extern "C" void CardSequence_813D33D8(s32 slot) {
s32 file = 0;
do {
clearCardFileEntry(slot, (s16)file);
CardSequence_813D2A74(slot, (s16)file);
file = file + 1;
} while (file < 0x7F);
}
extern "C" s32 loadCardFileIcons(s32 slot, s32 fileNo, CARDDir* dir) {
extern "C" s32 CardSequence_813D3424(s32 slot, s32 fileNo, CARDDir* dir) {
struct CardSequenceFileData {
s32 commentSectorSize;
s32 sectorSize;
@@ -922,11 +922,11 @@ closeFileSuccess:
return 0;
}
extern "C" void clearCardWritePending(s32, s32) {
extern "C" void CardSequence_813D3C24(s32, s32) {
sThread->writePending = 0;
}
extern "C" s32 checkCardFileDuplicate(s32 slot, s16 fileNo) {
extern "C" s32 CardSequence_813D3C38(s32 slot, s16 fileNo) {
CARDDir sourceDir;
CARDDir otherDir;
s32 result = __CARDGetStatusEx(slot, fileNo, &sourceDir);
@@ -950,7 +950,7 @@ extern "C" s32 checkCardFileDuplicate(s32 slot, s16 fileNo) {
return 0;
}
extern "C" void runCardMoveOrCopy(s32 slot, s16 fileNo, s32 command) {
extern "C" void CardSequence_813D3D14(s32 slot, s16 fileNo, s32 command) {
CARDDir createStatus;
CARDDir checkedStatus;
CARDDir ioStatus;
@@ -970,10 +970,10 @@ extern "C" void runCardMoveOrCopy(s32 slot, s16 fileNo, s32 command) {
s32 statusResult;
s32 stage;
result = checkCardFileDuplicate(slot, fileNo);
result = CardSequence_813D3C38(slot, fileNo);
if (result < 0) {
reportCardThreadError(slot, command, result);
CardSequence_813D32A8(slot, command, result);
goto finish;
}
@@ -999,7 +999,7 @@ sectorSizeCheck:
goto sectorSizeDone;
}
sectorSizeError:
reportCardThreadError(slot, command, sectorError);
CardSequence_813D32A8(slot, command, sectorError);
goto finish;
sectorSizeDone:
;
@@ -1023,7 +1023,7 @@ sectorSizeDone:
result = CARDGetResultCode(slot);
}
if (result < 0) {
reportCardThreadError(slot, command, result);
CardSequence_813D32A8(slot, command, result);
goto finish;
}
@@ -1056,7 +1056,7 @@ createDone:
;
}
if (destinationFileNo < 0) {
reportCardThreadError(destinationSlot, command, destinationFileNo);
CardSequence_813D32A8(destinationSlot, command, destinationFileNo);
goto finish;
}
@@ -1099,7 +1099,7 @@ createDone:
sThread->writePending = 1;
ioResult = CARDWriteAsync(&sThread->destinationFile,
sThread->transferBuffer, size, offset,
clearCardWritePending);
CardSequence_813D3C24);
if (ioResult < 0) {
goto copyIoFailure;
}
@@ -1176,7 +1176,7 @@ copyIoDone:
}
} else {
metadataCopied = TRUE;
result = loadCardFileIcons(destinationSlot, destinationFileNo,
result = CardSequence_813D3424(destinationSlot, destinationFileNo,
&sourceStatus);
if (result < 0) {
OSReport("Can't read icon for move dstfile\n");
@@ -1214,7 +1214,7 @@ copyIoDone:
s32 setResult = result;
if (result == -3) {
CARDFastDelete(slot, fileNo);
clearCardFileEntry(slot, fileNo);
CardSequence_813D2A74(slot, fileNo);
} else {
s32 restoreResult = __CARDSetStatusEx(slot, fileNo, &moveStatus);
if (restoreResult < 0) {
@@ -1227,13 +1227,13 @@ copyIoDone:
stage = 3;
result = CARDFastDelete(slot, fileNo);
if (result >= 0) {
clearCardFileEntry(slot, fileNo);
CardSequence_813D2A74(slot, fileNo);
stage = 4;
result = __CARDGetStatusEx(destinationSlot,
destinationFileNo, &moveStatus);
if (result >= 0) {
stage = 5;
if ((result = loadCardFileIcons(
if ((result = CardSequence_813D3424(
destinationSlot, destinationFileNo, &moveStatus)) < 0) {
goto moveStatusError;
}
@@ -1270,10 +1270,10 @@ moveStatusDone:
}
if (result >= 0) {
refreshCardSlotInfo(slot);
refreshCardSlotInfo(destinationSlot);
sendCardSlotState(slot, 0, fileNo & 0xFF);
sendCardSlotState(destinationSlot, command, destinationFileNo & 0xFF);
CardSequence_813D2B40(slot);
CardSequence_813D2B40(destinationSlot);
CardSequence_813D3380(slot, 0, fileNo & 0xFF);
CardSequence_813D3380(destinationSlot, command, destinationFileNo & 0xFF);
goto finish;
}
@@ -1281,7 +1281,7 @@ cleanup:
destinationSlot = slot ^ 1;
result = CARDGetResultCode(destinationSlot);
if (result < 0) {
reportCardThreadError(destinationSlot, command, result);
CardSequence_813D32A8(destinationSlot, command, result);
} else {
if (temporaryCreated && !metadataCopied) {
CARDFastDelete(destinationSlot, destinationFileNo);
@@ -1289,18 +1289,18 @@ cleanup:
if (metadataCopied) {
if (__CARDGetStatusEx(destinationSlot, destinationFileNo,
&createStatus) == 0) {
loadCardFileIcons(destinationSlot, destinationFileNo, &createStatus);
CardSequence_813D3424(destinationSlot, destinationFileNo, &createStatus);
}
}
refreshCardSlotInfo(destinationSlot);
sendCardSlotState(destinationSlot, 0, fileNo & 0xFF);
CardSequence_813D2B40(destinationSlot);
CardSequence_813D3380(destinationSlot, 0, fileNo & 0xFF);
}
result = CARDGetResultCode(slot);
if (result < 0) {
reportCardThreadError(slot, command, result);
CardSequence_813D32A8(slot, command, result);
} else {
refreshCardSlotInfo(slot);
sendCardSlotState(slot, 0, fileNo & 0xFF);
CardSequence_813D2B40(slot);
CardSequence_813D3380(slot, 0, fileNo & 0xFF);
}
finish:

View File

@@ -640,23 +640,23 @@ namespace ipl {
const char* langGroup = scLangGroups[lang];
char langCodeBuf[40] = "";
bool foundLangGroup = false;
bool bVar4 = false;
for (nw4r::lyt::GroupList::Iterator it = layout->GetGroupList().GetBeginIter(); it != layout->GetGroupList().GetEndIter(); it++) {
if (strcmp(it->GetName(), langGroup) == 0) {
foundLangGroup = true;
bVar4 = true;
} else {
bool isNonRsoGroup = true;
bool bVar3 = true;
for (int i = 0; i < channel::MAX_ANIMS; i++) {
char name[6];
sprintf(name, "Rso%d", i);
if (strncmp(it->GetName(), name, 5) == 0) {
isNonRsoGroup = false;
bVar3 = false;
break;
}
}
if (isNonRsoGroup) {
if (bVar3) {
for (nw4r::lyt::PaneLinkList::Iterator it2 = it->GetPaneList().GetBeginIter(); it2 != it->GetPaneList().GetEndIter(); it2++) {
it2->mTarget->SetVisible(false);
}
@@ -672,7 +672,7 @@ namespace ipl {
}
}
if (foundLangGroup) {
if (bVar4) {
nw4r::lyt::Group* group = layout->FindGroupByName(langGroup);
for (nw4r::lyt::PaneLinkList::Iterator it = group->GetPaneList().GetBeginIter(); it != group->GetPaneList().GetEndIter(); it++) {
it->mTarget->SetVisible(true);
@@ -730,7 +730,7 @@ namespace ipl {
}
void ChannelObj::createThumbnail() {
bool shouldAdjustHeap = false;
bool bVar1 = false;
if (mpBalloonLayout == NULL && System::getChannelManager()->isLoaded(mChanPage, mChanIndex)) {
initBalloon();
@@ -746,12 +746,12 @@ namespace ipl {
frame = createWadThumbnail();
} else {
frame = createWrongThumbnail();
shouldAdjustHeap = true;
bVar1 = true;
}
}
} else {
frame = createEmptyThumbnail();
shouldAdjustHeap = true;
bVar1 = true;
}
calcNormal();
@@ -764,7 +764,7 @@ namespace ipl {
mpThumbAnim->setCurrentFrame(frame);
}
if (shouldAdjustHeap) {
if (bVar1) {
mpThumbLayout->adjustHeap();
}
}

View File

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

View File

@@ -449,7 +449,7 @@ namespace ipl {
mpRsoExpHeaps[0] = EGG::ExpHeap::create(0x80000, System::getMem2App(), MEM_HEAP_OPT_THREAD_SAFE | MEM_HEAP_OPT_DEBUG_FILL);
mpRsoExpHeaps[1] = EGG::ExpHeap::create(0x80000, System::getMem2App(), MEM_HEAP_OPT_THREAD_SAFE | MEM_HEAP_OPT_DEBUG_FILL);
getButton()->setSuppressNewMailAnm(true);
getButton()->setUnk_0x105(true);
}
void ChannelTitle::calcCommon() {
@@ -931,7 +931,7 @@ namespace ipl {
System::getChannelManager()->resetChJumpLoad();
getButton()->setSuppressNewMailAnm(false);
getButton()->setUnk_0x105(false);
}
BOOL ChannelTitle::isResetAcceptable() const {
@@ -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

@@ -71,7 +71,7 @@ namespace ipl {
mSelectedFaceId = -1;
mpNigaoe = NULL;
mbClosing = false;
mbResetAcceptable = true;
unk_0x7D = true;
mNwc24ErrCountdown = 0;
mbToFriend = false;
@@ -385,7 +385,7 @@ namespace ipl {
snd::getSystem()->startSE("WIPL_SE_DECIDE");
mbResetAcceptable = false;
unk_0x7D = false;
// Copy letter contents
wmemcpy(mWCString, getMemoInputForm()->getSendString()->getWCString(), WC_STRING_LENGTH);
@@ -409,7 +409,7 @@ namespace ipl {
closeNWC24();
}
mbResetAcceptable = true;
unk_0x7D = true;
// Button animation
button->animation(Button::IDANIM_SELECT_CREATE_R);

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

@@ -11,7 +11,7 @@ struct MemoryCardSortEntry {
s64 key;
};
extern "C" int compareMemoryCardSortEntries(const void* first, const void* second) {
extern "C" int iplMemoryCardManager_813CD034(const void* first, const void* second) {
const MemoryCardSortEntry* a = static_cast<const MemoryCardSortEntry*>(first);
const MemoryCardSortEntry* b = static_cast<const MemoryCardSortEntry*>(second);
s64 bKey = b->key;
@@ -92,7 +92,7 @@ void MemoryCardManager::sort_file_array(u8 slot) {
mFile[slot][file].unk_0x08 = 0;
}
}
qsort(mFile[slot], 0x7f, sizeof(MCFile), compareMemoryCardSortEntries);
qsort(mFile[slot], 0x7f, sizeof(MCFile), iplMemoryCardManager_813CD034);
}
void MemoryCardManager::sendCardCmdMove(u8 slot, s16 index) {

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

View File

@@ -49,42 +49,42 @@ namespace ipl {
};
static const f32 scThumbnailOffsets[][2] = {{64.0f, 48.0f}, {85.0f, 48.0f}};
extern "C" void iplSDChannelObj_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

@@ -107,8 +107,13 @@ namespace ipl {
extern "C" bool iplSDChannelSelect_813DD240(
SDChannelSelect* scene, const s32* requiredBytes, const s32* requiredBlocks,
ESTitleId* titleIds, char* titleNames, u32* titleCount);
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, int enabled);
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, int enabled);
SDChannelSelect::SDChannelSelect(EGG::Heap* heap)
: FaderSceneBase(heap),
@@ -208,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);
}
}
@@ -597,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;
}
@@ -840,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;
@@ -1032,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;
}
@@ -1744,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;
}
@@ -1830,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);
}
}
@@ -2054,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);
}
}
@@ -2081,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:
@@ -2149,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);
}
}
@@ -2157,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);
}
}
}
@@ -2291,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;
}
@@ -2386,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);
@@ -2413,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;
}
@@ -2629,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) {
@@ -2977,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) {
@@ -2999,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) {
@@ -3061,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;
@@ -3078,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());
@@ -3203,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);
}
@@ -3212,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:
@@ -3292,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);
@@ -3328,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) {
@@ -3427,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 23: iplSDChannelTitle_updateMemoryCalc(this); break;
case 21: iplSDChannelTitle_updateEnqueueNotice(this); break;
case 22: iplSDChannelTitle_updateCopyProgress(this); break;
case 24: iplSDChannelTitle_loadTitleBanner(this); break;
case 25: iplSDChannelTitle_updateBannerLoad(this); break;
case 26: iplSDChannelTitle_showCopyError(this); break;
case 27: iplSDChannelTitle_updateCopyErrorDialog(this); break;
case 28: iplSDChannelTitle_tryLaunchSelected(this); break;
case 29: iplSDChannelTitle_finishProgressHide(this); break;
case 30: iplSDChannelTitle_returnToIdle(this); break;
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

@@ -290,25 +290,25 @@ extern int SORecvFrom(int socket, void* buffer, int length, int flags, void* add
extern int SOSendTo(int socket, const void* buffer, int length, int flags, const void* address);
extern int SOBind(int socket, const void* address);
int AOSSValidateInitConfig(AOSSInitInput* input);
int AOSS_813FFD68(AOSSInitInput* input);
int AOSS_CheckAP(AOSSAccessPointRecord* list);
int AOSSDispatchReceiveState(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket);
int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSSHandleFinalReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSSDecryptMessage(AOSSDecryptionMessage* message);
int AOSSCheckAccessPointName(u16 command, const u8* manufacturerAddress);
int AOSSParseWepConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
int AOSSParsePskConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
void AOSSInitKeySchedule(AOSSKeySchedule* schedule, const u8* key, u32 keyLength, u32 stateLength);
void AOSSInitCrc32Table(u32 seed, u32* table);
s16 AOSSBuildInterfaceOption(void* buffer);
int AOSSSendDiscoveryRequest(void* packet, AOSSRequestRecords* request, int socket);
int AOSSSendHelloRequest(void* packet, void* request, int socket);
int AOSSXorBufferWithKey(void* packet, s32 length, char* key, int keyLength);
int AOSSConnectAndAwaitHost(void* settings, void* config);
int AOSSParseNetworkSettings(const AOSSOptionRecord* packet, u8* settings);
int AOSSApplyAuthOptions(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData);
int AOSS_814001B4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket);
int AOSS_814002F0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSS_814004D0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSS_814006A4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request);
int AOSS_81400830(AOSSDecryptionMessage* message);
int AOSS_81400D34(u16 command, const u8* manufacturerAddress);
int AOSS_81401104(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
int AOSS_81401284(const AOSSOptionRecord* packet, AOSSStoredConfig* config);
void AOSS_81401C9C(AOSSKeySchedule* schedule, const u8* key, u32 keyLength, u32 stateLength);
void AOSS_81401DC0(u32 seed, u32* table);
s16 AOSS_81401BBC(void* buffer);
int AOSS_81401574(void* packet, AOSSRequestRecords* request, int socket);
int AOSS_81401778(void* packet, void* request, int socket);
int AOSS_81401E80(void* packet, s32 length, char* key, int keyLength);
int AOSS_814020CC(void* settings, void* config);
int AOSS_81400E0C(const AOSSOptionRecord* packet, u8* settings);
int AOSS_814013AC(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData);
int AOSSi_Init(AOSSInitInput* input) {
int result;
@@ -652,7 +652,7 @@ int AOSS_Init_old(AOSSInitInput* input)
}
goto finish_initialization;
wait_for_initial_link:
state = AOSSConnectAndAwaitHost(&settings,s_accessPointConfig);
state = AOSS_814020CC(&settings,s_accessPointConfig);
if (state == -1) {
input->status = 0xf;
if (s_accessPointConfig) {
@@ -860,7 +860,7 @@ request_socket_cleanup_complete:
memset(s_accessPointConfig,0,0x58);
initialWait = waitIntervals.limits.connection;
for (waitAttempt = 0; waitAttempt < (short)initialWait; waitAttempt++) {
requestResult = AOSSConnectAndAwaitHost(&settings,s_accessPointConfig);
requestResult = AOSS_814020CC(&settings,s_accessPointConfig);
if (requestResult == -1) {
input->status = 0xf;
if (s_accessPointConfig) {
@@ -950,14 +950,14 @@ request_socket_cleanup_complete:
s_operationState = 2;
AOSSi_Status(2);
}
requestResult = AOSSSendDiscoveryRequest(networkAddresses,&requestRecords,requestResult);
requestResult = AOSS_81401574(networkAddresses,&requestRecords,requestResult);
break;
case 1:
if (s_operationState != 3) {
s_operationState = 3;
AOSSi_Status(3);
}
requestResult = AOSSSendHelloRequest(networkAddresses,&requestRecords,requestResult);
requestResult = AOSS_81401778(networkAddresses,&requestRecords,requestResult);
break;
case 2:
@@ -969,7 +969,7 @@ request_socket_cleanup_complete:
memset(s_responseBuffer,0,0x5dc);
memcpy(messageIdentity,&requestRecords.records[2],8);
manufacturerLength = strlen(s_manufacturer);
AOSSXorBufferWithKey(messageIdentity,8,s_manufacturer,manufacturerLength);
AOSS_81401E80(messageIdentity,8,s_manufacturer,manufacturerLength);
receivedLength = SOHtoNs(1);
packetWords->initialLength = receivedLength;
packetWords->initialType = 0;
@@ -1089,7 +1089,7 @@ process_received_packet:
packetBuffer->socket = s_socket;
retryWait = SONtoHs(receivedLength);
packetBuffer->length = retryWait & 0xffff;
requestResult = AOSSDispatchReceiveState(protocolState,packetBuffer,&receivedPackets,&requestRecords,s_socket);
requestResult = AOSS_814001B4(protocolState,packetBuffer,&receivedPackets,&requestRecords,s_socket);
if (requestResult == 100) {
protocolResult = 0;
}
@@ -1206,7 +1206,7 @@ wait_for_packet:
memset(s_accessPointConfig,0,0x58);
initialWait = waitIntervals.limits.connection;
for (waitAttempt = 0; waitAttempt < (short)initialWait; waitAttempt++) {
state = AOSSConnectAndAwaitHost(&settings,s_accessPointConfig);
state = AOSS_814020CC(&settings,s_accessPointConfig);
if (state == -1) {
input->status = 0xf;
if (s_accessPointConfig) {
@@ -1391,7 +1391,7 @@ protocol_socket_cleanup_complete:
resultCode = 0xffffffff;
goto finish_initialization;
} else {
protocolResult = AOSSValidateInitConfig(input);
protocolResult = AOSS_813FFD68(input);
if (protocolResult == 0) goto configuration_success;
{
input->status = 6;
@@ -1414,7 +1414,7 @@ finish_initialization:
return (int)resultCode;
}
int AOSSValidateInitConfig(AOSSInitInput* input) {
int AOSS_813FFD68(AOSSInitInput* input) {
AOSSConfigRecord* config;
u8* output;
u8* cursor;
@@ -1599,7 +1599,7 @@ int AOSS_CheckAP(AOSSAccessPointRecord* list) {
return result;
}
int AOSSDispatchReceiveState(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket) {
int AOSS_814001B4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request, int socket) {
u16 messageLength = SONtoHs(packet->message.messageLength);
u16 opcode;
@@ -1611,26 +1611,26 @@ int AOSSDispatchReceiveState(int state, AOSSReceiveBuffer* packet, int* count, A
(*count)++;
return state;
}
if (AOSSDecryptMessage((AOSSDecryptionMessage*)&packet->message) > 0) {
if (AOSS_81400830((AOSSDecryptionMessage*)&packet->message) > 0) {
(*count)++;
return state;
}
opcode = SONtoHs(packet->message.opcode);
switch (opcode) {
case 0x1010:
state = AOSSHandleDiscoverReply(state, packet, count, request);
state = AOSS_814002F0(state, packet, count, request);
break;
case 0x2010:
state = AOSSHandleAuthReply(state, packet, count, request);
state = AOSS_814004D0(state, packet, count, request);
break;
case 0x3010:
state = AOSSHandleFinalReply(state, packet, count, request);
state = AOSS_814006A4(state, packet, count, request);
break;
}
return state;
}
int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
int AOSS_814002F0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
AOSSReplyPayload* reply;
AOSSRequestRecord* requestRecord;
size_t manufacturerLength;
@@ -1652,7 +1652,7 @@ int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AO
manufacturerLength = strlen(s_manufacturer);
reply = &packet->message.payload.reply;
requestRecord = &request->records[0];
AOSSXorBufferWithKey(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
AOSS_81401E80(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
compareResult = memcmp(requestRecord->address, packet->message.payload.manufacturerAddress, 6);
if (compareResult != 0) {
validationResult = -1;
@@ -1686,7 +1686,7 @@ int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AO
(*count)++;
return state;
}
parserResult = AOSSParseNetworkSettings(&reply->data.optionRecord, s_networkBuffer);
parserResult = AOSS_81400E0C(&reply->data.optionRecord, s_networkBuffer);
if (parserResult < 0) {
if (parserResult == -2) {
s_errorCode = 0x16;
@@ -1705,7 +1705,7 @@ int AOSSHandleDiscoverReply(int state, AOSSReceiveBuffer* packet, int* count, AO
return 1;
}
int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
int AOSS_814004D0(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
size_t manufacturerLength;
int compareResult;
u16 packetSequence;
@@ -1724,7 +1724,7 @@ int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRe
operationResult = 0;
reply = &packet->message.payload.reply;
manufacturerLength = strlen(s_manufacturer);
AOSSXorBufferWithKey(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
AOSS_81401E80(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
compareResult = memcmp(request->records[1].address,
packet->message.payload.manufacturerAddress, 6);
if (compareResult != 0) {
@@ -1756,7 +1756,7 @@ int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRe
} else {
memset(&s_configData, 0, sizeof(s_configData));
authType = SONtoHs(packet->message.authType);
operationResult = AOSSApplyAuthOptions(0, (const AOSSReplyOption*)reply, authType, &s_configData,
operationResult = AOSS_814013AC(0, (const AOSSReplyOption*)reply, authType, &s_configData,
s_networkBuffer);
if (operationResult < 0) {
*count = *count + 1;
@@ -1772,7 +1772,7 @@ int AOSSHandleAuthReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRe
return state;
}
int AOSSHandleFinalReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
int AOSS_814006A4(int state, AOSSReceiveBuffer* packet, int* count, AOSSRequestRecords* request) {
int result = state;
size_t manufacturerLength;
int compareResult;
@@ -1788,7 +1788,7 @@ int AOSSHandleFinalReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSR
errorCode = 0;
manufacturerLength = strlen(s_manufacturer);
AOSSXorBufferWithKey(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
AOSS_81401E80(&packet->message.payload.manufacturerAddress, 8, s_manufacturer, manufacturerLength);
compareResult = memcmp(request->records[2].address,
packet->message.payload.manufacturerAddress, 6);
if (compareResult != 0) {
@@ -1828,7 +1828,7 @@ int AOSSHandleFinalReply(int state, AOSSReceiveBuffer* packet, int* count, AOSSR
return result;
}
int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
int AOSS_81400830(AOSSDecryptionMessage* message) {
u32 checksum;
u8 manufacturerAddress[8];
AOSSKeySchedule schedule;
@@ -1850,14 +1850,14 @@ int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
int result;
memcpy(manufacturerAddress, message->manufacturerAddress, sizeof(manufacturerAddress));
result = AOSSXorBufferWithKey(manufacturerAddress, sizeof(manufacturerAddress), s_manufacturer,
result = AOSS_81401E80(manufacturerAddress, sizeof(manufacturerAddress), s_manufacturer,
strlen(s_manufacturer));
if (result == -1) {
s_errorCode = 2;
return -100;
}
result = AOSSCheckAccessPointName(SONtoHs(message->command), manufacturerAddress);
result = AOSS_81400D34(SONtoHs(message->command), manufacturerAddress);
if (result != 0) {
return result;
}
@@ -1886,7 +1886,7 @@ int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
} else {
memcpy(s_packetState.keyNonce, &encrypted->keyNonce, sizeof(encrypted->keyNonce));
memcpy(s_packetState.keyAddress, s_accessPointName, sizeof(s_accessPointName));
AOSSInitKeySchedule(&schedule, s_packetState.keyNonce,
AOSS_81401C9C(&schedule, s_packetState.keyNonce,
sizeof(s_packetState.keyNonce) + sizeof(s_packetState.keyAddress), dataLength);
outputCursor = decryptedData;
@@ -1906,7 +1906,7 @@ int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
}
crc = 0xffffffff;
AOSSInitCrc32Table(0, s_crcTable);
AOSS_81401DC0(0, s_crcTable);
for (crcIndex = 0; crcIndex < (s32)dataLength; crcIndex++) {
crc = (crc >> 8) ^ s_crcTable[(crc ^ decryptedData[crcIndex]) & 0xff];
}
@@ -1931,7 +1931,7 @@ int AOSSDecryptMessage(AOSSDecryptionMessage* message) {
return 0;
}
int AOSSCheckAccessPointName(u16 command, const u8* manufacturerAddress) {
int AOSS_81400D34(u16 command, const u8* manufacturerAddress) {
u8* storedAddress = s_accessPointName;
int result = 0;
int hasAddress = 0;
@@ -1961,7 +1961,7 @@ int AOSSCheckAccessPointName(u16 command, const u8* manufacturerAddress) {
return result;
}
int AOSSParseNetworkSettings(const AOSSOptionRecord* packet, u8* settings) {
int AOSS_81400E0C(const AOSSOptionRecord* packet, u8* settings) {
const u8* packetBytes = (const u8*)packet;
const AOSSOptionRecord* record;
s32 length;
@@ -2027,7 +2027,7 @@ int AOSSParseNetworkSettings(const AOSSOptionRecord* packet, u8* settings) {
return 0;
}
int AOSSParseWepConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
int AOSS_81401104(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
const u8* packetBytes = (const u8*)packet;
const AOSSOptionRecord* record = (const AOSSOptionRecord*)(packetBytes + 6);
u32 length;
@@ -2099,7 +2099,7 @@ int AOSSParseWepConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config)
return 0;
}
int AOSSParsePskConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
int AOSS_81401284(const AOSSOptionRecord* packet, AOSSStoredConfig* config) {
const u8* packetBytes = (const u8*)packet;
const AOSSOptionRecord* record = (const AOSSOptionRecord*)(packetBytes + 6);
u32 length;
@@ -2146,7 +2146,7 @@ int AOSSParsePskConfig(const AOSSOptionRecord* packet, AOSSStoredConfig* config)
return 0;
}
int AOSSApplyAuthOptions(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData) {
int AOSS_814013AC(int state, const AOSSReplyOption* response, int responseLength, void* config, void* networkData) {
u32 flags = 0;
const AOSSReplyOption* responseRecord;
AOSSConfigRecord* configRecord;
@@ -2190,19 +2190,19 @@ int AOSSApplyAuthOptions(int state, const AOSSReplyOption* response, int respons
do {
switch (option->fields.type) {
case 3:
result = AOSSParseWepConfig((const AOSSOptionRecord*)option, wep40Config);
result = AOSS_81401104((const AOSSOptionRecord*)option, wep40Config);
flags |= 1;
break;
case 4:
result = AOSSParseWepConfig((const AOSSOptionRecord*)option, wep104Config);
result = AOSS_81401104((const AOSSOptionRecord*)option, wep104Config);
flags |= 2;
break;
case 5:
result = AOSSParsePskConfig((const AOSSOptionRecord*)option, tkipConfig);
result = AOSS_81401284((const AOSSOptionRecord*)option, tkipConfig);
flags |= 4;
break;
case 6:
result = AOSSParsePskConfig((const AOSSOptionRecord*)option, aesConfig);
result = AOSS_81401284((const AOSSOptionRecord*)option, aesConfig);
flags |= 8;
break;
case 10:
@@ -2234,7 +2234,7 @@ int AOSSApplyAuthOptions(int state, const AOSSReplyOption* response, int respons
return 0;
}
int AOSSSendDiscoveryRequest(void* packet, AOSSRequestRecords* request, int socket) {
int AOSS_81401574(void* packet, AOSSRequestRecords* request, int socket) {
u8* responsePayload;
u8 accessPointName[8];
AOSSSocketAddress destination;
@@ -2257,7 +2257,7 @@ int AOSSSendDiscoveryRequest(void* packet, AOSSRequestRecords* request, int sock
responsePayload = response->payload;
memcpy(s_accessPointName, &request->records[0], 8);
memcpy(accessPointName, s_accessPointName, 8);
recordLength = AOSSBuildInterfaceOption(&requestRecord->record);
recordLength = AOSS_81401BBC(&requestRecord->record);
if (recordLength < 0) {
s_errorCode = 3;
if (requestRecord != 0) {
@@ -2269,7 +2269,7 @@ int AOSSSendDiscoveryRequest(void* packet, AOSSRequestRecords* request, int sock
requestRecord->length = SOHtoNs(recordLength);
requestLength = recordLength + 4;
memcpy(responsePayload, requestRecord, requestLength);
encryptionResult = AOSSXorBufferWithKey(accessPointName, 8, s_manufacturer, 6);
encryptionResult = AOSS_81401E80(accessPointName, 8, s_manufacturer, 6);
if (encryptionResult != 0) {
s_errorCode = 2;
if (requestRecord != 0) {
@@ -2302,7 +2302,7 @@ int AOSSSendDiscoveryRequest(void* packet, AOSSRequestRecords* request, int sock
return result;
}
int AOSSSendHelloRequest(void* packet, void* request, int socket) {
int AOSS_81401778(void* packet, void* request, int socket) {
AOSSHelloPacket* response = (AOSSHelloPacket*)s_responseBuffer;
AOSSHelloPayload* payload;
AOSSRequestRecords* requestRecords = (AOSSRequestRecords*)request;
@@ -2343,7 +2343,7 @@ int AOSSSendHelloRequest(void* packet, void* request, int socket) {
const u32* crcTable;
sequence = 1;
checksum = 0xffffffff;
AOSSInitCrc32Table(0, s_crcTable);
AOSS_81401DC0(0, s_crcTable);
crcTable = s_crcTable;
{
u32 part;
@@ -2361,7 +2361,7 @@ int AOSSSendHelloRequest(void* packet, void* request, int socket) {
memcpy(&payload->encrypted.key.nonce, &nonce, 2);
memcpy(s_packetState.keyNonce, payload->encrypted.key.nonceBytes, 2);
memcpy(s_packetState.keyAddress, s_accessPointName, 8);
AOSSInitKeySchedule(&construction.schedule, s_packetState.keyNonce,
AOSS_81401C9C(&construction.schedule, s_packetState.keyNonce,
sizeof(s_packetState.keyNonce) + sizeof(s_packetState.keyAddress), 8);
for (index = 0; index < 8; index++) {
state = construction.schedule.bytes;
@@ -2386,7 +2386,7 @@ int AOSSSendHelloRequest(void* packet, void* request, int socket) {
}
memcpy(construction.accessPointName, &requestRecords->records[1], 8);
encryptionResult = AOSSXorBufferWithKey(construction.accessPointName, 8, s_manufacturer, 6);
encryptionResult = AOSS_81401E80(construction.accessPointName, 8, s_manufacturer, 6);
if (encryptionResult != 0) {
s_errorCode = 2;
return -1;
@@ -2415,7 +2415,7 @@ int AOSSSendHelloRequest(void* packet, void* request, int socket) {
return 0;
}
s16 AOSSBuildInterfaceOption(void* buffer) {
s16 AOSS_81401BBC(void* buffer) {
AOSSOptionRecord* record = (AOSSOptionRecord*)buffer;
u32 optionValue;
s16 dataLength;
@@ -2439,7 +2439,7 @@ s16 AOSSBuildInterfaceOption(void* buffer) {
return (s16)(dataLength + 10);
}
void AOSSInitKeySchedule(AOSSKeySchedule* schedule, const u8* key, u32 keyLength, u32 stateLength) {
void AOSS_81401C9C(AOSSKeySchedule* schedule, const u8* key, u32 keyLength, u32 stateLength) {
u32 index = 0;
u32 keyIndex;
u32 swapIndex;
@@ -2471,7 +2471,7 @@ void AOSSInitKeySchedule(AOSSKeySchedule* schedule, const u8* key, u32 keyLength
}
}
void AOSSInitCrc32Table(u32 seed, u32* table) {
void AOSS_81401DC0(u32 seed, u32* table) {
u32 index;
u32 value;
@@ -2488,7 +2488,7 @@ void AOSSInitCrc32Table(u32 seed, u32* table) {
}
}
int AOSSXorBufferWithKey(void* packet, s32 length, char* key, int keyLength) {
int AOSS_81401E80(void* packet, s32 length, char* key, int keyLength) {
u8* temporaryHalf;
s32 halfLength = length / 2;
u8* packetHalf;
@@ -2542,7 +2542,7 @@ int AOSSXorBufferWithKey(void* packet, s32 length, char* key, int keyLength) {
return result;
}
int AOSSConnectAndAwaitHost(void* settings, void* config) {
int AOSS_814020CC(void* settings, void* config) {
s32 connectionAttempts = 0;
u32 ticksPerMillisecond;

View File

@@ -12,8 +12,8 @@ static u8 secondaryDns[4];
static void* (*allocateMemory)(u32, s32);
static void (*releaseMemory)(u32, void*, s32);
static void (*statusCallback)(void);
static NCDIfConfig AOSSi_NcdIfConfig;
static NCDIpConfig AOSSi_NcdIpConfig;
static NCDIfConfig AOSS_810BD4A8;
static NCDIpConfig AOSS_810BD608;
struct AOSSRate {
u16 mask;
@@ -60,11 +60,11 @@ void AOSSi_Cancel(void) {
AOSSi_cancel_flag = 1;
}
void AOSSi_SleepAlarmHandler(OSAlarm* alarm, OSContext* context) {
void AOSS_813FD17C(OSAlarm* alarm, OSContext* context) {
OSSendMessage((OSMessageQueue*)alarm->tag, NULL, 0);
}
void AOSSi_SleepMs(u32 milliseconds) {
void AOSS_813FD18C(u32 milliseconds) {
OSMessage storage;
OSMessage message;
OSMessageQueue queue;
@@ -72,7 +72,7 @@ void AOSSi_SleepMs(u32 milliseconds) {
OSInitMessageQueue(&queue, &storage, 1);
OSCreateAlarm(&alarm);
OSSetAlarmTag(&alarm, (u32)&queue);
OSSetAlarm(&alarm, (u32)(milliseconds * (OS_TIMER_CLOCK / 1000)), AOSSi_SleepAlarmHandler);
OSSetAlarm(&alarm, (u32)(milliseconds * (OS_TIMER_CLOCK / 1000)), AOSS_813FD17C);
OSReceiveMessage(&queue, &message, 1);
}
@@ -89,7 +89,7 @@ void AOSSi_Free(void* block) {
}
}
void AOSSi_StoreIpv4Octets(u8* destination, u32 address) {
void AOSS_813FD25C(u8* destination, u32 address) {
int index;
for (index = 0; index < 4; ++index) {
*destination++ = address >> ((3 - index) * 8);
@@ -97,11 +97,11 @@ void AOSSi_StoreIpv4Octets(u8* destination, u32 address) {
}
int AOSSi_SetNCDIPAddr(u32 address, u32 netmask, u32 gateway, u32 dns1, u32 dns2) {
AOSSi_StoreIpv4Octets(ipAddress, address);
AOSSi_StoreIpv4Octets(ipNetmask, netmask);
AOSSi_StoreIpv4Octets(ipGateway, gateway);
AOSSi_StoreIpv4Octets(primaryDns, dns1);
AOSSi_StoreIpv4Octets(secondaryDns, dns2);
AOSS_813FD25C(ipAddress, address);
AOSS_813FD25C(ipNetmask, netmask);
AOSS_813FD25C(ipGateway, gateway);
AOSS_813FD25C(primaryDns, dns1);
AOSS_813FD25C(secondaryDns, dns2);
return 0;
}
@@ -150,7 +150,7 @@ startup:
goto unlock;
}
++startupRetries;
AOSSi_SleepMs(10);
AOSS_813FD18C(10);
goto startup;
}
if (WD_GetInfo(&info) == 0) {
@@ -231,7 +231,7 @@ startup:
*output = list;
break;
}
AOSSi_SleepMs(100);
AOSS_813FD18C(100);
}
AOSSi_Free(buffer);
}
@@ -242,7 +242,7 @@ cleanup:
goto unlock;
}
++cleanupRetries;
AOSSi_SleepMs(10);
AOSS_813FD18C(10);
goto cleanup;
}
unlock:
@@ -252,7 +252,7 @@ unlock:
return -1;
}
++unlockRetries;
AOSSi_SleepMs(10);
AOSS_813FD18C(10);
goto unlock;
}
return result;
@@ -262,7 +262,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
int retries = 0;
int result = 0;
WD_Info info ATTRIBUTE_ALIGN(32);
NCDIfConfig* interfaceConfig = &AOSSi_NcdIfConfig;
NCDIfConfig* interfaceConfig = &AOSS_810BD4A8;
NCDIpConfig* ipConfig;
memset(interfaceConfig, 0, sizeof(*interfaceConfig));
interfaceConfig->selectedMedia = 1;
@@ -288,7 +288,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
}
interfaceConfig->netif.wireless.config.manual.ssidLength = (u8)connection->ssidLength;
memcpy(interfaceConfig->netif.wireless.config.manual.ssid, connection->ssid, connection->ssidLength);
ipConfig = &AOSSi_NcdIpConfig;
ipConfig = &AOSS_810BD608;
memset(ipConfig, 0, sizeof(*ipConfig));
ipConfig->adjust.maxTransferUnit = 1300;
ipConfig->adjust.tcpRetransTimeout = 100;
@@ -303,7 +303,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
if (NCDSetIpConfig(ipConfig) != 0) {
result = -1;
}
if (result == 0 && NCDSetIfConfig(&AOSSi_NcdIfConfig) != 0) {
if (result == 0 && NCDSetIfConfig(&AOSS_810BD4A8) != 0) {
result = -1;
}
if (result == 0) {
@@ -317,7 +317,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
break;
}
++retries;
AOSSi_SleepMs(10);
AOSS_813FD18C(10);
}
}
if (result == 0) {
@@ -335,7 +335,7 @@ int AOSSi_WLANConnect(struct AOSSConnection* connection, struct AOSSConnectionSt
}
void AOSSi_Sleep(u32 milliseconds) {
AOSSi_SleepMs(milliseconds);
AOSS_813FD18C(milliseconds);
}
int AOSSi_Status(void) {

View File

@@ -540,20 +540,20 @@ AtermProgressCallback gAtermProgressCallback;
u32 gAtermResult;
s32 gAtermState;
void ATERMAlarmWakeQueue(OSAlarm* alarm, OSContext* context);
s32 ATERMRunConfigProtocol(void);
void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length);
void ATERM_8140684C(OSAlarm* alarm, OSContext* context);
s32 ATERM_814038C8(void);
void ATERM_81405ACC(AtermMd5Context* context, void* input, u32 length);
extern u8 gAtermDigestFill[64];
extern u8* gAtermRequestOptions;
int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
int ATERMAesExpandEncryptKey(u32* expandedKey, const void* key, u32 keyBits);
int ATERMAesExpandDecryptKey(u32* expandedKey, const void* key, u32 keyBits);
void ATERMAesEncryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
void ATERMAesDecryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
int ATERMParseAssociationResponse(u16* response);
int ATERM_81404844(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
int ATERM_81404A18(u16* destination, u16* source, u32 length, void* key, u32 keyLength);
int ATERM_81404BFC(u32* expandedKey, const void* key, u32 keyBits);
int ATERM_8140502C(u32* expandedKey, const void* key, u32 keyBits);
void ATERM_81405254(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
void ATERM_81405690(const u32* expandedKey, u32 rounds, const u8* input, u8* output);
int ATERM_814033F0(u16* response);
int ATERMStartNetworkStack(void) {
int ATERM_814021BC(void) {
int status;
int waitCount = 0;
u32 convertedHost;
@@ -605,7 +605,7 @@ int ATERMStartNetworkStack(void) {
OSCreateAlarm(&interfaceAlarm);
OSSetAlarmTag(&interfaceAlarm, (u32)&interfaceQueue);
timeoutTicks = (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10;
OSSetAlarm(&interfaceAlarm, timeoutTicks, ATERMAlarmWakeQueue);
OSSetAlarm(&interfaceAlarm, timeoutTicks, ATERM_8140684C);
OSReceiveMessage(&interfaceQueue, &interfaceMessage, 1);
}
@@ -621,7 +621,7 @@ int ATERMStartNetworkStack(void) {
OSCreateAlarm(&hostAlarm);
OSSetAlarmTag(&hostAlarm, (u32)&hostQueue);
timeoutTicks = (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10;
OSSetAlarm(&hostAlarm, timeoutTicks, ATERMAlarmWakeQueue);
OSSetAlarm(&hostAlarm, timeoutTicks, ATERM_8140684C);
OSReceiveMessage(&hostQueue, &hostMessage, 1);
}
} else {
@@ -631,7 +631,7 @@ int ATERMStartNetworkStack(void) {
return waitCount;
}
int ATERMScanAccessPoints(u16* resultBuffer, u32 resultBufferLength) {
int ATERM_81402424(u16* resultBuffer, u32 resultBufferLength) {
int lockId;
int result = -2;
u16* scanBuffer = resultBuffer;
@@ -678,7 +678,7 @@ int ATERMScanAccessPoints(u16* resultBuffer, u32 resultBufferLength) {
OSCreateAlarm(&startupAlarm);
OSSetAlarmTag(&startupAlarm, (u32)&startupQueue);
OSSetAlarm(&startupAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&startupQueue, &startupMessage, 1);
} while (1);
@@ -719,7 +719,7 @@ int ATERMScanAccessPoints(u16* resultBuffer, u32 resultBufferLength) {
OSCreateAlarm(&scanAlarm);
OSSetAlarmTag(&scanAlarm, (u32)&scanQueue);
OSSetAlarm(&scanAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&scanQueue, &scanMessage, 1);
}
@@ -737,7 +737,7 @@ cleanup_driver:
OSCreateAlarm(&cleanupAlarm);
OSSetAlarmTag(&cleanupAlarm, (u32)&cleanupQueue);
OSSetAlarm(&cleanupAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&cleanupQueue, &cleanupMessage, 1);
}
@@ -752,7 +752,7 @@ unlock_driver:
OSCreateAlarm(&unlockAlarm);
OSSetAlarmTag(&unlockAlarm, (u32)&unlockQueue);
OSSetAlarm(&unlockAlarm, (__mulhwu(0x10624DD3, *(u32*)0x800000F8 >> 2) >> 6) * 10,
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&unlockQueue, &unlockMessage, 1);
}
}
@@ -760,7 +760,7 @@ unlock_driver:
return result;
}
int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
int ATERM_8140276C(AtermApRecordSet* currentRecords, AtermApRecordSet* previousRecords,
u32* changedIndex) {
u32 previousIndex;
u32 currentIndex = 0;
@@ -869,7 +869,7 @@ int ATERMFindChangedApRecord(AtermApRecordSet* currentRecords, AtermApRecordSet*
return result;
}
int ATERMDiscoverAccessPoints(void) {
int ATERM_81402A24(void) {
s32 result = -1;
u32 scanBufferBytes;
u32 recordIndex;
@@ -912,7 +912,7 @@ int ATERMDiscoverAccessPoints(void) {
break;
}
result = ATERMScanAccessPoints((u16*)scanBuffer, scanBufferBytes);
result = ATERM_81402424((u16*)scanBuffer, scanBufferBytes);
if (result < 0) {
goto cleanup;
}
@@ -954,7 +954,7 @@ int ATERMDiscoverAccessPoints(void) {
currentRecords->count = result;
if (gAtermState != 1 &&
ATERMFindChangedApRecord(currentRecords, previousRecords, (u32*)&progressInfo[0])) {
ATERM_8140276C(currentRecords, previousRecords, (u32*)&progressInfo[0])) {
AtermApRecord* selectedRecord;
gAtermSelectedRecordIndex = progressInfo[0];
selectedRecord = &currentRecords->entries[progressInfo[0]];
@@ -1036,7 +1036,7 @@ cleanup:
return result;
}
int ATERMBuildEncryptedMessage(u16* messageBuffer, u32 sequence, u16* payload, size_t payloadLength,
int ATERM_81402E40(u16* messageBuffer, u32 sequence, u16* payload, size_t payloadLength,
void* encryptionKey) {
u8* end;
u8* cursor;
@@ -1045,7 +1045,7 @@ int ATERMBuildEncryptedMessage(u16* messageBuffer, u32 sequence, u16* payload, s
memset(payload, 0, 8);
payload[0] = SOHtoNs((payloadLength - 8) & 0xFFFF);
if (encryptionKey != NULL) {
ATERMAesKeyWrap(messageBuffer + 3, payload, payloadLength, encryptionKey, 0x10);
ATERM_81404844(messageBuffer + 3, payload, payloadLength, encryptionKey, 0x10);
payloadLength += 8;
} else {
memcpy(messageBuffer + 3, payload, payloadLength);
@@ -1064,7 +1064,7 @@ int ATERMBuildEncryptedMessage(u16* messageBuffer, u32 sequence, u16* payload, s
return (int)(end + sizeof(u16) - (u8*)messageBuffer);
}
int ATERMParsePacket(AtermPacket* packet, u32* setupType) {
int ATERM_81402FC0(AtermPacket* packet, u32* setupType) {
u8* cursor;
u8* end;
u8* payload;
@@ -1142,7 +1142,7 @@ int ATERMParsePacket(AtermPacket* packet, u32* setupType) {
return 0;
}
int ATERMBuildAssociationRequest(AtermAssociationRequest* request) {
int ATERM_814031DC(AtermAssociationRequest* request) {
u8 scanAddress[8];
u8 interfaceMacAddress[8];
char interfaceMacText[32];
@@ -1227,7 +1227,7 @@ int ATERMBuildAssociationRequest(AtermAssociationRequest* request) {
return 1;
}
int ATERMParseAssociationResponse(u16* response) {
int ATERM_814033F0(u16* response) {
u16* optionCursor = response + 4;
u8* optionValue;
u16* responseEnd;
@@ -1317,7 +1317,7 @@ int ATERMParseAssociationResponse(u16* response) {
return result;
}
int ATERMParseHexBytes(u8* destination, const char* source, s32 length) {
int ATERM_81403614(u8* destination, const char* source, s32 length) {
s32 value = 0;
s32 characterIndex = 0;
@@ -1349,7 +1349,7 @@ int ATERMParseHexBytes(u8* destination, const char* source, s32 length) {
return 1;
}
int ATERMApplyScanSecuritySettings(void) {
int ATERM_814036D8(void) {
s32 result = 1;
char* sourceKey;
char* outputKey;
@@ -1389,7 +1389,7 @@ int ATERMApplyScanSecuritySettings(void) {
break;
case 10:
gAtermConfigurationResult.setupMode = 1;
ATERMParseHexBytes((u8*)outputKey, keyString, 10);
ATERM_81403614((u8*)outputKey, keyString, 10);
break;
case 13:
gAtermConfigurationResult.setupMode = 2;
@@ -1397,7 +1397,7 @@ int ATERMApplyScanSecuritySettings(void) {
break;
case 26:
gAtermConfigurationResult.setupMode = 2;
ATERMParseHexBytes((u8*)outputKey, keyString, 0x1A);
ATERM_81403614((u8*)outputKey, keyString, 0x1A);
break;
case 16:
gAtermConfigurationResult.setupMode = 3;
@@ -1405,7 +1405,7 @@ int ATERMApplyScanSecuritySettings(void) {
break;
case 32:
gAtermConfigurationResult.setupMode = 3;
ATERMParseHexBytes((u8*)outputKey, keyString, 0x20);
ATERM_81403614((u8*)outputKey, keyString, 0x20);
break;
default:
result = -7;
@@ -1432,7 +1432,7 @@ int ATERMApplyScanSecuritySettings(void) {
return result;
}
s32 ATERMRunConfigProtocol(void) {
s32 ATERM_814038C8(void) {
OSMessageQueue waitQueue;
OSMessage waitBuffer[1];
OSMessage waitMessage;
@@ -1459,7 +1459,7 @@ s32 ATERMRunConfigProtocol(void) {
OSSetAlarmTag(&waitAlarm, (u32)&waitQueue);
OSSetAlarm(&waitAlarm,
(__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6) * 500,
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&waitQueue, &waitMessage, 1);
switch (gAtermProtocolState) {
case 0:
@@ -1467,7 +1467,7 @@ s32 ATERMRunConfigProtocol(void) {
case 1:
{
AtermProgress progress;
result = ATERMDiscoverAccessPoints();
result = ATERM_81402A24();
if (result != 1) {
failed = 1;
break;
@@ -1485,7 +1485,7 @@ s32 ATERMRunConfigProtocol(void) {
break;
}
case 2:
result = ATERMStartNetworkStack();
result = ATERM_814021BC();
if (result != 1) {
failed = 1;
break;
@@ -1525,11 +1525,11 @@ s32 ATERMRunConfigProtocol(void) {
break;
}
peerAddress.length = 8;
ATERMBuildAssociationRequest((AtermAssociationRequest*)gAtermConfigurationResult.connectionPrefix);
ATERM_814031DC((AtermAssociationRequest*)gAtermConfigurationResult.connectionPrefix);
receivedLength = SORecvFrom(socket, gAtermConfigurationResult.packetBuffer,
sizeof(gAtermConfigurationResult.packetBuffer), 4, &peerAddress);
if (receivedLength > 0 &&
ATERMParsePacket((AtermPacket*)gAtermConfigurationResult.packetBuffer, &gAtermResponseMode)) {
ATERM_81402FC0((AtermPacket*)gAtermConfigurationResult.packetBuffer, &gAtermResponseMode)) {
AtermProgress progress;
gAtermDeadline = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6)) + 30000;
gAtermProtocolState = 5;
@@ -1588,7 +1588,7 @@ s32 ATERMRunConfigProtocol(void) {
longOption++;
}
optionEnd = (u8*)longOption;
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 2,
gAtermMessageLength = ATERM_81402E40((u16*)gAtermConfigurationResult.packetBuffer, 2,
(u16*)response->data, optionEnd - gAtermRequestOptions + 8, NULL);
sendAddress.length = 8;
sendAddress.family = 2;
@@ -1628,7 +1628,7 @@ s32 ATERMRunConfigProtocol(void) {
} else if (sequence != 3) {
payloadLength = 0;
} else if (gAtermConfigurationResult.connectionPrefix != NULL) {
ATERMAesKeyUnwrap((u16*)response->authentication.payload, (u16*)payload,
ATERM_81404A18((u16*)response->authentication.payload, (u16*)payload,
payloadLength, gAtermConfigurationResult.connectionPrefix, 16);
payloadLength -= 8;
} else {
@@ -1660,7 +1660,7 @@ s32 ATERMRunConfigProtocol(void) {
digestContext.state[1] = 0xEFCDAB89;
digestContext.state[2] = 0x98BADCFE;
digestContext.state[3] = 0x10325476;
ATERMMd5Update(&digestContext, &authenticationTime, sizeof(authenticationTime));
ATERM_81405ACC(&digestContext, &authenticationTime, sizeof(authenticationTime));
digestLength[0] = digestContext.bitCountLow;
digestLength[1] = digestContext.bitCountLow >> 8;
digestLength[2] = digestContext.bitCountLow >> 16;
@@ -1670,9 +1670,9 @@ s32 ATERMRunConfigProtocol(void) {
digestLength[6] = digestContext.bitCountHigh >> 16;
digestLength[7] = digestContext.bitCountHigh >> 24;
digestBytes = (digestContext.bitCountLow >> 3) & 0x3F;
ATERMMd5Update(&digestContext, gAtermDigestFill,
ATERM_81405ACC(&digestContext, gAtermDigestFill,
digestBytes < 56 ? 56 - digestBytes : 120 - digestBytes);
ATERMMd5Update(&digestContext, digestLength, sizeof(digestLength));
ATERM_81405ACC(&digestContext, digestLength, sizeof(digestLength));
response->authentication.digest[0] = digestContext.state[0];
response->authentication.digest[1] = digestContext.state[0] >> 8;
response->authentication.digest[2] = digestContext.state[0] >> 16;
@@ -1724,7 +1724,7 @@ s32 ATERMRunConfigProtocol(void) {
memcpy(option->value, response->authentication.digest, 8);
gAtermReplyLength = (u8*)(option + 1) - response->data;
response->authentication.decoded.length = gAtermReplyLength - 8;
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 4,
gAtermMessageLength = ATERM_81402E40((u16*)gAtermConfigurationResult.packetBuffer, 4,
(u16*)response->data, gAtermReplyLength, gAtermConfigurationResult.connectionPrefix);
sendAddress.length = 8;
sendAddress.family = 2;
@@ -1758,14 +1758,14 @@ s32 ATERMRunConfigProtocol(void) {
} else if (sequence != 5) {
payloadLength = 0;
} else if (sessionKey != NULL) {
ATERMAesKeyUnwrap((u16*)response->authentication.payload, (u16*)payload,
ATERM_81404A18((u16*)response->authentication.payload, (u16*)payload,
payloadLength, sessionKey, 16);
payloadLength -= 8;
} else {
memcpy(response->authentication.payload, payload, payloadLength);
}
gAtermReplyLength = payloadLength;
if (payloadLength != 0 && ATERMParseAssociationResponse((u16*)response->data)) {
if (payloadLength != 0 && ATERM_814033F0((u16*)response->data)) {
gAtermProtocolState = 9;
retries = 0;
gAtermMode = gScanSettings.ssid[0] != 0;
@@ -1795,7 +1795,7 @@ s32 ATERMRunConfigProtocol(void) {
memcpy(option->value, &gAtermMode, 1);
gAtermReplyLength = (u8*)(option + 1) - response->data;
response->authentication.decoded.length = gAtermReplyLength - 8;
gAtermMessageLength = ATERMBuildEncryptedMessage((u16*)gAtermConfigurationResult.packetBuffer, 6,
gAtermMessageLength = ATERM_81402E40((u16*)gAtermConfigurationResult.packetBuffer, 6,
(u16*)response->data, gAtermReplyLength, sessionKey);
if (NCDGetLinkStatus() != 5) {
lastSendTime = (u32)(OSGetTime() / (__mulhwu(reciprocal, OS_BUS_CLOCK >> 2) >> 6)) + 1000;
@@ -1817,7 +1817,7 @@ s32 ATERMRunConfigProtocol(void) {
if (now >= lastSendTime + 1000) {
if (++retries >= 10) {
failed = 1;
result = ATERMApplyScanSecuritySettings();
result = ATERM_814036D8();
} else {
gAtermProtocolState = 9;
}
@@ -1840,7 +1840,7 @@ s32 ATERMRunConfigProtocol(void) {
u8 gAtermDigestFill[64] = { 0x80 };
s32 ATERMi_AutoConfigThread(void) {
s32 result = ATERMRunConfigProtocol();
s32 result = ATERM_814038C8();
AtermProgress progress;
u32 equalityMask;
s32 completedState;
@@ -1864,7 +1864,7 @@ s32 ATERMi_AutoConfigThread(void) {
return 0;
}
int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
int ATERM_81404844(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
u32 expandedKey[80];
union { u32 words[4]; u8 bytes[16]; } block;
union { u64 value; u8 bytes[8]; } counter;
@@ -1889,7 +1889,7 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
return 0;
}
rounds = ATERMAesExpandEncryptKey(expandedKey, key, keyLength << 3);
rounds = ATERM_81404BFC(expandedKey, key, keyLength << 3);
destinationBytes = (u8*)destination;
sourceBytes = (const u8*)source;
memcpy(destinationBytes + 8, sourceBytes, length);
@@ -1901,7 +1901,7 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
outputBlock = destinationBytes + blockOffset;
memcpy(stateBytes + 8, outputBlock, 8);
ATERMAesEncryptBlock(expandedKey, rounds, stateBytes, stateBytes);
ATERM_81405254(expandedKey, rounds, stateBytes, stateBytes);
counter.value = (u64)(s64)blockIndex + passBase;
stateBytes[0] ^= counter.bytes[0];
stateBytes[1] ^= counter.bytes[1];
@@ -1918,7 +1918,7 @@ int ATERMAesKeyWrap(u16* destination, u16* source, u32 length, void* key, u32 ke
return 1;
}
int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
int ATERM_81404A18(u16* destination, u16* source, u32 length, void* key, u32 keyLength) {
u32 expandedKey[80];
union { u32 words[4]; u8 bytes[16]; } block;
union { u64 value; u8 bytes[8]; } counter;
@@ -1942,7 +1942,7 @@ int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32
return 0;
}
rounds = ATERMAesExpandDecryptKey(expandedKey, key, keyLength << 3);
rounds = ATERM_8140502C(expandedKey, key, keyLength << 3);
destinationBytes = (u8*)destination;
sourceBytes = (const u8*)source;
memcpy(block.words, sourceBytes, 8);
@@ -1963,7 +1963,7 @@ int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32
stateBytes[6] ^= counter.bytes[6];
stateBytes[7] ^= counter.bytes[7];
memcpy(stateBytes + 8, outputBlock, 8);
ATERMAesDecryptBlock(expandedKey, rounds, stateBytes, stateBytes);
ATERM_81405690(expandedKey, rounds, stateBytes, stateBytes);
memcpy(outputBlock, stateBytes + 8, 8);
}
}
@@ -1986,7 +1986,7 @@ int ATERMAesKeyUnwrap(u16* destination, u16* source, u32 length, void* key, u32
((u32)keyBytes[(index) * 4 + 2] << 8) ^ \
keyBytes[(index) * 4 + 3])
int ATERMAesExpandEncryptKey(u32* expandedKey, const void* key, u32 keyBits) {
int ATERM_81404BFC(u32* expandedKey, const void* key, u32 keyBits) {
const u8* keyBytes = (const u8*)key;
u32* roundKey = expandedKey;
@@ -2096,8 +2096,8 @@ int ATERMAesExpandEncryptKey(u32* expandedKey, const void* key, u32 keyBits) {
(inverseTable0[byte0] ^ inverseTable1[byte1]); \
}
int ATERMAesExpandDecryptKey(u32* expandedKey, const void* key, u32 keyBits) {
int rounds = ATERMAesExpandEncryptKey(expandedKey, key, keyBits);
int ATERM_8140502C(u32* expandedKey, const void* key, u32 keyBits) {
int rounds = ATERM_81404BFC(expandedKey, key, keyBits);
u32* roundKey;
s32 roundCount;
s32 firstIndex;
@@ -2145,7 +2145,7 @@ int ATERMAesExpandDecryptKey(u32* expandedKey, const void* key, u32 keyBits) {
#undef ATERM_AES_TRANSFORM_KEY
void ATERMAesEncryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
void ATERM_81405254(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
u32 state0, state1, state2, state3;
u32 next0, next1, next2, next3;
s32 roundPairs;
@@ -2232,7 +2232,7 @@ void ATERMAesEncryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u
output[15] = state3;
}
void ATERMAesDecryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
void ATERM_81405690(const u32* expandedKey, u32 rounds, const u8* input, u8* output) {
u32 state0, state1, state2, state3;
u32 next0, next1, next2, next3;
s32 roundPairs;
@@ -2319,9 +2319,9 @@ void ATERMAesDecryptBlock(const u32* expandedKey, u32 rounds, const u8* input, u
output[15] = state3;
}
void ATERMMd5Transform(u32 state[4], const u8 block[64]);
void ATERM_81405D0C(u32 state[4], const u8 block[64]);
void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length) {
void ATERM_81405ACC(AtermMd5Context* context, void* input, u32 length) {
u8* data = (u8*)input;
u32 bufferIndex = (context->bitCountLow >> 3) & 0x3F;
u32 bytesToFill;
@@ -2338,9 +2338,9 @@ void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length) {
for (copiedBytes = 0; copiedBytes < bytesToFill; copiedBytes++) {
context->buffer8[bufferIndex + copiedBytes] = data[copiedBytes];
}
ATERMMd5Transform(context->state, context->buffer8);
ATERM_81405D0C(context->state, context->buffer8);
for (copiedBytes = bytesToFill; copiedBytes + 63 < length; copiedBytes += 64) {
ATERMMd5Transform(context->state, data + copiedBytes);
ATERM_81405D0C(context->state, data + copiedBytes);
}
bufferIndex = 0;
} else {
@@ -2358,7 +2358,7 @@ void ATERMMd5Update(AtermMd5Context* context, void* input, u32 length) {
(A) += (B); \
} while (0)
void ATERMMd5Transform(u32 state[4], const u8 block[64]) {
void ATERM_81405D0C(u32 state[4], const u8 block[64]) {
u32 byteIndex;
u32 index;
const u8* inputWord;
@@ -2452,7 +2452,7 @@ void ATERMMd5Transform(u32 state[4], const u8 block[64]) {
}
#undef ATERM_MD5_STEP
void ATERMAlarmWakeQueue(OSAlarm* alarm, OSContext* context) {
void ATERM_8140684C(OSAlarm* alarm, OSContext* context) {
OSMessageQueue* queue = (OSMessageQueue*)alarm->tag;
OSSendMessage(queue, NULL, 0);
}
@@ -2525,7 +2525,7 @@ int ATERMi_ApConfigEnd(void) {
OSSetAlarmTag(&cancelAlarm, (u32)&cancelQueue);
OSSetAlarm(&cancelAlarm,
OSMillisecondsToTicks(100),
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&cancelQueue, &cancelMessage, 1);
}
@@ -2534,7 +2534,7 @@ int ATERMi_ApConfigEnd(void) {
OSSetAlarmTag(&joinAlarm, (u32)&joinQueue);
OSSetAlarm(&joinAlarm,
OSMillisecondsToTicks(500),
ATERMAlarmWakeQueue);
ATERM_8140684C);
OSReceiveMessage(&joinQueue, &joinMessage, 1);
while (OSIsThreadTerminated(&sAtermThread) == 0) {
OSJoinThread(&sAtermThread, NULL);

View File

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

View File

@@ -28,26 +28,26 @@ int ATERMi_ApConfigEnd();
namespace ipl {
namespace scene {
extern "C" MEMAllocator sRakuAllocator;
MEMAllocator sRakuAllocator;
extern "C" MEMAllocator RakuRakuThread_810BDDD0;
MEMAllocator RakuRakuThread_810BDDD0;
struct RakuStatus {
RakuProgress progress;
RakuConfiguration configuration;
};
extern "C" RakuStatus sRakuStatus;
RakuStatus sRakuStatus;
extern "C" OSMessageQueue sRakuMsgQueue;
OSMessageQueue sRakuMsgQueue;
extern "C" RakuStatus RakuRakuThread_810BDDE0;
RakuStatus RakuRakuThread_810BDDE0;
extern "C" OSMessageQueue RakuRakuThread_810BDED4;
OSMessageQueue RakuRakuThread_810BDED4;
static OSTime startTime;
static bool active;
static OSMessage messageSlot;
static int displayState = 1;
extern "C" {
static void* RakuSocketAlloc(u32, s32 size);
static void RakuSocketFree(u32, void* block, s32);
static void* RakuAtermAlloc(u32 size);
static void RakuAtermFree(void* block);
static void* RakuRakuThread_813FDEF0(u32, s32 size);
static void RakuRakuThread_813FDEFC(u32, void* block, s32);
static void* RakuRakuThread_813FDF08(u32 size);
static void RakuRakuThread_813FDF18(void* block);
}
struct RakuStack {
@@ -60,7 +60,7 @@ public:
virtual ~RakuRakuThread();
virtual void* Run();
virtual void unk_0x2C() = 0;
void syncRakuProgress();
void RakuRakuThread_813FDA04();
static void progressCallback(RakuProgress* progress);
void destroy();
int start();
@@ -78,15 +78,15 @@ private:
MEMHeapHandle mHeap;
};
void RakuRakuThread::syncRakuProgress() {
void RakuRakuThread::RakuRakuThread_813FDA04() {
BOOL interrupts = OSDisableInterrupts();
sRakuStatus.progress = *(RakuProgress*)this;
RakuRakuThread_810BDDE0.progress = *(RakuProgress*)this;
startTime = OSGetTime();
OSRestoreInterrupts(interrupts);
}
void RakuRakuThread::progressCallback(RakuProgress* progress) {
((RakuRakuThread*)progress)->syncRakuProgress();
((RakuRakuThread*)progress)->RakuRakuThread_813FDA04();
}
RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
@@ -101,12 +101,12 @@ RakuRakuThread::RakuRakuThread(EGG::Heap* heap) : utility::ut_thread() {
active = false;
mFinished = 0;
mRunning = 0;
OSInitMessageQueue(&sRakuMsgQueue, &messageSlot, 1);
OSInitMessageQueue(&RakuRakuThread_810BDED4, &messageSlot, 1);
}
RakuRakuThread::~RakuRakuThread() {
if (mRunning) {
OSJamMessage(&sRakuMsgQueue, (OSMessage)2, 1);
OSJamMessage(&RakuRakuThread_810BDED4, (OSMessage)2, 1);
WaitForThreadExit();
}
destroy();
@@ -114,7 +114,7 @@ RakuRakuThread::~RakuRakuThread() {
void RakuRakuThread::destroy() {
if (active) {
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
u32 start = OSGetTick();
while ((u32)(OSGetTick() - start) / (OS_TIMER_CLOCK / 1000) < 2000) {
RakuProgress progress;
@@ -127,7 +127,7 @@ void RakuRakuThread::destroy() {
}
if (mHeap != NULL) {
MEMDestroyExpHeap(mHeap);
memset(&sRakuAllocator, 0, sizeof(MEMAllocator));
memset(&RakuRakuThread_810BDDD0, 0, sizeof(MEMAllocator));
mHeap = NULL;
}
}
@@ -139,19 +139,19 @@ int RakuRakuThread::start() {
BOOL interrupts = OSDisableInterrupts();
startTime = OSGetTime();
mHeap = MEMCreateExpHeapEx(mHeapBuffer, 0x40000, 2);
MEMInitAllocatorForExpHeap(&sRakuAllocator, mHeap, 32);
MEMInitAllocatorForExpHeap(&RakuRakuThread_810BDDD0, mHeap, 32);
mPriority = OSGetThreadPriority(OSGetCurrentThread()) - 1;
active = true;
mFinished = 0;
memset(&sRakuStatus.configuration, 0, sizeof(RakuConfiguration));
memset(&sRakuStatus.progress, 0, sizeof(RakuProgress));
memset(&RakuRakuThread_810BDDE0.configuration, 0, sizeof(RakuConfiguration));
memset(&RakuRakuThread_810BDDE0.progress, 0, sizeof(RakuProgress));
SOLibraryConfig socketConfig;
socketConfig.alloc = RakuSocketAlloc;
socketConfig.free = RakuSocketFree;
socketConfig.alloc = RakuRakuThread_813FDEF0;
socketConfig.free = RakuRakuThread_813FDEFC;
SOInit(&socketConfig);
ATERMi_ApConfigStart(mPriority, 200,
progressCallback,
RakuAtermAlloc, RakuAtermFree, 4096);
RakuRakuThread_813FDF08, RakuRakuThread_813FDF18, 4096);
if (!mRunning) {
mRunning = 1;
memset(mStack, 0, 4);
@@ -165,12 +165,12 @@ int RakuRakuThread::start() {
void* RakuRakuThread::Run() {
OSMessage message;
while (true) {
while (OSReceiveMessage(&sRakuMsgQueue, &message, 0)) {
while (OSReceiveMessage(&RakuRakuThread_810BDED4, &message, 0)) {
if ((s32)message == 2) {
return this;
}
}
OSReceiveMessage(&sRakuMsgQueue, &message, 1);
OSReceiveMessage(&RakuRakuThread_810BDED4, &message, 1);
if ((s32)message == 2) {
break;
}
@@ -184,17 +184,17 @@ void* RakuRakuThread::Run() {
return this;
}
static void* RakuSocketAlloc(u32, s32 size) {
return MEMAllocFromAllocator(&sRakuAllocator, size);
static void* RakuRakuThread_813FDEF0(u32, s32 size) {
return MEMAllocFromAllocator(&RakuRakuThread_810BDDD0, size);
}
static void RakuSocketFree(u32, void* block, s32) {
MEMFreeToAllocator(&sRakuAllocator, block);
static void RakuRakuThread_813FDEFC(u32, void* block, s32) {
MEMFreeToAllocator(&RakuRakuThread_810BDDD0, block);
}
static void* RakuAtermAlloc(u32 size) {
return MEMAllocFromAllocator(&sRakuAllocator, size);
static void* RakuRakuThread_813FDF08(u32 size) {
return MEMAllocFromAllocator(&RakuRakuThread_810BDDD0, size);
}
static void RakuAtermFree(void* block) {
MEMFreeToAllocator(&sRakuAllocator, block);
static void RakuRakuThread_813FDF18(void* block) {
MEMFreeToAllocator(&RakuRakuThread_810BDDD0, block);
}
int RakuRakuThread::getState() {
@@ -202,7 +202,7 @@ int RakuRakuThread::getState() {
return 0;
}
BOOL interrupts = OSDisableInterrupts();
switch (sRakuStatus.progress.state) {
switch (RakuRakuThread_810BDDE0.progress.state) {
case 1: displayState = 1; break;
case 2: displayState = 2; break;
case 3: displayState = 2; break;
@@ -214,14 +214,14 @@ int RakuRakuThread::getState() {
}
if (displayState != 6 && displayState != 7 &&
((u32)OSGetTime() - (u32)startTime) / (OS_TIMER_CLOCK / 1000) >= 90000) {
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
}
OSRestoreInterrupts(interrupts);
return displayState;
}
int RakuRakuThread::cancel() {
return OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
return OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
}
int RakuRakuThread::finish(NCDApConfig* config, int* result) {
@@ -231,23 +231,23 @@ int RakuRakuThread::finish(NCDApConfig* config, int* result) {
}
return 1;
}
s32 state = sRakuStatus.progress.state;
s32 state = RakuRakuThread_810BDDE0.progress.state;
if ((u32)(state - 6) > 1) {
return 0;
}
if (!mFinished) {
if (state == 6) {
ATERMi_ApConfigGetResult(&sRakuStatus.configuration);
ATERMi_ApConfigGetResult(&RakuRakuThread_810BDDE0.configuration);
printInfo();
}
OSSendMessage(&sRakuMsgQueue, (OSMessage)1, 0);
OSSendMessage(&RakuRakuThread_810BDED4, (OSMessage)1, 0);
return 0;
}
SOFinish();
active = false;
destroy();
if (config != NULL) {
RakuConfiguration* settings = &sRakuStatus.configuration;
RakuConfiguration* settings = &RakuRakuThread_810BDDE0.configuration;
memcpy(config->ssid, settings->ssid, 32);
config->ssidLength = strlen(settings->ssid);
if (settings->security == 1) {
@@ -273,7 +273,7 @@ int RakuRakuThread::finish(NCDApConfig* config, int* result) {
}
}
if (result != NULL) {
*result = sRakuStatus.progress.result;
*result = RakuRakuThread_810BDDE0.progress.result;
}
return 1;
}

View File

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

View File

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

View File

@@ -36,7 +36,7 @@ namespace ipl {
}
TextWriter::TextWriter(EGG::Heap* heap)
: FaderSceneBase(heap), mState(STATE_NORMAL), mSelectedFaceId(-1), mpNigaoe(NULL), mbClosing(false), mbResetAcceptable(true),
: FaderSceneBase(heap), mState(STATE_NORMAL), mSelectedFaceId(-1), mpNigaoe(NULL), mbClosing(false), unk_0x7D(true),
mNwc24ErrCountdown(0) {
setSceneParentFlags(SCN_PARENTFLAG_DRAW | SCN_PARENTFLAG_CALC);
}
@@ -87,7 +87,7 @@ namespace ipl {
mSelectedFaceId = -1;
mpNigaoe = NULL;
mbClosing = false;
mbResetAcceptable = true;
unk_0x7D = true;
mNwc24ErrCountdown = 0;
// Text balloon for Mii face
@@ -398,7 +398,7 @@ namespace ipl {
snd::getSystem()->startSE("WIPL_SE_DECIDE");
mbResetAcceptable = false;
unk_0x7D = false;
// Copy memo contents
wmemcpy(mWCString, getMemoInputForm()->getSendString()->getWCString(), WC_STRING_LENGTH);
@@ -412,7 +412,7 @@ namespace ipl {
closeNWC24();
mbResetAcceptable = true;
unk_0x7D = true;
// Receive sent memo
System::receiveImmediately();

View File

@@ -19,11 +19,11 @@ extern "C" {
}
extern "C" void _seBlk__Q23ipl3snd();
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
extern "C" const f32 scSoundZeroF;
extern "C" const f32 scSoundOneF;
extern "C" const f32 scSoundTwoF;
extern "C" const f32 scSoundThirtyF;
extern "C" const f32 scSoundSixtyF;
extern "C" const f32 lbl_816946A4;
extern "C" const f32 lbl_816946AC;
extern "C" const f32 lbl_816946A8;
extern "C" const f32 lbl_816946B0;
extern "C" const f32 lbl_816946B4;
extern "C" {
void _savegpr_29();
void pauseOffSE__Q33ipl3snd6SystemFv();
@@ -265,10 +265,10 @@ namespace ipl {
li r5, 0
bl ClearEffect__Q44nw4r3snd6detail9AxManagerFQ34nw4r3snd6AuxBusi
bl GetInstance__Q44nw4r3snd6detail9AxManagerFv
lfs f1, scSoundZeroF
lfs f1, lbl_816946A4
li r4, 0
bl SetMasterVolume__Q44nw4r3snd6detail9AxManagerFfi
lfs f1, scSoundZeroF
lfs f1, lbl_816946A4
addi r3, r31, sBannerSoundPlayer__Q23ipl3snd@l
bl setMasterVolume__17BannerSoundPlayerFf
addi r11, r1, 0x20
@@ -315,7 +315,7 @@ namespace ipl {
sBannerSoundPlayer.setMasterVolume(0.9f);
}
extern "C" const f32 scSoundZeroF = 0.0f;
extern "C" const f32 lbl_816946A4 = 0.0f;
void System::stopBannerSound(int unk) {
sBannerSoundPlayer.stop(unk);
@@ -500,21 +500,21 @@ namespace snd {
if (block->handle.detail_GetAttachedSound() != NULL) {
block->handle.detail_GetAttachedSound()->SetPan(pan);
}
f32 pitch = scSoundTwoF * y / rect.right;
if (scSoundOneF < pitch) {
pitch = scSoundOneF;
f32 pitch = lbl_816946A8 * y / rect.right;
if (lbl_816946AC < pitch) {
pitch = lbl_816946AC;
}
if (block->handle.detail_GetAttachedSound() != NULL) {
block->handle.detail_GetAttachedSound()->SetVolume(pitch, 0);
}
if (scSoundThirtyF < y) {
f32 pitch2 = y / scSoundThirtyF;
if (lbl_816946B0 < y) {
f32 pitch2 = y / lbl_816946B0;
if (block->handle.detail_GetAttachedSound() != NULL) {
block->handle.detail_GetAttachedSound()->SetPitch(pitch2);
}
} else if (scSoundSixtyF < y) {
} else if (lbl_816946B4 < y) {
if (block->handle.detail_GetAttachedSound() != NULL) {
block->handle.detail_GetAttachedSound()->SetPitch(scSoundTwoF);
block->handle.detail_GetAttachedSound()->SetPitch(lbl_816946A8);
}
}
return (int)block;

View File

@@ -150,7 +150,7 @@ namespace ipl {
myWork->sdWriteProtected = FALSE;
myWork->prevAsyncResult = RESULT_WORKING;
mbCancel = false;
unk_0x04 = false;
OSResumeThread(&myWork->thread);
}
@@ -1235,7 +1235,7 @@ namespace ipl {
int result;
OSReport("NandSDWorker: cleaning partial nand app...\n");
for (int i = 0; i < titleIdCount; i++) {
if (mbCancel != false) {
if (unk_0x04 != false) {
return RESULT_UNK_18;
}
@@ -4877,7 +4877,7 @@ namespace ipl {
strncat(fmtStr, fileName, NAND_MAX_PATH);
while (faErr == FA_ERR_SUCCESS) {
if (mbCancel != false) {
if (unk_0x04 != false) {
return RESULT_UNK_18;
}

Some files were not shown because too many files have changed in this diff Show More