kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Rainchus:main' into main

Browse source
This commit is contained in:
CreateSource 2024-05-18 09:43:07 -04:00 • committed by GitHub
commit dbdad49abe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
34 changed files with 2683 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/REL/E3setupDLL/mgselect.c
View file

@ -5,6 +5,7 @@
#include "game/objsub.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "rel_sqrt_consts.h"
#include "REL/E3SetupDLL.h"
@ -69,7 +70,7 @@ void E3MGSelectInit()
mgPicObj = omAddObjEx(var_r31, 31, 0, 0, -1, CreateMGPic);
mgPicObj->work[0] = mgDefault;
E3LightInit();
WipeCreate(1, 0, -1);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
}
s16 lbl_2_data_36[] = { 0x0023, 0x0026, 0x0029, 0x002C };

10
src/REL/m404Dll/main.c
View file

@ -281,7 +281,7 @@ void fn_1_39C(omObjData *object)
{
fn_1_37C(0);
lbl_1_bss_24 = 60;
WipeCreate(1, 0, 60);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_400;
}
@ -326,7 +326,7 @@ void fn_1_400(omObjData *object)
if (!MGSeqStatGet(lbl_1_bss_C)) {
fn_1_37C(5);
WipeColorSet(255, 255, 255);
WipeCreate(2, 0, 30);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
lbl_1_bss_24 = 60;
}
case 5:
@ -334,7 +334,7 @@ void fn_1_400(omObjData *object)
break;
}
fn_1_37C(6);
WipeCreate(1, 0, 60);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
break;
case 6:
if (WipeStatGet()) {
@ -362,14 +362,14 @@ void fn_1_400(omObjData *object)
if (--lbl_1_bss_24) {
break;
}
WipeCreate(2, 0, 60);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_784;
break;
default:
break;
}
if (omSysExitReq && !WipeStatGet()) {
WipeCreate(2, 0, 60);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_784;
}
}

2465
src/REL/m405Dll/main.c Executable file
View file

File diff suppressed because it is too large Load diff

4
src/REL/m407dll/main.c
View file

@ -109,7 +109,7 @@ void fn_1_4980(Process* arg0) {
fn_1_3AC8(lbl_1_bss_3980);
fn_1_41CC(lbl_1_bss_3980);
fn_1_5C5C(lbl_1_bss_3980, lbl_1_bss_3978);
WipeCreate(1, 0, 0x3C);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
temp_r31->unk_06 = -1;
temp_r31->unk_08 = -1;
temp_r31->unk_24 = 0;
@ -127,7 +127,7 @@ void fn_1_4B7C(void) {
temp_r31 = lbl_1_bss_397C->data;
if (temp_r31->unk_04 == 0) {
WipeCreate(2, 0, 60);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
temp_r31->unk_04++;
}
if (WipeStatGet() == 0) {

2
src/REL/messDll/main.c
View file

@ -47,7 +47,7 @@ void ModuleProlog(void) {
}
static void fn_1_2BC(omObjData *arg0) {
WipeCreate(1, 0, 10);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10);
arg0->func = fn_1_300;
}

2
src/REL/modeltestDll/main.c
View file

@ -59,7 +59,7 @@ void ModuleProlog(void)
lbl_1_bss_9A0 = omAddObjEx(prc, 0x7FDA, 0, 0, -1, omOutView);
Hu3DBGColorSet(0x20U, 0x80U, 0x80U);
WipeCreate(1, 0, 0x1E);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
}
// -------------------------------------------------------------------------- //

2
src/REL/modeltestDll/modeltest00.c
View file

@ -46,7 +46,7 @@ void fn_1_34B0()
lbl_1_bss_9A8 = HuPrcCreate(fn_1_46F0, 0x64U, 0x2000U, 0);
Hu3DBGColorSet(0x20U, 0x80U, 0x80U);
WipeCreate(1, 0, 0x1E);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
}
// -------------------------------------------------------------------------- //

6
src/REL/option/scene.c
View file

@ -159,7 +159,7 @@ static void fn_1_5EC(omObjData *arg0) {
arg0->unk10 = 2;
/* fallthrough */
case 2:
WipeCreate(2, 0, 0x3C);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuAudFadeOut(1000);
arg0->unk10 = 3;
/* fallthrough */
@ -191,7 +191,7 @@ static void fn_1_6E8(void) {
espPosSet(temp_r31, 288.0f, 240.0f);
espAttrReset(temp_r31, 4);
Hu3DBGColorSet(0, 0, 0);
WipeCreate(1, 0, 0xA);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -199,7 +199,7 @@ static void fn_1_6E8(void) {
if (SLSave() == 0) {
GWSaveModeSet(1);
}
WipeCreate(2, 0, 0x14);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}

2
src/REL/option/state.c
View file

@ -73,7 +73,7 @@ static void fn_1_2FB0(omObjData *arg0) {
arg0->unk10 = 1;
/* fallthrough */
case 1:
WipeCreate(1, -1, 0x3C);
WipeCreate(WIPE_MODE_IN, -1, 60);
arg0->unk10 = 2;
break;
case 2:

2
src/REL/present/init.c
View file

@ -160,7 +160,7 @@ void fn_1_5EC(omObjData *object)
}
object->unk10 = 2;
case 2:
WipeCreate(2, 0, 60);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuAudFadeOut(1000);
object->unk10 = 3;
break;

2
src/REL/present/present.c
View file

@ -816,7 +816,7 @@ void fn_1_33AC(omObjData *object)
var_r31->unk_254 = 1.0f / 360.0f;
object->unk10 = 1;
case 1:
WipeCreate(1, 0, 120);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 120);
object->unk10 = 2;
case 2:
var_f31 = sind(90.0f * var_r31->unk_24C);

6
src/REL/subchrselDll/main.c
View file

@ -44,7 +44,7 @@ void ModuleProlog(void)
Process *sp8 = omInitObjMan(0x32, 0x2000);
Hu3DBGColorSet(0, 0, 0);
HuPrcChildCreate(SubchrMain, 4096, 12288, 0, HuPrcCurrentGet());
WipeCreate(1, 0, -1);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
}
static u16 GetBtns(void)
@ -97,7 +97,7 @@ static void SubchrMain()
}
}
HuAudFadeOut(30);
WipeCreate(2, 0, -1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
HuPrcSleep(wipeData.duration+1.0f);
MGSeqKillAll();
omOvlGotoEx(OVL_M433, 1, 0, 0);
@ -149,7 +149,7 @@ static void SubchrMain()
}
if(GetBtns() & PAD_BUTTON_B) {
HuAudFadeOut(30);
WipeCreate(2, 0, -1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
HuPrcSleep(wipeData.duration+1.0f);
MGSeqKillAll();
omOvlReturnEx(1, 1);

8
src/REL/w03Dll/condor.c
View file

@ -398,7 +398,7 @@ void fn_1_3968(s32 arg0) {
if (var_r28 == 0) {
if (sp8 == 0x78U) {
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
var_r28 = 1;
}
} else if (WipeStatGet() == 0) {
@ -415,7 +415,7 @@ void fn_1_3E88(s32 arg0) {
lbl_1_bss_7D = 1;
BoardStatusShowSetForce(arg0);
BoardStatusShowSet(arg0, 1);
WipeCreate(1, 0, 0x15);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
@ -495,7 +495,7 @@ void fn_1_3F5C(s32 arg0) {
BoardStatusItemSet(0);
HuPrcSleep(2);
BoardStatusItemSet(1);
WipeCreate(1, 0, 0x15);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
@ -1019,7 +1019,7 @@ void fn_1_5C5C(omObjData* arg0, w03UnkStruct5* arg1) {
if ((BoardModelMotionTimeGet(lbl_1_data_314) >= 410.0f) && (arg1->unk00_bit3) == 0) {
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
arg1->unk00_bit3 = 1;
BoardAudSeqFadeOut(1, 0x3E8);
}

11
src/REL/w03Dll/statue.c
View file

@ -662,19 +662,20 @@ void fn_1_2B44(void) {
GXSetBlendMode(GX_BM_BLEND, GX_BL_INVDSTCLR, GX_BL_SRCALPHA, GX_LO_NOOP);
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_TEX_S, GX_RGBX8, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_RGBX8, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_RGBA6, 0);
GXSetZMode(1, GX_LEQUAL, 0);
GXSetAlphaUpdate(1);
GXSetColorUpdate(1);
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition2u16(temp_f28, temp_f27);
GXPosition2f32(0.0f, 0.0f);
GXTexCoord2f32(0.0f, 0.0f);
GXPosition2u16(temp_f30, temp_f27);
GXPosition2f32(1.0f, 0.0f);
GXTexCoord2f32(1.0f, 0.0f);
GXPosition2u16(temp_f30, temp_f29);
GXPosition2f32(1.0f, 1.0f);
GXTexCoord2f32(1.0f, 1.0f);
GXPosition2u16(temp_f28, temp_f29);
GXPosition2f32(0.0f, 1.0f);
GXTexCoord2f32(0.0f, 1.0f);
GXEnd();
GXSetChanMatColor(GX_COLOR0A0, sp1C);
}

8
src/REL/w05Dll/hotel.c
View file

@ -147,21 +147,21 @@ void fn_1_155C(void) {
BoardCameraTargetModelSet(lbl_1_data_164);
BoardCameraOffsetSet(0.0f, 200.0f, 0.0f);
BoardCameraMotionWait();
HuPrcSleep(0x3C);
HuPrcSleep(60);
WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 0x30);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 48);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
fn_1_14D0();
fn_1_13D4();
WipeCreate(1, 0, 0x30);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 48);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
HuPrcSleep(0x3C);
HuPrcSleep(60);
BoardCameraTargetPlayerSet(lbl_1_bss_28);
BoardCameraMotionWait();
}