diff --git a/src/d/d_2dnumber.cpp b/src/d/d_2dnumber.cpp index 9ddd5b021..8b858472b 100644 --- a/src/d/d_2dnumber.cpp +++ b/src/d/d_2dnumber.cpp @@ -60,7 +60,6 @@ void dDlst_2DNumber_c::draw() { /* 800C874C-800C8944 .text init__18dDlst_2DMinigame_cFP7ResTIMGP7ResTIMG */ bool dDlst_2DMinigame_c::init(ResTIMG* img1, ResTIMG* img2) { - /* Nonmatching */ mPicture[0] = new J2DPicture(img1); if (mPicture[0] == NULL) return false; @@ -75,8 +74,8 @@ bool dDlst_2DMinigame_c::init(ResTIMG* img1, ResTIMG* img2) { mSize1.x = img1->width * 1.33f; mSize1.y = img1->height * 1.33f; - mSize2.x = img1->width * 1.16f; - mSize2.y = img1->height * 1.16f; + mSize2.x = img2->width * 1.16f; + mSize2.y = img2->height * 1.16f; mPicture[2]->setCornerColor(0x000000FF); return true; diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 3408bd6ac..c20e4868e 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -65,7 +65,7 @@ s32 dOvlpFd2_Delete(dOvlpFd2_c*) { /* 8022423C-80224268 .text dOvlpFd2_Create__FPv */ s32 dOvlpFd2_Create(void* i_this) { new (i_this) dOvlpFd2_c(); - return 4; + return cPhs_COMPLEATE_e; } overlap_method_class l_dOvlpFd2_Method = { diff --git a/src/d/d_ovlp_fade4.cpp b/src/d/d_ovlp_fade4.cpp index 331b73f5c..26f1eaaec 100644 --- a/src/d/d_ovlp_fade4.cpp +++ b/src/d/d_ovlp_fade4.cpp @@ -130,7 +130,7 @@ s32 dOvlpFd4_Delete(dOvlpFd4_c*) { /* 80225694-802256C0 .text dOvlpFd4_Create__FPv */ s32 dOvlpFd4_Create(void* i_this) { new (i_this) dOvlpFd4_c(); - return 4; + return cPhs_COMPLEATE_e; } overlap_method_class l_dOvlpFd4_Method = { diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp index fb9c57a14..aa10569fd 100644 --- a/src/f_op/f_op_overlap_mng.cpp +++ b/src/f_op/f_op_overlap_mng.cpp @@ -79,16 +79,18 @@ request_base_class* fopOvlpM_Request(s16 procName, u16 peekTime) { return l_fopOvlpM_overlap[0]; } - return 0; + return NULL; } void fopOvlpM_Management() { if (l_fopOvlpM_overlap[0] != NULL) { - int tmp = fopOvlpReq_Handler(l_fopOvlpM_overlap[0]); - if (6 <= tmp || 3 > tmp) { - return; + switch (fopOvlpReq_Handler(l_fopOvlpM_overlap[0])) { + case cPhs_UNK3_e: + case cPhs_COMPLEATE_e: + case cPhs_ERROR_e: + l_fopOvlpM_overlap[0] = NULL; + break; } - l_fopOvlpM_overlap[0] = NULL; } }