Merge branch 'main' into 26-02-27-allocator-isolation

This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
5530 changed files with 252979 additions and 26830 deletions
+4 -3
View File
@@ -10,7 +10,8 @@
#include "d/d_meter2_info.h"
#include "d/d_meter_HIO.h"
#include "d/d_msg_string.h"
#include <dolphin/types.h>
#include <types.h>
#include <cstring>
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
#include "d/d_msg_scrn_arrow.h"
@@ -491,7 +492,7 @@ void dMenu_Letter_c::read_open_init() {
}
J2DTextBox* text2 = (J2DTextBox*)field_0x2ec[i]->getPanePtr();
mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1,
NULL, NULL, NULL);
NULL, NULL, 0);
}
field_0x3e2 = mpString->getPageMax(LINE_MAX);
if (field_0x3e2 > 1) {
@@ -641,7 +642,7 @@ void dMenu_Letter_c::read_next_fadein_init() {
text1 = (J2DTextBox*)field_0x2f4[i]->getPanePtr();
}
J2DTextBox* text2 = (J2DTextBox*)field_0x2ec[i]->getPanePtr();
mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1, NULL, NULL, NULL);
mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1, NULL, NULL, 0);
}
char acStack_30[10];
sprintf(acStack_30, "%d/%d", field_0x3e3, field_0x3e2);