mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-29 08:30:08 -04:00
msg work (#1143)
* fopMsgM_msgDataProc_c::stringSet work * Fix JPN * More stringSet work * work * get rid of fake temps * stringSet 99.99% * fopMsgM_msgDataProc_c::stringLength 100% * d_msg work * fix pal * fix message_paper, d_meter version diff fixes
This commit is contained in:
+19
-20
@@ -539,7 +539,6 @@ void dMenu_Option_c::stickMove(u8 param_1) {
|
||||
}
|
||||
m858[1].mUserArea = 6;
|
||||
mDoAud_seStart(JA_SE_ITM_MENU_OPT_SW);
|
||||
;
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
@@ -665,29 +664,29 @@ void dMenu_Option_c::noteSet() {
|
||||
msg_entry = msgGet.getMesgEntry(head_p);
|
||||
|
||||
msgDataProc.dataInit();
|
||||
msgDataProc.bmgData = mesg;
|
||||
msgDataProc.setBmgData((char*)mesg);
|
||||
msgDataProc.setOutMessage(mD38, mD3C, mD40, mD44);
|
||||
msgDataProc.font[0] = mD2C;
|
||||
msgDataProc.font[1] = mD30;
|
||||
msgDataProc.charSpace = ((J2DTextBox*)m740[0].pane)->getCharSpace();
|
||||
msgDataProc.rubyCharSpace = ((J2DTextBox*)m740[1].pane)->getCharSpace();
|
||||
msgDataProc.lineSpace = ((J2DTextBox*)m740[0].pane)->getLineSpace();
|
||||
msgDataProc.mesgEntry = &msg_entry;
|
||||
msgDataProc.fontSize = f31;
|
||||
msgDataProc.rubyFontSize = f30;
|
||||
msgDataProc.lineWidth = 0x1D0;
|
||||
msgDataProc.centerLineWidth = 0x1D0;
|
||||
msgDataProc.sendSpeed = 2;
|
||||
msgDataProc.spaceTimer = 0;
|
||||
msgDataProc.setFont(mD2C);
|
||||
msgDataProc.setRubyFont(mD30);
|
||||
msgDataProc.setCharSpace(((J2DTextBox*)m740[0].pane)->getCharSpace());
|
||||
msgDataProc.setRubyCharSpace(((J2DTextBox*)m740[1].pane)->getCharSpace());
|
||||
msgDataProc.setLineSpace(((J2DTextBox*)m740[0].pane)->getLineSpace());
|
||||
msgDataProc.setMesgEntry(&msg_entry);
|
||||
msgDataProc.setFontSize(f31);
|
||||
msgDataProc.setRubyFontSize(f30);
|
||||
msgDataProc.setLineWidth(0x1D0);
|
||||
msgDataProc.setCenterLineWidth(0x1D0);
|
||||
msgDataProc.setSendSpeed(2);
|
||||
msgDataProc.setSpaceTimer(0);
|
||||
msgDataProc.field_0x299 = 1;
|
||||
msgDataProc.spaceFlag = 0;
|
||||
msgDataProc.setSpaceFlagOff();
|
||||
|
||||
msgDataProc.stringLength();
|
||||
msgDataProc.stringShift();
|
||||
msgDataProc.iconIdxRefresh();
|
||||
|
||||
s16 r26 = msgDataProc.lineCount;
|
||||
msgDataProc.lineCount = 0;
|
||||
s16 r26 = msgDataProc.getLineCount();
|
||||
msgDataProc.setLineCount(0);
|
||||
msgDataProc.stringSet();
|
||||
f32 f30_2 = (m740[0].pane->getHeight() - f31 - (f32)r26 * ((J2DTextBox*)m740[0].pane)->getLineSpace()) / 2.0f;
|
||||
((J2DTextBox*)m740[0].pane)->shiftSet(0.0f, f30_2);
|
||||
@@ -698,7 +697,7 @@ void dMenu_Option_c::noteSet() {
|
||||
|
||||
int r31 = ((J2DTextBox*)m740[0].pane)->getLineSpace() / 2.0f;
|
||||
for (int i = 0; i < 0xf; i++) {
|
||||
u32 r6 = msgDataProc.field_0x281[i];
|
||||
u8 r6 = msgDataProc.getIconNum(i);
|
||||
if (r6 == 0xFF) {
|
||||
continue;
|
||||
}
|
||||
@@ -708,8 +707,8 @@ void dMenu_Option_c::noteSet() {
|
||||
if (r6 == 0x16) {
|
||||
continue;
|
||||
}
|
||||
m0B0[i].mPosTopLeft.x = (f32)msgDataProc.field_0x168[i];
|
||||
m0B0[i].mPosTopLeft.y = f30_2 + (f32)(int)(msgDataProc.field_0x1A4[i] * 2 * r31);
|
||||
m0B0[i].mPosTopLeft.x = (f32)msgDataProc.getIconPosX(i);
|
||||
m0B0[i].mPosTopLeft.y = f30_2 + (f32)(msgDataProc.getIconPosY(i) * 2 * r31);
|
||||
m0B0[i].mPosTopLeftOrig.y = (f32)r6;
|
||||
|
||||
fopMsgM_outFontSet((J2DPicture*)m0B0[i].pane, &m0B0[i].mUserArea, 0xFF, r6);
|
||||
|
||||
Reference in New Issue
Block a user