Link all oustanding US-matched TUs for JP (#2671)

This commit is contained in:
Max Roncace
2025-09-19 14:32:05 -04:00
committed by GitHub
parent 818dec837f
commit 11ebeb3fe0
38 changed files with 1430 additions and 275 deletions
+30 -3
View File
@@ -1462,6 +1462,12 @@ void dDlst_TimerScrnDraw_c::playBckAnimation(f32 i_frame) {
mpGetInParent->getPanePtr()->setAnimation((J2DAnmTransform*)NULL);
}
#if VERSION == VERSION_GCN_JPN
bool dDlst_TimerScrnDraw_c::isLeadByte(int i_char) {
return (i_char >= 0x81 && i_char <= 0x9f) || (i_char >= 0xe0 && i_char <= 0xfc);
}
#endif
/* 80260B54-80260F04 25B494 03B0+00 1/1 0/0 0/0 .text drawPikari__21dDlst_TimerScrnDraw_cFi */
void dDlst_TimerScrnDraw_c::drawPikari(int i_no) {
f32 temp_f28;
@@ -1486,12 +1492,23 @@ void dDlst_TimerScrnDraw_c::drawPikari(int i_no) {
}
for (; string[str_idx] != 0; str_idx++) {
int c = string[str_idx] & 0xFF;
if (str_idx > 0) {
var_f29 +=
var_f25 * static_cast<J2DTextBox*>(mpGetInText->getPanePtr())->getCharSpace();
}
int c = string[str_idx] & 0xFF;
#if VERSION == VERSION_GCN_JPN
if (isLeadByte(c)) {
c = ((string[str_idx] & 0xFF) << 8) | (string[str_idx + 1] & 0xFF);
str_idx++;
} else {
c = string[str_idx] & 0xFF;
}
#else
c = string[str_idx] & 0xFF;
#endif
var_f29 +=
var_f25 * (font_size.mSizeX * ((f32)font_p->getWidth(c) / (f32)font_p->getCellWidth()));
@@ -1501,13 +1518,23 @@ void dDlst_TimerScrnDraw_c::drawPikari(int i_no) {
f32 frame;
for (str_idx = 0; string[str_idx] != 0; str_idx++) {
int c = string[str_idx] & 0xFF;
if (str_idx > 0) {
var_f26 +=
var_f25 * static_cast<J2DTextBox*>(mpGetInText->getPanePtr())->getCharSpace();
}
int c = string[str_idx] & 0xFF;
#if VERSION == VERSION_GCN_JPN
if (isLeadByte(c)) {
c = ((string[str_idx] & 0xFF) << 8) | (string[str_idx + 1] & 0xFF);
str_idx++;
} else {
c = string[str_idx] & 0xFF;
}
#else
c = string[str_idx] & 0xFF;
#endif
f32 temp_f24 =
var_f25 * (font_size.mSizeX * ((f32)font_p->getWidth(c) / (f32)font_p->getCellWidth()));
if (c != 0x20 && c != 0x8140) {