Compare commits

..

7 Commits

Author SHA1 Message Date
linker
3eb59cfa26 Link matched iplUSBAPThread
Promote scene/setting/iplUSBAPThread.cpp to Matching. Init is asm to
preserve the original r4/r3 zero-arg load order; registrationResult is
the shared lbl_81698C20; OSReport strings use labeled .data.
2026-10-01 17:30:30 -05:00
coah
282c29b2c7 data(pf_entry): match default volume label size (#525)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 17:30:07 -05:00
coah
27e37fd7ee cleanup(sdi_api): rename path/format string blob (#524)
lbl_81691748 -> __sdPathData (packed SD reset OSReport format +
slot0/slot1/slotw path strings used by ISD_InitCard).
2026-10-01 17:29:41 -05:00
coah
00051c32c6 cleanup(iplChannelTitle): name group/pane/brlan string labels (#522)
Replace Matching-only lbl_* layout string placeholders and pointer
arrays with scGroup_/scPaneName_/scBrlan_ names; update symbols.txt.
2026-10-01 17:29:16 -05:00
coah
80fecf3aa3 cleanup(iplChanAppBox): name brlan/pane strings and sdata2 constants (#521)
Replace Matching-only lbl_* animation, pane, group, and float
placeholders; update symbols.txt.
2026-10-01 17:29:11 -05:00
github-actions[bot]
37724c57d6 docs: update progress [skip ci] 2026-10-01 22:27:32 +00:00
coah
1a32db7bdc fix: update iplSDChannelSelect caller missed by #496 rename (#554) 2026-10-01 17:26:54 -05:00
10 changed files with 350 additions and 313 deletions

View File

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

@@ -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
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
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
__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
@@ -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
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
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
scAnimGroups__Q23ipl5scene = .data:0x8164E7D0; // type:object size:0x24
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
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
scAnimNames__Q23ipl5scene = .data:0x8164E90C; // type:object size:0x28
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
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
scBannerAnims__Q23ipl5scene = .data:0x8164E968; // type:object size:0xC
lbl_8164E974 = .data:0x8164E974; // type:object size:0xB data:string
lbl_8164E97F = .data:0x8164E97F; // type:object size:0x9 data:string
scGroup_G_Comment0 = .data:0x8164E974; // type:object size:0xB data:string
scGroup_G_DiskIn = .data:0x8164E97F; // type:object size:0x9 data:string
scDiskGroups__Q23ipl5scene = .data:0x8164E988; // type:object size:0x14 data:4byte
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
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
scDiskAnimNames__Q23ipl5scene = .data:0x8164EAAC; // type:object size:0x28 data:4byte
lbl_8164EAD4 = .data:0x8164EAD4; // type:object size:0x12 data:string
lbl_8164EAE6 = .data:0x8164EAE6; // type:object size:0x1A data:string
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
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
@@ -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
lbl_81691748 = .data:0x81691748; // type:object size:0x50
__sdPathData = .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
@@ -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
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
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_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
@@ -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
lbl_81696848 = .sdata:0x81696848; // type:object size:0x7 data:string
lbl_81696850 = .sdata:0x81696850; // type:object size:0x8 data:wstring
scGroup_G_Data = .sdata:0x81696848; // type:object size:0x7 data:string
scUnknownWstr = .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
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
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
scLayoutNames__Q23ipl5scene = .sdata:0x81696A40; // type:object size:0x4 data:4byte
lbl_81696A44 = .sdata:0x81696A44; // type:object size:0x7 data:string
scGroup_G_Back = .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
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
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_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

View File

@@ -874,7 +874,7 @@ config.libs = [
Object(Matching, "scene/setting/iplParental.cpp"),
Object(Matching, "scene/setting/iplAPScanThread.cpp"),
Object(NonMatching, "scene/setting/iplUSBAP.cpp"),
Object(NonMatching, "scene/setting/iplUSBAPThread.cpp"),
Object(Matching, "scene/setting/iplUSBAPThread.cpp"),
Object(Matching, "scene/setting/iplAOSSThread.cpp"),
Object(NonMatching, "scene/setting/AOSSLink.c"),
Object(NonMatching, "scene/setting/iplRakuRakuThread.cpp"),

View File

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

View File

@@ -15,7 +15,7 @@
#define SD_SLOT_PATH_LENGTH 32
char lbl_81691748[] = " +++ SD RESET Failed: %d +++\n\0"
char __sdPathData[] = " +++ SD RESET Failed: %d +++\n\0"
"/dev/sdio/slot0\0/dev/sdio/slot1\0/dev/sdio/slotw";
typedef void (*SDCallbackFunc)(s32, void*);
@@ -73,7 +73,7 @@ IOSError __sdCb(s32 result, void* arg) {
switch (data->unk_0x0C) {
case 4: {
if (result != 0) {
OSReport(lbl_81691748, result);
OSReport(__sdPathData, result);
data->dev->SDDevRca = 0;
} else {
if (data->dev != NULL) {
@@ -570,7 +570,7 @@ ISD_Error ISD_UnmountCard(SDDev* dev) {
ISD_Error ISD_InitCard() {
static u8* lo;
char* paths = lbl_81691748;
char* paths = __sdPathData;
ISD_Error ret = SD_ERROR_SUCCESS;
BOOL enabled;

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 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";
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";
#pragma section const_type ".sdata"
extern "C" __declspec(section ".sdata") const char lbl_81696848[] = "G_Data";
extern "C" __declspec(section ".sdata") const wchar_t lbl_81696850[] = L"???";
extern "C" __declspec(section ".sdata") const char scGroup_G_Data[] = "G_Data";
extern "C" __declspec(section ".sdata") const wchar_t scUnknownWstr[] = L"???";
#pragma section sconst_type ".sdata2"
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;
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;
#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(lbl_8164D108, lbl_81696848);
add_animation(lbl_8164D12D, lbl_81696848);
add_animation(lbl_8164D153, lbl_81696848);
add_animation(lbl_8164D17E, lbl_81696848);
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);
mpLayout->finishBinding();
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, false);
set_visible(scPaneName_N_Data16x9, false);
set_visible(scPaneName_N_Data4x3, 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(lbl_8164D1BF), true);
add_anmpane(lbl_8164D1BF, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
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));
} else {
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_8164D1C9), true);
add_anmpane(lbl_8164D1C9, get_animation(ANIM_DATA_FOCUS_IN), get_animation(ANIM_DATA_FOCUS_OUT));
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));
}
}
@@ -92,11 +92,11 @@ namespace ipl {
nw4r::math::VEC2 scale = mpThumbnail->getLytObj()->GetRootPane()->GetScale();
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
scale *= get_scale(lbl_8164D1D3).x;
scale *= get_scale(lbl_8164D1DF).x;
scale *= get_scale(scPaneName_N_Atari16x9).x;
scale *= get_scale(scPaneName_N_Data_01).x;
} else {
scale *= get_scale(lbl_8164D1E9).x;
scale *= get_scale(lbl_8164D1F4).x;
scale *= get_scale(scPaneName_N_Atari4x3).x;
scale *= get_scale(scPaneName_N_Data_00).x;
}
mpThumbnail->getLytObj()->GetRootPane()->SetScale(scale);
}
@@ -127,8 +127,8 @@ namespace ipl {
return;
mpLayout->draw();
set_visible(lbl_8164D1FE, false);
set_visible(lbl_8164D20F, false);
set_visible(scPaneName_DataBaseCover_00, false);
set_visible(scPaneName_DataBaseCover_01, 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(lbl_8164D1B5) && !get_visible(lbl_8164D1AA))
if (!get_visible(scPaneName_N_Data4x3) && !get_visible(scPaneName_N_Data16x9))
return;
if (mpThumbnail == NULL) {
@@ -171,11 +171,11 @@ namespace ipl {
mpThumbnail->draw();
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
set_visible(lbl_8164D20F, true);
mpLayout->draw(lbl_8164D20F);
set_visible(scPaneName_DataBaseCover_01, true);
mpLayout->draw(scPaneName_DataBaseCover_01);
} else {
set_visible(lbl_8164D1FE, true);
mpLayout->draw(lbl_8164D1FE);
set_visible(scPaneName_DataBaseCover_00, true);
mpLayout->draw(scPaneName_DataBaseCover_00);
}
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(lbl_8164D1AA, true);
set_visible(lbl_8164D1B5, false);
set_visible(scPaneName_N_Data16x9, true);
set_visible(scPaneName_N_Data4x3, false);
} else {
set_visible(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, true);
set_visible(scPaneName_N_Data16x9, false);
set_visible(scPaneName_N_Data4x3, 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(lbl_81696850);
mpBalloon->init(scUnknownWstr);
} 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(lbl_81696850);
mpBalloon->init(scUnknownWstr);
} 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(lbl_8164D1BF);
clear_anmpane(scPaneName_B_Data_01);
} else {
clear_anmpane(lbl_8164D1C9);
clear_anmpane(scPaneName_B_Data_00);
}
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(lbl_8164D1AA, false);
set_visible(lbl_8164D1B5, false);
set_visible(scPaneName_N_Data16x9, false);
set_visible(scPaneName_N_Data4x3, false);
mState = STATE_IDLE;
});

View File

@@ -32,181 +32,181 @@ namespace ipl {
ChannelTitle::TicketViewStorage ChannelTitle::msTicketView ALIGN32;
ESTicketView ChannelTitle::msUnlockTicket;
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[];
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[];
// clang-format off
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";
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";
const char* scAnimGroups[8+1] = {
lbl_8164E768,
lbl_8164E774,
lbl_8164E780,
lbl_8164E78D,
lbl_8164E79A,
lbl_8164E7A6,
lbl_8164E7B2,
lbl_8164E7C0,
scGroup_G_FocusBtnA,
scGroup_G_FocusBtnB,
scGroup_G_SelectBtnA,
scGroup_G_SelectBtnB,
scGroup_G_OnOffBtnA,
scGroup_G_OnOffBtnB,
scGroup_G_ChangeTextA,
scGroup_G_ChangeTextB,
NULL
};
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";
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";
const char* scAnimNames[10] = {
lbl_8164E7F4,
lbl_8164E813,
lbl_8164E830,
lbl_8164E84E,
lbl_8164E866,
lbl_8164E87D,
lbl_8164E89C,
lbl_8164E8BA,
lbl_8164E8D4,
lbl_8164E8F0
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
};
extern "C" char lbl_8164E934[] = "banner.brlan";
extern "C" char lbl_8164E941[] = "banner_Start.brlan";
extern "C" char lbl_8164E954[] = "banner_Loop.brlan";
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";
const char* scBannerAnims[3] = {
lbl_8164E934,
lbl_8164E941,
lbl_8164E954
scBrlan_banner,
scBrlan_banner_Start,
scBrlan_banner_Loop
};
extern "C" char lbl_8164E974[] = "G_Comment0";
extern "C" char lbl_8164E97F[] = "G_DiskIn";
extern "C" char scGroup_G_Comment0[] = "G_Comment0";
extern "C" char scGroup_G_DiskIn[] = "G_DiskIn";
const char* scDiskGroups[5] = {
lbl_8164E974,
lbl_81696A34,
lbl_81696A3A,
lbl_8164E97F,
scGroup_G_Comment0,
scGroup_G_Wii,
scGroup_G_GC,
scGroup_G_DiskIn,
NULL
};
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";
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";
const char* scDiskAnimNames[10] = {
lbl_8164E99C,
lbl_8164E9B4,
lbl_8164E9D0,
lbl_8164E9EB,
lbl_8164EA05,
lbl_8164EA20,
lbl_8164EA39,
lbl_8164EA55,
lbl_8164EA6F,
lbl_8164EA8D
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
};
extern "C" char lbl_8164EAD4[] = "my_DiskCh_a.brlyt";
extern "C" char lbl_8164EAE6[] = "my_GCTop_a_BackLoop.brlan";
extern "C" char scBrlyt_my_DiskCh_a[] = "my_DiskCh_a.brlyt";
extern "C" char scBrlan_my_GCTop_a_BackLoop[] = "my_GCTop_a_BackLoop.brlan";
#pragma push
#pragma section data_type ".sdata"
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 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_81696A28[] = "Change";
extern "C" const char* lbl_81696A30[] = {
lbl_81696A28,
extern "C" char scGroup_Change[] = "Change";
extern "C" const char* scGroupNames_Change[] = {
scGroup_Change,
};
extern "C" char lbl_81696A34[] = "G_Wii";
extern "C" char lbl_81696A3A[] = "G_GC";
extern "C" char scGroup_G_Wii[] = "G_Wii";
extern "C" char scGroup_G_GC[] = "G_GC";
const char* scLayoutNames[] = {
lbl_8164EAD4,
scBrlyt_my_DiskCh_a,
};
extern "C" char lbl_81696A44[] = "G_Back";
extern "C" char scGroup_G_Back[] = "G_Back";
const char* scGCAnimGroups[] = {
lbl_81696A44,
scGroup_G_Back,
};
const char* scGCAnimNames[] = {
lbl_8164EAE6,
scBrlan_my_GCTop_a_BackLoop,
};
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,
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,
};
#pragma pop
const char* scWidePanes[3][4] = {
{
lbl_81696A54,
lbl_81696A5A,
lbl_81696A60,
lbl_81696A66,
scPaneName_Fre_a,
scPaneName_Fre_d,
scPaneName_Fre_i,
scPaneName_Fre_l,
}, {
lbl_81696A6C,
lbl_81696A72,
lbl_81696A78,
lbl_81696A7E,
scPaneName_Fre_e,
scPaneName_Fre_f,
scPaneName_Fre_g,
scPaneName_Fre_h,
}, {
lbl_81696A84,
lbl_81696A8A,
lbl_81696A90,
lbl_81696A96,
scPaneName_Fre_b,
scPaneName_Fre_c,
scPaneName_Fre_j,
scPaneName_Fre_k,
}
};
@@ -341,12 +341,12 @@ namespace ipl {
}
}
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[0]), MESG_CMN_WII_MENU);
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[0]), MESG_CMN_WII_MENU);
if (System::getChannelManager()->checkNeedUpdate(mChanPage, mChanIndex)) {
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_TTL_BTN_UPDATE);
} else {
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CMN_START);
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[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], lbl_81696A30[0], false, false);
mpChangeAnims[i] = mpLayout->bind(scAnimNames[i], scGroupNames_Change[0], false, false);
}
mpLayout->finishBinding();
@@ -400,8 +400,8 @@ namespace ipl {
mpGui->createLayoutScene(*mpLayout->getNW4RLyt());
mpGui->setAllComponentTriggerTarget(false);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_A]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(lbl_81696A20[BTN_B]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_A]))->setTriggerTarget(true);
mpGui->getPaneComponentByPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[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(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[BTN_B]), MESG_CHAN_SEL_UPDATE_BTN, false);
} else {
setMessage(mpLayout->FindPaneByName(lbl_81696AAC[BTN_B]), MESG_CHAN_SEL_START_BTN, false);
setMessage(mpLayout->FindPaneByName(scPaneNames_T_Btn[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(lbl_81696A20[BTN_B]));
mpGui->initPane(mpLayout->FindPaneByName(scPaneNames_B_Btn[BTN_B]));
mbHovered[BTN_B] = FALSE;
}
unk_0x8C = 1;
@@ -2822,12 +2822,12 @@ namespace ipl {
break;
}
if (con->downTrg(controller::BTN_INTERACT)) {
if (strcmp(paneName, lbl_81696A20[ChannelTitle::BTN_A]) == 0) {
if (strcmp(paneName, scPaneNames_B_Btn[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, lbl_81696A20[ChannelTitle::BTN_B]) == 0) {
} else if (strcmp(paneName, scPaneNames_B_Btn[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, lbl_81696A20[i]) == 0) {
if (strcmp(paneName, scPaneNames_B_Btn[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, lbl_81696A20[i]) == 0) {
if (strcmp(paneName, scPaneNames_B_Btn[i]) == 0) {
if (i == 0 || mpInstance->unk_0x8C > 0) {
mpInstance->mbHovered[i]--;
if (mpInstance->mbHovered[i] <= FALSE) {

View File

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

View File

@@ -6,6 +6,8 @@ extern "C" {
BOOL USBAPStartRegistration(void*, void*, u32, u32, void*, void (*)(int), u16*, u8*);
BOOL USBAPCancelRegistration();
BOOL USBAPIsThreadTerminated();
void _savegpr_29();
void _restgpr_29();
}
namespace ipl {
@@ -23,27 +25,63 @@ private:
wchar_t mNickname[10];
};
static u8* registrationResult;
extern "C" u8* lbl_81698C20;
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_81657B18[] = "Registration completed !\n";
extern "C" const char lbl_81657B32[] = "Registration failed...\n";
extern "C" const char lbl_81657B4A[] = "Registration started\n";
#pragma pop
USBAPThread::USBAPThread() {
}
void USBAPRegisterCallback(int result) {
extern "C" void USBAPRegisterCallback__Q23ipl5sceneFi(int result) {
if (result == 1) {
*registrationResult = 1;
OSReport("Registration completed !\n");
*lbl_81698C20 = 1;
OSReport(lbl_81657B18);
} else {
*registrationResult = 2;
OSReport("Registration failed...\n");
*lbl_81698C20 = 2;
OSReport(lbl_81657B32);
}
}
void USBAPThread::Init(unsigned short* buffer, unsigned char* accessPoints) {
int priority = OSGetThreadPriority(OSGetCurrentThread()) + 1;
if (USBAPStartRegistration(NULL, NULL, priority,
0, this, USBAPRegisterCallback, buffer, accessPoints) == 1) {
OSReport("Registration started\n");
}
asm void USBAPThread::Init(unsigned short* buffer, unsigned char* accessPoints) {
nofralloc
stwu r1, -0x20(r1)
mflr r0
stw r0, 0x24(r1)
addi r11, r1, 0x20
bl _savegpr_29
mr r29, r3
mr r30, r4
mr r31, r5
bl OSGetCurrentThread
bl OSGetThreadPriority
lis r8, USBAPRegisterCallback__Q23ipl5sceneFi@ha
addi r5, r3, 1
mr r7, r29
mr r9, r30
mr r10, r31
addi r8, r8, USBAPRegisterCallback__Q23ipl5sceneFi@l
li r4, 0
li r3, 0
li r6, 0
bl USBAPStartRegistration
cmpwi r3, 1
bne lbl_init_done
lis r3, lbl_81657B4A@ha
addi r3, r3, lbl_81657B4A@l
crclr 4*cr1+eq
bl OSReport
lbl_init_done:
addi r11, r1, 0x20
bl _restgpr_29
lwz r0, 0x24(r1)
mtlr r0
addi r1, r1, 0x20
blr
}
BOOL USBAPThread::cancel() {
@@ -55,7 +93,7 @@ BOOL USBAPThread::is() {
}
void USBAPThread::setData(const wchar_t* nickname, unsigned char* result) {
registrationResult = result;
lbl_81698C20 = result;
memcpy(mNickname, nickname, 20);
utility::CharacterCode::changeEndian(mNickname, 10);
}