Compare commits

..

19 Commits

Author SHA1 Message Date
coah
c6b43c9523 cleanup(pf_code): rename pf_valid_fn_char_8162E6B0 to pf_valid_fn_char
Drop address suffix so source matches symbols.txt. Clear scope:local so
NonMatching pf_path splits resolve the same global.
2026-10-01 18:45:20 -05:00
coah
e305e6047c cleanup(CHANSVm): name float/int/string convert helpers (#657)
- CHANSVm_8144B1D8 → CHANSVmFloatSign
- CHANSVm_8144B30C → CHANSVmConvertToIntFromFloat
- CHANSVm_8144B430 → CHANSVmConvertToFloatFromUndefined
- CHANSVm_8144B470 → CHANSVmConvertToFloatFromInt
- CHANSVm_8144B4D4 → CHANSVmConvertToFloatFromStr
- CHANSVm_8144B62C → CHANSVmFloatToWString
- CHANSVm_8144B734 → CHANSVmConvertToStrFromFloat

Verified ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 18:45:19 -05:00
coah
df48bc9f76 Restore SD title switch block emission order (#656) 2026-10-01 18:43:05 -05:00
coah
3bd814f042 cleanup(SDMemory): rename iplSDMemory_813EE358 to containsTitleId (#655)
Helper scans a title-id list for a match; unused SDMemory* param kept.
Verified ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 18:42:39 -05:00
coah
51b78ed7da cleanup(iplBalloon): name fade/align/margin fields (#654)
Rename TextBalloon unk_ members and ctor/setPos params.

Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 18:40:27 -05:00
coah
3eb5d8faee cleanup(iplAOSSThread): name stack sentinel like RakuStack (#653)
Replace *(u32*)(mpStackBuffer + 0x3FC0) with AOSSStack::sentinel.

Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 18:40:21 -05:00
coah
d99950fc88 cleanup(tiCandidateBox): drop unused sdata2 float decls (#652)
Removed seven bare extern lbl_81694D* decls that were never referenced.
Verified ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 18:38:09 -05:00
coah
98d03059bd cleanup(iplBoardObject): rename Cos/Sin Ghidra locals (#651)
dVar2 → cosF, dVar3 → sinF in BoardObject::stt_stand.

Co-authored-by: coah <coah80@users.noreply.github.com>
2026-10-01 18:37:42 -05:00
coah
830e2f3920 cleanup(iplSound): name pitch/volume sdata2 float constants (#650)
lbl_816946A8 → scSoundTwoF (2.0f), lbl_816946AC → scSoundOneF (1.0f),
lbl_816946B0 → scSoundThirtyF (30.0f), lbl_816946B4 → scSoundSixtyF (60.0f).
2026-10-01 18:37:35 -05:00
coah
c1b00d8a14 cleanup(Date): drop unused lbl_816948F0 sdata2 decl (#649)
Bare extern was never referenced; scDateZeroF remains.
Verified ok + sha1 26116613f624061ba99c8d1a299aaa6efa85670d.
2026-10-01 18:37:29 -05:00
coah
9acdd7f8dc cleanup(WDScan): name OUI sdata/sdata2 padding bytes (#648)
Rename leftover lbl_* pad bytes that sit between the RSN/WPA OUI
triples (and after scWpaFindOui*) so force_active and locals match
the existing sc* naming.
2026-10-01 18:37:02 -05:00
coah
abf047831a cleanup(tiInputForm): rename scInputForm0_7111111F to DegToFIdx (#647)
0.7111111f is 256/360 (degrees → nw4r SinFIdx units). Drop the
digit-heavy name that looked like an address suffix.

Verified: ninja build/43U/ok; fuzzy unchanged; DOL sha1 unchanged.
2026-10-01 18:35:19 -05:00
coah
17be3b014b cleanup(ChannelSelect): name updateDiskState asm labels (#646)
Rename address-suffixed local labels and jumptable_8164DE80 inside the
carefully Equivalent updateDiskState asm to case*/done semantic names.
symbols.txt updated for the jumptable; codegen unchanged.

Verified: ninja build/43U/ok; ~96.37% code / ~99.76% fuzzy; DOL sha1 unchanged.
2026-10-01 18:35:13 -05:00
coah
0d9d3d1081 cleanup(runtime): prefix Matching asm L_* labels with function names (#645)
Rename 65 bare address labels in Runtime helpers (__div2u/__div2i/__mod*,
__cvt_*, __shr2i) to FunctionName_L_<addr> for readability; codegen unchanged.

Verified: ninja build/43U/ok; runtime 100%/100%; DOL sha1 unchanged.
2026-10-01 18:35:07 -05:00
coah
196b14aa58 cleanup(CDBDatabase): prefix Matching asm L_* labels with function names (#644)
Rename 169 bare address labels inside the seven Search* asm functions to
FunctionName_L_<addr>, matching the nand_drv style, so local branches are
readable without changing codegen.

Verified: ninja build/43U/ok; CDBDatabase 100%/100%; DOL sha1 unchanged.
2026-10-01 18:34:25 -05:00
coah
1dde229702 cleanup(sdChannelSelect): drop unused iplSDChannelSelect_813DD240 decl (#643)
The real path is collectTitlesFromNandUsage; this extern was never called.
Build still OK; DOL sha1 unchanged.
2026-10-01 18:33:58 -05:00
coah
94c03497ff cleanup(SDChannelObj): name address-suffixed C helpers (#636)
Rename iplSDChannelObj_813E* helpers to semantic names (setHeaps,
createBaseLayout, getLocalizedName, etc.) across the unit, callers,
header, and symbols.txt. Byte-identical: ok + sha1
26116613f624061ba99c8d1a299aaa6efa85670d; unit still ~90% code /
~99.99% fuzzy.
2026-10-01 18:33:42 -05:00
coah
e9dd012c09 cleanup(zmtkey): name Zi8MapKeyCode helper (#642)
Rename Zi8_81484484 (OEM/private-use wchar → key index) to
Zi8MapKeyCode. Byte-identical: ok + sha1
26116613f624061ba99c8d1a299aaa6efa85670d; unit still ~67.1% code /
~99.85% fuzzy.
2026-10-01 18:33:31 -05:00
coah
90e7b0ff2c iplSensitivity: suppress inline Rect dtor weak (#641)
Define IPL_CONTROLLER_TRIVIAL_RECT_DTOR so this TU no longer emits
~nw4r::ut::Rect. Compiled .text becomes byte-identical to the extract
(1112 bytes). Matching still blocked on .sdata2 layout (48 vs 56).

Co-authored-by: linker <linker@users.noreply.github.com>
2026-10-01 18:33:24 -05:00
22 changed files with 724 additions and 728 deletions

View File

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

View File

@@ -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
@@ -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
@@ -14198,7 +14198,7 @@ ca_ppki = .rodata:0x8162DBB8; // type:object size:0x400 noreloc
ms_dpki = .rodata:0x8162DFB8; // type:object size:0x240 noreloc
ms_ppki = .rodata:0x8162E1F8; // type:object size:0x240 noreloc
@1272 = .rodata:0x8162E438; // type:object size:0x278 scope:local data:4byte
pf_valid_fn_char = .rodata:0x8162E6B0; // type:object size:0x60 scope:local noreloc
pf_valid_fn_char = .rodata:0x8162E6B0; // type:object size:0x60 noreloc
fat_special_values = .rodata:0x8162E710; // type:object size:0x3C
cp932_to_unicode = .rodata:0x8162E750; // type:object size:0x4272 data:2byte
fa_nand_func = .rodata:0x816329C8; // type:object size:0x20
@@ -15942,7 +15942,7 @@ lbl_8164DD80 = .data:0x8164DD80; // type:object size:0x37
lbl_8164DDB7 = .data:0x8164DDB7; // type:object size:0xAD
scPaneName_N_GCIcon = .data:0x8164DE64; // type:object size:0x9 data:string
scPaneName_N_DiscUpdateIcon = .data:0x8164DE6D; // type:object size:0x11 data:string
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

View File

@@ -14,8 +14,8 @@ namespace ipl {
WAIT_UNTIL_FADE_IN = 15
};
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& 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

View File

@@ -8,7 +8,7 @@ ziU16 Zi8GetTableCount(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
ziU32 Zi8GetTableAddress(ziU8 language, ziU8 tableIndex, ziPtr __zi8_work_data);
ziU8 Zi8getKeyLayout(ziU8 language, ziWChar key, ziWChar* chars, ziU8 mode, ziPtr __zi8_work_data);
ziBool 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;
}

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@@ -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: {
@@ -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: {

View File

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

View File

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

View File

@@ -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) {

View File

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

View File

@@ -92,7 +92,7 @@ namespace ipl {
extern "C" void List_GetNth__Q24nw4r2utFPCQ34nw4r2ut4ListUs();
extern "C" void getChannelBasePane__Q33ipl5scene13ChannelSelectFi();
extern "C" void initPane__Q33ipl3gui11PaneManagerFPQ34nw4r3lyt4Pane();
extern "C" void* 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)

View File

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

View File

@@ -107,11 +107,6 @@ namespace ipl {
extern "C" bool iplSDChannelSelect_813DD240(
SDChannelSelect* scene, const s32* requiredBytes, const s32* requiredBlocks,
ESTitleId* titleIds, char* titleNames, u32* titleCount);
extern "C" void iplSDChannelObj_resetDialogAnim(SDChannelObj* channel, int enabled);

View File

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

View File

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

View File

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

View File

@@ -10,9 +10,9 @@
namespace ipl {
namespace scene {
TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& 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();
}

View File

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