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

Matched REL/m405 + some code cleanup

Browse source
This commit is contained in:
mrshigure 2024-05-15 18:56:45 -07:00
parent 440e47ec2c
commit 66ba618452
34 changed files with 2683 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/board/battle.c
View file

@ -197,7 +197,7 @@ static void ExecBattle(void) {
}
if (_CheckFlag(0x10004)) {
BoardStatusItemSet(1);
WipeCreate(1, 0, -1);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -296,7 +296,7 @@ static void ExecBattle(void) {
}
_SetFlag(0x1000E);
WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 0, -1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}

2
src/game/board/boo.c
View file

@ -683,7 +683,7 @@ static void BallRenderHook(void) {
GXSetScissor(0, 0, 160, 160);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_TEX_ST, GX_RGBA6, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_RGBA6, 0);
sp10.r = 0;
sp10.g = 0;
sp10.b = 0;

4
src/game/board/mg_setup.c
View file

@ -177,7 +177,7 @@ static void ExecMGSetup(void) {
sp54.z = 0.0f;
BoardCameraMotionStartEx(-1, NULL, &sp54, 1300.0f, -1.0f, 21);
BoardCameraMotionWait();
WipeCreate(1, 0, 0x15);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
@ -268,7 +268,7 @@ static void ExecMGSetup(void) {
BoardAudSeqFadeOut(0, 0x3E8U);
_SetFlag(0x1000EU);
WipeColorSet(0xFFU, 0xFFU, 0xFFU);
WipeCreate(2, 0, -1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}

4
src/game/board/view.c
View file

@ -103,7 +103,7 @@ void BoardViewOverheadExec(s32 arg0) {
}
_SetFlag(0x1001C);
WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 1, 1);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
@ -314,7 +314,7 @@ static void ExecOverheadView(void) {
HuPrcVSleep();
SetTargetView();
WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(1, 1, 0xA);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_CROSS, 10);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}

4
src/game/board/warp.c
View file

@ -148,7 +148,7 @@ static void WarpLaunch(s32 player) {
BoardPlayerPosSetV(player, &warpPos);
if (!(warpPos.y < warpYFloor)) {
WipeColorSet(0U, 0U, 0U);
WipeCreate(2, 0, 21);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
@ -182,7 +182,7 @@ static void WarpStartImpact(s32 player) {
BoardCameraMoveSet(0);
BoardCameraTargetSpaceSet(warpSpace);
HuPrcSleep(1);
WipeCreate(1, 0, 0x15);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) {
HuPrcVSleep();
}