cleanup(tiInputForm): name float/color sdata constants (#626)
* cleanup(tiInputForm): name float/color sdata constants Prefix scInputForm* to avoid colliding with other units' scHalfF/scTwoF globals. Leave unused N_KOR/N_CHN decls. * cleanup(tiInputForm): keep ChanAppBox scHalfF/scTwoF 0x81694900/0x81694904 belong to iplChanAppBox; restore those symbol names and leave only tiInputForm-owned scInputForm* at 0x81694D28+.
This commit was merged in pull request #626.
This commit is contained in:
@@ -20617,31 +20617,31 @@ lbl_81694D18 = .sdata2:0x81694D18; // type:object size:0x4 data:4byte
|
||||
lbl_81694D1C = .sdata2:0x81694D1C; // type:object size:0x4 data:4byte
|
||||
lbl_81694D20 = .sdata2:0x81694D20; // type:object size:0x1 data:byte
|
||||
lbl_81694D24 = .sdata2:0x81694D24; // type:object size:0x1 data:byte
|
||||
lbl_81694D28 = .sdata2:0x81694D28; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D2C = .sdata2:0x81694D2C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D30 = .sdata2:0x81694D30; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694D38 = .sdata2:0x81694D38; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D3C = .sdata2:0x81694D3C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D40 = .sdata2:0x81694D40; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D44 = .sdata2:0x81694D44; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D48 = .sdata2:0x81694D48; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D4C = .sdata2:0x81694D4C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D50 = .sdata2:0x81694D50; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D54 = .sdata2:0x81694D54; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D58 = .sdata2:0x81694D58; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D5C = .sdata2:0x81694D5C; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D60 = .sdata2:0x81694D60; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D64 = .sdata2:0x81694D64; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D68 = .sdata2:0x81694D68; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D6C = .sdata2:0x81694D6C; // type:object size:0x1 data:byte
|
||||
lbl_81694D6D = .sdata2:0x81694D6D; // type:object size:0x1 data:byte
|
||||
lbl_81694D6E = .sdata2:0x81694D6E; // type:object size:0x1 data:byte
|
||||
lbl_81694D6F = .sdata2:0x81694D6F; // type:object size:0x1 data:byte
|
||||
lbl_81694D70 = .sdata2:0x81694D70; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D74 = .sdata2:0x81694D74; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D78 = .sdata2:0x81694D78; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D80 = .sdata2:0x81694D80; // type:object size:0x8 align:8 data:double
|
||||
lbl_81694D88 = .sdata2:0x81694D88; // type:object size:0x4 align:4 data:float
|
||||
scInputFormZeroF = .sdata2:0x81694D28; // type:object size:0x4 align:4 data:float
|
||||
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
|
||||
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
|
||||
scInputForm10F = .sdata2:0x81694D50; // type:object size:0x4 align:4 data:float
|
||||
scInputForm52F = .sdata2:0x81694D54; // type:object size:0x4 align:4 data:float
|
||||
scInputFormTwoF = .sdata2:0x81694D58; // type:object size:0x4 align:4 data:float
|
||||
scInputForm140F = .sdata2:0x81694D5C; // type:object size:0x4 align:4 data:float
|
||||
scInputForm90F = .sdata2:0x81694D60; // type:object size:0x4 align:4 data:float
|
||||
scInputForm253F = .sdata2:0x81694D64; // type:object size:0x4 align:4 data:float
|
||||
scInputForm20F = .sdata2:0x81694D68; // type:object size:0x4 align:4 data:float
|
||||
scInputFormColorRU8 = .sdata2:0x81694D6C; // type:object size:0x1 data:byte
|
||||
scInputFormColorGU8 = .sdata2:0x81694D6D; // type:object size:0x1 data:byte
|
||||
scInputFormColorBU8 = .sdata2:0x81694D6E; // type:object size:0x1 data:byte
|
||||
scInputFormColorAU8 = .sdata2:0x81694D6F; // type:object size:0x1 data:byte
|
||||
scInputForm255F = .sdata2:0x81694D70; // type:object size:0x4 align:4 data:float
|
||||
scInputForm127F = .sdata2:0x81694D74; // type:object size:0x4 align:4 data:float
|
||||
scInputForm14592F = .sdata2:0x81694D78; // type:object size:0x4 align:4 data:float
|
||||
scInputFormF64ConvertMagic = .sdata2:0x81694D80; // type:object size:0x8 align:8 data:double
|
||||
scInputForm15F = .sdata2:0x81694D88; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D90 = .sdata2:0x81694D90; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D94 = .sdata2:0x81694D94; // type:object size:0x4 align:4 data:float
|
||||
lbl_81694D98 = .sdata2:0x81694D98; // type:object size:0x4 align:4 data:float
|
||||
|
||||
@@ -154,7 +154,7 @@ extern "C" const char scT_title_textCHN[];
|
||||
extern "C" const char lbl_816973A4[];
|
||||
extern "C" const char lbl_816973AC[];
|
||||
#pragma pop
|
||||
extern "C" const f32 lbl_81694D28;
|
||||
extern "C" const f32 scInputFormZeroF;
|
||||
extern "C" void _savegpr_20();
|
||||
extern "C" void _restgpr_20();
|
||||
extern "C" void _savegpr_27();
|
||||
@@ -386,31 +386,31 @@ extern "C" const wchar_t pppURLCheck[2][10] = {L"http://", L"https://"};
|
||||
|
||||
#pragma pop
|
||||
|
||||
extern "C" const f32 lbl_81694D28 = 0.0f;
|
||||
extern "C" const f32 lbl_81694D2C = 640.0f;
|
||||
extern "C" const f64 lbl_81694D30 = 4503601774854144.0;
|
||||
extern "C" const f32 lbl_81694D38 = 1.0f;
|
||||
extern "C" const f32 lbl_81694D3C = 0.5f;
|
||||
extern "C" const f32 lbl_81694D40 = 0.7111111f;
|
||||
extern "C" const f32 lbl_81694D44 = 150.0f;
|
||||
extern "C" const f32 lbl_81694D48 = 30.0f;
|
||||
extern "C" const f32 lbl_81694D4C = 50.0f;
|
||||
extern "C" const f32 lbl_81694D50 = 10.0f;
|
||||
extern "C" const f32 lbl_81694D54 = 52.0f;
|
||||
extern "C" const f32 lbl_81694D58 = 2.0f;
|
||||
extern "C" const f32 lbl_81694D5C = 140.0f;
|
||||
extern "C" const f32 lbl_81694D60 = 90.0f;
|
||||
extern "C" const f32 lbl_81694D64 = 253.0f;
|
||||
extern "C" const f32 lbl_81694D68 = 20.0f;
|
||||
extern "C" const u8 lbl_81694D6C = 0xff;
|
||||
extern "C" const u8 lbl_81694D6D = 0x32;
|
||||
extern "C" const u8 lbl_81694D6E = 0x32;
|
||||
extern "C" const u8 lbl_81694D6F = 0;
|
||||
extern "C" const f32 lbl_81694D70 = 255.0f;
|
||||
extern "C" const f32 lbl_81694D74 = 127.0f;
|
||||
extern "C" const f32 lbl_81694D78 = 14592.0f;
|
||||
extern "C" const f64 lbl_81694D80 = 4503599627370496.0;
|
||||
extern "C" const f32 lbl_81694D88 = 15.0f;
|
||||
extern "C" const f32 scInputFormZeroF = 0.0f;
|
||||
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 scInputForm150F = 150.0f;
|
||||
extern "C" const f32 scInputForm30F = 30.0f;
|
||||
extern "C" const f32 scInputForm50F = 50.0f;
|
||||
extern "C" const f32 scInputForm10F = 10.0f;
|
||||
extern "C" const f32 scInputForm52F = 52.0f;
|
||||
extern "C" const f32 scInputFormTwoF = 2.0f;
|
||||
extern "C" const f32 scInputForm140F = 140.0f;
|
||||
extern "C" const f32 scInputForm90F = 90.0f;
|
||||
extern "C" const f32 scInputForm253F = 253.0f;
|
||||
extern "C" const f32 scInputForm20F = 20.0f;
|
||||
extern "C" const u8 scInputFormColorRU8 = 0xff;
|
||||
extern "C" const u8 scInputFormColorGU8 = 0x32;
|
||||
extern "C" const u8 scInputFormColorBU8 = 0x32;
|
||||
extern "C" const u8 scInputFormColorAU8 = 0;
|
||||
extern "C" const f32 scInputForm255F = 255.0f;
|
||||
extern "C" const f32 scInputForm127F = 127.0f;
|
||||
extern "C" const f32 scInputForm14592F = 14592.0f;
|
||||
extern "C" const f64 scInputFormF64ConvertMagic = 4503599627370496.0;
|
||||
extern "C" const f32 scInputForm15F = 15.0f;
|
||||
f32 sfColorPhase;
|
||||
|
||||
bool mbHyphen = true;
|
||||
@@ -3386,7 +3386,7 @@ void Base::drawCursor(f32 x, f32 y) {
|
||||
f32 opacity = static_cast<u32>(muGlobalAlpha) / 255.0f;
|
||||
mfCursorX = x;
|
||||
mfCursorY = y;
|
||||
GXColor color = {lbl_81694D6C, lbl_81694D6D, lbl_81694D6E, lbl_81694D6F};
|
||||
GXColor color = {scInputFormColorRU8, scInputFormColorGU8, scInputFormColorBU8, scInputFormColorAU8};
|
||||
f32 pulse = nw4r::math::SinFIdx(0.7111111f * muCursorTimer);
|
||||
color.a = static_cast<s32>(opacity * (127.0f + 127.0f * pulse));
|
||||
f32 width = mfViewWidth - mfViewX;
|
||||
|
||||
Reference in New Issue
Block a user