Compare commits

..

7 Commits

Author SHA1 Message Date
Cursor Agent
4f654f72a9 data(NHTTP_request): match multipart boundary .rodata size
Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 22:16:06 +00:00
coah
5c20a11fa8 Restore truncated PC-keyboard event thunk name (#519) 2026-10-01 17:15:31 -05:00
coah
f85a98a6e3 cleanup(iplSettingSelect): name exit-sequence helpers (#516)
Rename Matching-only fn_* exit/reboot helpers to descriptive
snake_case names; update mangled symbols.txt entries.
2026-10-01 17:15:19 -05:00
coah
137ee3242a cleanup(iplCSPane): name fatal OSFatal color/msg and zero float (#511)
lbl_81697844..47 → scCsFatalColorR/G/B/A, lbl_8166A6E3 → scCsFatalMsg,
lbl_81694FC0 → scCsZeroF.
2026-10-01 17:15:08 -05:00
coah
2368a9a774 cleanup(tiHwKeyboard): name EU/non-EU country map tables (#515)
Rename Matching-only setLanguage country lookup tables and
symbols.txt entries.
2026-10-01 17:13:57 -05:00
coah
90399bb6cf cleanup(iplDate): name calendar date pane/string labels (#518)
Matching-only renames in scene/calendar/iplDate (+ symbols.txt).
2026-10-01 17:13:54 -05:00
coah
fc831357ea CDBDatabase: convert Close and FindByKey to matching C (#491)
* CDBDatabase: convert Close and FindByKey to matching C

Replace asm bodies for CDBDatabaseClose and CDBDatabaseFindByKey with
equivalent C that matches instruction-exact (ctxdiff diffs 0). Unit stays
33/33 matched with 100% code and data.

* CDBDatabase: reuse labeled error strings for Close/FindByKey

Point CDBReportError at the existing lbl_ string pool entries so the
linked DOL matches baserom SHA1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 17:13:50 -05:00
9 changed files with 337 additions and 417 deletions

View File

@@ -5267,10 +5267,10 @@ start_focusout_anm__Q33ipl5scene13SettingSelectFi = .text:0x814093D0; // type:fu
start_selected_anm__Q33ipl5scene13SettingSelectFi = .text:0x81409480; // type:function size:0x274
is_stopped_all_anm__Q33ipl5scene13SettingSelectCFv = .text:0x814096F4; // type:function size:0x74
onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409768; // type:function size:0xFC
fn_81409864__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
fn_814098F4__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
fn_81409988__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
fn_814099EC__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
calc_exit_sequence__Q33ipl5scene13SettingSelectFv = .text:0x81409864; // type:function size:0x90
prepare_exit_abort__Q33ipl5scene13SettingSelectFv = .text:0x814098F4; // type:function size:0x94
start_exit_fade__Q33ipl5scene13SettingSelectFv = .text:0x81409988; // type:function size:0x64
finish_exit_reboot__Q33ipl5scene13SettingSelectFv = .text:0x814099EC; // type:function size:0x198
__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409B84; // type:function size:0x58 scope:weak
@20@__dt__Q33ipl5scene13SettingSelectFv = .text:0x81409BDC; // type:function size:0x8 scope:weak
@84@onEvent__Q33ipl5scene13SettingSelectFUlUlPv = .text:0x81409BE4; // type:function size:0x8 scope:weak
@@ -5576,7 +5576,7 @@ __sinit_\tiPcKeyboard_cpp = .text:0x81416F34; // type:function size:0x1B0
@68@calc__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x814170FC; // type:function size:0x8
@68@draw__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x81417104; // type:function size:0x8
@68@init__Q49textinput8keyboard6pctype12LayoutByNW4RFv = .text:0x8141710C; // type:function size:0x8
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5 = .text:0x81417114; // type:function size:0x8
@236@onEvent__Q49textinput8keyboard6pctype12LayoutByNW4RFPQ49textinput8keyboard6pctype5UIObjUlPv = .text:0x81417114; // type:function size:0x8
create__Q49textinput8keyboard13cellphonetype4BaseFP12MEMAllocator = .text:0x8141711C; // type:function size:0xAC
init__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x814171C8; // type:function size:0xA8
calc__Q49textinput8keyboard13cellphonetype4BaseFv = .text:0x81417270; // type:function size:0x4
@@ -13986,8 +13986,8 @@ lbl_81616AE4 = .rodata:0x81616AE4; // type:object size:0x30
lbl_81616B14 = .rodata:0x81616B14; // type:object size:0x74
lbl_81616B88 = .rodata:0x81616B88; // type:object size:0x40
lbl_81616BC8 = .rodata:0x81616BC8; // type:object size:0x10 data:4byte
lbl_81616BD8 = .rodata:0x81616BD8; // type:object size:0xC
lbl_81616BE4 = .rodata:0x81616BE4; // type:object size:0xC
scCountryMap_EU = .rodata:0x81616BD8; // type:object size:0xC
scCountryMap_NonEU = .rodata:0x81616BE4; // type:object size:0xC
lbl_81616BF0 = .rodata:0x81616BF0; // type:object size:0x88
CHANSVmConstStringObjectUndefined = .rodata:0x81616C78; // type:object size:0x10
lbl_81616C88 = .rodata:0x81616C88; // type:object size:0x10
@@ -15673,11 +15673,11 @@ lbl_8164C54E = .data:0x8164C54E; // type:object size:0x18
lbl_8164C566 = .data:0x8164C566; // type:object size:0xC
lbl_8164C572 = .data:0x8164C572; // type:object size:0xA
__vt__Q33ipl5scene8Calendar = .data:0x8164C57C; // type:object size:0xA4
lbl_8164C620 = .data:0x8164C620; // type:object size:0xB data:string
lbl_8164C62C = .data:0x8164C62C; // type:object size:0x14 data:4byte
lbl_8164C640 = .data:0x8164C640; // type:object size:0x12 data:string
lbl_8164C652 = .data:0x8164C652; // type:object size:0xB data:string
lbl_8164C65D = .data:0x8164C65D; // type:object size:0x13 data:string
scN_CalDay_r = .data:0x8164C620; // type:object size:0xB data:string
scDateAnimPaneNames = .data:0x8164C62C; // type:object size:0x14 data:4byte
scMyIplTopFBrlan = .data:0x8164C640; // type:object size:0x12 data:string
scN_CalDay_t = .data:0x8164C652; // type:object size:0xB data:string
scSEDateFocus = .data:0x8164C65D; // type:object size:0x13 data:string
__vt__Q33ipl5scene4Date = .data:0x8164C670; // type:object size:0x18
@12712 = .data:0x8164C688; // type:object size:0xC scope:local data:string
...data.0 = .data:0x8164C688; // type:label scope:local
@@ -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
@@ -18149,7 +18149,7 @@ lbl_8166A6B1 = .data:0x8166A6B1; // type:object size:0xD data:string
lbl_8166A6BE = .data:0x8166A6BE; // type:object size:0xD data:string
lbl_8166A6CB = .data:0x8166A6CB; // type:object size:0xC data:string
lbl_8166A6D7 = .data:0x8166A6D7; // type:object size:0xC data:string
lbl_8166A6E3 = .data:0x8166A6E3; // type:object size:0x41 data:string
scCsFatalMsg = .data:0x8166A6E3; // type:object size:0x41 data:string
lbl_8166A728 = .data:0x8166A728; // type:object size:0xB data:string
lbl_8166A733 = .data:0x8166A733; // type:object size:0x9 data:string
lbl_8166A73C = .data:0x8166A73C; // type:object size:0xB data:string
@@ -20741,7 +20741,7 @@ lbl_81694FA0 = .sdata2:0x81694FA0; // type:object size:0x7 data:string
lbl_81694FA7 = .sdata2:0x81694FA7; // type:object size:0x5 data:string
lbl_81694FAC = .sdata2:0x81694FAC; // type:object size:0xC align:4
lbl_81694FB8 = .sdata2:0x81694FB8; // type:object size:0x8 align:8 data:double
lbl_81694FC0 = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
scCsZeroF = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float
@10105 = .sdata2:0x81694FC8; // type:object size:0x4 scope:local align:4 data:float
@9941 = .sdata2:0x81694FD0; // type:object size:0x8 scope:local data:4byte
@10304 = .sdata2:0x81694FD8; // type:object size:0x8 scope:local align:8 data:double
@@ -21785,11 +21785,11 @@ scPaneName_T_Stop = .sdata:0x816967B5; // type:object size:0x7 data:string
lbl_816967C0 = .sdata:0x816967C0; // type:object size:0x4 data:string
lbl_816967C4 = .sdata:0x816967C4; // type:object size:0x6 data:string
lbl_816967CA = .sdata:0x816967CA; // type:object size:0x7 data:string
lbl_816967D8 = .sdata:0x816967D8; // type:object size:0x6 data:string
lbl_816967DE = .sdata:0x816967DE; // type:object size:0x6 data:string
lbl_816967E4 = .sdata:0x816967E4; // type:object size:0x7 data:string
lbl_816967EB = .sdata:0x816967EB; // type:object size:0x7 data:string
lbl_816967F2 = .sdata:0x816967F2; // type:object size:0x6 data:string
scW_Cal = .sdata:0x816967D8; // type:object size:0x6 data:string
scT_Cal = .sdata:0x816967DE; // type:object size:0x6 data:string
scCal_Ac = .sdata:0x816967E4; // type:object size:0x7 data:string
scInfo_a = .sdata:0x816967EB; // type:object size:0x7 data:string
scB_Cal = .sdata:0x816967F2; // type:object size:0x6 data:string
@16087 = .sdata:0x816967F8; // type:object size:0x4 scope:local data:string
@16350 = .sdata:0x816967FC; // type:object size:0x7 scope:local data:string
@16351 = .sdata:0x81696803; // type:object size:0x7 scope:local 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
@@ -22466,10 +22466,10 @@ lbl_81697824 = .sdata:0x81697824; // type:object size:0x8 data:string
lbl_8169782C = .sdata:0x8169782C; // type:object size:0x8 data:string
lbl_81697834 = .sdata:0x81697834; // type:object size:0x8 data:string
lbl_8169783C = .sdata:0x8169783C; // type:object size:0x8 data:string
lbl_81697844 = .sdata:0x81697844; // type:object size:0x1 data:byte
lbl_81697845 = .sdata:0x81697845; // type:object size:0x1 data:byte
lbl_81697846 = .sdata:0x81697846; // type:object size:0x1 data:byte
lbl_81697847 = .sdata:0x81697847; // type:object size:0x1 data:byte
scCsFatalColorR = .sdata:0x81697844; // type:object size:0x1 data:byte
scCsFatalColorG = .sdata:0x81697845; // type:object size:0x1 data:byte
scCsFatalColorB = .sdata:0x81697846; // type:object size:0x1 data:byte
scCsFatalColorA = .sdata:0x81697847; // type:object size:0x1 data:byte
lbl_81697848 = .sdata:0x81697848; // type:object size:0x8 data:string
lbl_81697850 = .sdata:0x81697850; // type:object size:0x6 data:string
lbl_81697858 = .sdata:0x81697858; // type:object size:0x6 data:string

View File

@@ -167,12 +167,12 @@ namespace ipl {
bool is_stopped_all_anm() const;
void fn_81409864();
void calc_exit_sequence();
void fn_814098F4();
void fn_unk_inline();
void fn_81409988();
void fn_814099EC();
void prepare_exit_abort();
void wait_decide_se();
void start_exit_fade();
void finish_exit_reboot();
int mState; // 0x60
int mPrevState; // 0x64

View File

@@ -8,10 +8,10 @@ extern u32 CDBGetInitialCode();
extern void CDBLock();
extern CDBErr CDBDatabaseAllocate(CDBDatabase* database, u32 flags);
extern void CDBUnlock();
extern void CDBDatabaseFree();
extern CDBErr CDBDatabaseFree(CDBDatabase* database);
extern void CDBRecordCreateAtOnce();
extern void CDBRecordInitDescriptor();
extern void CDBRecordIsExistFile();
extern void CDBRecordInitDescriptor(CDBRecord* record, CDBDatabase* database, CDBRecordKey* key);
extern BOOL CDBRecordIsExistFile(CDBRecord* record);
extern void CDBRecordOpenReadOnly();
extern void CDBRecordKeyArrayInit();
extern void CDBRecordKeyArraySetReverse();
@@ -157,59 +157,27 @@ CDBErr CDBDatabaseOpen(CDBDatabase* database) {
return result;
}
asm CDBErr CDBDatabaseClose(CDBDatabase* database) {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x10(r1)
mflr r0
stw r0, 0x14(r1)
stw r31, 0xc(r1)
stw r30, 0x8(r1)
mr r30, r3
bl CDBLock
lwz r31, 0x8(r30)
cmpwi r31, 0x0
beq L_8148746C
addis r3, r31, 0x1
lwz r0, -0x3ff0(r3)
cmpwi r0, 0x0
bne L_8148749C
L_8148746C:
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487494
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B528@ha
addi r3, r3, lbl_8166B528@l
crclr 4*cr1+eq
bl OSReport
L_81487494:
li r31, 0x1b
b L_814874C4
L_8148749C:
mr r3, r30
bl CDBDatabaseFree
cmpwi r3, 0x0
beq L_814874B4
mr r31, r3
b L_814874C4
L_814874B4:
addis r3, r31, 0x1
li r0, 0x0
stw r0, -0x3ff0(r3)
li r31, 0x0
L_814874C4:
bl CDBUnlock
mr r3, r31
lwz r31, 0xc(r1)
lwz r30, 0x8(r1)
lwz r0, 0x14(r1)
mtlr r0
addi r1, r1, 0x10
blr
#endif
CDBErr CDBDatabaseClose(CDBDatabase* database) {
CDBErr result;
CDBErr status;
CDBDatabaseState* instance;
CDBLock();
instance = database->instance;
if (instance == NULL || instance->flags == 0) {
CDBReportError(lbl_8166B528);
result = CDB_ERROR_27;
} else {
status = CDBDatabaseFree(database);
if (status != CDB_ERROR_OK) {
result = status;
} else {
instance->flags = 0;
result = CDB_ERROR_OK;
}
}
CDBUnlock();
return result;
}
CDBErr CDBDatabasePrivateCreateRecordAtOnce(CDBDatabase* database, CDBRecord* record, const char* typeStr, const char* fileTypeStr, u8* recordData, u32 recordDataSize, char* makerCodeStr, char* gameCodeStr) {
@@ -525,72 +493,24 @@ asm CDBErr CDBDatabaseCreateRecordImAtOnce_() {
#endif
}
asm CDBErr CDBDatabaseFindByKey() {
#ifdef __MWERKS__
nofralloc
stwu r1, -0x20(r1)
mflr r0
stw r0, 0x24(r1)
stw r31, 0x1c(r1)
mr r31, r5
stw r30, 0x18(r1)
mr r30, r4
stw r29, 0x14(r1)
mr r29, r3
bl CDBLock
mr r3, r31
bl CDBRecordKeyIsValid
cmpwi r3, 0x0
bne L_81487ABC
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487AB4
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B5A8@ha
addi r3, r3, lbl_8166B5A8@l
crclr 4*cr1+eq
bl OSReport
L_81487AB4:
li r31, 0x5
b L_81487B14
L_81487ABC:
mr r3, r30
mr r4, r29
mr r5, r31
bl CDBRecordInitDescriptor
mr r3, r30
bl CDBRecordIsExistFile
cmpwi r3, 0x0
bne L_81487B10
li r3, 0x2
bl CDBIsPrintDebugMessage
cmpwi r3, 0x0
beq L_81487B08
li r3, 0x2
bl CDBReport_
lis r3, lbl_8166B5B8@ha
mr r4, r31
addi r3, r3, lbl_8166B5B8@l
crclr 4*cr1+eq
bl OSReport
L_81487B08:
li r31, 0x23
b L_81487B14
L_81487B10:
li r31, 0x0
L_81487B14:
bl CDBUnlock
mr r3, r31
lwz r31, 0x1c(r1)
lwz r30, 0x18(r1)
lwz r29, 0x14(r1)
lwz r0, 0x24(r1)
mtlr r0
addi r1, r1, 0x20
blr
#endif
CDBErr CDBDatabaseFindByKey(CDBDatabase* database, CDBRecord* record, CDBRecordKey* recordKey) {
CDBErr result;
CDBLock();
if (!CDBRecordKeyIsValid(recordKey)) {
CDBReportError(lbl_8166B5A8);
result = CDB_ERROR_5;
} else {
CDBRecordInitDescriptor(record, database, recordKey);
if (!CDBRecordIsExistFile(record)) {
CDBReportError(lbl_8166B5B8, recordKey->keyString);
result = CDB_ERROR_CANNOT_OPEN_FILE;
} else {
result = CDB_ERROR_OK;
}
}
CDBUnlock();
return result;
}
CDBErr CDBDatabaseSearchConditionsIsMatch(CDBSearchConditions* conditions, char* key) {

View File

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

View File

@@ -1,19 +1,19 @@
#include <revolution/gx/GXStruct.h>
#include <revolution/os/OSError.h>
extern "C" const char lbl_8166A6E3[];
extern "C" const u8 lbl_81697844;
extern "C" const u8 lbl_81697845;
extern "C" const u8 lbl_81697846;
extern "C" const u8 lbl_81697847;
extern "C" const char scCsFatalMsg[];
extern "C" const u8 scCsFatalColorR;
extern "C" const u8 scCsFatalColorG;
extern "C" const u8 scCsFatalColorB;
extern "C" const u8 scCsFatalColorA;
#define NW4R_DB_ASSERT_H
#define NW4R_ASSERT(x) \
{ \
if (!(x)) { \
GXColor front = {lbl_81697844, lbl_81697845, lbl_81697846, lbl_81697847}; \
GXColor front = {scCsFatalColorR, scCsFatalColorG, scCsFatalColorB, scCsFatalColorA}; \
GXColor back = {0, 0, 0, 0}; \
OSFatal((GXColor)front, (GXColor)back, lbl_8166A6E3); \
OSFatal((GXColor)front, (GXColor)back, scCsFatalMsg); \
} \
}
@@ -29,7 +29,7 @@ extern "C" const u8 lbl_81697847;
#include "math/iplMathTypes.h"
extern "C" const f32 lbl_81694FC0 = 0.0f;
extern "C" const f32 scCsZeroF = 0.0f;
extern "C" nw4r::ut::Color GetTextColor__Q34nw4r3lyt7TextBoxCFUl(const nw4r::lyt::TextBox*, u32);
@@ -130,7 +130,7 @@ namespace ipl {
nw4r::math::VEC2 scale;
scale.x = pane->GetScale().x;
scale.y = pane->GetScale().y;
result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, lbl_81694FC0) == TRUE;
result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, scCsZeroF) == TRUE;
}
}
return result;
@@ -514,7 +514,7 @@ namespace ipl {
nw4r::math::VEC3 get_vec_(CHANSVm* vm) {
u32 argc = CHANSVmGetArgc(vm);
CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0);
nw4r::math::VEC3 out(lbl_81694FC0, lbl_81694FC0, lbl_81694FC0);
nw4r::math::VEC3 out(scCsZeroF, scCsZeroF, scCsZeroF);
if (argc == 1 && util::is_valid_class(arg, "VEC3")) {
f32* src = static_cast<f32*>(*arg->value.ptr_v);
out.x = src[0];
@@ -540,7 +540,7 @@ namespace ipl {
nw4r::lyt::Size get_size_(CHANSVm* vm) {
u32 argc = CHANSVmGetArgc(vm);
CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0);
nw4r::lyt::Size out(lbl_81694FC0, lbl_81694FC0);
nw4r::lyt::Size out(scCsZeroF, scCsZeroF);
if (argc == 1 && util::is_valid_class(arg, "Size")) {
f32* src = static_cast<f32*>(*arg->value.ptr_v);
out.width = src[0];
@@ -622,15 +622,15 @@ namespace ipl {
namespace pane {
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8166A6E3[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
extern "C" const char scCsFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted.";
#pragma pop
#pragma push
#pragma section data_type ".sdata"
extern "C" __declspec(section ".sdata") const u8 lbl_81697844 = 0xff;
extern "C" __declspec(section ".sdata") const u8 lbl_81697845 = 0xff;
extern "C" __declspec(section ".sdata") const u8 lbl_81697846 = 0xff;
extern "C" __declspec(section ".sdata") const u8 lbl_81697847 = 0;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorR = 0xff;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorG = 0xff;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorB = 0xff;
extern "C" __declspec(section ".sdata") const u8 scCsFatalColorA = 0;
#pragma pop
}
}

View File

@@ -526,8 +526,8 @@ extern const u8 controlKeys[];
return false;
}
extern "C" const u8 lbl_81616BD8[] = {0x0f, 0x21, 0x20, 0x08, 0x09, 0x0e, 0x19, 0x00, 0x21, 0x21, 0x00, 0x00};
extern "C" const u8 lbl_81616BE4[] = {0x0f, 0x21, 0x20, 0x04, 0x09, 0x0e, 0x11, 0x00, 0x21, 0x21, 0x00, 0x00};
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,
@@ -640,16 +640,16 @@ const u8 controlKeys[] = {
nofralloc
cmpwi r4, 2
bne setLanguage_L1
lis r4, lbl_81616BD8@ha
lis r4, scCountryMap_EU@ha
lis r3, sInstance__Q39textinput5input10HKBManager@ha
addi r4, r4, lbl_81616BD8@l
addi r4, r4, scCountryMap_EU@l
lbzx r4, r4, r5
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
b SetCountry__Q39textinput5input10HKBManagerFUc
setLanguage_L1:
lis r4, lbl_81616BE4@ha
lis r4, scCountryMap_NonEU@ha
lis r3, sInstance__Q39textinput5input10HKBManager@ha
addi r4, r4, lbl_81616BE4@l
addi r4, r4, scCountryMap_NonEU@l
lbzx r4, r4, r5
addi r3, r3, sInstance__Q39textinput5input10HKBManager@l
b SetCountry__Q39textinput5input10HKBManagerFUc

View File

@@ -7,40 +7,40 @@
namespace ipl {
namespace scene {
extern "C" char lbl_816967D8[];
extern "C" char lbl_816967DE[];
extern "C" char lbl_816967E4[];
extern "C" char lbl_816967EB[];
extern "C" char lbl_816967F2[];
extern "C" char scW_Cal[];
extern "C" char scT_Cal[];
extern "C" char scCal_Ac[];
extern "C" char scInfo_a[];
extern "C" char scB_Cal[];
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8164C620[] = "N_CalDay_r";
extern "C" const char scN_CalDay_r[] = "N_CalDay_r";
#pragma pop
// clang-format off
extern "C" const char* lbl_8164C62C[Date::ANIM_PANE_MAX] = {
lbl_8164C620,
lbl_816967D8,
lbl_816967DE,
lbl_816967E4,
lbl_816967EB,
extern "C" const char* scDateAnimPaneNames[Date::ANIM_PANE_MAX] = {
scN_CalDay_r,
scW_Cal,
scT_Cal,
scCal_Ac,
scInfo_a,
};
#pragma push
#pragma section const_type ".data"
extern "C" const char lbl_8164C640[] = "my_IplTop_f.brlan";
extern "C" const char lbl_8164C652[] = "N_CalDay_t";
extern "C" const char lbl_8164C65D[] = "WIPL_SE_DATE_FOCUS";
extern "C" const char scMyIplTopFBrlan[] = "my_IplTop_f.brlan";
extern "C" const char scN_CalDay_t[] = "N_CalDay_t";
extern "C" const char scSEDateFocus[] = "WIPL_SE_DATE_FOCUS";
#pragma pop
#pragma push
#pragma section const_type ".sdata"
extern "C" char lbl_816967D8[] = "W_Cal";
extern "C" char lbl_816967DE[] = "T_Cal";
extern "C" char lbl_816967E4[] = "Cal_Ac";
extern "C" char lbl_816967EB[] = "Info_a";
extern "C" char lbl_816967F2[] = "B_Cal";
extern "C" char scW_Cal[] = "W_Cal";
extern "C" char scT_Cal[] = "T_Cal";
extern "C" char scCal_Ac[] = "Cal_Ac";
extern "C" char scInfo_a[] = "Info_a";
extern "C" char scB_Cal[] = "B_Cal";
#pragma pop
static const Date::AnmFrame scAnmFrame[] = {
@@ -73,7 +73,7 @@ namespace ipl {
// Bind animations
for (int i = 0; i < ANIM_PANE_MAX; i++) {
mpPaneAnims[i] = mpLayout->bind(lbl_8164C640, lbl_8164C62C[i], false);
mpPaneAnims[i] = mpLayout->bind(scMyIplTopFBrlan, scDateAnimPaneNames[i], false);
}
mpLayout->finishBinding();
@@ -81,7 +81,7 @@ namespace ipl {
mpGui = new gui::PaneManager(this, mpLayout->getDrawInfo(), NULL, NULL);
mpGui->setupScene(mpLayout);
mpGui->setAllComponentTriggerTarget(false);
mpGui->setTriggerTarget(mpLayout->FindPaneByName(lbl_816967F2), true);
mpGui->setTriggerTarget(mpLayout->FindPaneByName(scB_Cal), true);
// Init date
mpDate = new utility::Date();
@@ -128,19 +128,19 @@ namespace ipl {
}
void Date::setRotate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName(lbl_8164C652)->SetRotate(vec);
mpLayout->FindPaneByName(scN_CalDay_t)->SetRotate(vec);
}
void Date::setTranslate(const nw4r::math::VEC3& vec) {
mpLayout->FindPaneByName(lbl_8164C652)->SetTranslate(vec);
mpLayout->FindPaneByName(scN_CalDay_t)->SetTranslate(vec);
}
void Date::setVisible(bool visible) {
mpLayout->FindPaneByName(lbl_8164C62C[0])->SetVisible(visible);
mpLayout->FindPaneByName(scDateAnimPaneNames[0])->SetVisible(visible);
}
bool Date::getVisible() {
return mpLayout->FindPaneByName(lbl_8164C62C[0])->IsVisible();
return mpLayout->FindPaneByName(scDateAnimPaneNames[0])->IsVisible();
}
void Date::setAttribute(int attr) {
@@ -209,13 +209,13 @@ namespace ipl {
}
void Date::start_point_event(const char* paneName, controller::Interface* con) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (strcmp(paneName, scB_Cal) == 0) {
if (unk_0x3C == 0) {
static_cast<Calendar*>(System::getScene(SCENE_CALENDAR))->onPointDate(this);
onCmdRecv(1);
if (getVisible()) {
snd::getSystem()->startSE(lbl_8164C65D);
snd::getSystem()->startSE(scSEDateFocus);
if (con != NULL) {
con->rumble(1);
}
@@ -226,7 +226,7 @@ namespace ipl {
}
void Date::start_left_event(const char* paneName) {
if (strcmp(paneName, lbl_816967F2) == 0) {
if (strcmp(paneName, scB_Cal) == 0) {
if (unk_0x3C == 1) {
onCmdRecv(2);
}
@@ -262,7 +262,7 @@ namespace ipl {
numStr[index++] = 0;
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(lbl_8164C62C[2]));
nw4r::lyt::TextBox* pane = nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(mpLayout->FindPaneByName(scDateAnimPaneNames[2]));
pane->SetString(numStr);
}

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

@@ -185,7 +185,7 @@ namespace ipl {
break;
}
case STATE_16: {
fn_81409864();
calc_exit_sequence();
break;
}
}
@@ -688,28 +688,28 @@ namespace ipl {
}
}
void SettingSelect::fn_81409864() {
void SettingSelect::calc_exit_sequence() {
switch (unk_0x94) {
case 0: {
fn_814098F4();
prepare_exit_abort();
break;
}
case 1: {
fn_unk_inline();
wait_decide_se();
break;
}
case 2: {
fn_81409988();
start_exit_fade();
break;
}
case 3: {
fn_814099EC();
finish_exit_reboot();
break;
}
}
}
void SettingSelect::fn_814098F4() {
void SettingSelect::prepare_exit_abort() {
if (System::getChannelManager()->isReady()) {
for (int i = 0; i < WPAD_MAX_CONTROLLERS; i++) {
controller::Interface* con = System::getController(i);
@@ -724,20 +724,20 @@ namespace ipl {
}
}
void SettingSelect::fn_unk_inline() {
void SettingSelect::wait_decide_se() {
if (!snd::getSystem()->isSEActive("WIPL_SE_DECIDE")) {
unk_0x94 = 2;
}
}
void SettingSelect::fn_81409988() {
void SettingSelect::start_exit_fade() {
__WPADReconnect(TRUE);
snd::getSystem()->stopAllSound(20);
System::getFader()->fadeOut();
unk_0x94 = 3;
}
void SettingSelect::fn_814099EC() {
void SettingSelect::finish_exit_reboot() {
if (System::getFader()->getStatus() == EGG::Fader::PREPARE_IN) {
while (WPADGetStatus() != 0 || System::getBS2Manager()->getIPLState() != bs2::IPL_STATE_8) {
snd::getSystem()->calc();