Compare commits

..

1 Commits

Author SHA1 Message Date
coah
c1f247a8b8 cleanup(WPAD): name version and manage string data
Rename SDK version banner and WPADiManageHandler message blob.
2026-10-01 17:19:41 -05:00
44 changed files with 1320 additions and 1068 deletions

View File

@@ -53,9 +53,9 @@ Progress
<!-- progress:start -->
| Decompiled | Matched | Linked | Data |
|:---:|:---:|:---:|:---:|
| 99.37% | 87.72% | 62.05% | 92.06% |
| 99.37% | 87.69% | 61.93% | 91.37% |
units 918/1027 complete, functions 12215/12563 matched.
units 917/1027 complete, functions 12211/12563 matched.
decompiled = code with a C/C++ implementation (objdiff fuzzy), matched = byte-exact code, linked = code actually linked into the DOL, data = byte-exact data
<!-- progress:end -->

View File

@@ -804,14 +804,14 @@ src/scene/sdChannelSelect/iplSDChannelObj.cpp:
.rodata start:0x81610608 end:0x81610918
.data start:0x81654B38 end:0x81654F98
.sdata2 start:0x81694B18 end:0x81694B60
.sdata start:0x81696DD0 end:0x81696E30
.sdata start:0x81696DD0 end:0x81696E40
src/scene/sdChannelTitle/iplSDChannelTitle.cpp:
.text start:0x813E4BBC end:0x813E947C
.rodata start:0x81610918 end:0x81610948
.data start:0x81654F98 end:0x81655638
.sdata2 start:0x81694B60 end:0x81694B88
.sdata start:0x81696E30 end:0x81696EF0
.sdata start:0x81696E40 end:0x81696EF0
src/scene/sdButton/iplSDButton.cpp:
.text start:0x813E947C end:0x813EA88C

View File

@@ -1385,19 +1385,19 @@ getDiskBannerData__Q33ipl7channel7ManagerFib = .text:0x81339FB0; // type:functio
titleIDtoPageIndex__Q33ipl7channel7ManagerCFUxPiPi = .text:0x8133A2BC; // type:function size:0xA0
getLockedMsgFromBuf__Q33ipl7channel7ManagerCFPCQ33ipl7channel22SChanMgrDiskInMessages = .text:0x8133A35C; // type:function size:0xA8
nand_error_handling__Q33ipl7channel7ManagerFi = .text:0x8133A404; // type:function size:0xDC
findEntryByTitleId__Q33ipl7channel7ManagerFUx = .text:0x8133A4E0; // type:function size:0x9C
getBannerCSIdx__Q33ipl7channel7ManagerFUx = .text:0x8133A57C; // type:function size:0x3C
getSoundSize__Q33ipl7channel7ManagerFUx = .text:0x8133A5B8; // type:function size:0x38
needsNetSetting__Q33ipl7channel7ManagerFUx = .text:0x8133A5F0; // type:function size:0x44
usesAltSound__Q33ipl7channel7ManagerFUx = .text:0x8133A634; // type:function size:0x44
isMissingTicket__Q33ipl7channel7ManagerFUx = .text:0x8133A678; // type:function size:0x40
isNewsChannelV6Plus__Q33ipl7channel7ManagerFUx = .text:0x8133A6B8; // type:function size:0x84
isOperaChannel__Q33ipl7channel7ManagerFUx = .text:0x8133A73C; // type:function size:0x68
readBannerMetaAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A7A4; // type:function size:0xB8
readSoundMetaAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A85C; // type:function size:0xC8
readBannerCSAsync__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A924; // type:function size:0xCC
clearTmpChannel__Q33ipl7channel7ManagerFv = .text:0x8133A9F0; // type:function size:0x60
unloadBanner__Q33ipl7channel7ManagerFUx = .text:0x8133AA50; // type:function size:0x30
fn_8133A4E0__Q33ipl7channel7ManagerFUx = .text:0x8133A4E0; // type:function size:0x9C
fn_8133A57C__Q33ipl7channel7ManagerFUx = .text:0x8133A57C; // type:function size:0x3C
fn_8133A5B8__Q33ipl7channel7ManagerFUx = .text:0x8133A5B8; // type:function size:0x38
fn_8133A5F0__Q33ipl7channel7ManagerFUx = .text:0x8133A5F0; // type:function size:0x44
fn_8133A634__Q33ipl7channel7ManagerFUx = .text:0x8133A634; // type:function size:0x44
fn_8133A678__Q33ipl7channel7ManagerFUx = .text:0x8133A678; // type:function size:0x40
fn_8133A6B8__Q33ipl7channel7ManagerFUx = .text:0x8133A6B8; // type:function size:0x84
fn_8133A73C__Q33ipl7channel7ManagerFUx = .text:0x8133A73C; // type:function size:0x68
fn_8133A7A4__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A7A4; // type:function size:0xB8
fn_8133A85C__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A85C; // type:function size:0xC8
fn_8133A924__Q33ipl7channel7ManagerFPQ23EGG4HeapUx = .text:0x8133A924; // type:function size:0xCC
fn_8133A9F0__Q33ipl7channel7ManagerFv = .text:0x8133A9F0; // type:function size:0x60
fn_8133AA50__Q33ipl7channel7ManagerFUx = .text:0x8133AA50; // type:function size:0x30
__ct__Q33ipl7channel20ChannelScriptManagerFv = .text:0x8133AA80; // type:function size:0x10
create__Q33ipl7channel20ChannelScriptManagerFPQ23EGG7ExpHeap = .text:0x8133AA90; // type:function size:0x90
init__Q33ipl7channel20ChannelScriptManagerFPQ33ipl4nand4FilePQ33ipl7channel9RsoThread = .text:0x8133AB20; // type:function size:0x3D4
@@ -14110,7 +14110,7 @@ hairColorTable$1737 = .rodata:0x8161DDDC; // type:object size:0xB4 scope:local
eyeColorTable$1742 = .rodata:0x8161DE90; // type:object size:0x1E scope:local
scDefaultData = .rodata:0x8161DEB0; // type:object size:0x1BC scope:local
scDayMax$1845 = .rodata:0x8161E070; // type:object size:0xD scope:local
scJpegAanScale = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
lbl_8161E080 = .rodata:0x8161E080; // type:object size:0x100 scope:local data:4byte
TMCJPEGDEC_SampleH_N = .rodata:0x8161E180; // type:object size:0x18 data:byte
TMCJPEGDEC_SampleV_N = .rodata:0x8161E198; // type:object size:0x18 data:byte
TMCJPEGDEC_Zigzag_data = .rodata:0x8161E1B0; // type:object size:0x40 data:byte
@@ -15796,20 +15796,20 @@ __vt__Q33ipl5scene11ChannelEdit = .data:0x8164CC1C; // type:object size:0x4C
@17390 = .data:0x8164D00C; // type:object size:0x30 scope:local
__vt__Q33ipl5scene11ChanAppBase = .data:0x8164D03C; // type:object size:0x28
__vt__Q33ipl5scene13AnmController = .data:0x8164D0F8; // type:object size:0xC scope:weak
scBrlan_SaveDataIn = .data:0x8164D108; // type:object size:0x25 data:string
scBrlan_SaveDataOut = .data:0x8164D12D; // type:object size:0x26 data:string
scBrlan_SaveDataFocusIn = .data:0x8164D153; // type:object size:0x2B data:string
scBrlan_SaveDataFocusOut = .data:0x8164D17E; // type:object size:0x2C data:string
scPaneName_N_Data16x9 = .data:0x8164D1AA; // type:object size:0xB data:string
scPaneName_N_Data4x3 = .data:0x8164D1B5; // type:object size:0xA data:string
scPaneName_B_Data_01 = .data:0x8164D1BF; // type:object size:0xA data:string
scPaneName_B_Data_00 = .data:0x8164D1C9; // type:object size:0xA data:string
scPaneName_N_Atari16x9 = .data:0x8164D1D3; // type:object size:0xC data:string
scPaneName_N_Data_01 = .data:0x8164D1DF; // type:object size:0xA data:string
scPaneName_N_Atari4x3 = .data:0x8164D1E9; // type:object size:0xB data:string
scPaneName_N_Data_00 = .data:0x8164D1F4; // type:object size:0xA data:string
scPaneName_DataBaseCover_00 = .data:0x8164D1FE; // type:object size:0x11 data:string
scPaneName_DataBaseCover_01 = .data:0x8164D20F; // type:object size:0x11 data:string
lbl_8164D108 = .data:0x8164D108; // type:object size:0x25 data:string
lbl_8164D12D = .data:0x8164D12D; // type:object size:0x26 data:string
lbl_8164D153 = .data:0x8164D153; // type:object size:0x2B data:string
lbl_8164D17E = .data:0x8164D17E; // type:object size:0x2C data:string
lbl_8164D1AA = .data:0x8164D1AA; // type:object size:0xB data:string
lbl_8164D1B5 = .data:0x8164D1B5; // type:object size:0xA data:string
lbl_8164D1BF = .data:0x8164D1BF; // type:object size:0xA data:string
lbl_8164D1C9 = .data:0x8164D1C9; // type:object size:0xA data:string
lbl_8164D1D3 = .data:0x8164D1D3; // type:object size:0xC data:string
lbl_8164D1DF = .data:0x8164D1DF; // type:object size:0xA data:string
lbl_8164D1E9 = .data:0x8164D1E9; // type:object size:0xB data:string
lbl_8164D1F4 = .data:0x8164D1F4; // type:object size:0xA data:string
lbl_8164D1FE = .data:0x8164D1FE; // type:object size:0x11 data:string
lbl_8164D20F = .data:0x8164D20F; // type:object size:0x11 data:string
__vt__Q33ipl5scene10ChanAppBox = .data:0x8164D220; // type:object size:0x28
@18429 = .data:0x8164D2E8; // type:object size:0x20 scope:local data:string
@18431 = .data:0x8164D308; // type:object size:0x21 scope:local data:string
@@ -15940,19 +15940,19 @@ lbl_8164DCDF = .data:0x8164DCDF; // type:object size:0x35
jumptable_8164DD14 = .data:0x8164DD14; // type:object size:0x6C scope:local
lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
lbl_8164DE64 = .data:0x8164DE64; // type:object size:0x9 data:string
lbl_8164DE6D = .data:0x8164DE6D; // type:object size:0x11 data:string
jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
lbl_8164DE9C = .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
scSE_WIPL_SE_CH_TARGETTING = .data:0x8164DFCB; // type:object size:0x16 data:string
scSE_WIPL_SE_CH_HOLD = .data:0x8164DFE1; // type:object size:0x10 data:string
scSE_WIPL_SE_CH_SET = .data:0x8164DFF1; // type:object size:0xF data:string
scSE_WIPL_SE_CH_NOT_MOVE = .data:0x8164E000; // type:object size:0x14 data:string
lbl_8164DFCB = .data:0x8164DFCB; // type:object size:0x16 data:string
lbl_8164DFE1 = .data:0x8164DFE1; // type:object size:0x10 data:string
lbl_8164DFF1 = .data:0x8164DFF1; // type:object size:0xF data:string
lbl_8164E000 = .data:0x8164E000; // type:object size:0x14 data:string
lbl_8164E014 = .data:0x8164E014; // type:object size:0x10 data:string
scSE_WIPL_SE_GRAY_BUTTON = .data:0x8164E024; // type:object size:0x14 data:string
scSE_WIPL_SE_DECIDE = .data:0x8164E038; // type:object size:0xF data:string
lbl_8164E024 = .data:0x8164E024; // type:object size:0x14 data:string
lbl_8164E038 = .data:0x8164E038; // type:object size:0xF data:string
__vt__Q33ipl4math29HermiteIntp<Q33ipl4math4VEC3> = .data:0x8164E048; // type:object size:0x20
__vt__Q33ipl5scene27CsChanSelSDMenuEventHandler = .data:0x8164E068; // type:object size:0x1C
__vt__Q33ipl5scene27CsChanSelButtonEventHandler = .data:0x8164E084; // type:object size:0x1C
@@ -15983,46 +15983,46 @@ lbl_8164E6F3 = .data:0x8164E6F3; // type:object size:0x12 data:string
lbl_8164E705 = .data:0x8164E705; // type:object size:0x19 data:string
lbl_8164E71E = .data:0x8164E71E; // type:object size:0x26 data:string
lbl_8164E744 = .data:0x8164E744; // type:object size:0x1F data:string
scGroup_G_FocusBtnA = .data:0x8164E768; // type:object size:0xC data:string
scGroup_G_FocusBtnB = .data:0x8164E774; // type:object size:0xC data:string
scGroup_G_SelectBtnA = .data:0x8164E780; // type:object size:0xD data:string
scGroup_G_SelectBtnB = .data:0x8164E78D; // type:object size:0xD data:string
scGroup_G_OnOffBtnA = .data:0x8164E79A; // type:object size:0xC data:string
scGroup_G_OnOffBtnB = .data:0x8164E7A6; // type:object size:0xC data:string
scGroup_G_ChangeTextA = .data:0x8164E7B2; // type:object size:0xE data:string
scGroup_G_ChangeTextB = .data:0x8164E7C0; // type:object size:0xE data:string
lbl_8164E768 = .data:0x8164E768; // type:object size:0xC data:string
lbl_8164E774 = .data:0x8164E774; // type:object size:0xC data:string
lbl_8164E780 = .data:0x8164E780; // type:object size:0xD data:string
lbl_8164E78D = .data:0x8164E78D; // type:object size:0xD data:string
lbl_8164E79A = .data:0x8164E79A; // type:object size:0xC data:string
lbl_8164E7A6 = .data:0x8164E7A6; // type:object size:0xC data:string
lbl_8164E7B2 = .data:0x8164E7B2; // type:object size:0xE data:string
lbl_8164E7C0 = .data:0x8164E7C0; // type:object size:0xE data:string
scAnimGroups__Q23ipl5scene = .data:0x8164E7D0; // type:object size:0x24
scBrlan_my_ChTop_a_FocusBtnA_off = .data:0x8164E7F4; // type:object size:0x1F data:string
scBrlan_my_ChTop_a_FocusBtn_on = .data:0x8164E813; // type:object size:0x1D data:string
scBrlan_my_ChTop_a_SelectBtn_Ac = .data:0x8164E830; // type:object size:0x1E data:string
scBrlan_my_ChTop_a_OffBtn = .data:0x8164E84E; // type:object size:0x18 data:string
scBrlan_my_ChTop_a_OnBtn = .data:0x8164E866; // type:object size:0x17 data:string
scBrlan_my_ChTop_a_ChangeTextOut = .data:0x8164E87D; // type:object size:0x1F data:string
scBrlan_my_ChTop_a_ChangeTextIn = .data:0x8164E89C; // type:object size:0x1E data:string
scBrlan_my_ChTop_a_ChangeIn = .data:0x8164E8BA; // type:object size:0x1A data:string
scBrlan_my_ChTop_a_ChangeRoop = .data:0x8164E8D4; // type:object size:0x1C data:string
scBrlan_my_ChTop_a_ChangeOut = .data:0x8164E8F0; // type:object size:0x1B data:string
lbl_8164E7F4 = .data:0x8164E7F4; // type:object size:0x1F data:string
lbl_8164E813 = .data:0x8164E813; // type:object size:0x1D data:string
lbl_8164E830 = .data:0x8164E830; // type:object size:0x1E data:string
lbl_8164E84E = .data:0x8164E84E; // type:object size:0x18 data:string
lbl_8164E866 = .data:0x8164E866; // type:object size:0x17 data:string
lbl_8164E87D = .data:0x8164E87D; // type:object size:0x1F data:string
lbl_8164E89C = .data:0x8164E89C; // type:object size:0x1E data:string
lbl_8164E8BA = .data:0x8164E8BA; // type:object size:0x1A data:string
lbl_8164E8D4 = .data:0x8164E8D4; // type:object size:0x1C data:string
lbl_8164E8F0 = .data:0x8164E8F0; // type:object size:0x1B data:string
scAnimNames__Q23ipl5scene = .data:0x8164E90C; // type:object size:0x28
scBrlan_banner = .data:0x8164E934; // type:object size:0xD data:string
scBrlan_banner_Start = .data:0x8164E941; // type:object size:0x13 data:string
scBrlan_banner_Loop = .data:0x8164E954; // type:object size:0x12 data:string
lbl_8164E934 = .data:0x8164E934; // type:object size:0xD data:string
lbl_8164E941 = .data:0x8164E941; // type:object size:0x13 data:string
lbl_8164E954 = .data:0x8164E954; // type:object size:0x12 data:string
scBannerAnims__Q23ipl5scene = .data:0x8164E968; // type:object size:0xC
scGroup_G_Comment0 = .data:0x8164E974; // type:object size:0xB data:string
scGroup_G_DiskIn = .data:0x8164E97F; // type:object size:0x9 data:string
lbl_8164E974 = .data:0x8164E974; // type:object size:0xB data:string
lbl_8164E97F = .data:0x8164E97F; // type:object size:0x9 data:string
scDiskGroups__Q23ipl5scene = .data:0x8164E988; // type:object size:0x14 data:4byte
scBrlan_my_DiskCh_a_Start = .data:0x8164E99C; // type:object size:0x18 data:string
scBrlan_my_DiskCh_a_DiskStart = .data:0x8164E9B4; // type:object size:0x1C data:string
scBrlan_my_DiskCh_a_DiskLoop = .data:0x8164E9D0; // type:object size:0x1B data:string
scBrlan_my_DiskCh_a_DiskEnd = .data:0x8164E9EB; // type:object size:0x1A data:string
scBrlan_my_DiskCh_a_DiskLost = .data:0x8164EA05; // type:object size:0x1B data:string
scBrlan_my_DiskCh_a_DiskIn = .data:0x8164EA20; // type:object size:0x19 data:string
scBrlan_my_DiskCh_a_DiskEject = .data:0x8164EA39; // type:object size:0x1C data:string
scBrlan_my_DiskCh_a_Unknown = .data:0x8164EA55; // type:object size:0x1A data:string
scBrlan_my_DiskCh_a_UnknownLoop = .data:0x8164EA6F; // type:object size:0x1E data:string
scBrlan_my_DiskCh_a_UnknwnEject = .data:0x8164EA8D; // type:object size:0x1E data:string
lbl_8164E99C = .data:0x8164E99C; // type:object size:0x18 data:string
lbl_8164E9B4 = .data:0x8164E9B4; // type:object size:0x1C data:string
lbl_8164E9D0 = .data:0x8164E9D0; // type:object size:0x1B data:string
lbl_8164E9EB = .data:0x8164E9EB; // type:object size:0x1A data:string
lbl_8164EA05 = .data:0x8164EA05; // type:object size:0x1B data:string
lbl_8164EA20 = .data:0x8164EA20; // type:object size:0x19 data:string
lbl_8164EA39 = .data:0x8164EA39; // type:object size:0x1C data:string
lbl_8164EA55 = .data:0x8164EA55; // type:object size:0x1A data:string
lbl_8164EA6F = .data:0x8164EA6F; // type:object size:0x1E data:string
lbl_8164EA8D = .data:0x8164EA8D; // type:object size:0x1E data:string
scDiskAnimNames__Q23ipl5scene = .data:0x8164EAAC; // type:object size:0x28 data:4byte
scBrlyt_my_DiskCh_a = .data:0x8164EAD4; // type:object size:0x12 data:string
scBrlan_my_GCTop_a_BackLoop = .data:0x8164EAE6; // type:object size:0x1A data:string
lbl_8164EAD4 = .data:0x8164EAD4; // type:object size:0x12 data:string
lbl_8164EAE6 = .data:0x8164EAE6; // type:object size:0x1A data:string
scWidePanes__Q23ipl5scene = .data:0x8164EB00; // type:object size:0x30
lbl_8164EB30 = .data:0x8164EB30; // type:object size:0xC data:string
lbl_8164EB3C = .data:0x8164EB3C; // type:object size:0xCC
@@ -18664,7 +18664,7 @@ __vt__Q34nw4r3lyt7Picture = .data:0x816717F4; // type:object size:0x6C
@5574 = .data:0x816718E8; // type:object size:0x41 scope:local data:string
__vt__Q34nw4r3lyt7TextBox = .data:0x8167192C; // type:object size:0x74
flipInfos$7849 = .data:0x816719A0; // type:object size:0x3C scope:local
scLytFatalMsg = .data:0x816719DC; // type:object size:0x41 data:string
lbl_816719DC = .data:0x816719DC; // type:object size:0x41 data:string
__vt__Q34nw4r3lyt6Window = .data:0x81671A20; // type:object size:0x7C
__vt__Q34nw4r3lyt8Bounding = .data:0x81671AA0; // type:object size:0x64
kColSels$4880 = .data:0x81671B08; // type:object size:0x20 scope:local data:4byte
@@ -20016,7 +20016,7 @@ lbl_81691040 = .data:0x81691040; // type:object size:0x2D0
lbl_81691310 = .data:0x81691310; // type:object size:0x3B data:string
lbl_8169134C = .data:0x8169134C; // type:object size:0x3DC
st_uhs_msc_blk_func = .data:0x81691728; // type:object size:0x20
__sdPathData = .data:0x81691748; // type:object size:0x50
lbl_81691748 = .data:0x81691748; // type:object size:0x50
lbl_81691798 = .data:0x81691798; // type:object size:0x16 data:string
lbl_816917B0 = .data:0x816917B0; // type:object size:0xD data:string
lbl_816917C0 = .data:0x816917C0; // type:object size:0x15 data:string
@@ -20050,8 +20050,8 @@ lbl_816932D0 = .data:0x816932D0; // type:object size:0x48 data:string
lbl_81693318 = .data:0x81693318; // type:object size:0xA data:string
lbl_81693324 = .data:0x81693324; // type:object size:0x15 data:string
@466 = .data:0x81693340; // type:object size:0xD scope:local data:string
scCntCacheStrs = .data:0x81693350; // type:object size:0xD0
scCntCacheTitleDataFmt = .data:0x81693420; // type:object size:0x16 data:string
lbl_81693350 = .data:0x81693350; // type:object size:0xD0
lbl_81693420 = .data:0x81693420; // type:object size:0x16 data:string
__vt__Q23EGG9Allocator = .data:0x81693438; // type:object size:0x14
__vt__Q23EGG9ArcPlayer = .data:0x81693450; // type:object size:0x54
__vt__Q23EGG20SimpleAudioMgrWithFx = .data:0x816934A8; // type:object size:0x78
@@ -20370,9 +20370,9 @@ lbl_816948E8 = .sdata2:0x816948E8; // type:object size:0x8 align:4 data:float
@16092 = .sdata2:0x816948F4; // type:object size:0x4 scope:local align:4 data:float
@16094 = .sdata2:0x816948F8; // type:object size:0x4 scope:local align:4 data:float
@16095 = .sdata2:0x816948FC; // type:object size:0x4 scope:local align:4 data:float
scHalfF = .sdata2:0x81694900; // type:object size:0x4 align:4 data:float
scTwoF = .sdata2:0x81694904; // type:object size:0x4 align:4 data:float
scF2IBias = .sdata2:0x81694908; // type:object size:0x8 align:8 data:double
lbl_81694900 = .sdata2:0x81694900; // type:object size:0x4 align:4 data:float
lbl_81694904 = .sdata2:0x81694904; // type:object size:0x4 align:4 data:float
lbl_81694908 = .sdata2:0x81694908; // type:object size:0x8 align:8 data:double
lbl_81694910 = .sdata2:0x81694910; // type:object size:0x4 align:4 data:float
lbl_81694914 = .sdata2:0x81694914; // type:object size:0x4 align:4 data:float
lbl_81694918 = .sdata2:0x81694918; // type:object size:0x4 align:4 data:float
@@ -20769,12 +20769,12 @@ NET_AES_BLOCK_MODE_CBC = .sdata2:0x81695040; // type:object size:0x8
@524 = .sdata2:0x81695050; // type:object size:0x2 scope:local data:byte
@1077 = .sdata2:0x81695054; // type:object size:0x2 scope:local data:byte
@1128 = .sdata2:0x81695058; // type:object size:0x2 scope:local data:byte
scRsnOui0 = .sdata2:0x81695060; // type:object size:0x1 data:byte
scRsnOui1 = .sdata2:0x81695061; // type:object size:0x1 data:byte
scRsnOui2 = .sdata2:0x81695062; // type:object size:0x1 data:byte
scWpaOui0 = .sdata2:0x81695064; // type:object size:0x1 data:byte
scWpaOui1 = .sdata2:0x81695065; // type:object size:0x1 data:byte
scWpaOui2 = .sdata2:0x81695066; // type:object size:0x1 data:byte
lbl_81695060 = .sdata2:0x81695060; // type:object size:0x1 data:byte
lbl_81695061 = .sdata2:0x81695061; // type:object size:0x1 data:byte
lbl_81695062 = .sdata2:0x81695062; // type:object size:0x1 data:byte
lbl_81695064 = .sdata2:0x81695064; // type:object size:0x1 data:byte
lbl_81695065 = .sdata2:0x81695065; // type:object size:0x1 data:byte
lbl_81695066 = .sdata2:0x81695066; // type:object size:0x1 data:byte
scFilePermissions = .sdata2:0x81695068; // type:object size:0x2 scope:local
cWhite = .sdata2:0x81695070; // type:object size:0x4 scope:local data:byte
@2829 = .sdata2:0x81695074; // type:object size:0x4 scope:local align:4 data:float
@@ -21025,10 +21025,10 @@ lbl_8169553B = .sdata2:0x8169553B; // type:object size:0x1 data:byte
lbl_8169553C = .sdata2:0x8169553C; // type:object size:0x4 align:4 data:float
lbl_81695540 = .sdata2:0x81695540; // type:object size:0x8 align:8 data:double
lbl_81695548 = .sdata2:0x81695548; // type:object size:0x8 align:8 data:double
scLytFatalColorR = .sdata2:0x81695550; // type:object size:0x1 data:byte
scLytFatalColorG = .sdata2:0x81695551; // type:object size:0x1 data:byte
scLytFatalColorB = .sdata2:0x81695552; // type:object size:0x1 data:byte
scLytFatalColorA = .sdata2:0x81695553; // type:object size:0x5 data:byte
lbl_81695550 = .sdata2:0x81695550; // type:object size:0x1 data:byte
lbl_81695551 = .sdata2:0x81695551; // type:object size:0x1 data:byte
lbl_81695552 = .sdata2:0x81695552; // type:object size:0x1 data:byte
lbl_81695553 = .sdata2:0x81695553; // type:object size:0x5 data:byte
@6184 = .sdata2:0x81695558; // type:object size:0x4 scope:local align:4 data:float
@6185 = .sdata2:0x8169555C; // type:object size:0x4 scope:local align:4 data:float
@6186 = .sdata2:0x81695560; // type:object size:0x4 scope:local align:4 data:float
@@ -21802,8 +21802,8 @@ lbl_8169682A = .sdata:0x8169682A; // type:object size:0x7 data:string
lbl_81696831 = .sdata:0x81696831; // type:object size:0x7 data:string
lbl_81696838 = .sdata:0x81696838; // type:object size:0x7 data:string
lbl_8169683F = .sdata:0x8169683F; // type:object size:0x7 data:string
scGroup_G_Data = .sdata:0x81696848; // type:object size:0x7 data:string
scUnknownWstr = .sdata:0x81696850; // type:object size:0x8 data:wstring
lbl_81696848 = .sdata:0x81696848; // type:object size:0x7 data:string
lbl_81696850 = .sdata:0x81696850; // type:object size:0x8 data:wstring
s_all_pane_name__Q33ipl5scene10ChanAppBox = .sdata:0x81696858; // type:object size:0x6 data:string
lbl_81696860 = .sdata:0x81696860; // type:object size:0x7 data:string
lbl_81696867 = .sdata:0x81696867; // type:object size:0x7 data:string
@@ -21881,32 +21881,32 @@ lbl_816969F7 = .sdata:0x816969F7; // type:object size:0x4 data:string
lbl_816969FB = .sdata:0x816969FB; // type:object size:0x4 data:string
lbl_816969FF = .sdata:0x816969FF; // type:object size:0x4 data:string
lbl_81696A03 = .sdata:0x81696A03; // type:object size:0x7 data:string
scPaneName_B_BtnA = .sdata:0x81696A10; // type:object size:0x7 data:string
scPaneName_B_BtnB = .sdata:0x81696A17; // type:object size:0x7 data:string
scPaneNames_B_Btn = .sdata:0x81696A20; // type:object size:0x8 data:4byte
scGroup_Change = .sdata:0x81696A28; // type:object size:0x7 data:string
scGroupNames_Change = .sdata:0x81696A30; // type:object size:0x4 data:4byte
scGroup_G_Wii = .sdata:0x81696A34; // type:object size:0x6 data:string
scGroup_G_GC = .sdata:0x81696A3A; // type:object size:0x5 data:string
lbl_81696A10 = .sdata:0x81696A10; // type:object size:0x7 data:string
lbl_81696A17 = .sdata:0x81696A17; // type:object size:0x7 data:string
lbl_81696A20 = .sdata:0x81696A20; // type:object size:0x8 data:4byte
lbl_81696A28 = .sdata:0x81696A28; // type:object size:0x7 data:string
lbl_81696A30 = .sdata:0x81696A30; // type:object size:0x4 data:4byte
lbl_81696A34 = .sdata:0x81696A34; // type:object size:0x6 data:string
lbl_81696A3A = .sdata:0x81696A3A; // type:object size:0x5 data:string
scLayoutNames__Q23ipl5scene = .sdata:0x81696A40; // type:object size:0x4 data:4byte
scGroup_G_Back = .sdata:0x81696A44; // type:object size:0x7 data:string
lbl_81696A44 = .sdata:0x81696A44; // type:object size:0x7 data:string
scGCAnimGroups__Q23ipl5scene = .sdata:0x81696A4C; // type:object size:0x4 data:4byte
scGCAnimNames__Q23ipl5scene = .sdata:0x81696A50; // type:object size:0x4 data:4byte
scPaneName_Fre_a = .sdata:0x81696A54; // type:object size:0x6 data:string
scPaneName_Fre_d = .sdata:0x81696A5A; // type:object size:0x6 data:string
scPaneName_Fre_i = .sdata:0x81696A60; // type:object size:0x6 data:string
scPaneName_Fre_l = .sdata:0x81696A66; // type:object size:0x6 data:string
scPaneName_Fre_e = .sdata:0x81696A6C; // type:object size:0x6 data:string
scPaneName_Fre_f = .sdata:0x81696A72; // type:object size:0x6 data:string
scPaneName_Fre_g = .sdata:0x81696A78; // type:object size:0x6 data:string
scPaneName_Fre_h = .sdata:0x81696A7E; // type:object size:0x6 data:string
scPaneName_Fre_b = .sdata:0x81696A84; // type:object size:0x6 data:string
scPaneName_Fre_c = .sdata:0x81696A8A; // type:object size:0x6 data:string
scPaneName_Fre_j = .sdata:0x81696A90; // type:object size:0x6 data:string
scPaneName_Fre_k = .sdata:0x81696A96; // type:object size:0x6 data:string
scPaneName_T_BtnA = .sdata:0x81696A9C; // type:object size:0x7 data:string
scPaneName_T_BtnB = .sdata:0x81696AA3; // type:object size:0x7 data:string
scPaneNames_T_Btn__Q23ipl5scene = .sdata:0x81696AAC; // type:object size:0x8 data:4byte
lbl_81696A54 = .sdata:0x81696A54; // type:object size:0x6 data:string
lbl_81696A5A = .sdata:0x81696A5A; // type:object size:0x6 data:string
lbl_81696A60 = .sdata:0x81696A60; // type:object size:0x6 data:string
lbl_81696A66 = .sdata:0x81696A66; // type:object size:0x6 data:string
lbl_81696A6C = .sdata:0x81696A6C; // type:object size:0x6 data:string
lbl_81696A72 = .sdata:0x81696A72; // type:object size:0x6 data:string
lbl_81696A78 = .sdata:0x81696A78; // type:object size:0x6 data:string
lbl_81696A7E = .sdata:0x81696A7E; // type:object size:0x6 data:string
lbl_81696A84 = .sdata:0x81696A84; // type:object size:0x6 data:string
lbl_81696A8A = .sdata:0x81696A8A; // type:object size:0x6 data:string
lbl_81696A90 = .sdata:0x81696A90; // type:object size:0x6 data:string
lbl_81696A96 = .sdata:0x81696A96; // type:object size:0x6 data:string
lbl_81696A9C = .sdata:0x81696A9C; // type:object size:0x7 data:string
lbl_81696AA3 = .sdata:0x81696AA3; // type:object size:0x7 data:string
lbl_81696AAC__Q23ipl5scene = .sdata:0x81696AAC; // type:object size:0x8 data:4byte
lbl_81696AB4 = .sdata:0x81696AB4; // type:object size:0x4
lbl_81696AB8 = .sdata:0x81696AB8; // type:object size:0x4
lbl_81696ABC = .sdata:0x81696ABC; // type:object size:0x4 data:string
@@ -22538,7 +22538,7 @@ lbl_816979C8 = .sdata:0x816979C8; // type:object size:0x5 data:string
lbl_816979D0 = .sdata:0x816979D0; // type:object size:0x5 data:string
lbl_816979D8 = .sdata:0x816979D8; // type:object size:0x4 data:string
lbl_816979E0 = .sdata:0x816979E0; // type:object size:0x8 data:string
CDBFSPathSeparator = .sdata:0x816979E8; // type:object size:0x1 data:byte
lbl_816979E8 = .sdata:0x816979E8; // type:object size:0x1 data:byte
@1433 = .sdata:0x816979F0; // type:object size:0x4 scope:local data:string
@1435 = .sdata:0x816979F4; // type:object size:0x1 scope:local
@1440 = .sdata:0x816979F8; // type:object size:0x6 scope:local data:string
@@ -22700,9 +22700,9 @@ __SSLVersion = .sdata:0x81697CE0; // type:object size:0x4 data:4byte
qErr$1631 = .sdata:0x81697D58; // type:object size:0x4 scope:local data:4byte
l_dev_nandflash_init_info = .sdata:0x81697D60; // type:object size:0x8 scope:local
l_dev_sd_direct_init_info = .sdata:0x81697D68; // type:object size:0x8 scope:local
scWpaFindOui0 = .sdata:0x81697D70; // type:object size:0x1 data:byte
scWpaFindOui1 = .sdata:0x81697D71; // type:object size:0x1 data:byte
scWpaFindOui2 = .sdata:0x81697D72; // type:object size:0x1 data:byte
lbl_81697D70 = .sdata:0x81697D70; // type:object size:0x1 data:byte
lbl_81697D71 = .sdata:0x81697D71; // type:object size:0x1 data:byte
lbl_81697D72 = .sdata:0x81697D72; // type:object size:0x1 data:byte
__RFLVersion = .sdata:0x81697D78; // type:object size:0x4 data:4byte
sRFLLastErrCode = .sdata:0x81697D7C; // type:object size:0x4 scope:local data:4byte
scResFileFullPathName = .sdata:0x81697D80; // type:object size:0x4 scope:local data:4byte
@@ -23109,7 +23109,7 @@ lbl_816983EC = .sdata:0x816983EC; // type:object size:0x6 data:string
__KBDVersion = .sdata:0x816985C8; // type:object size:0x4 data:4byte
__KPRVersion = .sdata:0x816985D0; // type:object size:0x4 data:4byte
__CNTCACHEVersion = .sdata:0x816985D8; // type:object size:0x4 data:4byte
scCntCacheSpaceNl = .sdata:0x816985DC; // type:object size:0x3 data:string
lbl_816985DC = .sdata:0x816985DC; // type:object size:0x3 data:string
@428 = .sdata:0x816985E0; // type:object size:0x4 scope:local data:string
@429 = .sdata:0x816985E4; // type:object size:0x3 scope:local data:string
@442 = .sdata:0x816985E7; // type:object size:0x8 scope:local data:string

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -654,7 +654,7 @@ pf_s32 PFENT_MakeRootDir(PF_VOLUME* p_vol) {
return 7;
}
{
static pf_u8 default_volume_label[12] = "NO NAME ";
static pf_u8 default_volume_label[16] = "NO NAME ";
PFDRV_LoadVolumeLabelFromBuf(p_vol, default_volume_label);
}
return 0;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
#include <private/nhttp.h>
const char NHTTPi_strMultipartBound[24] = STR_POSTBOUND;
const char NHTTPi_strMultipartBound[] = STR_POSTBOUND;
void* NHTTPi_alloc(u32 size, int align);
void NHTTPi_free(void* ptr);

View File

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

View File

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

View File

@@ -526,6 +526,23 @@ extern const u8 controlKeys[];
return false;
}
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
const u8 controlKeys[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
0x00, 0x04, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
0x2b, 0x2c, 0x19, 0x1a, 0x1b, 0x13, 0x15, 0x17, 0x14, 0x16, 0x18, 0x00,
0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0f, 0x0e,
0x00, 0x00, 0x00, 0x00,
0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x0b,
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
bool HWKeyboard::updateTappingShift_(input::HKBManager& hkbManager) {
hkbManager.GetModifierState();
input::HKBManager::KeySet currentKeySet;
@@ -619,24 +636,6 @@ extern const u8 controlKeys[];
}
}
extern "C" const u8 scCountryMap_EU[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 scCountryMap_NonEU[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
const u8 controlKeys[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x0a, 0x03,
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
0x00, 0x04, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
0x2b, 0x2c, 0x19, 0x1a, 0x1b, 0x13, 0x15, 0x17, 0x14, 0x16, 0x18, 0x00,
0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x0f, 0x0e,
0x00, 0x00, 0x00, 0x00,
0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x05, 0x07, 0x0b,
0x06, 0x05, 0x07, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
extern "C" asm void setLanguage__Q49textinput8keyboard5hwkey10HWKeyboardFQ29textinput11DestinationQ29textinput8Language() {
nofralloc
cmpwi r4, 2

View File

@@ -4,27 +4,27 @@
#pragma push
#pragma section const_type ".data"
extern "C" const char scBrlan_SaveDataIn[] = "it_ObjChannelEdit_b_SaveDataIn.brlan";
extern "C" const char scBrlan_SaveDataOut[] = "it_ObjChannelEdit_b_SaveDataOut.brlan";
extern "C" const char scBrlan_SaveDataFocusIn[] = "it_ObjChannelEdit_b_SaveDataFoucusIn.brlan";
extern "C" const char scBrlan_SaveDataFocusOut[] = "it_ObjChannelEdit_b_SaveDataFoucusOut.brlan";
extern "C" const char scPaneName_N_Data16x9[] = "N_Data16x9";
extern "C" const char scPaneName_N_Data4x3[] = "N_Data4x3";
extern "C" const char scPaneName_B_Data_01[] = "B_Data_01";
extern "C" const char scPaneName_B_Data_00[] = "B_Data_00";
extern "C" const char scPaneName_N_Atari16x9[] = "N_Atari16x9";
extern "C" const char scPaneName_N_Data_01[] = "N_Data_01";
extern "C" const char scPaneName_N_Atari4x3[] = "N_Atari4x3";
extern "C" const char scPaneName_N_Data_00[] = "N_Data_00";
extern "C" const char scPaneName_DataBaseCover_00[] = "DataBaseCover_00";
extern "C" const char scPaneName_DataBaseCover_01[] = "DataBaseCover_01";
extern "C" const char lbl_8164D108[] = "it_ObjChannelEdit_b_SaveDataIn.brlan";
extern "C" const char lbl_8164D12D[] = "it_ObjChannelEdit_b_SaveDataOut.brlan";
extern "C" const char lbl_8164D153[] = "it_ObjChannelEdit_b_SaveDataFoucusIn.brlan";
extern "C" const char lbl_8164D17E[] = "it_ObjChannelEdit_b_SaveDataFoucusOut.brlan";
extern "C" const char lbl_8164D1AA[] = "N_Data16x9";
extern "C" const char lbl_8164D1B5[] = "N_Data4x3";
extern "C" const char lbl_8164D1BF[] = "B_Data_01";
extern "C" const char lbl_8164D1C9[] = "B_Data_00";
extern "C" const char lbl_8164D1D3[] = "N_Atari16x9";
extern "C" const char lbl_8164D1DF[] = "N_Data_01";
extern "C" const char lbl_8164D1E9[] = "N_Atari4x3";
extern "C" const char lbl_8164D1F4[] = "N_Data_00";
extern "C" const char lbl_8164D1FE[] = "DataBaseCover_00";
extern "C" const char lbl_8164D20F[] = "DataBaseCover_01";
#pragma section const_type ".sdata"
extern "C" __declspec(section ".sdata") const char scGroup_G_Data[] = "G_Data";
extern "C" __declspec(section ".sdata") const wchar_t scUnknownWstr[] = L"???";
extern "C" __declspec(section ".sdata") const char lbl_81696848[] = "G_Data";
extern "C" __declspec(section ".sdata") const wchar_t lbl_81696850[] = L"???";
#pragma section sconst_type ".sdata2"
extern "C" __declspec(section ".sdata2") const f32 scHalfF = 0.5f;
extern "C" __declspec(section ".sdata2") const f32 scTwoF = 2.0f;
extern "C" __declspec(section ".sdata2") const f64 scF2IBias = 4503599627370496.0;
extern "C" __declspec(section ".sdata2") const f32 lbl_81694900 = 0.5f;
extern "C" __declspec(section ".sdata2") const f32 lbl_81694904 = 2.0f;
extern "C" __declspec(section ".sdata2") const f64 lbl_81694908 = 4503599627370496.0;
#pragma pop
namespace ipl {
@@ -33,26 +33,26 @@ namespace ipl {
: AnmController(heap), ::gui::EventHandler(), mState(STATE_HIDDEN), mpThumbnail(NULL), mpBalloon(NULL), mbInitBalloon(false) {
mpLayout = new (heap) layout::Object(heap, layoutFile, layoutDir, layoutFileName);
add_animation(scBrlan_SaveDataIn, scGroup_G_Data);
add_animation(scBrlan_SaveDataOut, scGroup_G_Data);
add_animation(scBrlan_SaveDataFocusIn, scGroup_G_Data);
add_animation(scBrlan_SaveDataFocusOut, scGroup_G_Data);
add_animation(lbl_8164D108, lbl_81696848);
add_animation(lbl_8164D12D, lbl_81696848);
add_animation(lbl_8164D153, lbl_81696848);
add_animation(lbl_8164D17E, lbl_81696848);
mpLayout->finishBinding();
set_visible(scPaneName_N_Data16x9, false);
set_visible(scPaneName_N_Data4x3, false);
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, false);
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL, true);
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scPaneName_B_Data_01), true);
add_anmpane(scPaneName_B_Data_01, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1BF), true);
add_anmpane(lbl_8164D1BF, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
} else {
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scPaneName_B_Data_00), true);
add_anmpane(scPaneName_B_Data_00, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1C9), true);
add_anmpane(lbl_8164D1C9, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
}
}
@@ -92,11 +92,11 @@ namespace ipl {
nw4r::math::VEC2 scale = mpThumbnail->getLytObj()->GetRootPane()->GetScale();
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
scale *= get_scale(scPaneName_N_Atari16x9).x;
scale *= get_scale(scPaneName_N_Data_01).x;
scale *= get_scale(lbl_8164D1D3).x;
scale *= get_scale(lbl_8164D1DF).x;
} else {
scale *= get_scale(scPaneName_N_Atari4x3).x;
scale *= get_scale(scPaneName_N_Data_00).x;
scale *= get_scale(lbl_8164D1E9).x;
scale *= get_scale(lbl_8164D1F4).x;
}
mpThumbnail->getLytObj()->GetRootPane()->SetScale(scale);
}
@@ -127,8 +127,8 @@ namespace ipl {
return;
mpLayout->draw();
set_visible(scPaneName_DataBaseCover_00, false);
set_visible(scPaneName_DataBaseCover_01, false);
set_visible(lbl_8164D1FE, false);
set_visible(lbl_8164D20F, false);
ChannelEdit* sceneChannelEdit = get_channel_edit();
if (sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_R || sceneChannelEdit->getState() == ChannelEdit::STATE_ON_SCROLL_L)
@@ -138,7 +138,7 @@ namespace ipl {
if (mState == STATE_FADE_OUT)
return;
if (!get_visible(scPaneName_N_Data4x3) && !get_visible(scPaneName_N_Data16x9))
if (!get_visible(lbl_8164D1B5) && !get_visible(lbl_8164D1AA))
return;
if (mpThumbnail == NULL) {
@@ -171,11 +171,11 @@ namespace ipl {
mpThumbnail->draw();
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
set_visible(scPaneName_DataBaseCover_01, true);
mpLayout->draw(scPaneName_DataBaseCover_01);
set_visible(lbl_8164D20F, true);
mpLayout->draw(lbl_8164D20F);
} else {
set_visible(scPaneName_DataBaseCover_00, true);
mpLayout->draw(scPaneName_DataBaseCover_00);
set_visible(lbl_8164D1FE, true);
mpLayout->draw(lbl_8164D1FE);
}
GXSetScissor(0, 0, System::getRenderModeObj()->fbWidth, System::getRenderModeObj()->efbHeight);
@@ -187,11 +187,11 @@ namespace ipl {
void ChanAppBox::anmFadein() {
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
set_visible(scPaneName_N_Data16x9, true);
set_visible(scPaneName_N_Data4x3, false);
set_visible(lbl_8164D1AA, true);
set_visible(lbl_8164D1B5, false);
} else {
set_visible(scPaneName_N_Data16x9, false);
set_visible(scPaneName_N_Data4x3, true);
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, true);
}
do_animation(ANIM_DATA_IN, ANIM_TYPE_FORWARD, true);
mState = STATE_FADE_IN;
@@ -226,7 +226,7 @@ namespace ipl {
mbInitBalloon = true;
if (mpThumbnail->getIsCorrupt()) {
mpBalloon->init(scUnknownWstr);
mpBalloon->init(lbl_81696850);
} else {
if (mpThumbnail->getMatchesTmpTitle()) {
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
@@ -251,7 +251,7 @@ namespace ipl {
mbInitBalloon = true;
if (mpThumbnail->getIsCorrupt()) {
mpBalloon->init(scUnknownWstr);
mpBalloon->init(lbl_81696850);
} else {
if (mpThumbnail->getMatchesTmpTitle()) {
mpBalloon->init(System::getMessage(MESG_CHAN_EDIT_SD_CARD_MENU));
@@ -297,9 +297,9 @@ namespace ipl {
void ChanAppBox::clearEvent() {
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
clear_anmpane(scPaneName_B_Data_01);
clear_anmpane(lbl_8164D1BF);
} else {
clear_anmpane(scPaneName_B_Data_00);
clear_anmpane(lbl_8164D1C9);
}
if (mpBalloon != NULL) {
@@ -314,8 +314,8 @@ namespace ipl {
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadein, ANIM_DATA_IN, mState = STATE_IDLE);
WAIT_FOR_ANIM_STATE(ChanAppBox::on_fadeout, ANIM_DATA_OUT, {
set_visible(scPaneName_N_Data16x9, false);
set_visible(scPaneName_N_Data4x3, false);
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, false);
mState = STATE_IDLE;
});

View File

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

View File

@@ -32,181 +32,181 @@ namespace ipl {
ChannelTitle::TicketViewStorage ChannelTitle::msTicketView ALIGN32;
ESTicketView ChannelTitle::msUnlockTicket;
extern "C" char scPaneName_B_BtnA[];
extern "C" char scPaneName_B_BtnB[];
extern "C" char scGroup_Change[];
extern "C" char scGroup_G_Wii[];
extern "C" char scGroup_G_GC[];
extern "C" char scGroup_G_Back[];
extern "C" char scPaneName_Fre_a[];
extern "C" char scPaneName_Fre_d[];
extern "C" char scPaneName_Fre_i[];
extern "C" char scPaneName_Fre_l[];
extern "C" char scPaneName_Fre_e[];
extern "C" char scPaneName_Fre_f[];
extern "C" char scPaneName_Fre_g[];
extern "C" char scPaneName_Fre_h[];
extern "C" char scPaneName_Fre_b[];
extern "C" char scPaneName_Fre_c[];
extern "C" char scPaneName_Fre_j[];
extern "C" char scPaneName_Fre_k[];
extern "C" char scPaneName_T_BtnA[];
extern "C" char scPaneName_T_BtnB[];
extern "C" char lbl_81696A10[];
extern "C" char lbl_81696A17[];
extern "C" char lbl_81696A28[];
extern "C" char lbl_81696A34[];
extern "C" char lbl_81696A3A[];
extern "C" char lbl_81696A44[];
extern "C" char lbl_81696A54[];
extern "C" char lbl_81696A5A[];
extern "C" char lbl_81696A60[];
extern "C" char lbl_81696A66[];
extern "C" char lbl_81696A6C[];
extern "C" char lbl_81696A72[];
extern "C" char lbl_81696A78[];
extern "C" char lbl_81696A7E[];
extern "C" char lbl_81696A84[];
extern "C" char lbl_81696A8A[];
extern "C" char lbl_81696A90[];
extern "C" char lbl_81696A96[];
extern "C" char lbl_81696A9C[];
extern "C" char lbl_81696AA3[];
// clang-format off
extern "C" char scGroup_G_FocusBtnA[] = "G_FocusBtnA";
extern "C" char scGroup_G_FocusBtnB[] = "G_FocusBtnB";
extern "C" char scGroup_G_SelectBtnA[] = "G_SelectBtnA";
extern "C" char scGroup_G_SelectBtnB[] = "G_SelectBtnB";
extern "C" char scGroup_G_OnOffBtnA[] = "G_OnOffBtnA";
extern "C" char scGroup_G_OnOffBtnB[] = "G_OnOffBtnB";
extern "C" char scGroup_G_ChangeTextA[] = "G_ChangeTextA";
extern "C" char scGroup_G_ChangeTextB[] = "G_ChangeTextB";
extern "C" char lbl_8164E768[] = "G_FocusBtnA";
extern "C" char lbl_8164E774[] = "G_FocusBtnB";
extern "C" char lbl_8164E780[] = "G_SelectBtnA";
extern "C" char lbl_8164E78D[] = "G_SelectBtnB";
extern "C" char lbl_8164E79A[] = "G_OnOffBtnA";
extern "C" char lbl_8164E7A6[] = "G_OnOffBtnB";
extern "C" char lbl_8164E7B2[] = "G_ChangeTextA";
extern "C" char lbl_8164E7C0[] = "G_ChangeTextB";
const char* scAnimGroups[8+1] = {
scGroup_G_FocusBtnA,
scGroup_G_FocusBtnB,
scGroup_G_SelectBtnA,
scGroup_G_SelectBtnB,
scGroup_G_OnOffBtnA,
scGroup_G_OnOffBtnB,
scGroup_G_ChangeTextA,
scGroup_G_ChangeTextB,
lbl_8164E768,
lbl_8164E774,
lbl_8164E780,
lbl_8164E78D,
lbl_8164E79A,
lbl_8164E7A6,
lbl_8164E7B2,
lbl_8164E7C0,
NULL
};
extern "C" char scBrlan_my_ChTop_a_FocusBtnA_off[] = "my_ChTop_a_FocusBtnA_off.brlan";
extern "C" char scBrlan_my_ChTop_a_FocusBtn_on[] = "my_ChTop_a_FocusBtn_on.brlan";
extern "C" char scBrlan_my_ChTop_a_SelectBtn_Ac[] = "my_ChTop_a_SelectBtn_Ac.brlan";
extern "C" char scBrlan_my_ChTop_a_OffBtn[] = "my_ChTop_a_OffBtn.brlan";
extern "C" char scBrlan_my_ChTop_a_OnBtn[] = "my_ChTop_a_OnBtn.brlan";
extern "C" char scBrlan_my_ChTop_a_ChangeTextOut[] = "my_ChTop_a_ChangeTextOut.brlan";
extern "C" char scBrlan_my_ChTop_a_ChangeTextIn[] = "my_ChTop_a_ChangeTextIn.brlan";
extern "C" char scBrlan_my_ChTop_a_ChangeIn[] = "my_ChTop_a_ChangeIn.brlan";
extern "C" char scBrlan_my_ChTop_a_ChangeRoop[] = "my_ChTop_a_ChangeRoop.brlan";
extern "C" char scBrlan_my_ChTop_a_ChangeOut[] = "my_ChTop_a_ChangeOut.brlan";
extern "C" char lbl_8164E7F4[] = "my_ChTop_a_FocusBtnA_off.brlan";
extern "C" char lbl_8164E813[] = "my_ChTop_a_FocusBtn_on.brlan";
extern "C" char lbl_8164E830[] = "my_ChTop_a_SelectBtn_Ac.brlan";
extern "C" char lbl_8164E84E[] = "my_ChTop_a_OffBtn.brlan";
extern "C" char lbl_8164E866[] = "my_ChTop_a_OnBtn.brlan";
extern "C" char lbl_8164E87D[] = "my_ChTop_a_ChangeTextOut.brlan";
extern "C" char lbl_8164E89C[] = "my_ChTop_a_ChangeTextIn.brlan";
extern "C" char lbl_8164E8BA[] = "my_ChTop_a_ChangeIn.brlan";
extern "C" char lbl_8164E8D4[] = "my_ChTop_a_ChangeRoop.brlan";
extern "C" char lbl_8164E8F0[] = "my_ChTop_a_ChangeOut.brlan";
const char* scAnimNames[10] = {
scBrlan_my_ChTop_a_FocusBtnA_off,
scBrlan_my_ChTop_a_FocusBtn_on,
scBrlan_my_ChTop_a_SelectBtn_Ac,
scBrlan_my_ChTop_a_OffBtn,
scBrlan_my_ChTop_a_OnBtn,
scBrlan_my_ChTop_a_ChangeTextOut,
scBrlan_my_ChTop_a_ChangeTextIn,
scBrlan_my_ChTop_a_ChangeIn,
scBrlan_my_ChTop_a_ChangeRoop,
scBrlan_my_ChTop_a_ChangeOut
lbl_8164E7F4,
lbl_8164E813,
lbl_8164E830,
lbl_8164E84E,
lbl_8164E866,
lbl_8164E87D,
lbl_8164E89C,
lbl_8164E8BA,
lbl_8164E8D4,
lbl_8164E8F0
};
extern "C" char scBrlan_banner[] = "banner.brlan";
extern "C" char scBrlan_banner_Start[] = "banner_Start.brlan";
extern "C" char scBrlan_banner_Loop[] = "banner_Loop.brlan";
extern "C" char lbl_8164E934[] = "banner.brlan";
extern "C" char lbl_8164E941[] = "banner_Start.brlan";
extern "C" char lbl_8164E954[] = "banner_Loop.brlan";
const char* scBannerAnims[3] = {
scBrlan_banner,
scBrlan_banner_Start,
scBrlan_banner_Loop
lbl_8164E934,
lbl_8164E941,
lbl_8164E954
};
extern "C" char scGroup_G_Comment0[] = "G_Comment0";
extern "C" char scGroup_G_DiskIn[] = "G_DiskIn";
extern "C" char lbl_8164E974[] = "G_Comment0";
extern "C" char lbl_8164E97F[] = "G_DiskIn";
const char* scDiskGroups[5] = {
scGroup_G_Comment0,
scGroup_G_Wii,
scGroup_G_GC,
scGroup_G_DiskIn,
lbl_8164E974,
lbl_81696A34,
lbl_81696A3A,
lbl_8164E97F,
NULL
};
extern "C" char scBrlan_my_DiskCh_a_Start[] = "my_DiskCh_a_Start.brlan";
extern "C" char scBrlan_my_DiskCh_a_DiskStart[] = "my_DiskCh_a_DiskStart.brlan";
extern "C" char scBrlan_my_DiskCh_a_DiskLoop[] = "my_DiskCh_a_DiskLoop.brlan";
extern "C" char scBrlan_my_DiskCh_a_DiskEnd[] = "my_DiskCh_a_DiskEnd.brlan";
extern "C" char scBrlan_my_DiskCh_a_DiskLost[] = "my_DiskCh_a_DiskLost.brlan";
extern "C" char scBrlan_my_DiskCh_a_DiskIn[] = "my_DiskCh_a_DiskIn.brlan";
extern "C" char scBrlan_my_DiskCh_a_DiskEject[] = "my_DiskCh_a_DiskEject.brlan";
extern "C" char scBrlan_my_DiskCh_a_Unknown[] = "my_DiskCh_a_Unknown.brlan";
extern "C" char scBrlan_my_DiskCh_a_UnknownLoop[] = "my_DiskCh_a_UnknownLoop.brlan";
extern "C" char scBrlan_my_DiskCh_a_UnknwnEject[] = "my_DiskCh_a_UnknwnEject.brlan";
extern "C" char lbl_8164E99C[] = "my_DiskCh_a_Start.brlan";
extern "C" char lbl_8164E9B4[] = "my_DiskCh_a_DiskStart.brlan";
extern "C" char lbl_8164E9D0[] = "my_DiskCh_a_DiskLoop.brlan";
extern "C" char lbl_8164E9EB[] = "my_DiskCh_a_DiskEnd.brlan";
extern "C" char lbl_8164EA05[] = "my_DiskCh_a_DiskLost.brlan";
extern "C" char lbl_8164EA20[] = "my_DiskCh_a_DiskIn.brlan";
extern "C" char lbl_8164EA39[] = "my_DiskCh_a_DiskEject.brlan";
extern "C" char lbl_8164EA55[] = "my_DiskCh_a_Unknown.brlan";
extern "C" char lbl_8164EA6F[] = "my_DiskCh_a_UnknownLoop.brlan";
extern "C" char lbl_8164EA8D[] = "my_DiskCh_a_UnknwnEject.brlan";
const char* scDiskAnimNames[10] = {
scBrlan_my_DiskCh_a_Start,
scBrlan_my_DiskCh_a_DiskStart,
scBrlan_my_DiskCh_a_DiskLoop,
scBrlan_my_DiskCh_a_DiskEnd,
scBrlan_my_DiskCh_a_DiskLost,
scBrlan_my_DiskCh_a_DiskIn,
scBrlan_my_DiskCh_a_DiskEject,
scBrlan_my_DiskCh_a_Unknown,
scBrlan_my_DiskCh_a_UnknownLoop,
scBrlan_my_DiskCh_a_UnknwnEject
lbl_8164E99C,
lbl_8164E9B4,
lbl_8164E9D0,
lbl_8164E9EB,
lbl_8164EA05,
lbl_8164EA20,
lbl_8164EA39,
lbl_8164EA55,
lbl_8164EA6F,
lbl_8164EA8D
};
extern "C" char scBrlyt_my_DiskCh_a[] = "my_DiskCh_a.brlyt";
extern "C" char scBrlan_my_GCTop_a_BackLoop[] = "my_GCTop_a_BackLoop.brlan";
extern "C" char lbl_8164EAD4[] = "my_DiskCh_a.brlyt";
extern "C" char lbl_8164EAE6[] = "my_GCTop_a_BackLoop.brlan";
#pragma push
#pragma section data_type ".sdata"
extern "C" char scPaneName_B_BtnA[] = "B_BtnA";
extern "C" char scPaneName_B_BtnB[] = "B_BtnB";
extern "C" const char* scPaneNames_B_Btn[2] = {
scPaneName_B_BtnA,
scPaneName_B_BtnB,
extern "C" char lbl_81696A10[] = "B_BtnA";
extern "C" char lbl_81696A17[] = "B_BtnB";
extern "C" const char* lbl_81696A20[2] = {
lbl_81696A10,
lbl_81696A17,
};
extern "C" char scGroup_Change[] = "Change";
extern "C" const char* scGroupNames_Change[] = {
scGroup_Change,
extern "C" char lbl_81696A28[] = "Change";
extern "C" const char* lbl_81696A30[] = {
lbl_81696A28,
};
extern "C" char scGroup_G_Wii[] = "G_Wii";
extern "C" char scGroup_G_GC[] = "G_GC";
extern "C" char lbl_81696A34[] = "G_Wii";
extern "C" char lbl_81696A3A[] = "G_GC";
const char* scLayoutNames[] = {
scBrlyt_my_DiskCh_a,
lbl_8164EAD4,
};
extern "C" char scGroup_G_Back[] = "G_Back";
extern "C" char lbl_81696A44[] = "G_Back";
const char* scGCAnimGroups[] = {
scGroup_G_Back,
lbl_81696A44,
};
const char* scGCAnimNames[] = {
scBrlan_my_GCTop_a_BackLoop,
lbl_8164EAE6,
};
extern "C" char scPaneName_Fre_a[] = "Fre_a";
extern "C" char scPaneName_Fre_d[] = "Fre_d";
extern "C" char scPaneName_Fre_i[] = "Fre_i";
extern "C" char scPaneName_Fre_l[] = "Fre_l";
extern "C" char scPaneName_Fre_e[] = "Fre_e";
extern "C" char scPaneName_Fre_f[] = "Fre_f";
extern "C" char scPaneName_Fre_g[] = "Fre_g";
extern "C" char scPaneName_Fre_h[] = "Fre_h";
extern "C" char scPaneName_Fre_b[] = "Fre_b";
extern "C" char scPaneName_Fre_c[] = "Fre_c";
extern "C" char scPaneName_Fre_j[] = "Fre_j";
extern "C" char scPaneName_Fre_k[] = "Fre_k";
extern "C" char scPaneName_T_BtnA[] = "T_BtnA";
extern "C" char scPaneName_T_BtnB[] = "T_BtnB";
const char* scPaneNames_T_Btn[] = {
scPaneName_T_BtnA,
scPaneName_T_BtnB,
extern "C" char lbl_81696A54[] = "Fre_a";
extern "C" char lbl_81696A5A[] = "Fre_d";
extern "C" char lbl_81696A60[] = "Fre_i";
extern "C" char lbl_81696A66[] = "Fre_l";
extern "C" char lbl_81696A6C[] = "Fre_e";
extern "C" char lbl_81696A72[] = "Fre_f";
extern "C" char lbl_81696A78[] = "Fre_g";
extern "C" char lbl_81696A7E[] = "Fre_h";
extern "C" char lbl_81696A84[] = "Fre_b";
extern "C" char lbl_81696A8A[] = "Fre_c";
extern "C" char lbl_81696A90[] = "Fre_j";
extern "C" char lbl_81696A96[] = "Fre_k";
extern "C" char lbl_81696A9C[] = "T_BtnA";
extern "C" char lbl_81696AA3[] = "T_BtnB";
const char* lbl_81696AAC[] = {
lbl_81696A9C,
lbl_81696AA3,
};
#pragma pop
const char* scWidePanes[3][4] = {
{
scPaneName_Fre_a,
scPaneName_Fre_d,
scPaneName_Fre_i,
scPaneName_Fre_l,
lbl_81696A54,
lbl_81696A5A,
lbl_81696A60,
lbl_81696A66,
}, {
scPaneName_Fre_e,
scPaneName_Fre_f,
scPaneName_Fre_g,
scPaneName_Fre_h,
lbl_81696A6C,
lbl_81696A72,
lbl_81696A78,
lbl_81696A7E,
}, {
scPaneName_Fre_b,
scPaneName_Fre_c,
scPaneName_Fre_j,
scPaneName_Fre_k,
lbl_81696A84,
lbl_81696A8A,
lbl_81696A90,
lbl_81696A96,
}
};
@@ -341,12 +341,12 @@ namespace ipl {
}
}
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[0]), MESG_CMN_WII_MENU);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[0]), MESG_CMN_WII_MENU);
if (System::getChannelManager()->checkNeedUpdate(mChanPage, mChanIndex)) {
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
} else {
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CMN_START);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CMN_START);
}
if (isEnableToExecute(mChanPage, mChanIndex)) {
@@ -390,7 +390,7 @@ namespace ipl {
}
for (int i = ANIM_CHANGE_IN; i <= ANIM_CHANGE_OUT; i++) {
mpChangeAnims[i] = mpLayout->bind(scAnimNames[i], scGroupNames_Change[0], false, false);
mpChangeAnims[i] = mpLayout->bind(scAnimNames[i], lbl_81696A30[0], false, false);
}
mpLayout->finishBinding();
@@ -400,8 +400,8 @@ namespace ipl {
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_A]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_B]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_A]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_B]))->setTriggerTarget(true);
mpLimitRemainLyt = new layout::Object(getSceneHeap(), mpLayoutFile, "arc", "my_Timer_a.brlyt");
mpLimitDoneLyt = new layout::Object(getSceneHeap(), mpLayoutFile, "arc", "my_Timer_b.brlyt");
@@ -1187,9 +1187,9 @@ namespace ipl {
if (mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->getCurrentFrame() ==
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->getMaxFrame()) {
if (System::getChannelManager()->checkNeedUpdate(mChanPage, mChanIndex)) {
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
} else {
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_SEL_START_BTN, false);
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_START_BTN, false);
}
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_OUT]->play();
mpGrpAnims[ANIM_GRP_CHANGE_BTN_B][ANIM_CHANGE_TEXT_IN]->initAnmFrame();
@@ -2464,7 +2464,7 @@ namespace ipl {
if (unk_0x8C == 0) {
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_OFF_BTN]->stop();
mpGrpAnims[ANIM_GRP_ONOFF_BTN_B][ANIM_ON_BTN]->play();
mpGui->initPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_B]));
mpGui->initPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_B]));
mbHovered[BTN_B] = FALSE;
}
unk_0x8C = 1;
@@ -2604,8 +2604,8 @@ namespace ipl {
wcscpy(limitStr, System::getMessage(MESG_CHAN_SEL_TIME_LIMIT));
wchar_t hourStr[16] = L"";
wchar_t minuteStr[16] = L"";
wchar_t local_38[16] = L"";
wchar_t local_58[16] = L"";
if (hour == 0 && minute == 0) {
swprintf(limitStr, 65, L"%ls %ls", limitStr, System::getMessage(MESG_CHAN_SEL_LIMIT_UNDER_60));
@@ -2616,42 +2616,42 @@ namespace ipl {
if (System::getLanguage() == SC_LANG_JAPANESE || System::getLanguage() == SC_LANG_KOREAN ||
System::getLanguage() == SC_LANG_GERMAN) {
if (hour == 1) {
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
} else if (hour != 0) {
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
}
if (minute == 1) {
swprintf(minuteStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
swprintf(local_58, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
} else if (minute != 0) {
swprintf(minuteStr, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
swprintf(local_58, 16, L"%d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
}
} else if (System::getLanguage() == SC_LANG_FRENCH || System::getLanguage() == SC_LANG_ITALIAN) {
if (hour == 1) {
swprintf(hourStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
swprintf(local_38, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
} else if (hour != 0) {
swprintf(hourStr, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
swprintf(local_38, 16, L"%02d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
}
if (minute == 1) {
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
} else if (minute != 0) {
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
}
} else {
if (hour == 1) {
swprintf(hourStr, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
swprintf(local_38, 16, L"1%ls", System::getMessage(MESG_CHAN_SEL_SEPERATOR));
} else if (hour != 0) {
swprintf(hourStr, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
swprintf(local_38, 16, L"%d%ls", hour, System::getMessage(MESG_CHAN_SEL_SEPERATOR_2));
}
if (minute == 1) {
swprintf(minuteStr, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
swprintf(local_58, 16, L"01%ls", System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR));
} else if (minute != 0) {
swprintf(minuteStr, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
swprintf(local_58, 16, L"%02d%ls", minute, System::getMessage(MESG_CHAN_SEL_NO_SEPERATOR_2));
}
}
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, hourStr, minuteStr);
swprintf(limitStr, 65, L"%ls %ls%ls", limitStr, local_38, local_58);
}
}
}
@@ -2822,12 +2822,12 @@ namespace ipl {
break;
}
if (con->downTrg(controller::BTN_INTERACT)) {
if (strcmp(paneName, scPaneNames_B_Btn[ChannelTitle::BTN_A]) == 0) {
if (strcmp(paneName, lbl_81696A20[ChannelTitle::BTN_A]) == 0) {
mpInstance->mpGrpAnims[ChannelTitle::ANIM_GRP_SELECT_BTN_A][ChannelTitle::ANIM_SELECT_BTN]->play();
snd::getSystem()->startSE("WIPL_SE_BT_PUSH");
mpInstance->mState = ChannelTitle::STATE_START_ZOOM_OUT;
mpInstance->tryToGoBackward();
} else if (strcmp(paneName, scPaneNames_B_Btn[ChannelTitle::BTN_B]) == 0) {
} else if (strcmp(paneName, lbl_81696A20[ChannelTitle::BTN_B]) == 0) {
if (mpInstance->unk_0x8C != 2) {
snd::getSystem()->startSE("WIPL_SE_GRAY_BUTTON");
} else {
@@ -2841,7 +2841,7 @@ namespace ipl {
}
case ::gui::EventHandler::ON_POINT: {
for (int i = 0; i < ChannelTitle::BTN_MAX; i++) {
if (strcmp(paneName, scPaneNames_B_Btn[i]) == 0) {
if (strcmp(paneName, lbl_81696A20[i]) == 0) {
if (i == 0 || mpInstance->unk_0x8C > 0) {
mpInstance->mbHovered[i]++;
if (mpInstance->mbHovered[i] <= TRUE) {
@@ -2857,7 +2857,7 @@ namespace ipl {
}
case ::gui::EventHandler::ON_LEFT: {
for (int i = 0; i < ChannelTitle::BTN_MAX; i++) {
if (strcmp(paneName, scPaneNames_B_Btn[i]) == 0) {
if (strcmp(paneName, lbl_81696A20[i]) == 0) {
if (i == 0 || mpInstance->unk_0x8C > 0) {
mpInstance->mbHovered[i]--;
if (mpInstance->mbHovered[i] <= FALSE) {

View File

@@ -1058,7 +1058,7 @@ namespace ipl {
}
const ESTitleId* titleEntry = &mTitleIds[mCurrentTitle];
System::getChannelManager()->unloadBanner(*titleEntry);
System::getChannelManager()->fn_8133AA50(*titleEntry);
if (mpSDChannelSelect->getWorker()->get_async_result() == 0) {
mCurrentTitle++;

View File

@@ -571,7 +571,7 @@ namespace ipl {
mWorkerCommand = 11;
break;
case 12:
mpSDWorker->check_sd_app_titles_async(
mpSDWorker->iplNandSD_81348EA8(
command.arguments.pointers[0], command.arguments.pointers[1],
command.arguments.pointers[2]);
mWorkerCommand = 12;

View File

@@ -86,7 +86,10 @@ static inline void setMemoryTitleLists(SDMemory* memory, SDMemory::TitleRange sd
memory->setTitleLists(sdRange, nandRange);
}
static const char* sButtonNames[2] = {"B_BtnA", "B_BtnB"};
extern "C" char lbl_81696E30[];
extern "C" char lbl_81696E37[];
static const char* sButtonNames[2] = {lbl_81696E30, lbl_81696E37};
static const int sCaptureSizes[2][2] = {{128, 96}, {176, 96}};
@@ -846,7 +849,7 @@ extern "C" void iplSDChannelTitle_813E7074(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E71A4(SDChannelTitle* scene) {
if (!scene->mpChannelSelect->getWorker()->is_working()) {
SCSetTmpTitleID(0);
System::getChannelManager()->clearTmpChannel();
System::getChannelManager()->fn_8133A9F0();
int result = scene->mpChannelSelect->getWorker()->get_async_result();
if (!result) {
if (scene->mbCopiedTitle) {
@@ -980,7 +983,7 @@ extern "C" void iplSDChannelTitle_813E7800(SDChannelTitle* scene) {
extern "C" void iplSDChannelTitle_813E787C(SDChannelTitle* scene) {
if (scene->mbTmdReady) {
if (!System::getChannelManager()->isMissingTicket(scene->mTitleId) && !utility::ESMisc::CheckTmdCountryCode(scene->mpTmd)) {
if (!System::getChannelManager()->fn_8133A678(scene->mTitleId) && !utility::ESMisc::CheckTmdCountryCode(scene->mpTmd)) {
System::getErrorHandler()->set(ErrorHandler::DEFAULT, 3, NULL, 0, -1);
}
scene->mMakerCode = scene->mpTmd->head.groupId;
@@ -1040,8 +1043,8 @@ extern "C" void iplSDChannelTitle_813E7B30(SDChannelTitle* scene, ESTitleId titl
delete scene->mpScriptFile;
scene->mpScriptFile = NULL;
}
if (System::getChannelManager()->getBannerCSIdx(title)) {
scene->mpScriptFile = System::getChannelManager()->readBannerCSAsync(scene->mpRsoHeap, title);
if (System::getChannelManager()->fn_8133A57C(title)) {
scene->mpScriptFile = System::getChannelManager()->fn_8133A924(scene->mpRsoHeap, title);
scene->mbScriptFailed = false;
scene->mScriptEnabled = 1;
scene->mScriptState = 1;
@@ -1094,7 +1097,7 @@ extern "C" void iplSDChannelTitle_813E7D14(SDChannelTitle* scene) {
scene->mScriptState = 1;
scene->mScriptHeapIndex = nextHeap;
}
if (System::getChannelManager()->usesAltSound(scene->mTitleId) &&
if (System::getChannelManager()->fn_8133A634(scene->mTitleId) &&
scene->mScriptFrame == scene->mScriptDuration - 240) {
snd::getSystem()->stopBannerSound(180);
}
@@ -1152,7 +1155,7 @@ extern "C" void iplSDChannelTitle_813E8034(SDChannelTitle* scene) {
scene->mpBannerAnimations[0]->play();
}
if (scene->mState != 6) {
if (!System::getChannelManager()->usesAltSound(scene->mTitleId) || !scene->mScriptEnabled) {
if (!System::getChannelManager()->fn_8133A634(scene->mTitleId) || !scene->mScriptEnabled) {
iplSDChannelTitle_813E8160(scene);
}
if (!scene->mpBannerLayout) {
@@ -1166,7 +1169,7 @@ extern "C" void iplSDChannelTitle_813E8034(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);
u32 size = System::getChannelManager()->fn_8133A5B8(scene->mTitleId);
snd::getSystem()->startBannerSound(sound, size, false);
}
}
@@ -1227,7 +1230,7 @@ extern "C" void iplSDChannelTitle_813E8360(SDChannelTitle* scene) {
}
extern "C" BOOL iplSDChannelTitle_813E847C(SDChannelTitle*, ESTmdView*, ESTitleId titleId) {
if (!System::getChannelManager()->needsNetSetting(titleId) || ncd::NCDSetting::getConnectEnableFlag()) {
if (!System::getChannelManager()->fn_8133A5F0(titleId) || ncd::NCDSetting::getConnectEnableFlag()) {
return TRUE;
}
return FALSE;
@@ -1426,8 +1429,8 @@ extern "C" void iplSDChannelTitle_813E8D14(SDChannelTitle*, nw4r::lyt::Pane* pan
}
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);
*sound = System::getChannelManager()->fn_8133A85C(System::getMem2App(), title);
nand::MetaFile* banner = System::getChannelManager()->fn_8133A7A4(System::getMem2App(), title);
return new (System::getMem2App(), 4) nand::LayoutFile(banner, NULL);
}
@@ -1450,15 +1453,15 @@ extern "C" BOOL iplSDChannelTitle_813E8F04(SDChannelTitle* scene, ESTmdView* tmd
return TRUE;
}
if (parental.enable & SC_PARENTAL_FLAG_ENABLED) {
u32 restrictions = System::getChannelManager()->isNewsChannelV6Plus(scene->mTitleId);
u32 restrictions = System::getChannelManager()->fn_8133A6B8(scene->mTitleId);
u32 networkRestrictions = SCGetNetContentRestrictions();
if (networkRestrictions & restrictions) {
return FALSE;
}
if (SCGetWwwRestriction() && System::getChannelManager()->isOperaChannel(scene->mTitleId)) {
if (SCGetWwwRestriction() && System::getChannelManager()->fn_8133A73C(scene->mTitleId)) {
return FALSE;
}
if (System::getChannelManager()->isOperaChannel(scene->mTitleId)) {
if (System::getChannelManager()->fn_8133A73C(scene->mTitleId)) {
return TRUE;
} else {
return utility::ESMisc::CheckTmdParentalControl(tmd);

View File

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

View File

@@ -1003,21 +1003,39 @@ namespace ipl {
return count - 1;
}
int Manager::getAvailableInList(const ESTitleId* titleIds, u32 titleCount) {
int dens = 12;
u32 i;
for (i = 0; i < titleCount; i++) {
if (titleIds[i] == 0) {
int page = (int)i / dens;
int slot = (int)i % dens;
u8* p = (u8*)this + page * 0xc0;
p += slot * 16;
if (*(p + 0x30) != 1) {
return (int)i;
}
}
}
return -1;
asm int Manager::getAvailableInList(register const ESTitleId* titleIds, register u32 titleCount) {
nofralloc
li r8, 0
li r6, 0
li r7, 0xc
mtctr r5
cmplwi r5, 0
ble getAvailableInList_L3
getAvailableInList_L1:
add r5, r4, r6
lwzx r0, r4, r6
lwz r5, 4(r5)
or. r0, r5, r0
bne getAvailableInList_L2
divw r5, r8, r7
mullw r0, r5, r7
mulli r5, r5, 0xc0
subf r0, r0, r8
add r5, r3, r5
slwi r0, r0, 4
add r5, r5, r0
lbz r0, 0x30(r5)
cmplwi r0, 1
beq getAvailableInList_L2
mr r3, r8
blr
getAvailableInList_L2:
addi r8, r8, 1
addi r6, r6, 8
bdnz getAvailableInList_L1
getAvailableInList_L3:
li r3, -1
blr
}
asm int Manager::isEqualChannel(register ESTitleId titleId0, register ESTitleId titleId1) {

View File

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