mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-10-09 21:44:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

f_op_msg_mng OK

Browse Source
This commit is contained in:
oga-sven
2026-09-26 16:38:27 +02:00
parent 0403637a86
commit bb4975a461
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -469,7 +469,7 @@ config.libs = [
Object(Matching, "f_op/f_op_kankyo.cpp"),
Object(Matching, "f_op/f_op_msg.cpp"),
Object(Matching, "f_op/f_op_kankyo_mng.cpp"),
Object(NonMatching, "f_op/f_op_msg_mng.cpp"),
Object(MatchingFor("GZLE01"), "f_op/f_op_msg_mng.cpp"),
Object(Matching, "f_op/f_op_draw_iter.cpp"),
Object(Matching, "f_op/f_op_draw_tag.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "f_op/f_op_scene_pause.cpp"),
src/f_op/f_op_msg_mng.cpp
+3 -11
View File
@@ -3548,10 +3548,6 @@ void fopMsgM_msgDataProc_c::colorAnime(J2DPicture* i_pic) {
/* 800322B4-80034F3C .text stringSet__21fopMsgM_msgDataProc_cFv */
void fopMsgM_msgDataProc_c::stringSet() {
/* Nonmatching - regalloc */
// demo: regswap on int r28
// jpn: matches 100%
// usa and pal: regswap on s8 r30
s8 r30 = g_msgHIO.field_0x6c;
field_0x60 = field_0x40;
@@ -4079,11 +4075,9 @@ void fopMsgM_msgDataProc_c::stringSet() {
((u8)bmgData[count + 2] == 0 && (u8)bmgData[count + 3] == 0 && (u8)bmgData[count + 4] == MsgCtrlCode_UNK23)
) {
if ((u8)bmgData[count + 4] == MsgCtrlCode_UNK22) {
u32 msgNo = dComIfGp_getNpcNameMessageID();
getString(field_0x60, field_0x68, field_0x64, field_0x6C, msgNo, &nowCursorPos, &field_0x24, &field_0x150);
getString(field_0x60, field_0x68, field_0x64, field_0x6C, dComIfGp_getNpcNameMessageID(), &nowCursorPos, &field_0x24, &field_0x150);
} else if ((u8)bmgData[count + 4] == MsgCtrlCode_UNK23) {
u32 msgNo = dComIfGp_getItemNameMessageID();
getString(field_0x60, field_0x68, field_0x64, field_0x6C, msgNo, &nowCursorPos, &field_0x24, &field_0x150);
getString(field_0x60, field_0x68, field_0x64, field_0x6C, dComIfGp_getItemNameMessageID(), &nowCursorPos, &field_0x24, &field_0x150);
}
if (selectFlag != Select_ON) {
field_0x14 = nowCursorPos - field_0xF8[lineCount];
@@ -5807,7 +5801,6 @@ void fopMsgM_msgDataProc_c::getString(char* i_dest, u32 i_msgNo) {
/* 80035408-80035A24 .text getString__21fopMsgM_msgDataProc_cFPcPcPcPcUlPfPfPi */
void fopMsgM_msgDataProc_c::getString(char* i_dest, char* param_2, char* param_3, char* param_4, u32 i_msgNo, f32* param_6, f32* param_7, int* param_8) {
/* Nonmatching - regalloc */
fopMsgM_msgGet_c msgGet;
f32 f31;
@@ -5824,8 +5817,7 @@ void fopMsgM_msgDataProc_c::getString(char* i_dest, char* param_2, char* param_3
if (i_msgNo == 0) {
src = name;
} else {
mesg_header* header = msgGet.getMesgHeader(i_msgNo);
src = msgGet.getMessage(header);
src = msgGet.getMessage(msgGet.getMesgHeader(i_msgNo));
}
#endif