cleanup d_msg_flow (#2447)

This commit is contained in:
TakaRikka
2025-05-17 09:56:20 -07:00
committed by GitHub
parent 165095b3d9
commit d1a5f8d71c
11 changed files with 1708 additions and 851 deletions
+2 -2
View File
@@ -260,8 +260,8 @@ void daNpcKakashi_setSwdTutorialResult(bool param_0) {
}
/* 800317A4-800317DC 02C0E4 0038+00 0/0 1/1 1/1 .text daNpcKakashi_getSuccessCount__Fv */
int daNpcKakashi_getSuccessCount() {
return dComIfGs_getTmpReg(0xFEFF);
u8 daNpcKakashi_getSuccessCount() {
return dComIfGs_getTmpReg(0xFEFF) & 0xFF;
}
/* 800317DC-80031838 02C11C 005C+00 0/0 0/0 1/1 .text daNpcKakashi_incSuccessCount__Fv */
+1557 -767
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -1219,11 +1219,11 @@ int dShopSystem_c::seq_choose(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
i_flow->doFlow(actor, NULL, 0);
int select_num = i_flow->getSelectNum();
u16 select_num = i_flow->getSelectNum();
if (dMsgObject_c::getStatus() != 6 && dMsgObject_c::getStatus() != 8 &&
dMsgObject_c::getStatus() != 9 && dMsgObject_c::getStatus() != 20)
{
if ((u16)select_num == 0) {
if (select_num == 0) {
setSeq(SEQ_DECIDE_YES);
} else {
setSeq(SEQ_DECIDE_NO);