some small matches and cleanups

This commit is contained in:
Jasper St. Pierre
2024-04-13 15:45:30 -07:00
parent b5d054f152
commit a7a4984a89
4 changed files with 11 additions and 10 deletions
+2 -3
View File
@@ -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;
+1 -1
View File
@@ -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 = {
+1 -1
View File
@@ -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 = {
+7 -5
View File
@@ -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;
}
}