Skip to content

Commit 5e59247

Browse files
committed
fix HBMDataInfo struct
1 parent 9611d33 commit 5e59247

File tree

2 files changed

+1
-35
lines changed

2 files changed

+1
-35
lines changed

include/revolution/hbm.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ typedef struct HBMDataInfo {
7373
/* 0x18 */ int backFlag;
7474
/* 0x1C */ int region;
7575
/* 0x20 */ int cursor;
76-
/* 0x24 */ int messageFlag;
7776
/* 0x28 */ u32 memSize;
7877
/* 0x2C */ f32 frameDelta;
7978
/* 0x30 */ Vec2 adjust;

src/revolution/homebuttonLib/HBMBase.cpp

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2257,40 +2257,7 @@ namespace homebutton {
22572257
nw4hbm::ut::DynamicCast<nw4hbm::lyt::TextBox*>(p_pane);
22582258

22592259
u16 len;
2260-
if (mpHBInfo->messageFlag & (btn_no + 1)) {
2261-
#if HBM_REVISION == 1
2262-
for (len = 0; true; len++) {
2263-
if (mpText[mpHBInfo->region][btn_no + 2][len] != 0x0D) {
2264-
continue;
2265-
}
2266-
2267-
if (mpText[mpHBInfo->region][btn_no + 2][len + 1] != 0x0A) {
2268-
continue;
2269-
}
2270-
2271-
break;
2272-
}
2273-
2274-
p_text->SetString(mpText[mpHBInfo->region][btn_no + 2], 0, len);
2275-
#else
2276-
for (len = 0; true; len++) {
2277-
// U+FF1F FULLWIDTH QUESTION MARK
2278-
if (mpText[mpHBInfo->region][btn_no + 2][len] == L'') {
2279-
break;
2280-
}
2281-
2282-
// U+003F QUESTION MARK
2283-
if (mpText[mpHBInfo->region][btn_no + 2][len] == L'\?') {
2284-
break;
2285-
}
2286-
}
2287-
2288-
p_text->SetString(mpText[mpHBInfo->region][btn_no + 2], 0, ++len);
2289-
#endif
2290-
2291-
} else {
2292-
p_text->SetString(mpText[mpHBInfo->region][btn_no + 2], 0);
2293-
}
2260+
p_text->SetString(mpText[mpHBInfo->region][btn_no + 2], 0);
22942261

22952262
mpLayout->GetRootPane()
22962263
->FindPaneByName(scFuncTextPaneName[2], true)

0 commit comments

Comments
 (0)