Compare commits
24 Commits
cleanup/sd
...
match/tiPc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a881fa8c3 | ||
|
|
ca998ad7cf | ||
|
|
486c20c623 | ||
|
|
6adb0dc52e | ||
|
|
c9f64372cf | ||
|
|
9f4a70db74 | ||
|
|
e305e6047c | ||
|
|
df48bc9f76 | ||
|
|
3bd814f042 | ||
|
|
51b78ed7da | ||
|
|
3eb5d8faee | ||
|
|
d99950fc88 | ||
|
|
98d03059bd | ||
|
|
830e2f3920 | ||
|
|
c1b00d8a14 | ||
|
|
9acdd7f8dc | ||
|
|
abf047831a | ||
|
|
17be3b014b | ||
|
|
0d9d3d1081 | ||
|
|
196b14aa58 | ||
|
|
1dde229702 | ||
|
|
94c03497ff | ||
|
|
e9dd012c09 | ||
|
|
90e7b0ff2c |
@@ -53,9 +53,9 @@ Progress
|
||||
<!-- progress:start -->
|
||||
| Decompiled | Matched | Linked | Data |
|
||||
|:---:|:---:|:---:|:---:|
|
||||
| 99.38% | 87.96% | 62.33% | 92.07% |
|
||||
| 99.38% | 87.97% | 62.33% | 92.07% |
|
||||
|
||||
units 919/1027 complete, functions 12224/12563 matched.
|
||||
units 919/1027 complete, functions 12225/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 -->
|
||||
|
||||
@@ -29,8 +29,8 @@ force_active:
|
||||
- strspn
|
||||
- strcspn
|
||||
- padding__Q23ipl5scene
|
||||
- lbl_81695063
|
||||
- lbl_81695067
|
||||
- scRsnOuiPad
|
||||
- scWpaOuiPad
|
||||
- __vt__Q49textinput6extend4memo19NigaoeEventObserver
|
||||
|
||||
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.
|
||||
|
||||
@@ -4685,42 +4685,42 @@ copyFrom__Q33ipl5scene22SDChannelSelectCommandFRCQ33ipl5scene22SDChannelSelectCo
|
||||
@20@__dt__Q33ipl5scene15SDChannelSelectFv = .text:0x813E2F24; // type:function size:0x8
|
||||
__ct__Q33ipl5scene12SDChannelObjFPQ23EGG4Heapii = .text:0x813E2F2C; // type:function size:0x130
|
||||
__dt__Q33ipl5scene12SDChannelObjFv = .text:0x813E305C; // type:function size:0xA8
|
||||
iplSDChannelObj_813E3104 = .text:0x813E3104; // type:function size:0x18
|
||||
iplSDChannelObj_813E311C = .text:0x813E311C; // type:function size:0xC
|
||||
iplSDChannelObj_813E3128 = .text:0x813E3128; // type:function size:0x50
|
||||
iplSDChannelObj_813E3178 = .text:0x813E3178; // type:function size:0x8
|
||||
iplSDChannelObj_813E3180 = .text:0x813E3180; // type:function size:0xAC
|
||||
iplSDChannelObj_813E322C = .text:0x813E322C; // type:function size:0x9C
|
||||
iplSDChannelObj_813E32C8 = .text:0x813E32C8; // type:function size:0x3C
|
||||
iplSDChannelObj_813E3304 = .text:0x813E3304; // type:function size:0x8
|
||||
iplSDChannelObj_813E330C = .text:0x813E330C; // type:function size:0x14
|
||||
iplSDChannelObj_activateIfIdle = .text:0x813E3104; // type:function size:0x18
|
||||
iplSDChannelObj_setHeaps = .text:0x813E311C; // type:function size:0xC
|
||||
iplSDChannelObj_getOrAllocThumbnailData = .text:0x813E3128; // type:function size:0x50
|
||||
iplSDChannelObj_setPane = .text:0x813E3178; // type:function size:0x8
|
||||
iplSDChannelObj_setLayoutFile = .text:0x813E3180; // type:function size:0xAC
|
||||
iplSDChannelObj_calc = .text:0x813E322C; // type:function size:0x9C
|
||||
iplSDChannelObj_drawBase = .text:0x813E32C8; // type:function size:0x3C
|
||||
iplSDChannelObj_drawPage = .text:0x813E3304; // type:function size:0x8
|
||||
iplSDChannelObj_drawDialog = .text:0x813E330C; // type:function size:0x14
|
||||
getTranslate__Q33ipl5scene12SDChannelObjCFv = .text:0x813E3320; // type:function size:0x10
|
||||
iplSDChannelObj_813E3330 = .text:0x813E3330; // type:function size:0x24
|
||||
iplSDChannelObj_813E3354 = .text:0x813E3354; // type:function size:0x98
|
||||
iplSDChannelObj_813E33EC = .text:0x813E33EC; // type:function size:0x94
|
||||
iplSDChannelObj_813E3480 = .text:0x813E3480; // type:function size:0x60
|
||||
iplSDChannelObj_813E34E0 = .text:0x813E34E0; // type:function size:0x8
|
||||
iplSDChannelObj_813E34E8 = .text:0x813E34E8; // type:function size:0x4C
|
||||
iplSDChannelObj_813E3534 = .text:0x813E3534; // type:function size:0x4C
|
||||
iplSDChannelObj_813E3580 = .text:0x813E3580; // type:function size:0x2D8
|
||||
iplSDChannelObj_813E3858 = .text:0x813E3858; // type:function size:0xC8
|
||||
iplSDChannelObj_813E3920 = .text:0x813E3920; // type:function size:0x164
|
||||
iplSDChannelObj_813E3A84 = .text:0x813E3A84; // type:function size:0x98
|
||||
iplSDChannelObj_813E3B1C = .text:0x813E3B1C; // type:function size:0x84
|
||||
iplSDChannelObj_813E3BA0 = .text:0x813E3BA0; // type:function size:0xB8
|
||||
iplSDChannelObj_813E3C58 = .text:0x813E3C58; // type:function size:0x44
|
||||
iplSDChannelObj_813E3C9C = .text:0x813E3C9C; // type:function size:0x19C
|
||||
iplSDChannelObj_813E3E38 = .text:0x813E3E38; // type:function size:0xF0
|
||||
iplSDChannelObj_813E3F28 = .text:0x813E3F28; // type:function size:0x4C
|
||||
iplSDChannelObj_813E3F74 = .text:0x813E3F74; // type:function size:0xEC
|
||||
iplSDChannelObj_813E4060 = .text:0x813E4060; // type:function size:0xDC
|
||||
iplSDChannelObj_813E413C = .text:0x813E413C; // type:function size:0x2D4
|
||||
iplSDChannelObj_813E4410 = .text:0x813E4410; // type:function size:0x148
|
||||
iplSDChannelObj_813E4558 = .text:0x813E4558; // type:function size:0x1AC
|
||||
iplSDChannelObj_813E4704 = .text:0x813E4704; // type:function size:0x118
|
||||
iplSDChannelObj_813E481C = .text:0x813E481C; // type:function size:0x18C
|
||||
iplSDChannelObj_813E49A8 = .text:0x813E49A8; // type:function size:0xAC
|
||||
iplSDChannelObj_813E4A54 = .text:0x813E4A54; // type:function size:0x168
|
||||
iplSDChannelObj_hasAppMeta = .text:0x813E3330; // type:function size:0x24
|
||||
iplSDChannelObj_startAppear = .text:0x813E3354; // type:function size:0x98
|
||||
iplSDChannelObj_startDisappear = .text:0x813E33EC; // type:function size:0x94
|
||||
iplSDChannelObj_setSelected = .text:0x813E3480; // type:function size:0x60
|
||||
iplSDChannelObj_playPageHide = .text:0x813E34E0; // type:function size:0x8
|
||||
iplSDChannelObj_resetPageAnim = .text:0x813E34E8; // type:function size:0x4C
|
||||
iplSDChannelObj_resetDialogAnim = .text:0x813E3534; // type:function size:0x4C
|
||||
iplSDChannelObj_applyLanguageGroups = .text:0x813E3580; // type:function size:0x2D8
|
||||
iplSDChannelObj_createBaseLayout = .text:0x813E3858; // type:function size:0xC8
|
||||
iplSDChannelObj_createIconLayout = .text:0x813E3920; // type:function size:0x164
|
||||
iplSDChannelObj_createMenuLayout = .text:0x813E3A84; // type:function size:0x98
|
||||
iplSDChannelObj_syncLayoutsToPane = .text:0x813E3B1C; // type:function size:0x84
|
||||
iplSDChannelObj_createPageLayout = .text:0x813E3BA0; // type:function size:0xB8
|
||||
iplSDChannelObj_setPageTranslate = .text:0x813E3C58; // type:function size:0x44
|
||||
iplSDChannelObj_setPageAnim = .text:0x813E3C9C; // type:function size:0x19C
|
||||
iplSDChannelObj_updatePageAnim = .text:0x813E3E38; // type:function size:0xF0
|
||||
iplSDChannelObj_playPageAnimator = .text:0x813E3F28; // type:function size:0x4C
|
||||
iplSDChannelObj_createDialogLayout = .text:0x813E3F74; // type:function size:0xEC
|
||||
iplSDChannelObj_getLocalizedName = .text:0x813E4060; // type:function size:0xDC
|
||||
iplSDChannelObj_setBalloonText = .text:0x813E413C; // type:function size:0x2D4
|
||||
iplSDChannelObj_positionDialog = .text:0x813E4410; // type:function size:0x148
|
||||
iplSDChannelObj_setDialogAnim = .text:0x813E4558; // type:function size:0x1AC
|
||||
iplSDChannelObj_updateDialogAnim = .text:0x813E4704; // type:function size:0x118
|
||||
iplSDChannelObj_findNewMessageGroup = .text:0x813E481C; // type:function size:0x18C
|
||||
iplSDChannelObj_updateNewMessage = .text:0x813E49A8; // type:function size:0xAC
|
||||
iplSDChannelObj_checkNewMessage = .text:0x813E4A54; // type:function size:0x168
|
||||
__ct__Q33ipl5scene14SDChannelTitleFPQ23EGG4HeapPQ33ipl5scene15SDChannelSelect = .text:0x813E4BBC; // type:function size:0x1F4
|
||||
__dt__Q33ipl5scene14SDChannelTitleFv = .text:0x813E4DB0; // type:function size:0x70
|
||||
prepare__Q33ipl5scene14SDChannelTitleFv = .text:0x813E4E20; // type:function size:0x4C
|
||||
@@ -4866,7 +4866,7 @@ onDialogState9__Q33ipl5scene8SDMemoryFv = .text:0x813EDF04; // type:function siz
|
||||
onDialogState10__Q33ipl5scene8SDMemoryFv = .text:0x813EDFA8; // type:function size:0x130
|
||||
onDialogState11__Q33ipl5scene8SDMemoryFv = .text:0x813EE0D8; // type:function size:0xE0
|
||||
onDialogState12__Q33ipl5scene8SDMemoryFv = .text:0x813EE1B8; // type:function size:0x1A0
|
||||
iplSDMemory_813EE358 = .text:0x813EE358; // type:function size:0x44
|
||||
iplSDMemory_containsTitleId = .text:0x813EE358; // type:function size:0x44
|
||||
onDialogState13__Q33ipl5scene8SDMemoryFv = .text:0x813EE39C; // type:function size:0xEC
|
||||
onDialogState14__Q33ipl5scene8SDMemoryFv = .text:0x813EE488; // type:function size:0x1C4
|
||||
onDialogState15__Q33ipl5scene8SDMemoryFv = .text:0x813EE64C; // type:function size:0x12C
|
||||
@@ -6670,19 +6670,19 @@ CHANSVmStrCpyToU16FromU8 = .text:0x8144B058; // type:function size:0x34
|
||||
CHANSVmStrCpyToU8FromU16 = .text:0x8144B08C; // type:function size:0x44
|
||||
CHANSVmStrCpyToU8FromStringObject = .text:0x8144B0D0; // type:function size:0xB4
|
||||
VmIsNan = .text:0x8144B184; // type:function size:0x54 scope:local
|
||||
CHANSVm_8144B1D8 = .text:0x8144B1D8; // type:function size:0x20 scope:local
|
||||
CHANSVmFloatSign = .text:0x8144B1D8; // type:function size:0x20 scope:local
|
||||
VmIntToFloat = .text:0x8144B1F8; // type:function size:0x50 scope:local
|
||||
CHANSVmParseInt = .text:0x8144B248; // type:function size:0xC4 scope:local
|
||||
CHANSVm_8144B30C = .text:0x8144B30C; // type:function size:0xAC scope:local
|
||||
CHANSVmConvertToIntFromFloat = .text:0x8144B30C; // type:function size:0xAC scope:local
|
||||
CHANSVmConvertToIntFromStr = .text:0x8144B3B8; // type:function size:0x70
|
||||
CHANSVmConvertToIntFromArray = .text:0x8144B428; // type:function size:0x8
|
||||
CHANSVm_8144B430 = .text:0x8144B430; // type:function size:0x40
|
||||
CHANSVm_8144B470 = .text:0x8144B470; // type:function size:0x64
|
||||
CHANSVm_8144B4D4 = .text:0x8144B4D4; // type:function size:0x14C
|
||||
CHANSVmConvertToFloatFromUndefined = .text:0x8144B430; // type:function size:0x40
|
||||
CHANSVmConvertToFloatFromInt = .text:0x8144B470; // type:function size:0x64
|
||||
CHANSVmConvertToFloatFromStr = .text:0x8144B4D4; // type:function size:0x14C
|
||||
CHANSVmConvertToStrFromUndefined = .text:0x8144B620; // type:function size:0xC
|
||||
CHANSVm_8144B62C = .text:0x8144B62C; // type:function size:0x58 scope:local
|
||||
CHANSVmFloatToWString = .text:0x8144B62C; // type:function size:0x58 scope:local
|
||||
CHANSVmConvertToStrFromInt = .text:0x8144B684; // type:function size:0xB0
|
||||
CHANSVm_8144B734 = .text:0x8144B734; // type:function size:0xDC
|
||||
CHANSVmConvertToStrFromFloat = .text:0x8144B734; // type:function size:0xDC
|
||||
CHANSVmConvertToStrFromArray = .text:0x8144B810; // type:function size:0x10
|
||||
CHANSVmConvertObjectTypeError = .text:0x8144B820; // type:function size:0x50
|
||||
CHANSVmGetEnumedType = .text:0x8144B870; // type:function size:0x6C scope:local
|
||||
@@ -6804,14 +6804,14 @@ VmStringSplice = .text:0x8144FDD8; // type:function size:0x1E4
|
||||
VmStringSplit = .text:0x8144FFBC; // type:function size:0x378
|
||||
VmStringToLowerCase = .text:0x81450334; // type:function size:0xB4
|
||||
VmStringToUpperCase = .text:0x814503E8; // type:function size:0xB4
|
||||
CHANSVm_8145049C = .text:0x8145049C; // type:function size:0x6BC
|
||||
CHANSVmFormatString = .text:0x8145049C; // type:function size:0x6BC
|
||||
VmStringFormat = .text:0x81450B58; // type:function size:0x4C
|
||||
VmGetStrFromObjHdr = .text:0x81450BA4; // type:function size:0x24
|
||||
VmGetIntFromObjHdr = .text:0x81450BC8; // type:function size:0x24
|
||||
VmBlobInitValue = .text:0x81450BEC; // type:function size:0x20 scope:local
|
||||
VmBlobCreateDirect = .text:0x81450C0C; // type:function size:0xAC scope:local
|
||||
VmBlobGetDataBufferDirect = .text:0x81450CB8; // type:function size:0x5C scope:local
|
||||
CHANSVm_81450D14 = .text:0x81450D14; // type:function size:0xB8
|
||||
CHANSVmBlobResolveOffset = .text:0x81450D14; // type:function size:0xB8
|
||||
VmBlobCtor = .text:0x81450DCC; // type:function size:0xA8 scope:local
|
||||
VmBlobDtor = .text:0x81450E74; // type:function size:0x28 scope:local
|
||||
VmBlobGetOffset = .text:0x81450E9C; // type:function size:0x68
|
||||
@@ -6820,8 +6820,8 @@ VmBlobSkip = .text:0x81450FC8; // type:function size:0xF0
|
||||
VmBlobGetLength = .text:0x814510B8; // type:function size:0x68
|
||||
VmBlobSetLength = .text:0x81451120; // type:function size:0xF8
|
||||
VmBlobFill = .text:0x81451218; // type:function size:0xFC
|
||||
CHANSVm_81451314 = .text:0x81451314; // type:function size:0x34
|
||||
CHANSVm_81451348 = .text:0x81451348; // type:function size:0x50
|
||||
CHANSVmBlobGetCount = .text:0x81451314; // type:function size:0x34
|
||||
CHANSVmBlobHasSpace = .text:0x81451348; // type:function size:0x50
|
||||
VmBlobGetString = .text:0x81451398; // type:function size:0xC8
|
||||
VmBlobSetString = .text:0x81451460; // type:function size:0x12C
|
||||
VmBlobGetWString = .text:0x8145158C; // type:function size:0xE0
|
||||
@@ -6857,7 +6857,7 @@ VmBlobSetS32 = .text:0x814532E4; // type:function size:0xD8
|
||||
VmBlobSetS64 = .text:0x814533BC; // type:function size:0xE4
|
||||
vmBlobParsePackFormatString = .text:0x814534A0; // type:function size:0x1D0
|
||||
VmBlobPackCommon = .text:0x81453670; // type:function size:0xA70 scope:local
|
||||
CHANSVm_814540E0 = .text:0x814540E0; // type:function size:0x6C
|
||||
CHANSVmMakeU64 = .text:0x814540E0; // type:function size:0x6C
|
||||
VmBlobCreate = .text:0x8145414C; // type:function size:0x8
|
||||
VmBlobPack = .text:0x81454154; // type:function size:0x8
|
||||
VmBlobUnpack = .text:0x8145415C; // type:function size:0x814
|
||||
@@ -6875,7 +6875,7 @@ CHANSVmGetFreeExeSize = .text:0x81455198; // type:function size:0x28
|
||||
CHANSVmAddExe = .text:0x814551C0; // type:function size:0x3F8
|
||||
VmOffsU32ToPtr = .text:0x814555B8; // type:function size:0x18 scope:local
|
||||
CHANSConvertModuleOfsToPtr = .text:0x814555D0; // type:function size:0x84
|
||||
CHANSVm_81455654 = .text:0x81455654; // type:function size:0x8C
|
||||
CHANSVmLookupScopedObject = .text:0x81455654; // type:function size:0x8C
|
||||
VmPushFuncReturnInfo = .text:0x814556E0; // type:function size:0x1AC scope:local
|
||||
VmReturnWithValue = .text:0x8145588C; // type:function size:0x1D4 scope:local
|
||||
CHANSVmLinkModules = .text:0x81455A60; // type:function size:0x2F4
|
||||
@@ -7284,7 +7284,7 @@ Zi8_814834AC = .text:0x814834AC; // type:function size:0x55C
|
||||
Zi8GetKOcandidates = .text:0x81483A08; // type:function size:0xA74
|
||||
Zi8LogError = .text:0x8148447C; // type:function size:0x4
|
||||
Zi8ReplaceLastError = .text:0x81484480; // type:function size:0x4
|
||||
Zi8_81484484 = .text:0x81484484; // type:function size:0x80
|
||||
Zi8MapKeyCode = .text:0x81484484; // type:function size:0x80
|
||||
ziNumKeysWithChars = .text:0x81484504; // type:function size:0xC4 scope:local
|
||||
Zi8getKeyLayout = .text:0x814845C8; // type:function size:0x2D8
|
||||
Zi8ChangeCharCase = .text:0x814848A0; // type:function size:0x48C
|
||||
@@ -15942,7 +15942,7 @@ lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
|
||||
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
|
||||
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
|
||||
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
|
||||
jumptable_8164DE80 = .data:0x8164DE80; // type:object size:0x1C scope:local
|
||||
updateDiskState_jumptable = .data:0x8164DE80; // type:object size:0x1C scope:local
|
||||
scSE_WSD_SELECT = .data:0x8164DE9C; // type:object size:0xB data:string
|
||||
lbl_8164DEA7 = .data:0x8164DEA7; // type:object size:0x10 data:string
|
||||
lbl_8164DEB7 = .data:0x8164DEB7; // type:object size:0x114
|
||||
@@ -20244,10 +20244,10 @@ lbl_81694654 = .sdata2:0x81694654; // type:object size:0x4 align:4 data:float
|
||||
@10044 = .sdata2:0x8169469C; // type:object size:0x4 scope:local align:4 data:float
|
||||
lbl_816946A0 = .sdata2:0x816946A0; // type:object size:0x4 align:4 data:float
|
||||
scSoundZeroF = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946A8 = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946AC = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946B0 = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946B4 = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float
|
||||
scSoundTwoF = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
|
||||
scSoundOneF = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
|
||||
scSoundThirtyF = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
|
||||
scSoundSixtyF = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946B8 = .sdata2:0x816946B8; // type:object size:0x8 align:8 data:double
|
||||
lbl_816946C0 = .sdata2:0x816946C0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816946C8 = .sdata2:0x816946C8; // type:object size:0x8 align:8 data:double
|
||||
@@ -20622,7 +20622,7 @@ scInputForm640F = .sdata2:0x81694D2C; // type:object size:0x4 align:4 data:float
|
||||
scInputFormF32ConvertMagic = .sdata2:0x81694D30; // type:object size:0x8 align:8 data:double
|
||||
scInputFormOneF = .sdata2:0x81694D38; // type:object size:0x4 align:4 data:float
|
||||
scInputFormHalfF = .sdata2:0x81694D3C; // type:object size:0x4 align:4 data:float
|
||||
scInputForm0_7111111F = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
|
||||
scInputFormDegToFIdxF = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
|
||||
scInputForm150F = .sdata2:0x81694D44; // type:object size:0x4 align:4 data:float
|
||||
scInputForm30F = .sdata2:0x81694D48; // type:object size:0x4 align:4 data:float
|
||||
scInputForm50F = .sdata2:0x81694D4C; // type:object size:0x4 align:4 data:float
|
||||
@@ -24048,7 +24048,7 @@ g_detach_func = .sbss:0x8169970C; // type:object size:0x4 scope:local data:4byte
|
||||
st_uhs_msc_status = .sbss:0x81699710; // type:object size:0x4 scope:local data:4byte
|
||||
st_uhs_msc_msgid = .sbss:0x81699714; // type:object size:0x4 scope:local data:4byte
|
||||
st_uhs_msc_tskid = .sbss:0x81699718; // type:object size:0x4 scope:local data:4byte
|
||||
uhg_msc_memid = .sbss:0x8169971C; // type:object size:0x4 scope:local data:4byte
|
||||
uhg_msc_memid = .sbss:0x8169971C; // type:object size:0x4 data:4byte
|
||||
st_uhs_msc_blk_buf = .sbss:0x81699720; // type:object size:0x4 scope:local data:4byte
|
||||
__sdCardStatus = .sbss:0x81699728; // type:object size:0x4 scope:local data:4byte
|
||||
__sdReq = .sbss:0x8169972C; // type:object size:0x4 scope:local data:4byte
|
||||
|
||||
@@ -81,22 +81,22 @@ namespace ipl {
|
||||
void* mpThumbnailData;
|
||||
NandSDWorker::SDAppMetaEntry mAppMeta;
|
||||
};
|
||||
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
EGG::ExpHeap* secondHeap);
|
||||
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane);
|
||||
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile);
|
||||
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool selected);
|
||||
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int enabled);
|
||||
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel);
|
||||
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane);
|
||||
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile);
|
||||
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel);
|
||||
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int state);
|
||||
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool selected);
|
||||
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int enabled);
|
||||
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel);
|
||||
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel);
|
||||
|
||||
union SDChannelSelectCommandArguments {
|
||||
u32 values[3];
|
||||
|
||||
@@ -14,8 +14,8 @@ namespace ipl {
|
||||
WAIT_UNTIL_FADE_IN = 15
|
||||
};
|
||||
|
||||
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& unk2,
|
||||
f32 unk3 = 120.0f, f32 unk4 = 30.0f);
|
||||
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& initialPos,
|
||||
f32 margin16x9 = 120.0f, f32 margin4x3 = 30.0f);
|
||||
~TextBalloon();
|
||||
|
||||
void calc();
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
void fadeout();
|
||||
void fadeoutForce();
|
||||
|
||||
void setPos(const math::VEC3& pos, bool unk0, int unk1);
|
||||
void setPos(const math::VEC3& pos, bool use16x9X, int hAlign);
|
||||
void updatePos(const math::VEC3& pos);
|
||||
|
||||
void set_translate(const math::VEC3& trans);
|
||||
@@ -50,7 +50,7 @@ namespace ipl {
|
||||
|
||||
undefined4 unk_0x00;
|
||||
undefined4 unk_0x04;
|
||||
BOOL unk_0x08;
|
||||
BOOL mbWaitingFadeIn; // 0x08
|
||||
|
||||
layout::Object* mpLayout; // 0x0C
|
||||
|
||||
@@ -60,10 +60,10 @@ namespace ipl {
|
||||
|
||||
u32 mTextLen; // 0x18
|
||||
math::VEC3 mBalloonPos; // 0x1C
|
||||
undefined4 unk_0x28;
|
||||
undefined unk_0x2C;
|
||||
f32 unk_0x30;
|
||||
f32 unk_0x34;
|
||||
undefined4 mHAlign; // 0x28
|
||||
undefined mbUse16x9X; // 0x2C
|
||||
f32 mMargin16x9; // 0x30
|
||||
f32 mMargin4x3; // 0x34
|
||||
|
||||
int mWaitUntilFadeIn; // 0x38
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ ziU16 Zi8GetTableCount(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
|
||||
ziU32 Zi8GetTableAddress(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
|
||||
ziU8 Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data);
|
||||
|
||||
ziBool Zi8_81484484(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
|
||||
ziBool Zi8MapKeyCode(ziWChar character, ziWChar* output, ziPtr __zi8_work_data) {
|
||||
if (character == 0xeffa) {
|
||||
*output = 0;
|
||||
} else if ((character >= 0xeff1) && (character <= 0xeff9)) {
|
||||
@@ -58,7 +58,7 @@ ziBool Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, zi
|
||||
*chars = 0;
|
||||
if (ZI_WORK->userKeys[language] != 0) {
|
||||
customTable = ZI_WORK->userKeys[language];
|
||||
if (!Zi8_81484484(key, &key, __zi8_work_data)) {
|
||||
if (!Zi8MapKeyCode(key, &key, __zi8_work_data)) {
|
||||
return 0;
|
||||
}
|
||||
keyChars = customTable->lower[key];
|
||||
@@ -87,7 +87,7 @@ tables_ready:
|
||||
Zi8ReplaceLastError(0x962, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
if (!Zi8_81484484(key, &key, __zi8_work_data) || (key >= numKeys)) {
|
||||
if (!Zi8MapKeyCode(key, &key, __zi8_work_data) || (key >= numKeys)) {
|
||||
Zi8ReplaceLastError(300, __zi8_work_data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@ typedef struct UHF_MSC_MESSAGE {
|
||||
} UHF_MSC_MESSAGE;
|
||||
|
||||
extern UHF_MSC_DEVICE uhg_msc_blk_device_tbl[8];
|
||||
extern s32 uhg_msc_memid_8169971C;
|
||||
extern s32 uhg_msc_memid;
|
||||
s32 uhf_ker_set_priority(s32 task_id, s32 priority);
|
||||
void* uhf_ker_get_memory_block(s32 pool, u32 size, u32 alignment);
|
||||
s32 uhf_ker_release_memory_block(s32 pool, void* block);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <private/fa/puh_msc.h>
|
||||
|
||||
s32 uhg_msc_memid_8169971C;
|
||||
s32 uhg_msc_memid;
|
||||
static s32 st_uhs_msc_tskid;
|
||||
static s32 st_uhs_msc_msgid;
|
||||
static s32 st_uhs_msc_status;
|
||||
@@ -47,13 +47,13 @@ static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command
|
||||
s32 result = 0;
|
||||
s32 semaphore;
|
||||
UHF_MSC_MESSAGE* message;
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid_8169971C, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
if (message == NULL) {
|
||||
return -12;
|
||||
}
|
||||
semaphore = uhf_ker_create_sem(0, 0);
|
||||
if (semaphore <= 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
return -12;
|
||||
}
|
||||
message->command = command;
|
||||
@@ -61,7 +61,7 @@ static s32 _uhf_msc_api_send_message(UHF_MSC_PARAMETERS* parameters, u32 command
|
||||
message->result = &result;
|
||||
message->parameters = *parameters;
|
||||
if (uhf_ker_send_message(st_uhs_msc_msgid, message, 0) != 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
uhf_ker_delete_sem(semaphore);
|
||||
return -12;
|
||||
}
|
||||
|
||||
@@ -287,13 +287,13 @@ s32 _uhf_msc_blk_send_message(UHF_MSC_PARAMETERS* parameters, u32 command) {
|
||||
s32 semaphore;
|
||||
UHF_MSC_MESSAGE* message;
|
||||
s32 mailbox = uhf_msc_get_message_id();
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid_8169971C, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
message = uhf_ker_get_memory_block(uhg_msc_memid, sizeof(UHF_MSC_MESSAGE), 4);
|
||||
if (message == NULL) {
|
||||
return -1;
|
||||
}
|
||||
semaphore = uhf_ker_create_sem(0, 0);
|
||||
if (semaphore <= 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
return -1;
|
||||
}
|
||||
message->command = command;
|
||||
@@ -301,7 +301,7 @@ s32 _uhf_msc_blk_send_message(UHF_MSC_PARAMETERS* parameters, u32 command) {
|
||||
message->result = &result;
|
||||
message->parameters = *parameters;
|
||||
if (uhf_ker_send_message(mailbox, message, 0) != 0) {
|
||||
uhf_ker_release_memory_block(uhg_msc_memid_8169971C, message);
|
||||
uhf_ker_release_memory_block(uhg_msc_memid, message);
|
||||
uhf_ker_delete_sem(semaphore);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1282,11 +1282,13 @@ s32 PFFAT_GetSectorSpecified(PFFAT_FFD* file, u32 fileSectorIndex,
|
||||
|
||||
error = PFFAT_GetSector(file, fileSectorIndex, clusterIndex != 0, 0,
|
||||
sector);
|
||||
if (error != 0) {
|
||||
goto done;
|
||||
switch (error) {
|
||||
case 0:
|
||||
error = 0;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
error = 0;
|
||||
done:
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -13,22 +13,22 @@
|
||||
const u8 scRsnOui0 = 0;
|
||||
const u8 scRsnOui1 = 0x0F;
|
||||
const u8 scRsnOui2 = 0xAC;
|
||||
const u8 lbl_81695063 = 0;
|
||||
const u8 scRsnOuiPad = 0;
|
||||
const u8 scWpaOui0 = 0;
|
||||
const u8 scWpaOui1 = 0x50;
|
||||
const u8 scWpaOui2 = 0xF2;
|
||||
const u8 lbl_81695067 = 0;
|
||||
const u8 scWpaOuiPad = 0;
|
||||
#pragma pop
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
const u8 scWpaFindOui0 = 0;
|
||||
const u8 scWpaFindOui1 = 0x50;
|
||||
const u8 scWpaFindOui2 = 0xF2;
|
||||
const u8 lbl_81697D73 = 0;
|
||||
const u8 lbl_81697D74 = 0;
|
||||
const u8 lbl_81697D75 = 0;
|
||||
const u8 lbl_81697D76 = 0;
|
||||
const u8 lbl_81697D77 = 0;
|
||||
const u8 scWpaFindOuiPad0 = 0;
|
||||
const u8 scWpaFindOuiPad1 = 0;
|
||||
const u8 scWpaFindOuiPad2 = 0;
|
||||
const u8 scWpaFindOuiPad3 = 0;
|
||||
const u8 scWpaFindOuiPad4 = 0;
|
||||
#pragma pop
|
||||
|
||||
#define scRsnOui0 (*((volatile const u8*)&scRsnOui0))
|
||||
|
||||
@@ -313,18 +313,18 @@ asm void __div2u() {
|
||||
cmpwi r3, 0x0
|
||||
cntlzw r0, r3
|
||||
cntlzw r9, r4
|
||||
bne L_815F9538
|
||||
bne __div2u_L_815F9538
|
||||
addi r0, r9, 0x20
|
||||
L_815F9538:
|
||||
__div2u_L_815F9538:
|
||||
cmpwi r5, 0x0
|
||||
cntlzw r9, r5
|
||||
cntlzw r10, r6
|
||||
bne L_815F954C
|
||||
bne __div2u_L_815F954C
|
||||
addi r9, r10, 0x20
|
||||
L_815F954C:
|
||||
__div2u_L_815F954C:
|
||||
cmpw r0, r9
|
||||
subfic r10, r0, 0x40
|
||||
bgt L_815F9604
|
||||
bgt __div2u_L_815F9604
|
||||
addi r9, r9, 0x1
|
||||
subfic r9, r9, 0x40
|
||||
add r0, r0, r9
|
||||
@@ -332,49 +332,49 @@ L_815F954C:
|
||||
mtctr r9
|
||||
cmpwi r9, 0x20
|
||||
subi r7, r9, 0x20
|
||||
blt L_815F9584
|
||||
blt __div2u_L_815F9584
|
||||
srw r8, r3, r7
|
||||
li r7, 0x0
|
||||
b L_815F9598
|
||||
L_815F9584:
|
||||
b __div2u_L_815F9598
|
||||
__div2u_L_815F9584:
|
||||
srw r8, r4, r9
|
||||
subfic r7, r9, 0x20
|
||||
slw r7, r3, r7
|
||||
or r8, r8, r7
|
||||
srw r7, r3, r9
|
||||
L_815F9598:
|
||||
__div2u_L_815F9598:
|
||||
cmpwi r0, 0x20
|
||||
subic r9, r0, 0x20
|
||||
blt L_815F95B0
|
||||
blt __div2u_L_815F95B0
|
||||
slw r3, r4, r9
|
||||
li r4, 0x0
|
||||
b L_815F95C4
|
||||
L_815F95B0:
|
||||
b __div2u_L_815F95C4
|
||||
__div2u_L_815F95B0:
|
||||
slw r3, r3, r0
|
||||
subfic r9, r0, 0x20
|
||||
srw r9, r4, r9
|
||||
or r3, r3, r9
|
||||
slw r4, r4, r0
|
||||
L_815F95C4:
|
||||
__div2u_L_815F95C4:
|
||||
li r10, -0x1
|
||||
addic r7, r7, 0x0
|
||||
L_815F95CC:
|
||||
__div2u_L_815F95CC:
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
adde r8, r8, r8
|
||||
adde r7, r7, r7
|
||||
subfc r0, r6, r8
|
||||
subfe. r9, r5, r7
|
||||
blt L_815F95F4
|
||||
blt __div2u_L_815F95F4
|
||||
mr r8, r0
|
||||
mr r7, r9
|
||||
addic r0, r10, 0x1
|
||||
L_815F95F4:
|
||||
bdnz L_815F95CC
|
||||
__div2u_L_815F95F4:
|
||||
bdnz __div2u_L_815F95CC
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
blr
|
||||
L_815F9604:
|
||||
__div2u_L_815F9604:
|
||||
li r4, 0x0
|
||||
li r3, 0x0
|
||||
blr
|
||||
@@ -385,32 +385,32 @@ asm void __div2i() {
|
||||
#ifdef __MWERKS__
|
||||
stwu r1, -0x10(r1)
|
||||
clrrwi. r9, r3, 31
|
||||
beq L_815F9624
|
||||
beq __div2i_L_815F9624
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F9624:
|
||||
__div2i_L_815F9624:
|
||||
stw r9, 0x8(r1)
|
||||
clrrwi. r10, r5, 31
|
||||
beq L_815F9638
|
||||
beq __div2i_L_815F9638
|
||||
subfic r6, r6, 0x0
|
||||
subfze r5, r5
|
||||
L_815F9638:
|
||||
__div2i_L_815F9638:
|
||||
stw r10, 0xc(r1)
|
||||
cmpwi r3, 0x0
|
||||
cntlzw r0, r3
|
||||
cntlzw r9, r4
|
||||
bne L_815F9650
|
||||
bne __div2i_L_815F9650
|
||||
addi r0, r9, 0x20
|
||||
L_815F9650:
|
||||
__div2i_L_815F9650:
|
||||
cmpwi r5, 0x0
|
||||
cntlzw r9, r5
|
||||
cntlzw r10, r6
|
||||
bne L_815F9664
|
||||
bne __div2i_L_815F9664
|
||||
addi r9, r10, 0x20
|
||||
L_815F9664:
|
||||
__div2i_L_815F9664:
|
||||
cmpw r0, r9
|
||||
subfic r10, r0, 0x40
|
||||
bgt L_815F9738
|
||||
bgt __div2i_L_815F9738
|
||||
addi r9, r9, 0x1
|
||||
subfic r9, r9, 0x40
|
||||
add r0, r0, r9
|
||||
@@ -418,60 +418,60 @@ L_815F9664:
|
||||
mtctr r9
|
||||
cmpwi r9, 0x20
|
||||
subi r7, r9, 0x20
|
||||
blt L_815F969C
|
||||
blt __div2i_L_815F969C
|
||||
srw r8, r3, r7
|
||||
li r7, 0x0
|
||||
b L_815F96B0
|
||||
L_815F969C:
|
||||
b __div2i_L_815F96B0
|
||||
__div2i_L_815F969C:
|
||||
srw r8, r4, r9
|
||||
subfic r7, r9, 0x20
|
||||
slw r7, r3, r7
|
||||
or r8, r8, r7
|
||||
srw r7, r3, r9
|
||||
L_815F96B0:
|
||||
__div2i_L_815F96B0:
|
||||
cmpwi r0, 0x20
|
||||
subic r9, r0, 0x20
|
||||
blt L_815F96C8
|
||||
blt __div2i_L_815F96C8
|
||||
slw r3, r4, r9
|
||||
li r4, 0x0
|
||||
b L_815F96DC
|
||||
L_815F96C8:
|
||||
b __div2i_L_815F96DC
|
||||
__div2i_L_815F96C8:
|
||||
slw r3, r3, r0
|
||||
subfic r9, r0, 0x20
|
||||
srw r9, r4, r9
|
||||
or r3, r3, r9
|
||||
slw r4, r4, r0
|
||||
L_815F96DC:
|
||||
__div2i_L_815F96DC:
|
||||
li r10, -0x1
|
||||
addic r7, r7, 0x0
|
||||
L_815F96E4:
|
||||
__div2i_L_815F96E4:
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
adde r8, r8, r8
|
||||
adde r7, r7, r7
|
||||
subfc r0, r6, r8
|
||||
subfe. r9, r5, r7
|
||||
blt L_815F970C
|
||||
blt __div2i_L_815F970C
|
||||
mr r8, r0
|
||||
mr r7, r9
|
||||
addic r0, r10, 0x1
|
||||
L_815F970C:
|
||||
bdnz L_815F96E4
|
||||
__div2i_L_815F970C:
|
||||
bdnz __div2i_L_815F96E4
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
lwz r9, 0x8(r1)
|
||||
lwz r10, 0xc(r1)
|
||||
xor. r7, r9, r10
|
||||
beq L_815F9734
|
||||
beq __div2i_L_815F9734
|
||||
cmpwi r9, 0x0
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F9734:
|
||||
b L_815F9740
|
||||
L_815F9738:
|
||||
__div2i_L_815F9734:
|
||||
b __div2i_L_815F9740
|
||||
__div2i_L_815F9738:
|
||||
li r4, 0x0
|
||||
li r3, 0x0
|
||||
L_815F9740:
|
||||
__div2i_L_815F9740:
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
#endif
|
||||
@@ -482,18 +482,18 @@ asm void __mod2u() {
|
||||
cmpwi r3, 0x0
|
||||
cntlzw r0, r3
|
||||
cntlzw r9, r4
|
||||
bne L_815F975C
|
||||
bne __mod2u_L_815F975C
|
||||
addi r0, r9, 0x20
|
||||
L_815F975C:
|
||||
__mod2u_L_815F975C:
|
||||
cmpwi r5, 0x0
|
||||
cntlzw r9, r5
|
||||
cntlzw r10, r6
|
||||
bne L_815F9770
|
||||
bne __mod2u_L_815F9770
|
||||
addi r9, r10, 0x20
|
||||
L_815F9770:
|
||||
__mod2u_L_815F9770:
|
||||
cmpw r0, r9
|
||||
subfic r10, r0, 0x40
|
||||
bgt L_815F9828
|
||||
bgt __mod2u_L_815F9828
|
||||
addi r9, r9, 0x1
|
||||
subfic r9, r9, 0x40
|
||||
add r0, r0, r9
|
||||
@@ -501,49 +501,49 @@ L_815F9770:
|
||||
mtctr r9
|
||||
cmpwi r9, 0x20
|
||||
subi r7, r9, 0x20
|
||||
blt L_815F97A8
|
||||
blt __mod2u_L_815F97A8
|
||||
srw r8, r3, r7
|
||||
li r7, 0x0
|
||||
b L_815F97BC
|
||||
L_815F97A8:
|
||||
b __mod2u_L_815F97BC
|
||||
__mod2u_L_815F97A8:
|
||||
srw r8, r4, r9
|
||||
subfic r7, r9, 0x20
|
||||
slw r7, r3, r7
|
||||
or r8, r8, r7
|
||||
srw r7, r3, r9
|
||||
L_815F97BC:
|
||||
__mod2u_L_815F97BC:
|
||||
cmpwi r0, 0x20
|
||||
subic r9, r0, 0x20
|
||||
blt L_815F97D4
|
||||
blt __mod2u_L_815F97D4
|
||||
slw r3, r4, r9
|
||||
li r4, 0x0
|
||||
b L_815F97E8
|
||||
L_815F97D4:
|
||||
b __mod2u_L_815F97E8
|
||||
__mod2u_L_815F97D4:
|
||||
slw r3, r3, r0
|
||||
subfic r9, r0, 0x20
|
||||
srw r9, r4, r9
|
||||
or r3, r3, r9
|
||||
slw r4, r4, r0
|
||||
L_815F97E8:
|
||||
__mod2u_L_815F97E8:
|
||||
li r10, -0x1
|
||||
addic r7, r7, 0x0
|
||||
L_815F97F0:
|
||||
__mod2u_L_815F97F0:
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
adde r8, r8, r8
|
||||
adde r7, r7, r7
|
||||
subfc r0, r6, r8
|
||||
subfe. r9, r5, r7
|
||||
blt L_815F9818
|
||||
blt __mod2u_L_815F9818
|
||||
mr r8, r0
|
||||
mr r7, r9
|
||||
addic r0, r10, 0x1
|
||||
L_815F9818:
|
||||
bdnz L_815F97F0
|
||||
__mod2u_L_815F9818:
|
||||
bdnz __mod2u_L_815F97F0
|
||||
mr r4, r8
|
||||
mr r3, r7
|
||||
blr
|
||||
L_815F9828:
|
||||
__mod2u_L_815F9828:
|
||||
blr
|
||||
#endif
|
||||
}
|
||||
@@ -551,30 +551,30 @@ L_815F9828:
|
||||
asm void __mod2i() {
|
||||
#ifdef __MWERKS__
|
||||
cmpwi cr7, r3, 0x0
|
||||
bge cr7, L_815F983C
|
||||
bge cr7, __mod2i_L_815F983C
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F983C:
|
||||
__mod2i_L_815F983C:
|
||||
cmpwi r5, 0x0
|
||||
bge L_815F984C
|
||||
bge __mod2i_L_815F984C
|
||||
subfic r6, r6, 0x0
|
||||
subfze r5, r5
|
||||
L_815F984C:
|
||||
__mod2i_L_815F984C:
|
||||
cmpwi r3, 0x0
|
||||
cntlzw r0, r3
|
||||
cntlzw r9, r4
|
||||
bne L_815F9860
|
||||
bne __mod2i_L_815F9860
|
||||
addi r0, r9, 0x20
|
||||
L_815F9860:
|
||||
__mod2i_L_815F9860:
|
||||
cmpwi r5, 0x0
|
||||
cntlzw r9, r5
|
||||
cntlzw r10, r6
|
||||
bne L_815F9874
|
||||
bne __mod2i_L_815F9874
|
||||
addi r9, r10, 0x20
|
||||
L_815F9874:
|
||||
__mod2i_L_815F9874:
|
||||
cmpw r0, r9
|
||||
subfic r10, r0, 0x40
|
||||
bgt L_815F9928
|
||||
bgt __mod2i_L_815F9928
|
||||
addi r9, r9, 0x1
|
||||
subfic r9, r9, 0x40
|
||||
add r0, r0, r9
|
||||
@@ -582,52 +582,52 @@ L_815F9874:
|
||||
mtctr r9
|
||||
cmpwi r9, 0x20
|
||||
subi r7, r9, 0x20
|
||||
blt L_815F98AC
|
||||
blt __mod2i_L_815F98AC
|
||||
srw r8, r3, r7
|
||||
li r7, 0x0
|
||||
b L_815F98C0
|
||||
L_815F98AC:
|
||||
b __mod2i_L_815F98C0
|
||||
__mod2i_L_815F98AC:
|
||||
srw r8, r4, r9
|
||||
subfic r7, r9, 0x20
|
||||
slw r7, r3, r7
|
||||
or r8, r8, r7
|
||||
srw r7, r3, r9
|
||||
L_815F98C0:
|
||||
__mod2i_L_815F98C0:
|
||||
cmpwi r0, 0x20
|
||||
subic r9, r0, 0x20
|
||||
blt L_815F98D8
|
||||
blt __mod2i_L_815F98D8
|
||||
slw r3, r4, r9
|
||||
li r4, 0x0
|
||||
b L_815F98EC
|
||||
L_815F98D8:
|
||||
b __mod2i_L_815F98EC
|
||||
__mod2i_L_815F98D8:
|
||||
slw r3, r3, r0
|
||||
subfic r9, r0, 0x20
|
||||
srw r9, r4, r9
|
||||
or r3, r3, r9
|
||||
slw r4, r4, r0
|
||||
L_815F98EC:
|
||||
__mod2i_L_815F98EC:
|
||||
li r10, -0x1
|
||||
addic r7, r7, 0x0
|
||||
L_815F98F4:
|
||||
__mod2i_L_815F98F4:
|
||||
adde r4, r4, r4
|
||||
adde r3, r3, r3
|
||||
adde r8, r8, r8
|
||||
adde r7, r7, r7
|
||||
subfc r0, r6, r8
|
||||
subfe. r9, r5, r7
|
||||
blt L_815F991C
|
||||
blt __mod2i_L_815F991C
|
||||
mr r8, r0
|
||||
mr r7, r9
|
||||
addic r0, r10, 0x1
|
||||
L_815F991C:
|
||||
bdnz L_815F98F4
|
||||
__mod2i_L_815F991C:
|
||||
bdnz __mod2i_L_815F98F4
|
||||
mr r4, r8
|
||||
mr r3, r7
|
||||
L_815F9928:
|
||||
bge cr7, L_815F9934
|
||||
__mod2i_L_815F9928:
|
||||
bge cr7, __mod2i_L_815F9934
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F9934:
|
||||
__mod2i_L_815F9934:
|
||||
blr
|
||||
#endif
|
||||
}
|
||||
@@ -668,9 +668,9 @@ asm void __shr2i() {
|
||||
slw r10, r3, r8
|
||||
or r4, r4, r10
|
||||
sraw r10, r3, r9
|
||||
ble L_815F99A0
|
||||
ble __shr2i_L_815F99A0
|
||||
or r4, r4, r10
|
||||
L_815F99A0:
|
||||
__shr2i_L_815F99A0:
|
||||
sraw r3, r3, r5
|
||||
blr
|
||||
#endif
|
||||
@@ -680,13 +680,13 @@ asm void __cvt_sll_dbl() {
|
||||
#ifdef __MWERKS__
|
||||
stwu r1, -0x10(r1)
|
||||
clrrwi. r5, r3, 31
|
||||
beq L_815F99BC
|
||||
beq __cvt_sll_dbl_L_815F99BC
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F99BC:
|
||||
__cvt_sll_dbl_L_815F99BC:
|
||||
or. r7, r3, r4
|
||||
li r6, 0x0
|
||||
beq L_815F9A44
|
||||
beq __cvt_sll_dbl_L_815F9A44
|
||||
cntlzw r7, r3
|
||||
cntlzw r8, r4
|
||||
extlwi r9, r7, 5, 26
|
||||
@@ -705,22 +705,22 @@ L_815F99BC:
|
||||
clrlwi r7, r4, 21
|
||||
cmpwi r7, 0x400
|
||||
addi r6, r6, 0x43e
|
||||
blt L_815F9A2C
|
||||
bgt L_815F9A20
|
||||
blt __cvt_sll_dbl_L_815F9A2C
|
||||
bgt __cvt_sll_dbl_L_815F9A20
|
||||
rlwinm. r7, r4, 0, 20, 20
|
||||
beq L_815F9A2C
|
||||
L_815F9A20:
|
||||
beq __cvt_sll_dbl_L_815F9A2C
|
||||
__cvt_sll_dbl_L_815F9A20:
|
||||
addic r4, r4, 0x800
|
||||
addze r3, r3
|
||||
addze r6, r6
|
||||
L_815F9A2C:
|
||||
__cvt_sll_dbl_L_815F9A2C:
|
||||
rotrwi r4, r4, 11
|
||||
rlwimi r4, r3, 21, 0, 10
|
||||
extrwi r3, r3, 20, 1
|
||||
slwi r6, r6, 20
|
||||
or r3, r6, r3
|
||||
or r3, r5, r3
|
||||
L_815F9A44:
|
||||
__cvt_sll_dbl_L_815F9A44:
|
||||
stw r3, 0x8(r1)
|
||||
stw r4, 0xc(r1)
|
||||
lfd f1, 0x8(r1)
|
||||
@@ -734,7 +734,7 @@ asm void __cvt_ull_dbl() {
|
||||
stwu r1, -0x10(r1)
|
||||
or. r7, r3, r4
|
||||
li r6, 0x0
|
||||
beq L_815F9AE0
|
||||
beq __cvt_ull_dbl_L_815F9AE0
|
||||
cntlzw r7, r3
|
||||
cntlzw r8, r4
|
||||
extlwi r9, r7, 5, 26
|
||||
@@ -753,21 +753,21 @@ asm void __cvt_ull_dbl() {
|
||||
clrlwi r7, r4, 21
|
||||
cmpwi r7, 0x400
|
||||
addi r6, r6, 0x43e
|
||||
blt L_815F9ACC
|
||||
bgt L_815F9AC0
|
||||
blt __cvt_ull_dbl_L_815F9ACC
|
||||
bgt __cvt_ull_dbl_L_815F9AC0
|
||||
rlwinm. r7, r4, 0, 20, 20
|
||||
beq L_815F9ACC
|
||||
L_815F9AC0:
|
||||
beq __cvt_ull_dbl_L_815F9ACC
|
||||
__cvt_ull_dbl_L_815F9AC0:
|
||||
addic r4, r4, 0x800
|
||||
addze r3, r3
|
||||
addze r6, r6
|
||||
L_815F9ACC:
|
||||
__cvt_ull_dbl_L_815F9ACC:
|
||||
rotrwi r4, r4, 11
|
||||
rlwimi r4, r3, 21, 0, 10
|
||||
extrwi r3, r3, 20, 1
|
||||
slwi r6, r6, 20
|
||||
or r3, r6, r3
|
||||
L_815F9AE0:
|
||||
__cvt_ull_dbl_L_815F9AE0:
|
||||
stw r3, 0x8(r1)
|
||||
stw r4, 0xc(r1)
|
||||
lfd f1, 0x8(r1)
|
||||
@@ -781,7 +781,7 @@ asm void __cvt_ull_flt() {
|
||||
stwu r1, -0x10(r1)
|
||||
or. r7, r3, r4
|
||||
li r6, 0x0
|
||||
beq L_815F9B7C
|
||||
beq __cvt_ull_flt_L_815F9B7C
|
||||
cntlzw r7, r3
|
||||
cntlzw r8, r4
|
||||
extlwi r9, r7, 5, 26
|
||||
@@ -800,21 +800,21 @@ asm void __cvt_ull_flt() {
|
||||
clrlwi r7, r4, 21
|
||||
cmpwi r7, 0x400
|
||||
addi r6, r6, 0x43e
|
||||
blt L_815F9B68
|
||||
bgt L_815F9B5C
|
||||
blt __cvt_ull_flt_L_815F9B68
|
||||
bgt __cvt_ull_flt_L_815F9B5C
|
||||
rlwinm. r7, r4, 0, 20, 20
|
||||
beq L_815F9B68
|
||||
L_815F9B5C:
|
||||
beq __cvt_ull_flt_L_815F9B68
|
||||
__cvt_ull_flt_L_815F9B5C:
|
||||
addic r4, r4, 0x800
|
||||
addze r3, r3
|
||||
addze r6, r6
|
||||
L_815F9B68:
|
||||
__cvt_ull_flt_L_815F9B68:
|
||||
rotrwi r4, r4, 11
|
||||
rlwimi r4, r3, 21, 0, 10
|
||||
extrwi r3, r3, 20, 1
|
||||
slwi r6, r6, 20
|
||||
or r3, r6, r3
|
||||
L_815F9B7C:
|
||||
__cvt_ull_flt_L_815F9B7C:
|
||||
stw r3, 0x8(r1)
|
||||
stw r4, 0xc(r1)
|
||||
lfd f1, 0x8(r1)
|
||||
@@ -832,17 +832,17 @@ asm void __cvt_dbl_usll() {
|
||||
lwz r4, 0xc(r1)
|
||||
extrwi r5, r3, 11, 1
|
||||
cmplwi r5, 0x3ff
|
||||
bge L_815F9BBC
|
||||
bge __cvt_dbl_usll_L_815F9BBC
|
||||
li r3, 0x0
|
||||
li r4, 0x0
|
||||
b L_815F9C58
|
||||
L_815F9BBC:
|
||||
b __cvt_dbl_usll_L_815F9C58
|
||||
__cvt_dbl_usll_L_815F9BBC:
|
||||
mr r6, r3
|
||||
clrlwi r3, r3, 12
|
||||
oris r3, r3, 0x10
|
||||
subi r5, r5, 0x433
|
||||
cmpwi r5, 0x0
|
||||
bge L_815F9BFC
|
||||
bge __cvt_dbl_usll_L_815F9BFC
|
||||
neg r5, r5
|
||||
subfic r8, r5, 0x20
|
||||
subic r9, r5, 0x20
|
||||
@@ -852,21 +852,21 @@ L_815F9BBC:
|
||||
srw r10, r3, r9
|
||||
or r4, r4, r10
|
||||
srw r3, r3, r5
|
||||
b L_815F9C48
|
||||
L_815F9BFC:
|
||||
b __cvt_dbl_usll_L_815F9C48
|
||||
__cvt_dbl_usll_L_815F9BFC:
|
||||
cmpwi r5, 0xa
|
||||
ble+ L_815F9C28
|
||||
ble+ __cvt_dbl_usll_L_815F9C28
|
||||
clrrwi. r6, r6, 31
|
||||
beq L_815F9C18
|
||||
beq __cvt_dbl_usll_L_815F9C18
|
||||
lis r3, 0x8000
|
||||
li r4, 0x0
|
||||
b L_815F9C58
|
||||
L_815F9C18:
|
||||
b __cvt_dbl_usll_L_815F9C58
|
||||
__cvt_dbl_usll_L_815F9C18:
|
||||
lis r3, 0x7fff
|
||||
ori r3, r3, 0xffff
|
||||
li r4, -0x1
|
||||
b L_815F9C58
|
||||
L_815F9C28:
|
||||
b __cvt_dbl_usll_L_815F9C58
|
||||
__cvt_dbl_usll_L_815F9C28:
|
||||
subfic r8, r5, 0x20
|
||||
subic r9, r5, 0x20
|
||||
slw r3, r3, r5
|
||||
@@ -875,12 +875,12 @@ L_815F9C28:
|
||||
slw r10, r4, r9
|
||||
or r3, r3, r10
|
||||
slw r4, r4, r5
|
||||
L_815F9C48:
|
||||
__cvt_dbl_usll_L_815F9C48:
|
||||
clrrwi. r6, r6, 31
|
||||
beq L_815F9C58
|
||||
beq __cvt_dbl_usll_L_815F9C58
|
||||
subfic r4, r4, 0x0
|
||||
subfze r3, r3
|
||||
L_815F9C58:
|
||||
__cvt_dbl_usll_L_815F9C58:
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
#endif
|
||||
@@ -894,19 +894,19 @@ asm void __cvt_dbl_ull() {
|
||||
lwz r4, 0xc(r1)
|
||||
extrwi r5, r3, 11, 1
|
||||
cmplwi r5, 0x3ff
|
||||
bge L_815F9C88
|
||||
L_815F9C7C:
|
||||
bge __cvt_dbl_ull_L_815F9C88
|
||||
__cvt_dbl_ull_L_815F9C7C:
|
||||
li r3, 0x0
|
||||
li r4, 0x0
|
||||
b L_815F9D00
|
||||
L_815F9C88:
|
||||
b __cvt_dbl_ull_L_815F9D00
|
||||
__cvt_dbl_ull_L_815F9C88:
|
||||
clrrwi. r6, r3, 31
|
||||
bne L_815F9C7C
|
||||
bne __cvt_dbl_ull_L_815F9C7C
|
||||
clrlwi r3, r3, 12
|
||||
oris r3, r3, 0x10
|
||||
subi r5, r5, 0x433
|
||||
cmpwi r5, 0x0
|
||||
bge L_815F9CCC
|
||||
bge __cvt_dbl_ull_L_815F9CCC
|
||||
neg r5, r5
|
||||
subfic r8, r5, 0x20
|
||||
subic r9, r5, 0x20
|
||||
@@ -916,14 +916,14 @@ L_815F9C88:
|
||||
srw r10, r3, r9
|
||||
or r4, r4, r10
|
||||
srw r3, r3, r5
|
||||
b L_815F9D00
|
||||
L_815F9CCC:
|
||||
b __cvt_dbl_ull_L_815F9D00
|
||||
__cvt_dbl_ull_L_815F9CCC:
|
||||
cmpwi r5, 0xb
|
||||
ble+ L_815F9CE0
|
||||
ble+ __cvt_dbl_ull_L_815F9CE0
|
||||
li r3, -0x1
|
||||
li r4, -0x1
|
||||
b L_815F9D00
|
||||
L_815F9CE0:
|
||||
b __cvt_dbl_ull_L_815F9D00
|
||||
__cvt_dbl_ull_L_815F9CE0:
|
||||
subfic r8, r5, 0x20
|
||||
subic r9, r5, 0x20
|
||||
slw r3, r3, r5
|
||||
@@ -932,7 +932,7 @@ L_815F9CE0:
|
||||
slw r10, r4, r9
|
||||
or r3, r3, r10
|
||||
slw r4, r4, r5
|
||||
L_815F9D00:
|
||||
__cvt_dbl_ull_L_815F9D00:
|
||||
addi r1, r1, 0x10
|
||||
blr
|
||||
#endif
|
||||
|
||||
@@ -604,7 +604,7 @@ vmBoolInt VmIsNan(vmFloat value) {
|
||||
return isnan(value) || value == VM_NAN;
|
||||
}
|
||||
|
||||
double CHANSVm_8144B1D8(double value) {
|
||||
double CHANSVmFloatSign(double value) {
|
||||
// Clamp to -1.0~1.0
|
||||
return value < 0.0 ? -1.0 : value > 0.0 ? 1.0 : value;
|
||||
}
|
||||
@@ -650,14 +650,14 @@ static s32 CHANSVmParseInt(CHANSVmObjHdr* obj, s32 base, u64* out) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B30C(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToIntFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
// Convert to int from float
|
||||
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_INTEGER, 0);
|
||||
if (newObj != vmNull) {
|
||||
if (VmIsNan(object->value.float_v)) {
|
||||
newObj->value.int_v = 0;
|
||||
} else {
|
||||
newObj->value.int_v = (u64)(CHANSVm_8144B1D8(object->value.float_v) * floor(fabs(object->value.float_v)));
|
||||
newObj->value.int_v = (u64)(CHANSVmFloatSign(object->value.float_v) * floor(fabs(object->value.float_v)));
|
||||
}
|
||||
}
|
||||
return newObj;
|
||||
@@ -675,7 +675,7 @@ CHANSVmObjHdr* CHANSVmConvertToIntFromArray(CHANSVm* vm, CHANSVmObjType type, CH
|
||||
return vmNull;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B430(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToFloatFromUndefined(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
|
||||
if (result != vmNull) {
|
||||
result->value.float_v = VM_NAN;
|
||||
@@ -683,7 +683,7 @@ CHANSVmObjHdr* CHANSVm_8144B430(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
|
||||
return result;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B470(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToFloatFromInt(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
|
||||
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
|
||||
if (result != vmNull) {
|
||||
result->value.float_v = VmIntToFloat(intObj->value.int_v);
|
||||
@@ -771,7 +771,7 @@ static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B4D4(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToFloatFromStr(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
// Convert string keyword into float value
|
||||
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
|
||||
|
||||
@@ -785,7 +785,7 @@ CHANSVmObjHdr* CHANSVmConvertToStrFromUndefined(CHANSVm* vm, CHANSVmObjType type
|
||||
return (CHANSVmObjHdr*)CHANSVmConstStringObjectUndefined_;
|
||||
}
|
||||
|
||||
s32 CHANSVm_8144B62C(vmWString buf, u32 len, vmFloat val) NO_INLINE {
|
||||
s32 CHANSVmFloatToWString(vmWString buf, u32 len, vmFloat val) NO_INLINE {
|
||||
s32 result = snprintf((char*)buf, len / 2, scFloatPrintfFmt, val);
|
||||
CHANSVmStrCpyToU16FromU8(buf, (vmString)buf, result);
|
||||
return VM_STR_LENGTH(result);
|
||||
@@ -815,7 +815,7 @@ error:
|
||||
return vmNull;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B734(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToStrFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
|
||||
const CHANSVmObjHdr* base;
|
||||
CHANSVmObjHdr* newObj;
|
||||
s32 result;
|
||||
@@ -835,7 +835,7 @@ CHANSVmObjHdr* CHANSVm_8144B734(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
|
||||
|
||||
newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_STRING, VM_STRING_SIZE);
|
||||
if (newObj != vmNull) {
|
||||
result = CHANSVm_8144B62C(newObj->value.wstring_v->spData, VM_STRING_SIZE, value->value.float_v);
|
||||
result = CHANSVmFloatToWString(newObj->value.wstring_v->spData, VM_STRING_SIZE, value->value.float_v);
|
||||
newObj->value.wstring_v->len = result;
|
||||
if (newObj->value.wstring_v->len == 0) {
|
||||
goto error;
|
||||
@@ -904,9 +904,9 @@ char scVmGetResultType[] = "VmGetResultType";
|
||||
// clang-format off
|
||||
const VmConvertEntry VmTypeConvertFuncTbl[] = {
|
||||
{vmNull, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, vmNull, CHANSVm_8144B30C, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVm_8144B430, CHANSVm_8144B470, vmNull, CHANSVm_8144B4D4, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVm_8144B734, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertToIntFromFloat, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertToFloatFromUndefined, CHANSVmConvertToFloatFromInt, vmNull, CHANSVmConvertToFloatFromStr, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVmConvertToStrFromFloat, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull},
|
||||
};
|
||||
@@ -2183,7 +2183,7 @@ static u32 VmArrayJoinSub(CHANSVmObjHdr* obj, CHANSVmObjHdr* array, wchar_t* sep
|
||||
if (offset + 0x80 > bufSize) {
|
||||
goto error;
|
||||
}
|
||||
elemLen = CHANSVm_8144B62C((vmWString)((u8*)(*obj->value.ptr_v) + offset), 0x80, chunk->elements[countInChunk].value.float_v);
|
||||
elemLen = CHANSVmFloatToWString((vmWString)((u8*)(*obj->value.ptr_v) + offset), 0x80, chunk->elements[countInChunk].value.float_v);
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_TYPE_ARRAY: {
|
||||
@@ -3400,7 +3400,7 @@ VmMethodDefine(String, ToUpperCase) {
|
||||
return vmFalse;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8145049C(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
|
||||
CHANSVmObjHdr* CHANSVmFormatString(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
|
||||
u8 pad0[8];
|
||||
u8 tempBuf[16];
|
||||
u8 fmtBufData[32];
|
||||
@@ -3745,7 +3745,7 @@ null_return:
|
||||
VmMethodDefine(String, Format) {
|
||||
u32 result;
|
||||
if (VmParentObj != vmNull && VmParentObj->type == CHANS_VM_TYPE_CLASS_REF) {
|
||||
result = (u32)CHANSVm_8145049C(VmInst, VmReturnObj, 0);
|
||||
result = (u32)CHANSVmFormatString(VmInst, VmReturnObj, 0);
|
||||
return result != 0;
|
||||
}
|
||||
return 0;
|
||||
@@ -3775,10 +3775,10 @@ int VmGetIntFromObjHdr(CHANSVmObjHdr* object) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit);
|
||||
BOOL CHANSVm_81451348(BlobHeader* blob, s64 size);
|
||||
u32 CHANSVmBlobGetCount(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit);
|
||||
BOOL CHANSVmBlobHasSpace(BlobHeader* blob, s64 size);
|
||||
CHANSVmObjHdr* CHANSVmNewBlobObject(CHANSVm* VmInst, CHANSVmObjHdr* obj, u32 size, void* src, u32 count);
|
||||
static u64 CHANSVm_814540E0(u32 upper, u32 lower);
|
||||
static u64 CHANSVmMakeU64(u32 upper, u32 lower);
|
||||
|
||||
static void VmBlobInitValue(BlobHeader* blob, u32 size) {
|
||||
if (blob != vmNull) {
|
||||
@@ -3834,7 +3834,7 @@ static u8* VmBlobGetDataBufferDirect(CHANSVmObjHdr* obj) {
|
||||
return vmNull;
|
||||
}
|
||||
|
||||
BOOL CHANSVm_81450D14(BlobHeader* blob, s64 val, u32* out) {
|
||||
BOOL CHANSVmBlobResolveOffset(BlobHeader* blob, s64 val, u32* out) {
|
||||
s64 pos;
|
||||
|
||||
if (blob == vmNull) {
|
||||
@@ -3901,7 +3901,7 @@ VmMethodDefine(Blob, Seek) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, val->value.int_v, &tmp)) {
|
||||
if (CHANSVmBlobResolveOffset(blob, val->value.int_v, &tmp)) {
|
||||
blob->offset = tmp;
|
||||
} else {
|
||||
return 0;
|
||||
@@ -3988,9 +3988,9 @@ VmMethodDefine(Blob, Fill) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
count = blob != vmNull ? CHANSVm_81451314(blob, fill, blob->offset) : 0;
|
||||
count = blob != vmNull ? CHANSVmBlobGetCount(blob, fill, blob->offset) : 0;
|
||||
|
||||
if (CHANSVm_81451348(blob, count)) {
|
||||
if (CHANSVmBlobHasSpace(blob, count)) {
|
||||
memset(blob->pData + blob->offset, (u8)val->value.int_v, count);
|
||||
blob->offset += count;
|
||||
return 1;
|
||||
@@ -3999,7 +3999,7 @@ VmMethodDefine(Blob, Fill) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
|
||||
u32 CHANSVmBlobGetCount(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
|
||||
if (ptr != vmNull) {
|
||||
return *(u32*)((u8*)ptr + 4);
|
||||
}
|
||||
@@ -4013,7 +4013,7 @@ u32 CHANSVm_81451314(BlobHeader* blob, CHANSVmObjHdr* ptr, u32 limit) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
BOOL CHANSVm_81451348(BlobHeader* blob, s64 size) {
|
||||
BOOL CHANSVmBlobHasSpace(BlobHeader* blob, s64 size) {
|
||||
u32 curOff = blob->offset;
|
||||
return size >= 0 && (s64)(blob->size - curOff) >= size;
|
||||
}
|
||||
@@ -4028,7 +4028,7 @@ VmMethodDefine(Blob, GetString) {
|
||||
}
|
||||
|
||||
size = (u32)arg->value.int_v;
|
||||
if (CHANSVm_81451348(blob, size)) {
|
||||
if (CHANSVmBlobHasSpace(blob, size)) {
|
||||
CHANSVmErr err = CHANSVmSetU16StringFromU8(VmInst, VmReturnObj, (char*)(blob->pData + blob->offset), size);
|
||||
blob->offset += size;
|
||||
return err == CHANS_VM_OK;
|
||||
@@ -4058,7 +4058,7 @@ VmMethodDefine(Blob, SetString) {
|
||||
}
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(blob, size)) {
|
||||
if (CHANSVmBlobHasSpace(blob, size)) {
|
||||
memset(blob->pData + blob->offset, 0, size);
|
||||
CHANSVmStrCpyToU8FromU16(blob->pData + blob->offset, strData, charCount);
|
||||
blob->offset += size;
|
||||
@@ -4076,7 +4076,7 @@ VmMethodDefine(Blob, GetWString) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(blob, VM_STR_LENGTH(arg->value.int_v))) {
|
||||
if (CHANSVmBlobHasSpace(blob, VM_STR_LENGTH(arg->value.int_v))) {
|
||||
CHANSVmErr err = CHANSVmSetU16String(VmInst, VmReturnObj, (wchar_t*)(blob->pData + blob->offset), (u32)arg->value.int_v << 1);
|
||||
u32 oldOffset = blob->offset;
|
||||
u64 length = VM_STR_LENGTH(arg->value.int_v);
|
||||
@@ -4113,7 +4113,7 @@ VmMethodDefine(Blob, SetWString) {
|
||||
}
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(blob, size)) {
|
||||
if (CHANSVmBlobHasSpace(blob, size)) {
|
||||
memcpy(blob->pData + blob->offset, strData, strLen);
|
||||
if (strLen < size) {
|
||||
memset(blob->pData + blob->offset + strLen, 0, size - strLen);
|
||||
@@ -4184,8 +4184,8 @@ VmMethodDefine(Blob, CopyRangeFrom) {
|
||||
srcOff = 0;
|
||||
destOff = 0;
|
||||
|
||||
if (CHANSVm_81450D14(destBlob, destOffObj->value.int_v, &destOff) != 0 && CHANSVm_81450D14(srcBlob, srcOffObj->value.int_v, &srcOff) != 0) {
|
||||
count = CHANSVm_81451314(srcBlob, countObj, srcOff);
|
||||
if (CHANSVmBlobResolveOffset(destBlob, destOffObj->value.int_v, &destOff) != 0 && CHANSVmBlobResolveOffset(srcBlob, srcOffObj->value.int_v, &srcOff) != 0) {
|
||||
count = CHANSVmBlobGetCount(srcBlob, countObj, srcOff);
|
||||
{
|
||||
u32 destinationOffset = destOff;
|
||||
okFlag = (s64)count >= 0 && (s64)(destBlob->size - destinationOffset) >= (s64)count;
|
||||
@@ -4213,9 +4213,9 @@ VmMethodDefine(Blob, GetBlob) {
|
||||
if (blob == vmNull)
|
||||
return 0;
|
||||
|
||||
count = blob != vmNull ? CHANSVm_81451314(blob, arg, blob->offset) : 0;
|
||||
count = blob != vmNull ? CHANSVmBlobGetCount(blob, arg, blob->offset) : 0;
|
||||
|
||||
if (CHANSVm_81451348(blob, count)) {
|
||||
if (CHANSVmBlobHasSpace(blob, count)) {
|
||||
if (CHANSVmNewBlobObject(VmInst, VmReturnObj, count, blob->offset + blob->pData, count) != vmNull) {
|
||||
blob->offset += count;
|
||||
return 1;
|
||||
@@ -4262,7 +4262,7 @@ VmMethodDefine(Blob, SetBlob) {
|
||||
}
|
||||
}
|
||||
|
||||
if (CHANSVm_81451348(destBlob, logicalSize)) {
|
||||
if (CHANSVmBlobHasSpace(destBlob, logicalSize)) {
|
||||
memmove(destBlob->pData + *(u32*)&destBlob->offset, srcBlob->pData + srcBlob->offset, copySize);
|
||||
if (copySize < logicalSize) {
|
||||
memset(destBlob->offset + destBlob->pData + copySize, 0, logicalSize - copySize);
|
||||
@@ -4284,9 +4284,9 @@ VmMethodDefine(Blob, GetHexString) {
|
||||
return vmFalse;
|
||||
}
|
||||
|
||||
count = blob != vmNull ? CHANSVm_81451314(blob, arg, blob->offset) : 0;
|
||||
count = blob != vmNull ? CHANSVmBlobGetCount(blob, arg, blob->offset) : 0;
|
||||
|
||||
if (CHANSVm_81451348(blob, count) && CHANSVmNewObject(VmInst, vmFalse, VmReturnObj, CHANS_VM_OBJ_TYPE_STRING, count * 4) != vmNull) {
|
||||
if (CHANSVmBlobHasSpace(blob, count) && CHANSVmNewObject(VmInst, vmFalse, VmReturnObj, CHANS_VM_OBJ_TYPE_STRING, count * 4) != vmNull) {
|
||||
wchar_t* dest = (wchar_t*)VmGetStrFromObjHdr(VmReturnObj);
|
||||
u8* src = blob->pData;
|
||||
u32 offset = blob->offset;
|
||||
@@ -4352,8 +4352,8 @@ VmMethodDefine(Blob, CalcRangeSHA1Digest) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
|
||||
{
|
||||
u32 off = offset;
|
||||
@@ -4417,8 +4417,8 @@ VmMethodDefine(Blob, CalcRangeMD5Digest) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
|
||||
{
|
||||
u32 off = offset;
|
||||
@@ -4464,8 +4464,8 @@ VmMethodDefine(Blob, CalcRangeCRC16) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
{
|
||||
u32 off = offset;
|
||||
if (((s64)size >= 0LL && (s64)(blob->size - off) >= (s64)size) != vmFalse) {
|
||||
@@ -4500,8 +4500,8 @@ VmMethodDefine(Blob, CalcRangeCRC32) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
{
|
||||
u32 off = offset;
|
||||
|
||||
@@ -4573,8 +4573,8 @@ VmMethodDefine(Blob, CalcRangeHMAC) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (CHANSVm_81450D14(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVm_81451314(blob, arg1, offset);
|
||||
if (CHANSVmBlobResolveOffset(blob, arg0->value.int_v, &offset) != 0) {
|
||||
size = CHANSVmBlobGetCount(blob, arg1, offset);
|
||||
off = offset;
|
||||
if (((s64)size >= 0LL && (s64)(blob->size - off) >= (s64)size) != vmFalse) {
|
||||
NETHMACContext ctx;
|
||||
@@ -5202,7 +5202,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
copySize = paramValue;
|
||||
}
|
||||
|
||||
if (copySize < 0 || !CHANSVm_81451348(parentBlob, copySize)) {
|
||||
if (copySize < 0 || !CHANSVmBlobHasSpace(parentBlob, copySize)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5220,7 +5220,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
if (paramValue < 0 || !CHANSVm_81451348(parentBlob, paramValue)) {
|
||||
if (paramValue < 0 || !CHANSVmBlobHasSpace(parentBlob, paramValue)) {
|
||||
goto error;
|
||||
}
|
||||
if (paramValue > 0) {
|
||||
@@ -5247,7 +5247,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!CHANSVm_81451348(parentBlob, elemSize * count)) {
|
||||
if (!CHANSVmBlobHasSpace(parentBlob, elemSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5342,7 +5342,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
*(u64*)packBuf = CHANSVm_814540E0(packBuf[0], packBuf[1]);
|
||||
*(u64*)packBuf = CHANSVmMakeU64(packBuf[0], packBuf[1]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -5379,7 +5379,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (!CHANSVm_81451348(parentBlob, elemSize * count)) {
|
||||
if (!CHANSVmBlobHasSpace(parentBlob, elemSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5424,7 +5424,7 @@ static vmBoolInt VmBlobPackCommon(CHANSVm* VmInst, CHANSVmObjHdr* VmParentObj, C
|
||||
}
|
||||
|
||||
bufSize = (count + 1) / 2;
|
||||
if (!CHANSVm_81451348(parentBlob, bufSize)) {
|
||||
if (!CHANSVmBlobHasSpace(parentBlob, bufSize)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5472,7 +5472,7 @@ error:
|
||||
return vmFalse;
|
||||
}
|
||||
|
||||
static u64 CHANSVm_814540E0(u32 upper, u32 lower) {
|
||||
static u64 CHANSVmMakeU64(u32 upper, u32 lower) {
|
||||
// Read U64 and byte-swap
|
||||
u64 x = (u64)upper << 32 | lower;
|
||||
return x >> 56 & 0x00000000000000ffULL | x >> 40 & 0x000000000000ff00ULL | x >> 24 & 0x0000000000ff0000ULL | x >> 8 & 0x00000000ff000000ULL |
|
||||
@@ -5648,7 +5648,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
} else {
|
||||
count = outVal;
|
||||
}
|
||||
if (count < 0 || !CHANSVm_81451348(srcBlob, count)) {
|
||||
if (count < 0 || !CHANSVmBlobHasSpace(srcBlob, count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5663,7 +5663,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
if (outVal < 0 || !CHANSVm_81451348(srcBlob, outVal)) {
|
||||
if (outVal < 0 || !CHANSVmBlobHasSpace(srcBlob, outVal)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5682,7 +5682,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
} else {
|
||||
count = outVal;
|
||||
}
|
||||
if (count < 0 || !CHANSVm_81451348(srcBlob, outSize * count)) {
|
||||
if (count < 0 || !CHANSVmBlobHasSpace(srcBlob, outSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5710,7 +5710,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
unpackBuf.value = CHANSVm_814540E0(unpackBuf.words[0], unpackBuf.words[1]);
|
||||
unpackBuf.value = CHANSVmMakeU64(unpackBuf.words[0], unpackBuf.words[1]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -5794,7 +5794,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
}
|
||||
count = (srcBlob->size - srcBlob->offset) / outSize;
|
||||
}
|
||||
if ((s32)count < 0 || !CHANSVm_81451348(srcBlob, outSize * count)) {
|
||||
if ((s32)count < 0 || !CHANSVmBlobHasSpace(srcBlob, outSize * count)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -5845,7 +5845,7 @@ VmMethodDefine(Blob, Unpack) {
|
||||
}
|
||||
|
||||
bufSize = (s32)(count + 1) / 2;
|
||||
if (!CHANSVm_81451348(srcBlob, bufSize)) {
|
||||
if (!CHANSVmBlobHasSpace(srcBlob, bufSize)) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -6466,7 +6466,7 @@ void CHANSConvertModuleOfsToPtr(CHANSVmModule* ptr) {
|
||||
VmOffsU32ToPtr((void**)&ptr->pLineTbl, ptr);
|
||||
}
|
||||
|
||||
static CHANSVmObjHdr* CHANSVm_81455654(CHANSVm* vm, s32 id) {
|
||||
static CHANSVmObjHdr* CHANSVmLookupScopedObject(CHANSVm* vm, s32 id) {
|
||||
CHANSVmObjHdr* data = vmNull;
|
||||
CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;
|
||||
CHANSVmExecutionCtx* ctx = pVm->pActiveCtx;
|
||||
@@ -6755,7 +6755,7 @@ static CHANSVmErr VmReturnWithValue(CHANSVm* vm, u32 val) {
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < pVm->pActiveCtx->pDbg->moduleCount; i++) {
|
||||
if (CHANSVmDeleteObject(vm, CHANSVm_81455654(vm, i)) != CHANS_VM_OK) {
|
||||
if (CHANSVmDeleteObject(vm, CHANSVmLookupScopedObject(vm, i)) != CHANS_VM_OK) {
|
||||
return CHANS_VM_ERR_RETURN;
|
||||
}
|
||||
}
|
||||
@@ -6873,7 +6873,7 @@ CHANSVmErr CHANSVmLinkModules(CHANSVm* vm, vmS32 unk0) {
|
||||
CHANSVmObjHdr* obj;
|
||||
if (idx >= module->moduleCount) {
|
||||
goto pass3_idx_err;
|
||||
} else if (obj = CHANSVm_81455654(vm, idx), obj == vmNull) {
|
||||
} else if (obj = CHANSVmLookupScopedObject(vm, idx), obj == vmNull) {
|
||||
goto pass3_obj_err;
|
||||
} else if (obj->type == CHANS_VM_OBJ_TYPE_BLANK) {
|
||||
goto pass3_success;
|
||||
@@ -7602,7 +7602,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OBJ_TYPE_FLOAT: {
|
||||
invertedVal = (s64)(CHANSVm_8144B1D8(pAcc->value.float_v) * floor(fabs(pAcc->value.float_v)));
|
||||
invertedVal = (s64)(CHANSVmFloatSign(pAcc->value.float_v) * floor(fabs(pAcc->value.float_v)));
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OBJ_TYPE_STRING: {
|
||||
@@ -7818,7 +7818,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
result = CHANS_VM_ERR_GET_PROPERTY_NAME;
|
||||
arrayIdx = 0;
|
||||
imm16Val = VM_READ_BE_U16(operandBuf, 0);
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
accumulator = &pVm->accumulator;
|
||||
if (foundObj != vmNull && accumulator->type == CHANS_VM_OBJ_TYPE_INTEGER &&
|
||||
(computedAddr = accumulator->value.data.len, (u64)accumulator->value.int_v <= ~1U)) {
|
||||
@@ -7954,7 +7954,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
if (operandBuf == vmNull) {
|
||||
return CHANS_VM_ERR_CODE_RANGE;
|
||||
}
|
||||
foundObj = CHANSVm_81455654(vm, (VM_READ_BE_U16(operandBuf, 0)) & 0x1FFF);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, (VM_READ_BE_U16(operandBuf, 0)) & 0x1FFF);
|
||||
result = VmDeleteCommon(vm, foundObj);
|
||||
break;
|
||||
}
|
||||
@@ -7982,12 +7982,12 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
imm16Val = (opcodeVal << 8 | operandBuf[1]) & 0x1FFF;
|
||||
switch (opcodeVal & CHANS_VM_OP_SYMBOL_STORE) {
|
||||
case 0: {
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
result = VmStore(vm, &pVm->accumulator, foundObj);
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OP_SYMBOL_STORE: {
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
result = VmStore(vm, foundObj, &pVm->accumulator);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -5,13 +5,6 @@
|
||||
|
||||
#include <new>
|
||||
|
||||
extern "C" const f32 lbl_81694D90;
|
||||
extern "C" const f32 lbl_81694DA8;
|
||||
extern "C" const f32 lbl_81694DAC;
|
||||
extern "C" const f32 lbl_81694DB0;
|
||||
extern "C" const f32 lbl_81694DB4;
|
||||
extern "C" const f32 lbl_81694DBC;
|
||||
extern "C" const double lbl_81694DC8;
|
||||
extern "C" void _savegpr_24();
|
||||
extern "C" void _restgpr_24();
|
||||
extern "C" void GetFont__Q34nw4r3lyt8TextBoxCFv();
|
||||
|
||||
@@ -391,7 +391,7 @@ extern "C" const f32 scInputForm640F = 640.0f;
|
||||
extern "C" const f64 scInputFormF32ConvertMagic = 4503601774854144.0;
|
||||
extern "C" const f32 scInputFormOneF = 1.0f;
|
||||
extern "C" const f32 scInputFormHalfF = 0.5f;
|
||||
extern "C" const f32 scInputForm0_7111111F = 0.7111111f;
|
||||
extern "C" const f32 scInputFormDegToFIdxF = 0.7111111f;
|
||||
extern "C" const f32 scInputForm150F = 150.0f;
|
||||
extern "C" const f32 scInputForm30F = 30.0f;
|
||||
extern "C" const f32 scInputForm50F = 50.0f;
|
||||
|
||||
@@ -2539,11 +2539,14 @@ namespace textinput {
|
||||
u32 koreanCode = code;
|
||||
if (caps)
|
||||
koreanCode = util::reverseLetterCaseW(koreanCode);
|
||||
u16 mapped;
|
||||
if (koreanCode >= L'a' && koreanCode <= L'z')
|
||||
koreanCode = KOREAN_LOWER[static_cast<u16>(koreanCode) - L'a'];
|
||||
mapped = KOREAN_LOWER[static_cast<u16>(koreanCode) - L'a'];
|
||||
else if (koreanCode >= L'A' && koreanCode <= L'Z')
|
||||
koreanCode = KOREAN_UPPER[static_cast<u16>(koreanCode) - L'A'];
|
||||
code = koreanCode;
|
||||
mapped = KOREAN_UPPER[static_cast<u16>(koreanCode) - L'A'];
|
||||
else
|
||||
mapped = koreanCode;
|
||||
code = mapped;
|
||||
}
|
||||
}
|
||||
animation = searchAnmPane(code);
|
||||
|
||||
@@ -486,12 +486,12 @@ namespace ipl {
|
||||
|
||||
void BoardObject::stt_stand() {
|
||||
f32 degrees = mStandData.unk_0x0C * 30.0f + 30.0f;
|
||||
f32 dVar2 = nw4r::math::CosFIdx(degrees * 0.7111111f);
|
||||
f32 cosF = nw4r::math::CosFIdx(degrees * 0.7111111f);
|
||||
degrees = mStandData.unk_0x0C * 30.0f + 30.0f;
|
||||
f32 dVar3 = nw4r::math::SinFIdx(degrees * 0.7111111f);
|
||||
f32 sinF = nw4r::math::SinFIdx(degrees * 0.7111111f);
|
||||
|
||||
math::VEC2 standPos;
|
||||
__ct__Q33ipl4math4VEC2Fff(&standPos, dVar3 * 160.0f, dVar2 * 160.0f);
|
||||
__ct__Q33ipl4math4VEC2Fff(&standPos, sinF * 160.0f, cosF * 160.0f);
|
||||
mBoardPos = (((mStandData.pos * (f32)(10 - mStandData.unk_0x08)) + (standPos * mStandData.unk_0x08)) / 10.0f);
|
||||
|
||||
if ((mStandData.unk_0x08 += 1) > 10) {
|
||||
|
||||
@@ -313,7 +313,6 @@ namespace ipl {
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata2"
|
||||
extern "C" const f32 scDateZeroF = 0.0f;
|
||||
extern "C" const f32 lbl_816948F0;
|
||||
#pragma pop
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace ipl {
|
||||
extern "C" void List_GetNth__Q24nw4r2utFPCQ34nw4r2ut4ListUs();
|
||||
extern "C" void getChannelBasePane__Q33ipl5scene13ChannelSelectFi();
|
||||
extern "C" void initPane__Q33ipl3gui11PaneManagerFPQ34nw4r3lyt4Pane();
|
||||
extern "C" void* jumptable_8164DE80[];
|
||||
extern "C" void* updateDiskState_jumptable[];
|
||||
extern "C" void getCurrentChannel__Q33ipl7channel7ManagerFPiPi();
|
||||
extern "C" void calcNormalRestart__Q33ipl5scene13ChannelSelectFv();
|
||||
extern "C" void _savegpr_28();
|
||||
@@ -857,7 +857,7 @@ namespace ipl {
|
||||
|
||||
extern "C" char scPaneName_N_GCIcon[] = "N_GCIcon";
|
||||
extern "C" char scPaneName_N_DiscUpdateIcon[] = "N_DiscUpdateIcon";
|
||||
extern "C" void* jumptable_8164DE80[7] = {
|
||||
extern "C" void* updateDiskState_jumptable[7] = {
|
||||
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x4C),
|
||||
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x21C),
|
||||
(void*)((const char*)updateDiskState__Q33ipl5scene13ChannelSelectFv + 0x284),
|
||||
@@ -1346,18 +1346,18 @@ namespace ipl {
|
||||
lwz r4, 0xa8(r28)
|
||||
cmplwi r0, 0x6
|
||||
lwz r27, 0x4(r4)
|
||||
bgt updateDiskState_813AD2C8
|
||||
lis r4, jumptable_8164DE80@ha
|
||||
bgt updateDiskState_done
|
||||
lis r4, updateDiskState_jumptable@ha
|
||||
slwi r0, r0, 2
|
||||
addi r4, r4, jumptable_8164DE80@l
|
||||
addi r4, r4, updateDiskState_jumptable@l
|
||||
lwzx r4, r4, r0
|
||||
mtctr r4
|
||||
bctr
|
||||
updateDiskState_813ACF94:
|
||||
updateDiskState_case0:
|
||||
lwz r4, 0xa4(r3)
|
||||
lwz r0, 0x14(r4)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
lwz r3, 0x94(r3)
|
||||
lis r29, scPaneName_N_GCIcon@ha
|
||||
addi r4, r29, scPaneName_N_GCIcon@l
|
||||
@@ -1381,7 +1381,7 @@ namespace ipl {
|
||||
li r4, 0x0
|
||||
bl SetVisible__Q34nw4r3lyt4PaneFb
|
||||
cmpwi r27, 0x5
|
||||
bne updateDiskState_813AD078
|
||||
bne updateDiskState_case0_diskState3
|
||||
lwz r4, 0xc0(r31)
|
||||
lwz r3, 0x84(r28)
|
||||
subi r4, r4, 0xf
|
||||
@@ -1391,32 +1391,32 @@ namespace ipl {
|
||||
lwz r0, 0xc0(r31)
|
||||
mr r27, r3
|
||||
cmpwi r0, 0xf
|
||||
bne updateDiskState_813AD03C
|
||||
bne updateDiskState_case0_afterThumb
|
||||
lwz r3, 0xa8(r28)
|
||||
addi r4, r31, 0xf8
|
||||
addi r5, r31, 0xfc
|
||||
bl getDiskInfo__Q33ipl3bs27ManagerFPPcPPc
|
||||
updateDiskState_813AD03C:
|
||||
updateDiskState_case0_afterThumb:
|
||||
cmpwi r27, 0x0
|
||||
beq updateDiskState_813AD050
|
||||
beq updateDiskState_case0_afterLayout
|
||||
lwz r3, 0x90(r31)
|
||||
mr r4, r27
|
||||
bl createDiskLayout__Q33ipl5scene10ChannelObjFPv
|
||||
updateDiskState_813AD050:
|
||||
updateDiskState_case0_afterLayout:
|
||||
lbz r0, 0xf4(r31)
|
||||
cmpwi r0, 0x0
|
||||
bne updateDiskState_813AD064
|
||||
bne updateDiskState_case0_afterDiskIn
|
||||
mr r3, r31
|
||||
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
|
||||
updateDiskState_813AD064:
|
||||
updateDiskState_case0_afterDiskIn:
|
||||
li r3, 0x0
|
||||
li r0, 0x1
|
||||
stb r3, 0xf4(r31)
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD078:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case0_diskState3:
|
||||
cmpwi r27, 0x3
|
||||
bne updateDiskState_813AD134
|
||||
bne updateDiskState_case0_diskState6
|
||||
lwz r3, 0x84(r28)
|
||||
li r0, 0x0
|
||||
addi r4, r29, scPaneName_N_GCIcon@l
|
||||
@@ -1444,7 +1444,7 @@ namespace ipl {
|
||||
bl setLangPane__Q33ipl5scene10ChannelObjFPCQ33ipl6layout6Object
|
||||
lwz r3, 0x98(r31)
|
||||
cmpwi r3, 0x0
|
||||
beq updateDiskState_813AD10C
|
||||
beq updateDiskState_case0_state3_afterAnim
|
||||
li r0, 0x2
|
||||
stw r0, 0x18(r3)
|
||||
lwz r28, 0x98(r31)
|
||||
@@ -1452,45 +1452,45 @@ namespace ipl {
|
||||
bl initFrame__Q33ipl7utility15FrameControllerFv
|
||||
li r0, 0x1
|
||||
stw r0, 0x14(r28)
|
||||
updateDiskState_813AD10C:
|
||||
updateDiskState_case0_state3_afterAnim:
|
||||
lbz r0, 0xf4(r31)
|
||||
cmpwi r0, 0x0
|
||||
bne updateDiskState_813AD120
|
||||
bne updateDiskState_case0_state3_afterDiskIn
|
||||
mr r3, r31
|
||||
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
|
||||
updateDiskState_813AD120:
|
||||
updateDiskState_case0_state3_afterDiskIn:
|
||||
li r3, 0x0
|
||||
li r0, 0x1
|
||||
stb r3, 0xf4(r31)
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD134:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case0_diskState6:
|
||||
cmpwi r27, 0x6
|
||||
bne updateDiskState_813AD2C8
|
||||
bne updateDiskState_done
|
||||
lbz r0, 0xf4(r31)
|
||||
cmpwi r0, 0x0
|
||||
bne updateDiskState_813AD150
|
||||
bne updateDiskState_case0_state6_afterDiskIn
|
||||
mr r3, r31
|
||||
bl startDiskInEvent__Q33ipl5scene13ChannelSelectFv
|
||||
updateDiskState_813AD150:
|
||||
updateDiskState_case0_state6_afterDiskIn:
|
||||
li r3, 0x0
|
||||
li r0, 0x4
|
||||
stb r3, 0xf4(r31)
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD164:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case1:
|
||||
lwz r4, 0x8c(r3)
|
||||
lwz r0, 0x14(r4)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
lwz r3, 0x90(r3)
|
||||
bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv
|
||||
cmpwi r27, 0x5
|
||||
bne updateDiskState_813AD1C0
|
||||
bne updateDiskState_case1_setState3
|
||||
lwz r3, 0x90(r31)
|
||||
lwz r3, 0x34(r3)
|
||||
cmpwi r3, 0x0
|
||||
beq updateDiskState_813AD1B4
|
||||
beq updateDiskState_case1_setState2
|
||||
li r0, 0x2
|
||||
stw r0, 0x18(r3)
|
||||
lwz r3, 0x90(r31)
|
||||
@@ -1499,85 +1499,85 @@ namespace ipl {
|
||||
bl initFrame__Q33ipl7utility15FrameControllerFv
|
||||
li r0, 0x1
|
||||
stw r0, 0x14(r27)
|
||||
updateDiskState_813AD1B4:
|
||||
updateDiskState_case1_setState2:
|
||||
li r0, 0x2
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD1C0:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case1_setState3:
|
||||
li r0, 0x3
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD1CC:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case2:
|
||||
cmpwi r27, 0x5
|
||||
bne updateDiskState_813AD1E4
|
||||
bne updateDiskState_case2_doOut
|
||||
lwz r4, 0x84(r28)
|
||||
lbz r0, 0x1b81(r4)
|
||||
cmpwi r0, 0x0
|
||||
beq updateDiskState_813AD2C8
|
||||
updateDiskState_813AD1E4:
|
||||
beq updateDiskState_done
|
||||
updateDiskState_case2_doOut:
|
||||
lwz r3, 0xa0(r3)
|
||||
lwz r0, 0x14(r3)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
mr r3, r31
|
||||
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
|
||||
lwz r3, 0x90(r31)
|
||||
bl changeDisk__Q33ipl5scene10ChannelObjFv
|
||||
li r0, 0x6
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD210:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case3:
|
||||
cmpwi r27, 0x3
|
||||
bne updateDiskState_813AD228
|
||||
bne updateDiskState_case3_doOut
|
||||
lwz r4, 0x84(r28)
|
||||
lbz r0, 0x1b81(r4)
|
||||
cmpwi r0, 0x0
|
||||
beq updateDiskState_813AD2C8
|
||||
updateDiskState_813AD228:
|
||||
beq updateDiskState_done
|
||||
updateDiskState_case3_doOut:
|
||||
lwz r3, 0xa0(r3)
|
||||
lwz r0, 0x14(r3)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
mr r3, r31
|
||||
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
|
||||
lwz r3, 0x90(r31)
|
||||
bl changeDisk__Q33ipl5scene10ChannelObjFv
|
||||
li r0, 0x6
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD254:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case4:
|
||||
lwz r4, 0x8c(r3)
|
||||
lwz r0, 0x14(r4)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
li r0, 0x5
|
||||
stw r0, 0xf0(r3)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD270:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case5:
|
||||
cmpwi r27, 0x6
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
lwz r4, 0xa0(r3)
|
||||
lwz r0, 0x14(r4)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
bl startDiskOutEvent__Q33ipl5scene13ChannelSelectFv
|
||||
lwz r3, 0x90(r31)
|
||||
bl changeDisk__Q33ipl5scene10ChannelObjFv
|
||||
li r0, 0x6
|
||||
stw r0, 0xf0(r31)
|
||||
b updateDiskState_813AD2C8
|
||||
updateDiskState_813AD2A0:
|
||||
b updateDiskState_done
|
||||
updateDiskState_case6:
|
||||
lwz r4, 0x8c(r3)
|
||||
lwz r0, 0x14(r4)
|
||||
cmpwi r0, 0x1
|
||||
beq updateDiskState_813AD2C8
|
||||
beq updateDiskState_done
|
||||
lwz r3, 0x90(r3)
|
||||
bl destroyDiskLayout__Q33ipl5scene10ChannelObjFv
|
||||
lwz r3, 0x90(r31)
|
||||
bl resetDiskTitleName__Q33ipl5scene10ChannelObjFv
|
||||
li r0, 0x0
|
||||
stw r0, 0xf0(r31)
|
||||
updateDiskState_813AD2C8:
|
||||
updateDiskState_done:
|
||||
addi r11, r1, 0x20
|
||||
bl _restgpr_27
|
||||
lwz r0, 0x24(r1)
|
||||
|
||||
@@ -934,7 +934,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" bool iplSDMemory_813EE358(const SDMemory* memory,
|
||||
extern "C" bool iplSDMemory_containsTitleId(const SDMemory* memory,
|
||||
ESTitleId titleId,
|
||||
const ESTitleId* titleIds, u32 titleCount) {
|
||||
for (u32 i = 0; i < titleCount; i++) {
|
||||
@@ -951,7 +951,7 @@ namespace ipl {
|
||||
s32 result = mpSDChannelSelect->getWorker()->get_async_result();
|
||||
if (result == 0) {
|
||||
ESTitleId titleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDMemory_813EE358(this, titleId,
|
||||
if (iplSDMemory_containsTitleId(this, titleId,
|
||||
mNandTitleIds, mNandTitleCount)) {
|
||||
mDialogState = 17;
|
||||
} else {
|
||||
@@ -984,8 +984,8 @@ namespace ipl {
|
||||
swprintf(mCurrentTitleName, 0x107f, L"%ls\n%ls", titleName, message);
|
||||
System::getDialog()->setTitleForSDMemory(mCurrentTitleName);
|
||||
|
||||
if (iplSDMemory_813EE358(this, mTitleIds[mCurrentTitle], mSDTitleIds, mTitleNameCount) ||
|
||||
iplSDMemory_813EE358(this, mTitleIds[mCurrentTitle], mNandTitleIds, mNandTitleCount)) {
|
||||
if (iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mSDTitleIds, mTitleNameCount) ||
|
||||
iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mNandTitleIds, mNandTitleCount)) {
|
||||
ESTitleId titleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDChannelSelect_813DB478(mpSDChannelSelect, titleId)) {
|
||||
mDialogState = 14;
|
||||
@@ -1064,7 +1064,7 @@ namespace ipl {
|
||||
mCurrentTitle++;
|
||||
if (mTitleCount > mCurrentTitle) {
|
||||
ESTitleId nextTitleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDMemory_813EE358(this, nextTitleId,
|
||||
if (iplSDMemory_containsTitleId(this, nextTitleId,
|
||||
mNandTitleIds, mNandTitleCount)) {
|
||||
mDialogState = 17;
|
||||
} else {
|
||||
|
||||
@@ -49,42 +49,42 @@ namespace ipl {
|
||||
};
|
||||
|
||||
static const f32 scThumbnailOffsets[][2] = {{64.0f, 48.0f}, {85.0f, 48.0f}};
|
||||
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
EGG::ExpHeap* secondHeap) NO_INLINE;
|
||||
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, bool request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3580(const layout::Object* layout) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3858(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" f32 iplSDChannelObj_813E3920(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" f32 iplSDChannelObj_813E3A84(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3B1C(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3BA0(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3C58(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3C9C(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3E38(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3F28(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E3F74(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int index) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E413C(SDChannelObj* channel, const wchar_t* text) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E4410(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E4558(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E4704(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E481C(SDChannelObj* channel, layout::Object* layout) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_813E49A8(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" BOOL iplSDChannelObj_813E4A54(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_syncLayoutsToPane(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_createPageLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setPageTranslate(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setPageAnim(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_updatePageAnim(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_playPageAnimator(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_createDialogLayout(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int index) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setBalloonText(SDChannelObj* channel, const wchar_t* text) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_positionDialog(SDChannelObj* channel, const nw4r::math::VEC3& vec) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_setDialogAnim(SDChannelObj* channel, int request) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_updateDialogAnim(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_findNewMessageGroup(SDChannelObj* channel, layout::Object* layout) NO_INLINE;
|
||||
extern "C" void iplSDChannelObj_updateNewMessage(SDChannelObj* channel) NO_INLINE;
|
||||
extern "C" BOOL iplSDChannelObj_checkNewMessage(SDChannelObj* channel) NO_INLINE;
|
||||
|
||||
SDChannelObj::SDChannelObj(EGG::Heap* heap, int page, int index)
|
||||
: mpHeap(heap), mpDialogHeap(NULL), mpChannelHeap(NULL), mState(0), mPage(page), mIndex(index),
|
||||
@@ -112,42 +112,42 @@ namespace ipl {
|
||||
if (mpDialogLayout != NULL)
|
||||
delete mpDialogLayout;
|
||||
}
|
||||
extern "C" void iplSDChannelObj_813E3104(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_activateIfIdle(SDChannelObj* channel) {
|
||||
if (channel->mState == 0)
|
||||
channel->mState = 2;
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E311C(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
extern "C" void iplSDChannelObj_setHeaps(SDChannelObj* channel, EGG::ExpHeap* firstHeap,
|
||||
EGG::ExpHeap* secondHeap) {
|
||||
channel->mpDialogHeap = firstHeap;
|
||||
channel->mpChannelHeap = secondHeap;
|
||||
}
|
||||
|
||||
extern "C" void* iplSDChannelObj_813E3128(SDChannelObj* channel) {
|
||||
extern "C" void* iplSDChannelObj_getOrAllocThumbnailData(SDChannelObj* channel) {
|
||||
if (channel->mpThumbnailData == NULL)
|
||||
channel->mpThumbnailData = new (channel->mpHeap, 32) u8[0x19000];
|
||||
return channel->mpThumbnailData;
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3178(SDChannelObj* channel, nw4r::lyt::Pane* pane) {
|
||||
extern "C" void iplSDChannelObj_setPane(SDChannelObj* channel, nw4r::lyt::Pane* pane) {
|
||||
channel->mpPane = pane;
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3180(SDChannelObj* channel, nand::LayoutFile* layoutFile) {
|
||||
extern "C" void iplSDChannelObj_setLayoutFile(SDChannelObj* channel, nand::LayoutFile* layoutFile) {
|
||||
if (!SDChannelSelect::isChannelReady(channel)) {
|
||||
channel->mpLayoutFile = layoutFile;
|
||||
if (channel->mpPageLayout == NULL)
|
||||
iplSDChannelObj_813E3BA0(channel);
|
||||
iplSDChannelObj_createPageLayout(channel);
|
||||
if (channel->mpDialogLayout == NULL)
|
||||
iplSDChannelObj_813E3F74(channel);
|
||||
iplSDChannelObj_createDialogLayout(channel);
|
||||
if (channel->mState == 2 || channel->mState == 1 && channel->mpPaneAnimator->isFinished()) {
|
||||
iplSDChannelObj_813E3858(channel);
|
||||
iplSDChannelObj_createBaseLayout(channel);
|
||||
channel->mState = 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E322C(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_calc(SDChannelObj* channel) {
|
||||
switch (channel->mState) {
|
||||
case 0:
|
||||
channel->mState = 2;
|
||||
@@ -157,25 +157,25 @@ namespace ipl {
|
||||
break;
|
||||
channel->mState = 2;
|
||||
case 2:
|
||||
iplSDChannelObj_813E3858(channel);
|
||||
iplSDChannelObj_createBaseLayout(channel);
|
||||
channel->mState = 3;
|
||||
break;
|
||||
case 3:
|
||||
iplSDChannelObj_813E3B1C(channel);
|
||||
iplSDChannelObj_syncLayoutsToPane(channel);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E32C8(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_drawBase(SDChannelObj* channel) {
|
||||
if (SDChannelSelect::isChannelReady(channel))
|
||||
channel->mpBaseLayout->draw();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3304(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_drawPage(SDChannelObj* channel) {
|
||||
channel->mpPageLayout->draw();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E330C(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_drawDialog(SDChannelObj* channel) {
|
||||
if (channel->mpDialogLayout != NULL)
|
||||
channel->mpDialogLayout->draw();
|
||||
}
|
||||
@@ -184,14 +184,14 @@ namespace ipl {
|
||||
return (nw4r::math::VEC3&)mpBaseLayout->GetRootPane()->GetTranslate();
|
||||
}
|
||||
|
||||
extern "C" bool iplSDChannelObj_813E3330(SDChannelObj* channel) {
|
||||
extern "C" bool iplSDChannelObj_hasAppMeta(SDChannelObj* channel) {
|
||||
if (channel->mStateFlags == 0 || channel->mStateFlags == 3)
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3354(SDChannelObj* channel, int request) {
|
||||
extern "C" void iplSDChannelObj_startAppear(SDChannelObj* channel, int request) {
|
||||
if (request & 0x10000U) {
|
||||
channel->mAnimationState = 0;
|
||||
} else if (request & 0x20000U) {
|
||||
@@ -201,14 +201,14 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (!(request & 1)) {
|
||||
iplSDChannelObj_813E3C9C(channel, 1);
|
||||
iplSDChannelObj_setPageAnim(channel, 1);
|
||||
}
|
||||
if (!(request & 2)) {
|
||||
iplSDChannelObj_813E4558(channel, 1);
|
||||
iplSDChannelObj_setDialogAnim(channel, 1);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E33EC(SDChannelObj* channel, int request) {
|
||||
extern "C" void iplSDChannelObj_startDisappear(SDChannelObj* channel, int request) {
|
||||
if (request & 0x10000U) {
|
||||
channel->mAnimationState = 0;
|
||||
} else if (request & 0x20000U) {
|
||||
@@ -218,44 +218,44 @@ namespace ipl {
|
||||
}
|
||||
|
||||
if (!(request & 1)) {
|
||||
iplSDChannelObj_813E3C9C(channel, 3);
|
||||
iplSDChannelObj_setPageAnim(channel, 3);
|
||||
}
|
||||
if (!(request & 2)) {
|
||||
iplSDChannelObj_813E4558(channel, 4);
|
||||
iplSDChannelObj_setDialogAnim(channel, 4);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3480(SDChannelObj* channel, bool request) {
|
||||
extern "C" void iplSDChannelObj_setSelected(SDChannelObj* channel, bool request) {
|
||||
if (request) {
|
||||
iplSDChannelObj_813E3C9C(channel, 1);
|
||||
iplSDChannelObj_setPageAnim(channel, 1);
|
||||
channel->mAnimationState = 1;
|
||||
} else {
|
||||
iplSDChannelObj_813E3C9C(channel, 0);
|
||||
iplSDChannelObj_setPageAnim(channel, 0);
|
||||
channel->mAnimationState = 0;
|
||||
}
|
||||
|
||||
iplSDChannelObj_813E4558(channel, 0);
|
||||
iplSDChannelObj_setDialogAnim(channel, 0);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E34E0(SDChannelObj* channel) {
|
||||
iplSDChannelObj_813E3C9C(channel, 4);
|
||||
extern "C" void iplSDChannelObj_playPageHide(SDChannelObj* channel) {
|
||||
iplSDChannelObj_setPageAnim(channel, 4);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E34E8(SDChannelObj* channel, int request) {
|
||||
iplSDChannelObj_813E3C9C(channel, 0);
|
||||
extern "C" void iplSDChannelObj_resetPageAnim(SDChannelObj* channel, int request) {
|
||||
iplSDChannelObj_setPageAnim(channel, 0);
|
||||
if (request) {
|
||||
channel->mAnimationState = 0;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, bool request) {
|
||||
iplSDChannelObj_813E4558(channel, 0);
|
||||
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, bool request) {
|
||||
iplSDChannelObj_setDialogAnim(channel, 0);
|
||||
if (request) {
|
||||
channel->mAnimationState = 0;
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3580(const layout::Object* layout) {
|
||||
extern "C" void iplSDChannelObj_applyLanguageGroups(const layout::Object* layout) {
|
||||
int lang = System::getLanguage();
|
||||
const char* langGroup = scLangGroups[lang];
|
||||
char availableLanguages[10][4] = {};
|
||||
@@ -319,18 +319,18 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3858(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_createBaseLayout(SDChannelObj* channel) {
|
||||
bool adjust = false;
|
||||
if (channel->mpDialogLayout == NULL)
|
||||
iplSDChannelObj_813E3F74(channel);
|
||||
iplSDChannelObj_createDialogLayout(channel);
|
||||
f32 frame;
|
||||
if (iplSDChannelObj_813E3330(channel))
|
||||
frame = iplSDChannelObj_813E3920(channel);
|
||||
if (iplSDChannelObj_hasAppMeta(channel))
|
||||
frame = iplSDChannelObj_createIconLayout(channel);
|
||||
else {
|
||||
frame = iplSDChannelObj_813E3A84(channel);
|
||||
frame = iplSDChannelObj_createMenuLayout(channel);
|
||||
adjust = true;
|
||||
}
|
||||
iplSDChannelObj_813E3B1C(channel);
|
||||
iplSDChannelObj_syncLayoutsToPane(channel);
|
||||
if (channel->mpBaseAnimator != NULL)
|
||||
channel->mpBaseAnimator->play();
|
||||
channel->mpBaseLayout->finishBinding();
|
||||
@@ -340,11 +340,11 @@ namespace ipl {
|
||||
channel->mpBaseLayout->adjustHeap();
|
||||
}
|
||||
|
||||
extern "C" f32 iplSDChannelObj_813E3920(SDChannelObj* channel) {
|
||||
extern "C" f32 iplSDChannelObj_createIconLayout(SDChannelObj* channel) {
|
||||
f32 frame = 0.0f;
|
||||
channel->mpBaseLayout =
|
||||
layout::Object::create(channel->mpHeap, 0x8000, channel->mpThumbnailData, "arc", "icon.brlyt");
|
||||
iplSDChannelObj_813E3580(channel->mpBaseLayout);
|
||||
iplSDChannelObj_applyLanguageGroups(channel->mpBaseLayout);
|
||||
if (channel->mpBaseLayout->searchFile("icon.brlan"))
|
||||
channel->mpBaseAnimator = channel->mpBaseLayout->bind("icon.brlan");
|
||||
else if (channel->mpBaseLayout->searchFile("icon_Whole.brlan"))
|
||||
@@ -357,30 +357,30 @@ namespace ipl {
|
||||
frame = minimum + (System::getRndm()->get_u16() % (u16)(maximum - minimum));
|
||||
}
|
||||
if (channel->mStateFlags == 0) {
|
||||
iplSDChannelObj_813E481C(channel, channel->mpBaseLayout);
|
||||
iplSDChannelObj_findNewMessageGroup(channel, channel->mpBaseLayout);
|
||||
channel->mNewMessageState = 1;
|
||||
}
|
||||
return frame;
|
||||
}
|
||||
|
||||
extern "C" f32 iplSDChannelObj_813E3A84(SDChannelObj* channel) {
|
||||
extern "C" f32 iplSDChannelObj_createMenuLayout(SDChannelObj* channel) {
|
||||
channel->mpBaseLayout =
|
||||
layout::Object::create(channel->mpHeap, 0x8000, channel->mpLayoutFile, "arc", "mn_SdcardMenu_d.brlyt");
|
||||
channel->mpBaseAnimator = channel->mpBaseLayout->bind("mn_SdcardMenu_d.brlan");
|
||||
return System::getRndm()->get_u16() % 2000;
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3B1C(SDChannelObj* channel) {
|
||||
iplSDChannelObj_813E49A8(channel);
|
||||
extern "C" void iplSDChannelObj_syncLayoutsToPane(SDChannelObj* channel) {
|
||||
iplSDChannelObj_updateNewMessage(channel);
|
||||
nw4r::math::VEC3 position(0, 0, 0);
|
||||
MTXMultVec(channel->mpPane->GetGlobalMtx(), position, position);
|
||||
channel->mpBaseLayout->GetRootPane()->SetTranslate(position);
|
||||
channel->mpBaseLayout->calc();
|
||||
iplSDChannelObj_813E3C58(channel, position);
|
||||
iplSDChannelObj_813E4410(channel, position);
|
||||
iplSDChannelObj_setPageTranslate(channel, position);
|
||||
iplSDChannelObj_positionDialog(channel, position);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3BA0(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_createPageLayout(SDChannelObj* channel) {
|
||||
channel->mpPageLayout = new (channel->mpDialogHeap, 4)
|
||||
layout::Object(channel->mpDialogHeap, channel->mpLayoutFile, "arc", "my_IplTop_d.brlyt");
|
||||
|
||||
@@ -388,17 +388,17 @@ namespace ipl {
|
||||
channel->mpPageAnimators[i] = channel->mpPageLayout->bind(scCursorAnims[i], scCursur, false);
|
||||
}
|
||||
|
||||
iplSDChannelObj_813E3C9C(channel, 0);
|
||||
iplSDChannelObj_setPageAnim(channel, 0);
|
||||
channel->mpPageLayout->finishBinding();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3C58(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
|
||||
extern "C" void iplSDChannelObj_setPageTranslate(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
|
||||
channel->mpPageLayout->GetRootPane()->SetTranslate(vec);
|
||||
iplSDChannelObj_813E3E38(channel);
|
||||
iplSDChannelObj_updatePageAnim(channel);
|
||||
channel->mpPageLayout->calc();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3C9C(SDChannelObj* channel, int request) {
|
||||
extern "C" void iplSDChannelObj_setPageAnim(SDChannelObj* channel, int request) {
|
||||
if (request == 0) {
|
||||
channel->mPageAnimation = 0;
|
||||
channel->mPageAnimationFrame = 0;
|
||||
@@ -413,14 +413,14 @@ namespace ipl {
|
||||
channel->mPageAnimation = 4;
|
||||
channel->mPageAnimationFrame = 0;
|
||||
channel->mpPageLayout->GetRootPane()->SetVisible(true);
|
||||
iplSDChannelObj_813E3F28(channel, 2);
|
||||
iplSDChannelObj_playPageAnimator(channel, 2);
|
||||
} else {
|
||||
switch (channel->mPageAnimation) {
|
||||
case 0: {
|
||||
if (request == 1) {
|
||||
channel->mPageAnimation = 1;
|
||||
channel->mpPageLayout->GetRootPane()->SetVisible(true);
|
||||
iplSDChannelObj_813E3F28(channel, 1);
|
||||
iplSDChannelObj_playPageAnimator(channel, 1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -437,7 +437,7 @@ namespace ipl {
|
||||
case 2: {
|
||||
if (request == 3) {
|
||||
channel->mPageAnimation = 3;
|
||||
iplSDChannelObj_813E3F28(channel, 0);
|
||||
iplSDChannelObj_playPageAnimator(channel, 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -453,7 +453,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3E38(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_updatePageAnim(SDChannelObj* channel) {
|
||||
switch (channel->mPageAnimation) {
|
||||
case 1: {
|
||||
if (!channel->mpPageAnimators[1]->isPlaying()) {
|
||||
@@ -472,7 +472,7 @@ namespace ipl {
|
||||
break;
|
||||
}
|
||||
if (prev == 3) {
|
||||
iplSDChannelObj_813E3C9C(channel, 3);
|
||||
iplSDChannelObj_setPageAnim(channel, 3);
|
||||
channel->mPageAnimationFrame = 0;
|
||||
}
|
||||
}
|
||||
@@ -481,46 +481,46 @@ namespace ipl {
|
||||
case 3: {
|
||||
if (!channel->mpPageAnimators[0]->isPlaying()) {
|
||||
int prev = channel->mPageAnimationFrame;
|
||||
iplSDChannelObj_813E3C9C(channel, 0);
|
||||
iplSDChannelObj_setPageAnim(channel, 0);
|
||||
if (prev == 1) {
|
||||
iplSDChannelObj_813E3C9C(channel, 1);
|
||||
iplSDChannelObj_setPageAnim(channel, 1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
if (!channel->mpPageAnimators[2]->isPlaying()) {
|
||||
iplSDChannelObj_813E3C9C(channel, 0);
|
||||
iplSDChannelObj_setPageAnim(channel, 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3F28(SDChannelObj* channel, int request) {
|
||||
extern "C" void iplSDChannelObj_playPageAnimator(SDChannelObj* channel, int request) {
|
||||
channel->mpPageAnimators[request]->setAnmType(ANIM_TYPE_FORWARD);
|
||||
channel->mpPageAnimators[request]->play();
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3F74(SDChannelObj* channel) {
|
||||
if (!iplSDChannelObj_813E3330(channel)) {
|
||||
extern "C" void iplSDChannelObj_createDialogLayout(SDChannelObj* channel) {
|
||||
if (!iplSDChannelObj_hasAppMeta(channel)) {
|
||||
channel->mpDialogLayout = NULL;
|
||||
return;
|
||||
}
|
||||
channel->mpDialogLayout = new (channel->mpChannelHeap, 4)
|
||||
layout::Object(channel->mpChannelHeap, channel->mpLayoutFile, "arc", "my_IplTopBalloon_a.brlyt");
|
||||
if (channel->mStateFlags == 0)
|
||||
iplSDChannelObj_813E413C(channel, iplSDChannelObj_813E4060(channel, 0));
|
||||
iplSDChannelObj_setBalloonText(channel, iplSDChannelObj_getLocalizedName(channel, 0));
|
||||
else if (channel->mStateFlags == 3)
|
||||
iplSDChannelObj_813E413C(channel, scUnknownName);
|
||||
iplSDChannelObj_setBalloonText(channel, scUnknownName);
|
||||
else
|
||||
iplSDChannelObj_813E413C(channel, L"");
|
||||
iplSDChannelObj_setBalloonText(channel, L"");
|
||||
channel->mpDialogAnimator = channel->mpDialogLayout->bind("my_IplTopBalloon_a_BalloonInOut.brlan");
|
||||
iplSDChannelObj_813E4558(channel, 0);
|
||||
iplSDChannelObj_setDialogAnim(channel, 0);
|
||||
channel->mpDialogLayout->finishBinding();
|
||||
}
|
||||
|
||||
extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int index) {
|
||||
extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int index) {
|
||||
if (channel->mAppMeta.metaHdr.names[System::getLanguage()][index][0] != 0)
|
||||
return channel->mAppMeta.metaHdr.names[System::getLanguage()][index];
|
||||
const u32* languages = scLangLookup[System::getRegion()];
|
||||
@@ -533,7 +533,7 @@ namespace ipl {
|
||||
return channel->mAppMeta.metaHdr.names[languages[0]][index];
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E413C(SDChannelObj* channel, const wchar_t* text) {
|
||||
extern "C" void iplSDChannelObj_setBalloonText(SDChannelObj* channel, const wchar_t* text) {
|
||||
nw4r::lyt::TextBox* textPane =
|
||||
nw4r::ut::DynamicCast<nw4r::lyt::TextBox*>(channel->mpDialogLayout->FindPaneByName(scBalloon));
|
||||
|
||||
@@ -585,7 +585,7 @@ namespace ipl {
|
||||
channel->mpDialogLayout->FindPaneByName(scBase)->SetSize(newSize);
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E4410(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
|
||||
extern "C" void iplSDChannelObj_positionDialog(SDChannelObj* channel, const nw4r::math::VEC3& vec) {
|
||||
if (channel->mpDialogLayout != NULL) {
|
||||
nw4r::lyt::Size size;
|
||||
|
||||
@@ -611,12 +611,12 @@ namespace ipl {
|
||||
const nw4r::math::VEC3 pos(vec.x + horizontalOffset, vec.y + verticalOffset, 0.0f);
|
||||
channel->mpDialogLayout->GetRootPane()->SetTranslate(pos);
|
||||
|
||||
iplSDChannelObj_813E4704(channel);
|
||||
iplSDChannelObj_updateDialogAnim(channel);
|
||||
channel->mpDialogLayout->calc();
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E4558(SDChannelObj* channel, int request) {
|
||||
extern "C" void iplSDChannelObj_setDialogAnim(SDChannelObj* channel, int request) {
|
||||
if (channel->mpDialogLayout != NULL) {
|
||||
if (request == 0) {
|
||||
channel->mDialogState = 0;
|
||||
@@ -676,11 +676,11 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E4704(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_updateDialogAnim(SDChannelObj* channel) {
|
||||
switch (channel->mDialogState) {
|
||||
case 1: {
|
||||
if ((reinterpret_cast<u32&>(channel->mDialogTimer) += 1) >= 20.0f) {
|
||||
iplSDChannelObj_813E4558(channel, 2);
|
||||
iplSDChannelObj_setDialogAnim(channel, 2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -690,9 +690,9 @@ namespace ipl {
|
||||
case 2: {
|
||||
if (!channel->mpDialogLayout->isPlaying(0)) {
|
||||
int prev = channel->mDialogFrame;
|
||||
iplSDChannelObj_813E4558(channel, 3);
|
||||
iplSDChannelObj_setDialogAnim(channel, 3);
|
||||
if (prev == 4) {
|
||||
iplSDChannelObj_813E4558(channel, 4);
|
||||
iplSDChannelObj_setDialogAnim(channel, 4);
|
||||
channel->mDialogFrame = 0;
|
||||
}
|
||||
}
|
||||
@@ -701,9 +701,9 @@ namespace ipl {
|
||||
case 4: {
|
||||
if (!channel->mpDialogLayout->isPlaying(0)) {
|
||||
int prev = channel->mDialogFrame;
|
||||
iplSDChannelObj_813E4558(channel, 0);
|
||||
iplSDChannelObj_setDialogAnim(channel, 0);
|
||||
if (prev == 1) {
|
||||
iplSDChannelObj_813E4558(channel, 1);
|
||||
iplSDChannelObj_setDialogAnim(channel, 1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -711,7 +711,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E481C(SDChannelObj* channel, layout::Object* layout) {
|
||||
extern "C" void iplSDChannelObj_findNewMessageGroup(SDChannelObj* channel, layout::Object* layout) {
|
||||
char groupName[20];
|
||||
char** lookup;
|
||||
nw4r::lyt::Group* group;
|
||||
@@ -752,11 +752,11 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void iplSDChannelObj_813E49A8(SDChannelObj* channel) {
|
||||
extern "C" void iplSDChannelObj_updateNewMessage(SDChannelObj* channel) {
|
||||
if (System::getNwc24Manager() != NULL) {
|
||||
switch (channel->mNewMessageState) {
|
||||
case 1: {
|
||||
if (iplSDChannelObj_813E4A54(channel)) {
|
||||
if (iplSDChannelObj_checkNewMessage(channel)) {
|
||||
channel->mNewMessageState = 2;
|
||||
channel->mNewMessageFrame = 0;
|
||||
}
|
||||
@@ -772,7 +772,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" BOOL iplSDChannelObj_813E4A54(SDChannelObj* channel) {
|
||||
extern "C" BOOL iplSDChannelObj_checkNewMessage(SDChannelObj* channel) {
|
||||
if (System::getNwc24Manager() == NULL || !System::getNwc24Manager()->getNewTitleTbl(NULL)) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@@ -107,13 +107,8 @@ namespace ipl {
|
||||
|
||||
|
||||
|
||||
extern "C" bool iplSDChannelSelect_813DD240(
|
||||
SDChannelSelect* scene, const s32* requiredBytes, const s32* requiredBlocks,
|
||||
ESTitleId* titleIds, char* titleNames, u32* titleCount);
|
||||
|
||||
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3534(SDChannelObj* channel, int enabled);
|
||||
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, int enabled);
|
||||
|
||||
SDChannelSelect::SDChannelSelect(EGG::Heap* heap)
|
||||
: FaderSceneBase(heap),
|
||||
@@ -213,7 +208,7 @@ namespace ipl {
|
||||
SDChannelObj* channel = NULL;
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
iplSDChannelObj_813E3104(channel);
|
||||
iplSDChannelObj_activateIfIdle(channel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -602,7 +597,7 @@ namespace ipl {
|
||||
mpCurrentLoadedChannel = loadedChannel;
|
||||
mpSDWorker->get_sd_app_meta_async(
|
||||
static_cast<ESTitleId32>(notice.titleId),
|
||||
static_cast<u8*>(iplSDChannelObj_813E3128(loadedChannel)),
|
||||
static_cast<u8*>(iplSDChannelObj_getOrAllocThumbnailData(loadedChannel)),
|
||||
&loadedChannel->mAppMeta);
|
||||
mWorkerCommand = 3;
|
||||
}
|
||||
@@ -845,9 +840,9 @@ namespace ipl {
|
||||
SDChannelObj* completed = mpCurrentLoadedChannel;
|
||||
completed->mStateFlags = 0;
|
||||
completed->mState = 2;
|
||||
DCFlushRange(iplSDChannelObj_813E3128(mpCurrentLoadedChannel), 0x19000);
|
||||
DCFlushRange(iplSDChannelObj_getOrAllocThumbnailData(mpCurrentLoadedChannel), 0x19000);
|
||||
} else {
|
||||
memcpy(iplSDChannelObj_813E3128(mpCurrentLoadedChannel),
|
||||
memcpy(iplSDChannelObj_getOrAllocThumbnailData(mpCurrentLoadedChannel),
|
||||
mpCorruptIconFile->getBuffer(), mpCorruptIconFile->getLength());
|
||||
memset(&mpCurrentLoadedChannel->mAppMeta, 0, sizeof(mpCurrentLoadedChannel->mAppMeta));
|
||||
SDChannelObj* completed = mpCurrentLoadedChannel;
|
||||
@@ -1835,9 +1830,9 @@ namespace ipl {
|
||||
int channelIndex = channel->getIndex();
|
||||
if (channelPage == mCurrentPage) {
|
||||
if (mState != 5 || channelIndex != mCurrentChannelIndex) {
|
||||
iplSDChannelObj_813E34E8(channel, 1);
|
||||
iplSDChannelObj_resetPageAnim(channel, 1);
|
||||
}
|
||||
iplSDChannelObj_813E3534(channel, 1);
|
||||
iplSDChannelObj_resetDialogAnim(channel, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2059,19 +2054,19 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void SDChannelSelect::updateChannelObject(SDChannelObj* channel) {
|
||||
iplSDChannelObj_813E3104(channel);
|
||||
iplSDChannelObj_813E311C(channel, mpDialogHeap, mpChannelHeap);
|
||||
iplSDChannelObj_813E3178(channel,
|
||||
iplSDChannelObj_activateIfIdle(channel);
|
||||
iplSDChannelObj_setHeaps(channel, mpDialogHeap, mpChannelHeap);
|
||||
iplSDChannelObj_setPane(channel,
|
||||
getChannelBasePane(channel->getPage(), channel->getIndex(),
|
||||
mCurrentPage));
|
||||
iplSDChannelObj_813E3180(channel, mpLayoutFile);
|
||||
iplSDChannelObj_setLayoutFile(channel, mpLayoutFile);
|
||||
}
|
||||
|
||||
void SDChannelSelect::calcChannelObjects() {
|
||||
SDChannelObj* channel = NULL;
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
iplSDChannelObj_813E322C(channel);
|
||||
iplSDChannelObj_calc(channel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2086,9 +2081,9 @@ namespace ipl {
|
||||
}
|
||||
|
||||
setChannelScissor(channel);
|
||||
iplSDChannelObj_813E32C8(channel);
|
||||
iplSDChannelObj_drawBase(channel);
|
||||
|
||||
if (iplSDChannelObj_813E3330(channel)) {
|
||||
if (iplSDChannelObj_hasAppMeta(channel)) {
|
||||
switch (mState) {
|
||||
case 15:
|
||||
case 16:
|
||||
@@ -2154,7 +2149,7 @@ namespace ipl {
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
if (hasChannelObject(channel->getPage(), channel->getIndex())) {
|
||||
iplSDChannelObj_813E3304(channel);
|
||||
iplSDChannelObj_drawPage(channel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2162,7 +2157,7 @@ namespace ipl {
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
if (hasChannelObject(channel->getPage(), channel->getIndex())) {
|
||||
iplSDChannelObj_813E330C(channel);
|
||||
iplSDChannelObj_drawDialog(channel);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2296,7 +2291,7 @@ namespace ipl {
|
||||
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
int titleIndex = channel->getPage() * MAX_CHANNEL_INDEX + channel->getIndex();
|
||||
if (!iplSDChannelObj_813E3330(channel) && mpChannelTitleIds[titleIndex] != 0 &&
|
||||
if (!iplSDChannelObj_hasAppMeta(channel) && mpChannelTitleIds[titleIndex] != 0 &&
|
||||
mbNeedsRefresh) {
|
||||
channel->mStateFlags = 2;
|
||||
}
|
||||
@@ -2391,7 +2386,7 @@ namespace ipl {
|
||||
while (channel = static_cast<SDChannelObj*>(
|
||||
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
if (iplSDChannelObj_813E3330(channel)) {
|
||||
if (iplSDChannelObj_hasAppMeta(channel)) {
|
||||
SDChannelObj* previous = static_cast<SDChannelObj*>(
|
||||
nw4r::ut::List_GetPrev(&mChannelObjects, channel));
|
||||
nw4r::ut::List_Remove(&mChannelObjects, channel);
|
||||
@@ -2418,7 +2413,7 @@ namespace ipl {
|
||||
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
int channelIndex = channel->mPage * 12 + channel->mIndex;
|
||||
if (!iplSDChannelObj_813E3330(channel) &&
|
||||
if (!iplSDChannelObj_hasAppMeta(channel) &&
|
||||
mpChannelTitleIds[channelIndex] != 0) {
|
||||
channel->mStateFlags = 2;
|
||||
}
|
||||
@@ -2634,7 +2629,7 @@ namespace ipl {
|
||||
initPageAnimations(
|
||||
math::VEC3((nw4r::math::VEC3&)channel->mpBaseLayout->GetRootPane()->GetTranslate()),
|
||||
0);
|
||||
iplSDChannelObj_813E34E0(channel);
|
||||
iplSDChannelObj_playPageHide(channel);
|
||||
|
||||
SDButton* button = static_cast<SDButton*>(System::getSceneManager()->getScene(0x24));
|
||||
if (mbLeftArrowVisible) {
|
||||
@@ -2982,7 +2977,7 @@ namespace ipl {
|
||||
while (channel = static_cast<SDChannelObj*>(
|
||||
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
iplSDChannelObj_813E34E8(channel, 1);
|
||||
iplSDChannelObj_resetPageAnim(channel, 1);
|
||||
}
|
||||
|
||||
for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) {
|
||||
@@ -3004,7 +2999,7 @@ namespace ipl {
|
||||
while (channel = static_cast<SDChannelObj*>(
|
||||
nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
iplSDChannelObj_813E34E8(channel, 1);
|
||||
iplSDChannelObj_resetPageAnim(channel, 1);
|
||||
}
|
||||
|
||||
for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) {
|
||||
@@ -3066,10 +3061,10 @@ namespace ipl {
|
||||
} else {
|
||||
SDChannelObj* destination = findChannelObject(mDestinationPage, mDestinationIndex);
|
||||
|
||||
iplSDChannelObj_813E3178(
|
||||
iplSDChannelObj_setPane(
|
||||
static_cast<SDChannelObj*>(mpCurrentChannel),
|
||||
getChannelBasePane(mDestinationPage, mDestinationIndex, mCurrentPage));
|
||||
iplSDChannelObj_813E3178(
|
||||
iplSDChannelObj_setPane(
|
||||
destination, getChannelBasePane(mSourcePage, mSourceIndex, mCurrentPage));
|
||||
|
||||
SDChannelObj* current;
|
||||
@@ -3083,8 +3078,8 @@ namespace ipl {
|
||||
destination->mPage = sourcePage;
|
||||
destination->mIndex = sourceIndex;
|
||||
|
||||
iplSDChannelObj_813E322C(static_cast<SDChannelObj*>(mpCurrentChannel));
|
||||
iplSDChannelObj_813E322C(destination);
|
||||
iplSDChannelObj_calc(static_cast<SDChannelObj*>(mpCurrentChannel));
|
||||
iplSDChannelObj_calc(destination);
|
||||
|
||||
mpCurrentChannel = transitionAnimator;
|
||||
destination->mpBaseAnimator->setCurrentFrame(mpHelpLayout->getCurrentFrame());
|
||||
@@ -3208,7 +3203,7 @@ namespace ipl {
|
||||
if (isChannelMoveTarget(mCurrentPage, index) ||
|
||||
(mCurrentPage == mSourcePage && index == mSourceIndex)) {
|
||||
SDChannelObj* channel = findChannelObject(mCurrentPage, index);
|
||||
iplSDChannelObj_813E3354(channel, 2);
|
||||
iplSDChannelObj_startAppear(channel, 2);
|
||||
snd::getSystem()->startSE("WIPL_SE_CH_TARGETTING");
|
||||
controller->rumble(1);
|
||||
}
|
||||
@@ -3217,7 +3212,7 @@ namespace ipl {
|
||||
if (isChannelMoveTarget(mCurrentPage, index) ||
|
||||
(mCurrentPage == mSourcePage && index == mSourceIndex)) {
|
||||
SDChannelObj* channel = findChannelObject(mCurrentPage, index);
|
||||
iplSDChannelObj_813E33EC(channel, 2);
|
||||
iplSDChannelObj_startDisappear(channel, 2);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@@ -3297,7 +3292,7 @@ namespace ipl {
|
||||
int channelPage = channel->getPage();
|
||||
int channelIndex = channel->getIndex();
|
||||
bool selected = channelPage == page && channelIndex == index;
|
||||
iplSDChannelObj_813E3480(channel, selected);
|
||||
iplSDChannelObj_setSelected(channel, selected);
|
||||
}
|
||||
|
||||
snd::getSystem()->startSEwithPos("WIPL_SE_CH_HOLD", mPointerPosition.x);
|
||||
@@ -3333,7 +3328,7 @@ namespace ipl {
|
||||
SDChannelObj* channel = NULL;
|
||||
while (channel = static_cast<SDChannelObj*>(nw4r::ut::List_GetNext(&mChannelObjects, channel)),
|
||||
channel != NULL) {
|
||||
iplSDChannelObj_813E34E8(channel, 1);
|
||||
iplSDChannelObj_resetPageAnim(channel, 1);
|
||||
}
|
||||
|
||||
for (int index = 0; index < MAX_CHANNEL_INDEX; ++index) {
|
||||
@@ -3432,14 +3427,14 @@ namespace ipl {
|
||||
break;
|
||||
case ::gui::EventHandler::ON_POINT:
|
||||
if (mpScene->mState == 1 && SDChannelSelect::isChannelReady(channel)) {
|
||||
iplSDChannelObj_813E3354(channel, 0);
|
||||
iplSDChannelObj_startAppear(channel, 0);
|
||||
snd::getSystem()->startSE("WIPL_SE_CH_TARGETTING");
|
||||
controller->rumble(1);
|
||||
}
|
||||
break;
|
||||
case ::gui::EventHandler::ON_LEFT:
|
||||
if (mpScene->mState == 1 && SDChannelSelect::isChannelReady(channel)) {
|
||||
iplSDChannelObj_813E33EC(channel, 0);
|
||||
iplSDChannelObj_startDisappear(channel, 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -134,8 +134,8 @@ public:
|
||||
SDChannelTitle* mpScene;
|
||||
};
|
||||
|
||||
extern "C" void iplSDChannelObj_813E3580(layout::Object* layout);
|
||||
extern "C" const wchar_t* iplSDChannelObj_813E4060(SDChannelObj* channel, int nameIndex);
|
||||
extern "C" void iplSDChannelObj_applyLanguageGroups(layout::Object* layout);
|
||||
extern "C" const wchar_t* iplSDChannelObj_getLocalizedName(SDChannelObj* channel, int nameIndex);
|
||||
extern "C" bool iplSDChannelTitle_startZoomFade(SDChannelTitle* scene);
|
||||
extern "C" void iplSDChannelTitle_rebuildBannerLayout(SDChannelTitle* scene);
|
||||
extern "C" void iplSDChannelTitle_setPaneMessage(SDChannelTitle* scene, nw4r::lyt::Pane* pane, u32 message, bool allocate);
|
||||
@@ -311,9 +311,9 @@ FaderSceneCommand SDChannelTitle::calcNormal() {
|
||||
case 18: if (SCCheckStatus() != 1) { mState = 21; } break;
|
||||
case 19: iplSDChannelTitle_startCopyProgress(this); break;
|
||||
case 20: iplSDChannelTitle_updateCopyPrepare(this); break;
|
||||
case 23: iplSDChannelTitle_updateMemoryCalc(this); break;
|
||||
case 21: iplSDChannelTitle_updateEnqueueNotice(this); break;
|
||||
case 22: iplSDChannelTitle_updateCopyProgress(this); break;
|
||||
case 23: iplSDChannelTitle_updateMemoryCalc(this); break;
|
||||
case 24: iplSDChannelTitle_loadTitleBanner(this); break;
|
||||
case 25: iplSDChannelTitle_updateBannerLoad(this); break;
|
||||
case 26: iplSDChannelTitle_showCopyError(this); break;
|
||||
@@ -401,8 +401,8 @@ FaderSceneCommand SDChannelTitle::calcFadeout() {
|
||||
} title;
|
||||
title.id = channel->mAppMeta.titleId;
|
||||
wchar_t names[2][21];
|
||||
memcpy(names[0], iplSDChannelObj_813E4060(channel, 0), sizeof(names[0]));
|
||||
memcpy(names[1], iplSDChannelObj_813E4060(channel, 1), sizeof(names[1]));
|
||||
memcpy(names[0], iplSDChannelObj_getLocalizedName(channel, 0), sizeof(names[0]));
|
||||
memcpy(names[1], iplSDChannelObj_getLocalizedName(channel, 1), sizeof(names[1]));
|
||||
union MakerCode {
|
||||
u16 code;
|
||||
char bytes[2];
|
||||
@@ -537,7 +537,7 @@ extern "C" void iplSDChannelTitle_createBannerLayout(SDChannelTitle* scene) {
|
||||
if (scene->mpBannerFiles[scene->mLoadedIndex] && scene->mpBannerFiles[scene->mLoadedIndex]->checkData() == 1) {
|
||||
scene->mpBannerLayout = layout::Object::create(scene->mpBannerHeap, 0x40000,
|
||||
scene->mpBannerFiles[scene->mLoadedIndex], "arc", "banner.brlyt");
|
||||
iplSDChannelObj_813E3580(scene->mpBannerLayout);
|
||||
iplSDChannelObj_applyLanguageGroups(scene->mpBannerLayout);
|
||||
iplSDChannelTitle_bindBannerAnimations(scene);
|
||||
} else {
|
||||
scene->mpBannerLayout = NULL;
|
||||
@@ -552,15 +552,15 @@ extern "C" void iplSDChannelTitle_createIconLayout(SDChannelTitle* scene) {
|
||||
SDChannelObj* channel = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex);
|
||||
if (channel) {
|
||||
scene->mpIconLayout = layout::Object::create(scene->mpIconHeap, 0x8000,
|
||||
iplSDChannelObj_813E3128(channel), "arc", "icon.brlyt");
|
||||
iplSDChannelObj_813E3580(scene->mpIconLayout);
|
||||
iplSDChannelObj_getOrAllocThumbnailData(channel), "arc", "icon.brlyt");
|
||||
iplSDChannelObj_applyLanguageGroups(scene->mpIconLayout);
|
||||
if (scene->mpIconLayout->searchFile("icon.brlan")) {
|
||||
scene->mpIconLayout->bind("icon.brlan")->play();
|
||||
} else if (scene->mpIconLayout->searchFile("icon_Whole.brlan")) {
|
||||
scene->mpIconLayout->bind("icon_Whole.brlan")->play();
|
||||
}
|
||||
if (channel->mStateFlags == 0) {
|
||||
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(iplSDChannelObj_813E4060(channel, 0));
|
||||
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(iplSDChannelObj_getLocalizedName(channel, 0));
|
||||
} else {
|
||||
static_cast<nw4r::lyt::TextBox*>(scene->mpProgressLayout->FindPaneByName("T_title"))->SetString(sMissingTitle);
|
||||
}
|
||||
@@ -611,7 +611,7 @@ extern "C" void iplSDChannelTitle_updateChangeState(SDChannelTitle* scene) {
|
||||
++scene->mChangeFrame;
|
||||
if ((!scene->mpBannerFiles[1 - scene->mLoadedIndex] || scene->mpBannerFiles[1 - scene->mLoadedIndex]->isFinished()) &&
|
||||
(!scene->mpSoundFiles[1 - scene->mLoadedIndex] || scene->mpSoundFiles[1 - scene->mLoadedIndex]->isFinished()) &&
|
||||
iplSDChannelObj_813E3330(channel) && scene->mChangeFrame > 10 &&
|
||||
iplSDChannelObj_hasAppMeta(channel) && scene->mChangeFrame > 10 &&
|
||||
(!scene->mScriptEnabled || scene->mScriptState == 4)) {
|
||||
if (scene->mpBannerFiles[scene->mLoadedIndex]) {
|
||||
delete scene->mpBannerFiles[scene->mLoadedIndex];
|
||||
@@ -972,7 +972,7 @@ extern "C" void iplSDChannelTitle_tryLaunchSelected(SDChannelTitle* scene) {
|
||||
scene->mState = 1;
|
||||
} else {
|
||||
SDChannelObj* channel = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex);
|
||||
if (iplSDChannelObj_813E3330(channel)) {
|
||||
if (iplSDChannelObj_hasAppMeta(channel)) {
|
||||
iplSDChannelTitle_beginLaunch(scene, channel);
|
||||
}
|
||||
}
|
||||
@@ -1264,7 +1264,7 @@ extern "C" void iplSDChannelTitle_setPageAndIndex(SDChannelTitle* scene, int pag
|
||||
SDChannelObj* channel = scene->mpChannelSelect->findChannelObject(scene->mPage, scene->mIndex);
|
||||
scene->mPosition.x = SDChannelSelect::getChannelPanePosition(scene->mpChannelSelect, scene->mIndex).x;
|
||||
scene->mPosition.y = SDChannelSelect::getChannelPanePosition(scene->mpChannelSelect, scene->mIndex).y;
|
||||
if (iplSDChannelObj_813E3330(channel)) {
|
||||
if (iplSDChannelObj_hasAppMeta(channel)) {
|
||||
iplSDChannelTitle_beginLaunch(scene, channel);
|
||||
} else {
|
||||
scene->mState = 28;
|
||||
|
||||
@@ -64,6 +64,11 @@ namespace ipl {
|
||||
static s32 sAOSSState;
|
||||
static s32 sAOSSUnk;
|
||||
|
||||
struct AOSSStack {
|
||||
u32 storage[4080];
|
||||
u32 sentinel;
|
||||
};
|
||||
|
||||
class AOSSThread : public utility::ut_thread {
|
||||
public:
|
||||
AOSSThread(EGG::Heap* heap);
|
||||
@@ -84,7 +89,7 @@ namespace ipl {
|
||||
private:
|
||||
s32 mState; // 0x32C
|
||||
s32 mThreadPriority; // 0x330
|
||||
u8* mpStackBuffer; // 0x334
|
||||
AOSSStack* mpStack; // 0x334
|
||||
u8* mpHeapBuffer; // 0x338
|
||||
MEMHeapHandle mpExpHeap; // 0x33C
|
||||
AOSSConfig mAoss; // 0x340
|
||||
@@ -94,7 +99,7 @@ namespace ipl {
|
||||
mpExpHeap = NULL;
|
||||
sAOSSState = 0;
|
||||
mpHeapBuffer = (u8*)heap->alloc(0x40000, 0x20);
|
||||
mpStackBuffer = (u8*)heap->alloc(0x1000, 0x20);
|
||||
mpStack = (AOSSStack*)heap->alloc(0x1000, 0x20);
|
||||
}
|
||||
|
||||
void AOSSThread::destroy(int flag) {
|
||||
@@ -137,8 +142,8 @@ namespace ipl {
|
||||
mThreadPriority = OSGetThreadPriority(OSGetCurrentThread()) - 2;
|
||||
sAOSSState = 1;
|
||||
SOInit(&config);
|
||||
memset(mpStackBuffer, 0, 4);
|
||||
Create(mpStackBuffer, 0x1000, mThreadPriority, TRUE);
|
||||
memset(mpStack, 0, 4);
|
||||
Create(mpStack, 0x1000, mThreadPriority, TRUE);
|
||||
|
||||
OSRestoreInterrupts(level);
|
||||
return 1;
|
||||
@@ -178,7 +183,7 @@ namespace ipl {
|
||||
mAoss.unk_0x04 = 4;
|
||||
NETGetWirelessMacAddress(mAoss.mac);
|
||||
|
||||
*(u32*)(mpStackBuffer + 0x3FC0) = 0x97654321;
|
||||
mpStack->sentinel = 0x97654321;
|
||||
|
||||
mState = AOSSi_Init(&mAoss);
|
||||
AOSSi_EndLocal();
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
#define IPL_CONTROLLER_TRIVIAL_RECT_DTOR
|
||||
#include <nw4r/ut/Rect.h>
|
||||
#undef IPL_CONTROLLER_TRIVIAL_RECT_DTOR
|
||||
|
||||
#include "system/iplSystem.h"
|
||||
#include "system/iplNand.h"
|
||||
#include "utility/iplGraphics.h"
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& unk2,
|
||||
f32 unk3, f32 unk4)
|
||||
: unk_0x08(FALSE), mpText(NULL), mTextLen(0), mBalloonPos(unk2), unk_0x28(0), unk_0x2C(1), unk_0x30(unk3), unk_0x34(unk4),
|
||||
TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& initialPos,
|
||||
f32 margin16x9, f32 margin4x3)
|
||||
: mbWaitingFadeIn(FALSE), mpText(NULL), mTextLen(0), mBalloonPos(initialPos), mHAlign(0), mbUse16x9X(1), mMargin16x9(margin16x9), mMargin4x3(margin4x3),
|
||||
mWaitUntilFadeIn(0) {
|
||||
mpLayout = new (heap, 4) layout::Object(heap, layoutFile, directory, fileName);
|
||||
mpLayout->bind("my_IplTopBalloon_a_BalloonInOut.brlan");
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
void TextBalloon::calc() {
|
||||
mpLayout->calc();
|
||||
|
||||
switch (unk_0x08) {
|
||||
switch (mbWaitingFadeIn) {
|
||||
case TRUE: {
|
||||
break;
|
||||
}
|
||||
@@ -73,7 +73,7 @@ namespace ipl {
|
||||
|
||||
balloonPane->SetVisible(false);
|
||||
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
|
||||
void TextBalloon::fadein() {
|
||||
@@ -81,7 +81,7 @@ namespace ipl {
|
||||
mpLayout->FindPaneByName("N_Balloon")->SetVisible(false);
|
||||
|
||||
mWaitUntilFadeIn = 0;
|
||||
unk_0x08 = TRUE;
|
||||
mbWaitingFadeIn = TRUE;
|
||||
|
||||
set_textbox(mpText);
|
||||
set_translate(mBalloonPos);
|
||||
@@ -91,17 +91,17 @@ namespace ipl {
|
||||
void TextBalloon::fadeinNoSetTextbox() {
|
||||
if (mpText != NULL) {
|
||||
mWaitUntilFadeIn = 0;
|
||||
unk_0x08 = TRUE;
|
||||
mbWaitingFadeIn = TRUE;
|
||||
|
||||
set_translate(mBalloonPos);
|
||||
}
|
||||
}
|
||||
|
||||
void TextBalloon::setPos(const math::VEC3& pos, bool unk0, int unk1) {
|
||||
void TextBalloon::setPos(const math::VEC3& pos, bool use16x9X, int hAlign) {
|
||||
mBalloonPos = pos;
|
||||
|
||||
unk_0x28 = unk1;
|
||||
unk_0x2C = unk0;
|
||||
mHAlign = hAlign;
|
||||
mbUse16x9X = use16x9X;
|
||||
|
||||
nw4r::ut::Rect proj16x9;
|
||||
nw4r::ut::Rect proj4x3;
|
||||
@@ -109,7 +109,7 @@ namespace ipl {
|
||||
System::getProjectionRect(&proj16x9);
|
||||
System::getProjectionRect4x3(&proj4x3);
|
||||
|
||||
if (unk_0x2C == 0) {
|
||||
if (mbUse16x9X == 0) {
|
||||
mBalloonPos.x *= proj4x3.GetWidth() / proj16x9.GetWidth();
|
||||
}
|
||||
}
|
||||
@@ -122,7 +122,7 @@ namespace ipl {
|
||||
System::getProjectionRect(&proj16x9);
|
||||
System::getProjectionRect4x3(&proj4x3);
|
||||
|
||||
if (unk_0x2C == 0) {
|
||||
if (mbUse16x9X == 0) {
|
||||
mBalloonPos.x *= proj4x3.GetWidth() / proj16x9.GetWidth();
|
||||
}
|
||||
|
||||
@@ -133,27 +133,27 @@ namespace ipl {
|
||||
if (mWaitUntilFadeIn++ > WAIT_UNTIL_FADE_IN) {
|
||||
anm_fadein();
|
||||
snd::getSystem()->startSE("WIPL_SE_BALLOON");
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
void TextBalloon::fadeout() {
|
||||
if (!unk_0x08) {
|
||||
if (!mbWaitingFadeIn) {
|
||||
mpLayout->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
mpLayout->start();
|
||||
}
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
|
||||
void TextBalloon::fadeoutForce() {
|
||||
if (!unk_0x08) {
|
||||
if (!mbWaitingFadeIn) {
|
||||
if (mpLayout->getAnim()->getAnmType() == ANIM_TYPE_FORWARD) {
|
||||
mpLayout->getAnim()->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
mpLayout->getAnim()->restart();
|
||||
}
|
||||
} else if (unk_0x08 == TRUE) {
|
||||
} else if (mbWaitingFadeIn == TRUE) {
|
||||
mWaitUntilFadeIn = 0;
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,9 +167,9 @@ namespace ipl {
|
||||
f32 temp0;
|
||||
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
temp0 = unk_0x30;
|
||||
temp0 = mMargin16x9;
|
||||
} else {
|
||||
temp0 = unk_0x34;
|
||||
temp0 = mMargin4x3;
|
||||
}
|
||||
|
||||
nw4r::lyt::Pane* balloonPane = mpLayout->FindPaneByName("N_Balloon");
|
||||
@@ -181,7 +181,7 @@ namespace ipl {
|
||||
System::getProjectionRect(&proj16x9);
|
||||
System::getProjectionRect4x3(&proj4x3);
|
||||
|
||||
switch (unk_0x28) {
|
||||
switch (mHAlign) {
|
||||
case 1: {
|
||||
temp1 = get_size("W_Base")->width / 2;
|
||||
break;
|
||||
@@ -192,7 +192,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
if (unk_0x2C == 0) {
|
||||
if (mbUse16x9X == 0) {
|
||||
temp1 *= proj4x3.GetWidth() / proj16x9.GetWidth();
|
||||
}
|
||||
|
||||
|
||||
@@ -20,10 +20,10 @@ extern "C" {
|
||||
extern "C" void _seBlk__Q23ipl3snd();
|
||||
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
|
||||
extern "C" const f32 scSoundZeroF;
|
||||
extern "C" const f32 lbl_816946AC;
|
||||
extern "C" const f32 lbl_816946A8;
|
||||
extern "C" const f32 lbl_816946B0;
|
||||
extern "C" const f32 lbl_816946B4;
|
||||
extern "C" const f32 scSoundOneF;
|
||||
extern "C" const f32 scSoundTwoF;
|
||||
extern "C" const f32 scSoundThirtyF;
|
||||
extern "C" const f32 scSoundSixtyF;
|
||||
extern "C" {
|
||||
void _savegpr_29();
|
||||
void pauseOffSE__Q33ipl3snd6SystemFv();
|
||||
@@ -500,21 +500,21 @@ namespace snd {
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetPan(pan);
|
||||
}
|
||||
f32 pitch = lbl_816946A8 * y / rect.right;
|
||||
if (lbl_816946AC < pitch) {
|
||||
pitch = lbl_816946AC;
|
||||
f32 pitch = scSoundTwoF * y / rect.right;
|
||||
if (scSoundOneF < pitch) {
|
||||
pitch = scSoundOneF;
|
||||
}
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetVolume(pitch, 0);
|
||||
}
|
||||
if (lbl_816946B0 < y) {
|
||||
f32 pitch2 = y / lbl_816946B0;
|
||||
if (scSoundThirtyF < y) {
|
||||
f32 pitch2 = y / scSoundThirtyF;
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetPitch(pitch2);
|
||||
}
|
||||
} else if (lbl_816946B4 < y) {
|
||||
} else if (scSoundSixtyF < y) {
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetPitch(lbl_816946A8);
|
||||
block->handle.detail_GetAttachedSound()->SetPitch(scSoundTwoF);
|
||||
}
|
||||
}
|
||||
return (int)block;
|
||||
|
||||
Reference in New Issue
Block a user