Compare commits

...

1 Commits

Author SHA1 Message Date
coah
8e5ec9ae03 cleanup(eZiText): rename work unk_0x1B2C to zyFuzzy
Union holding Zhuyin fuzzy pairs; initd copies .word into zyFuzzy.
2026-10-02 14:13:14 -05:00
4 changed files with 22 additions and 22 deletions

View File

@@ -327,7 +327,7 @@ struct __zi8_work_data_s {
struct {
ziU32 msb : 1;
} bits;
} unk_0x1B2C;
} zyFuzzy; // 0x1B2C
ziU8 unk_0x1B30;
ziU8 unk_0x1B31;
ziU16 unk_0x1B32;

View File

@@ -603,37 +603,37 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
} else {
switch ((int)match.phon2[index] >> 9) {
case 24: case 25:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->cANDch) ordinalIndex = 0xFDFF;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->cANDch) ordinalIndex = 0xFDFF;
break;
case 26: case 27:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->sANDsh) ordinalIndex = 0xFDFF;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->sANDsh) ordinalIndex = 0xFDFF;
break;
case 28: case 29:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->zANDzh) ordinalIndex = 0xFDFF;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->zANDzh) ordinalIndex = 0xFDFF;
break;
case 56: case 59:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->fANDh) ordinalIndex = 0xF9FF;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->fANDh) ordinalIndex = 0xF9FF;
break;
case 52: case 55:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->bANDp) ordinalIndex = 0xF9FF;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->bANDp) ordinalIndex = 0xF9FF;
break;
case 60: case 63:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->gANDk) ordinalIndex = 0xF9FF;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->gANDk) ordinalIndex = 0xF9FF;
break;
case 38:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->nANDl && ((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->rANDn) ordinalIndex = 0xE1FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->nANDl) ordinalIndex = 0xE5FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->rANDn) ordinalIndex = 0xE3FF;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->nANDl && ((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->rANDn) ordinalIndex = 0xE1FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->nANDl) ordinalIndex = 0xE5FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->rANDn) ordinalIndex = 0xE3FF;
break;
case 43:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->nANDl && ((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->lANDr) ordinalIndex = 0xE1FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->lANDr) ordinalIndex = 0xF1FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->nANDl) ordinalIndex = 0xE5FF;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->nANDl && ((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->lANDr) ordinalIndex = 0xE1FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->lANDr) ordinalIndex = 0xF1FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->nANDl) ordinalIndex = 0xE5FF;
break;
case 44:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->rANDn && ((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->lANDr) ordinalIndex = 0xE1FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->rANDn) ordinalIndex = 0xE3FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->lANDr) ordinalIndex = 0xF1FF;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->rANDn && ((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->lANDr) ordinalIndex = 0xE1FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->rANDn) ordinalIndex = 0xE3FF;
else if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->lANDr) ordinalIndex = 0xF1FF;
break;
}
}
@@ -662,10 +662,10 @@ static int zi8InternalGetZH(ziGetParam* request, ZiChineseOptions* options, ziPt
} else {
switch (match.phon2[index] & 0x1F0) {
case 0x60: case 0xE0: case 0x160:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->anANDang) ordinalIndex = 0xFFF7;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->anANDang) ordinalIndex = 0xFFF7;
break;
case 0x70:
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->unk_0x1B2C.word)->enANDeng) ordinalIndex = 0xFFF7;
if (((ziFuzzyZYPairs*)&((struct __zi8_work_data_s*)work)->zyFuzzy.word)->enANDeng) ordinalIndex = 0xFFF7;
break;
}
}

View File

@@ -41,9 +41,9 @@ ziBool Zi8ZHsetPYfuzzyPairs(ziFuzzyPYPairs pairs ZI_NEED_WORK) {
ziBool Zi8ZHsetZYfuzzyPairs(ziFuzzyZYPairs pairs ZI_NEED_WORK) {
if (pairs.ziDefault) {
ZI_WORK->unk_0x1B2C.word = *(const ziU32*)&Zi8ZYdefaultFuzzyPairs;
ZI_WORK->zyFuzzy.word = *(const ziU32*)&Zi8ZYdefaultFuzzyPairs;
} else {
ZI_WORK->unk_0x1B2C.word = *(ziU32*)&pairs;
ZI_WORK->zyFuzzy.word = *(ziU32*)&pairs;
}
return 1;
}

View File

@@ -50,8 +50,8 @@ ziU8 Zi8InitializeDynamic(ziLanguageEntry* langEntries ZI_NEED_WORK) {
ZI_WORK->unk_0x17 = 5;
ZI_WORK->cangjieEnabled = Zi8GetFormatVersion(1, ZI_WORK) & 2;
ZI_WORK->unk_0x1B28.bits.msb = 1;
ZI_WORK->unk_0x1B2C.bits.msb = 1;
zyFuzzy = ZI_WORK->unk_0x1B2C.word;
ZI_WORK->zyFuzzy.bits.msb = 1;
zyFuzzy = ZI_WORK->zyFuzzy.word;
pzyFuzzy = &zyFuzzy;
Zi8ZHsetZYfuzzyPairs(pzyFuzzy, ZI_WORK);
pyFuzzy = ZI_WORK->unk_0x1B28.word;