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

Applying HU3D defines across the board (1/?)

Browse source
This commit is contained in:
mrshigure 2024-08-26 13:51:03 -07:00
parent dc3ada0adc
commit 27e67cb66c
89 changed files with 634 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ void BoardLandBlueExec(s32 player, s32 space) {
coin_chg = BoardCoinChgCreate(&pos, coins);
HuAudFXPlay(839);
BoardCameraMotionWait();
BoardPlayerMotionShiftSet(player, 12, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(player, 12, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
for (i = 0; i < coins; i++) {
BoardPlayerCoinsAdd(player, 1);
@ -131,7 +131,7 @@ void BoardLandRedExec(s32 player, s32 space) {
coin_chg = BoardCoinChgCreate(&pos, -coins);
HuAudFXPlay(840);
BoardCameraMotionWait();
BoardPlayerMotionShiftSet(player, 13, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(player, 13, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
for (i = 0; i < coins; i++) {
BoardPlayerCoinsAdd(player, -1);
HuAudFXPlay(14);

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

@ -454,7 +454,7 @@ static void UpdateExplode(omObjData *arg0) {
if (currSpace == GWPlayer[i].space_curr) {
temp_f31 = 20.0f * BoardRandFloat();
HuAudFXPlay(bombFXTbl[GWPlayer[i].character]);
BoardPlayerMotionShiftSet(i, 6, temp_f31, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(i, 6, temp_f31, 8.0f, HU3D_MOTATTR_LOOP);
}
}
CharModelLayerSetAll(2);

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

@ -116,7 +116,7 @@ static void BlockProc(void)
BoardWinCreate(0, 0x10000, -1);
BoardWinWait();
BoardWinKill();
BoardPlayerMotionShiftSet(player, 0xB, 0, 8.0, 0.0);
BoardPlayerMotionShiftSet(player, 0xB, 0, 8.0, HU3D_MOTATTR_NONE);
HuPrcSleep(9);
while (BoardPlayerMotionTimeGet(player) < 30.0f) {
HuPrcVSleep();

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

@ -931,7 +931,7 @@ static void BallPlayerScare(omObjData *arg0, BallPlayerWork *arg1) {
temp_r29 = arg0->data;
temp_f31 = -BoardPlayerRotYGet(stealTarget);
if (stealType == 2) {
BoardPlayerMotionShiftSet(stealTarget, temp_r29->unk04[3], 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(stealTarget, temp_r29->unk04[3], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
SetBallPlayerState(0);
} else {
BoardPlayerMotBlendSet(stealTarget, temp_f31, 15);
@ -1039,7 +1039,7 @@ static void BallPlayerCatch(omObjData *arg0, BallPlayerWork *arg1) {
omVibrate(stealTarget, 12, 4, 2);
TakeBallStar();
}
BoardPlayerMotionShiftSet(stealTarget, temp_r27->unk04[0], 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(stealTarget, temp_r27->unk04[0], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
arg1->unk02 = 1;
}
if (stealType == 0) {
@ -1124,7 +1124,7 @@ static void SetBallBooState(s32 arg0) {
ballBooObj->rot.y = (sp8.y - ballBooObj->trans.y) / 30.0f;
ballBooObj->rot.z = (sp8.z - ballBooObj->trans.z) / 30.0f;
temp_r31->unk02 = 30;
BoardModelMotionShiftSet(temp_r31->unk04, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r31->unk04, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
if (arg0 == 5) {
HuAudFXPlay(0x64);
@ -1133,7 +1133,7 @@ static void SetBallBooState(s32 arg0) {
if (arg0 == 7) {
temp_r31->unk08 = -ballBooObj->scale.y;
HuAudFXPlay(0x64);
BoardModelMotionShiftSet(temp_r31->unk04, 5, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r31->unk04, 5, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
if (arg0 == 3) {
battleTimer = 0;
@ -1200,7 +1200,7 @@ static void BallBooChase(omObjData *arg0, BallBooWork *arg1) {
} else {
SetBallBooState(0);
}
BoardModelMotionShiftSet(arg1->unk04, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(arg1->unk04, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
}
@ -1255,7 +1255,7 @@ static void BallBooFlash(omObjData *arg0, BallBooWork *arg1) {
if (BoardDAngleCalcRange(&arg0->scale.y, arg1->unk08, 8.0f) != 0) {
SetBallBooState(6);
BoardModelMotionShiftSet(arg1->unk04, 3, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(arg1->unk04, 3, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
temp_f31 = BoardPlayerRotYGet(stealTarget);
BoardPlayerPosGet(stealTarget, &sp8);
sp8.x += 500.0 * sind(-temp_f31);

28
src/game/board/boo_house.c
View file

@ -253,7 +253,7 @@ static void ExecBooHouse(void)
BoardPlayerMoveBetween(currPlayer, var_r30, temp_r29);
BoardPlayerIdleSet(currPlayer);
BoardMusStart(1, 1, 0x7F, 0);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[0], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardWinCreate(2, hostMesTbl[GWBoardGet()][0], BoardWinPortraitGet());
BoardWinWait();
@ -295,7 +295,7 @@ repeatWindowView:
BoardStatusShowSet(currPlayer, 0);
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
CloseBooHouse();
BoardCameraViewSet(1);
BoardCameraRotSet(0.0f, 0.0f);
@ -409,19 +409,19 @@ static void OpenBooHouse(void)
while (BoardModelMotionTimeGet(houseMdl[0]) < 90.0f) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(houseMdl[0], houseShowMot, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(houseMdl[1], houseHideMot, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(houseMdl[0], houseShowMot, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardModelMotionShiftSet(houseMdl[1], houseHideMot, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardModelHookObjReset(houseMdl[0], "yoko02");
SetBooBallPos();
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[2], 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[2], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
}
static void CloseBooHouse(void)
{
BoardModelPosSet(ballMdl, 0.0f, 0.0f, 0.0f);
BoardModelHookSet(houseMdl[0], "yoko02", ballMdl);
BoardModelMotionShiftSet(houseMdl[1], 0, 90.0f, 10.0f, 0);
BoardModelMotionShiftSet(houseMdl[0], 0, 90.0f, 10.0f, 0);
BoardModelMotionShiftSet(houseMdl[1], 0, 90.0f, 10.0f, HU3D_MOTATTR_NONE);
BoardModelMotionShiftSet(houseMdl[0], 0, 90.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(0xA);
while (BoardModelMotionShiftIDGet(houseMdl[0]) != -1) {
@ -697,7 +697,7 @@ void ApplyCoinSteal(s16 arg0, s16 arg1)
BoardWinKill();
BoardStatusShowSetForce(currPlayer);
BoardStatusShowSet(currPlayer, 1);
BoardPlayerMotionShiftSet(currPlayer, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(currPlayer, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
for (var_r30 = 0; var_r30 < arg0; var_r30++) {
BoardPlayerCoinsAdd(currPlayer, 1);
@ -721,7 +721,7 @@ void ApplyStarSteal(void)
BoardAudSeqPause(1, 1, 0x3E8);
HuPrcSleep(0x17);
BoardPlayerVoiceEnableSet(currPlayer, 7, 0);
BoardPlayerMotionShiftSet(currPlayer, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(currPlayer, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(boardStarSndTbl[GWPlayer[currPlayer].character]);
BoardPlayerStarsAdd(currPlayer, 1);
HuAudFXPlay(8);
@ -742,7 +742,7 @@ void ApplyBooLight(void)
BoardWinCreate(2, MAKE_MESSID(7, 11), 3);
BoardWinWait();
BoardWinKill();
BoardPlayerMotionShiftSet(currPlayer, 8, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(currPlayer, 8, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
while (BoardPlayerMotionEndCheck(currPlayer) == 0) {
HuPrcVSleep();
}
@ -860,13 +860,13 @@ void BoardBooHouseTutorialExec(void)
while (BoardModelMotionEndCheck(BoardBooHouseHostGet()) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[0], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardTutorialHookExec(0x1C, 0);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardBooHouseHostGet(), hostMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardModelPosSet(ballMdl, 0.0f, 0.0f, 0.0f);
BoardModelHookSet(houseMdl[0], "yoko02", ballMdl);
BoardModelMotionShiftSet(houseMdl[1], 0, 90.0f, 10.0f, 0);
BoardModelMotionShiftSet(houseMdl[0], 0, 90.0f, 10.0f, 0);
BoardModelMotionShiftSet(houseMdl[1], 0, 90.0f, 10.0f, HU3D_MOTATTR_NONE);
BoardModelMotionShiftSet(houseMdl[0], 0, 90.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(0xA);
while (BoardModelMotionShiftIDGet(houseMdl[0]) != -1) {
HuPrcVSleep();

40
src/game/board/bowser.c
View file

@ -220,12 +220,12 @@ static void ExecBowserMain(void)
BoardCameraViewSet(3);
BoardFilterFadeInit(30, 160);
BoardCameraMotionWait();
BoardPlayerMotionShiftSet(eventPlayer, jumpMot, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(eventPlayer, jumpMot, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardPlayerMotionSpeedSet(eventPlayer, 2.0f);
HuPrcSleep(120);
ConfigBowserEvent();
HuAudFXPlay(scareFxTbl[GWPlayer[eventPlayer].character]);
BoardPlayerMotionShiftSet(eventPlayer, scareMot, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(eventPlayer, scareMot, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
CreateMiniBowser();
while(!CheckMiniBowser()) {
HuPrcVSleep();
@ -241,7 +241,7 @@ static void ExecBowserMain(void)
HuPrcSleep(30);
}
ExecBowserSpecial();
BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
HuAudFXPlay(58);
BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
@ -288,7 +288,7 @@ static void ExecMGReturn(void)
DoMGReturnEffect();
GWSystem.player_curr = player;
BoardStatusShowSetAll(1);
BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 3, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
HuAudFXPlay(58);
BoardWinCreate(2, MAKE_MESSID(3, 11), 5);
@ -357,7 +357,7 @@ static void ExecBowserSpecial(void)
BoardWinWait();
BoardWinKill();
HuAudFXPlay(857);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
for(i=0; i<4; i++) {
omVibrate(i, 12, 12, 0);
}
@ -376,7 +376,7 @@ static void ExecBowserSpecial(void)
while(!BoardModelMotionEndCheck(bowserMdl)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
StopBowserEvent();
switch(GWSystem.bowser_event) {
case 0:
@ -422,7 +422,7 @@ static void ExecBowserGame(void)
BoardWinCreate(2, mess, 5);
BoardWinWait();
BoardWinKill();
BoardModelMotionShiftSet(bowserMdl, 5, 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while(BoardModelMotionTimeGet(bowserMdl) < 80.0f) {
HuPrcVSleep();
@ -545,7 +545,7 @@ static void ExecBowserShuffle(void)
player++;
}
HuAudFXPlay(857);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
while(!BoardModelMotionEndCheck(bowserMdl)) {
HuPrcVSleep();
}
@ -597,7 +597,7 @@ static void ExecBowserRevo(void)
}
coin /= 4;
HuAudFXPlay(857);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
while(!BoardModelMotionEndCheck(bowserMdl)) {
HuPrcVSleep();
}
@ -622,11 +622,11 @@ static void ExecBowserRevo(void)
static void ExecBowserSuit(void)
{
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
BoardWinCreate(2, MAKE_MESSID(3, 18), 5);
BoardWinWait();
HuAudFXPlay(857);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
StartSuitGive();
while(!CheckSuitGive()) {
@ -826,7 +826,7 @@ static void ExecBowserObj(omObjData *object)
}
if(work->mot_active && BoardModelMotionEndCheck(bowserMdl)) {
work->mot_active = 0;
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
switch(work->state) {
case 1:
@ -880,7 +880,7 @@ static void ExecBowserFall(BowserWork *work, omObjData *object)
}
if(BoardModelMotionEndCheck(bowserMdl)) {
work->state = 0;
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(bowserMdl, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
return;
}
if(!work->fall_done && !(BoardModelMotionTimeGet(bowserMdl) < 140.0f)) {
@ -933,7 +933,7 @@ static void ExecBowserJump(BowserWork *work, omObjData *object)
{
switch(work->jump_state) {
case 0:
BoardModelMotionShiftSet(bowserMdl, 2, 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(bowserMdl, 2, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
work->jump_state = 1;
break;
@ -1532,9 +1532,9 @@ static void MiniBowserTake(void)
omVibrate(eventPlayer, 12, 6, 6);
}
if(coin_inc < 0) {
BoardPlayerMotionShiftSet(eventPlayer, 13, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(eventPlayer, 13, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
} else {
BoardPlayerMotionShiftSet(eventPlayer, 12, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(eventPlayer, 12, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
}
for(i=0; i<steal; i++) {
BoardPlayerCoinsAdd(eventPlayer, coin_inc);
@ -1607,9 +1607,9 @@ static void MiniBowserTakeAll(void)
}
for(i=0; i<4; i++) {
if(coin_inc < 0) {
BoardPlayerMotionShiftSet(i, 13, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(i, 13, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
} else {
BoardPlayerMotionShiftSet(i, 12, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(i, 12, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
}
}
if(steal >= 20) {
@ -1778,9 +1778,9 @@ static void SetMiniBowserMotion(s32 mot, u8 end, s32 pause)
work = OM_GET_WORK_PTR(miniBowserBalloonObj, MiniBowserBalloonWork);
models = work->models;
if(pause) {
attr = 0x40000001;
attr = HU3D_MOTATTR_LOOP;
} else {
attr = 0;
attr = HU3D_MOTATTR_NONE;
}
if(end) {
OSu8tof32(&end, &shift_end);

32
src/game/board/item.c
View file

@ -944,7 +944,7 @@ static void ExecItemPipe(void) {
}
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(sp2C[1], 6, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(sp2C[1], 6, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardModelVoiceEnableSet(BoardPlayerModelGet(sp2C[1]), 6, 0);
CharModelLayerSetAll(2);
BoardPlayerIdleSet(sp2C[0]);
@ -1480,7 +1480,7 @@ static void ExecItemWhistle(void) {
}
HuPrcVSleep();
}
BoardModelMotionShiftSet(temp_r28, temp_r20, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r28, temp_r20, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
HuAudFXPlay(0x322);
for (var_r29 = 0; var_r29 < 180; var_r29++) {
for (var_r31 = 0; var_r31 < 4; var_r31++) {
@ -1533,7 +1533,7 @@ static void ExecItemWhistle(void) {
if (sp28[0] < 100.0f) {
if (var_r27 == 0) {
var_r27 = 1;
BoardModelMotionShiftSet(temp_r28, temp_r21, 0.0f, 3.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r28, temp_r21, 0.0f, 3.0f, HU3D_MOTATTR_LOOP);
HuAudFXPlay(forceMoveSfxTbl[GWBoardGet()]);
}
sp9C.y += var_f30;
@ -1619,18 +1619,18 @@ static void ExecItemBowser(void) {
HuAudFXPlay(0x326);
BoardModelVisibilitySet(temp_r31, 1);
BoardModelHookSet(suitMdl, "itemhook_head", temp_r31);
BoardModelMotionShiftSet(suitMdl, suitMot[1], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(temp_r31, suitCommonMot[1], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(suitMdl, suitMot[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardModelMotionShiftSet(temp_r31, suitCommonMot[1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
while (!BoardModelMotionEndCheck(suitMdl)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(suitMdl, suitMot[0], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(temp_r31, suitCommonMot[0], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(suitMdl, suitMot[0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardModelMotionShiftSet(temp_r31, suitCommonMot[0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(0x28);
HuAudPlayerVoicePlay(currItemRestore, 0x129);
omVibrate(currItemRestore, 12, 4, 2);
HuPrcSleep(60);
BoardModelMotionShiftSet(suitMdl, 0, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(suitMdl, 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
HuPrcKill(NULL);
while (1) {
HuPrcVSleep();
@ -1828,7 +1828,7 @@ static void ExecItemBooBall(void) {
BoardWinKill();
BoardStatusShowSetAll(1);
if (var_r29 != 0) {
BoardPlayerMotionShiftSet(currItemRestore, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(currItemRestore, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(30);
for (var_r31 = 0; var_r31 < spC; var_r31++) {
BoardPlayerCoinsAdd(currItemRestore, 1);
@ -1837,7 +1837,7 @@ static void ExecItemBooBall(void) {
}
BoardPlayerMotionEndWait(currItemRestore);
HuPrcSleep(10);
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
break;
case 1:
@ -1874,7 +1874,7 @@ static void ExecItemBooBall(void) {
if (var_r29 != 0) {
BoardPlayerVoiceEnableSet(currItemRestore, 7, 0);
sp18 = HuAudSStreamPlay(6);
BoardPlayerMotionShiftSet(currItemRestore, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(currItemRestore, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(boardStarSndTbl[GWPlayer[currItemRestore].character]);
BoardPlayerStarsAdd(currItemRestore, 1);
HuAudFXPlay(8);
@ -1885,7 +1885,7 @@ static void ExecItemBooBall(void) {
HuPrcVSleep();
}
}
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
break;
case 3:
BoardViewMapExec(currItemRestore);
@ -2311,7 +2311,7 @@ static void GenieSceneExec(void) {
temp_f30 = 40.0f - var_f31 * var_f31 * 0.25f * 0.0125f;
if (temp_f30 <= 0.0f && var_r22 == 0) {
var_r22 = 1;
BoardModelMotionShiftSet(temp_r28, 3, 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(temp_r28, 3, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
}
var_f31 += 1.0f;
sp50.y += temp_f30;
@ -2668,7 +2668,7 @@ static void ExecItemBag(void) {
}
HuPrcChildWatch();
BoardPlayerItemAdd(currItemRestore, itemBagItems[var_r30]);
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(currItemRestore, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(10);
var_r30++;
}
@ -2754,8 +2754,8 @@ static void RestoreItemBowser(void) {
BoardModelAttrSet(temp_r31, 0x400000);
suitMdl = BoardBowserSuitModelGet();
temp_r29 = BoardBowserSuitPlayerModelGet();
BoardModelMotionShiftSet(suitMdl, suitMot[0], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(temp_r29, suitCommonMot[0], 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(suitMdl, suitMot[0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardModelMotionShiftSet(temp_r29, suitCommonMot[0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(40);
HuAudPlayerVoicePlay(currItemRestore, 0x129);
HuPrcSleep(20);

38
src/game/board/last5.c
View file

@ -513,9 +513,9 @@ static void Last5Main(void)
}
BoardWinCreate(2, messBase+10, BoardWinPortraitGetStar());
BoardWinWait();
BoardModelMotionShiftSet(hostMdl, hostMot[5], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(hostMdl, hostMot[5], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcVSleep(8);
BoardModelMotionShiftSet(hostMdl, hostMot[6], 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[6], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
for(temp_r31=0; temp_r31<4; temp_r31++) {
temp_r30 = sp28[temp_r31];
temp_r27 = sp24[temp_r31];
@ -581,7 +581,7 @@ static void Last5Main(void)
}
BoardModelMotionStart(hostMdl, hostMot[5], 0x40000004);
HuPrcVSleep(8);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardWinCreate(2, messBase+15, BoardWinPortraitGetStar());
BoardWinWait();
if((s32)GWSystem.team != 0) {
@ -619,7 +619,7 @@ static void Last5Main(void)
while(!CheckHostMove()) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(8);
if((s32)GWSystem.team != 0) {
temp_r30 = last5Player;
@ -642,9 +642,9 @@ static void Last5Main(void)
BoardWinCreate(2, messBase+16, BoardWinPortraitGetStar());
BoardWinInsertMesSet(BoardPlayerGetCharMess(temp_r30), 3);
BoardWinWait();
BoardModelMotionShiftSet(hostMdl, hostMot[5], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(hostMdl, hostMot[5], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcVSleep(8);
BoardModelMotionShiftSet(hostMdl, hostMot[6], 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[6], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
temp_r19 = 0;
temp_r29 = 3;
for(temp_f31=0; temp_r29>0; temp_f31++) {
@ -668,7 +668,7 @@ static void Last5Main(void)
sp3C = sp48;
BoardModelMotionStart(hostMdl, hostMot[5], 0x40000004);
HuPrcVSleep(8);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
CreateLast5Roulette();
SetLast5RouletteFade(1);
SetLast5RouletteState(2);
@ -722,15 +722,15 @@ static void Last5Main(void)
BoardPlayerIdleSet(temp_r30);
BoardModelVisibilitySet(BoardPlayerModelGet(temp_r30), 0);
SetLast5RouletteFade(0);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardWinCreate(2, messBase+23, BoardWinPortraitGetStar());
BoardWinWait();
BoardModelMotionShiftSet(hostMdl, hostMot[4], 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(hostMdl, hostMot[4], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while(!BoardModelMotionEndCheck(hostMdl)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(hostMdl, hostMot[2], 0.0f, 8.0f, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[2], 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
SetLotteryDrawState(4);
}
@ -1086,7 +1086,7 @@ static void ExecLotteryDraw(void)
SetLotteryDrawWheelState(3);
BoardWinCreate(2, 2+messBase+ticket, BoardWinPortraitGetStar());
BoardWinWait();
BoardModelMotionShiftSet(hostMdl, hostMot[7], 0, 8, 0);
BoardModelMotionShiftSet(hostMdl, hostMot[7], 0, 8, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while(BoardModelMotionTimeGet(hostMdl) < 26.0f) {
HuPrcVSleep();
@ -1098,7 +1098,7 @@ static void ExecLotteryDraw(void)
while(!BoardModelMotionEndCheck(hostMdl)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, HU3D_MOTATTR_LOOP);
while(GetLotteryDrawWheelState() != 0) {
HuPrcVSleep();
}
@ -1133,7 +1133,7 @@ static void ExecLotteryDraw(void)
}
} else {
BoardAudSeqPause(1, 1, 1000);
BoardModelMotionShiftSet(hostMdl, hostMot[3], 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[3], 0, 8, HU3D_MOTATTR_LOOP);
stream = HuAudSStreamPlay(10);
while(HuAudSStreamStatGet(stream)) {
HuPrcVSleep();
@ -1164,11 +1164,11 @@ static void ExecLotteryDraw(void)
HuPrcVSleep();
}
BoardPlayerIdleSet(player);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, HU3D_MOTATTR_LOOP);
while(!CheckHostMove()) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, HU3D_MOTATTR_LOOP);
BoardStatusShowSetForce(player);
BoardStatusShowSet(player, 1);
BoardPlayerMotBlendSet(player, 0, 7);
@ -1178,7 +1178,7 @@ static void ExecLotteryDraw(void)
BoardWinCreate(2, 6+messBase, BoardWinPortraitGetStar());
BoardWinWait();
BoardAudSeqPause(1, 1, 1000);
BoardModelMotionShiftSet(hostMdl, hostMot[1], 0, 8, 0);
BoardModelMotionShiftSet(hostMdl, hostMot[1], 0, 8, HU3D_MOTATTR_NONE);
star_pos.x = host_start.x;
star_pos.y = 60.0f+host_start.y;
star_pos.z = host_start.z;
@ -1188,11 +1188,11 @@ static void ExecLotteryDraw(void)
BoardStatusShowSet(player, 0);
StartHostMove(&host_start, &host_end, 25);
BoardPlayerPosLerpStart(player, &player_start, &player_end, 25);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, HU3D_MOTATTR_LOOP);
while(!CheckHostMove()) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, 1, 0, 8, HU3D_MOTATTR_LOOP);
while(GWPlayer[player].moving) {
HuPrcVSleep();
}
@ -1514,7 +1514,7 @@ static void StartHostMove(Vec *from, Vec *to, s16 time)
angle = 180.0*(atan2(object->rot.x, object->rot.z)/M_PI);
work->angle = 0;
OSf32tos16(&angle, &work->angle_end);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, 0x40000001);
BoardModelMotionShiftSet(hostMdl, hostMot[0], 0, 8, HU3D_MOTATTR_LOOP);
BoardModelMotionSpeedSet(hostMdl, 3.0f);
}

20
src/game/board/lottery.c
View file

@ -533,7 +533,7 @@ static void ExecLottery(void) {
while (!BoardModelMotionEndCheck(lotteryMdl[0])) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[3], 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
BoardPlayerRotSet(temp_r31, 0.0f, temp_r26, 0.0f);
BoardPlayerPosLerpStart(temp_r31, &sp38, &sp2C, 0x14);
while (GWPlayer[temp_r31].moving) {
@ -556,7 +556,7 @@ static void ExecLottery(void) {
while (!BoardStatusStopCheck(temp_r31)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[0], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
if (GWPlayer[temp_r31].draw_ticket == 0 && GWSystem.max_turn - GWSystem.turn >= 5) {
SetupTicket(temp_r31);
ShowTicket();
@ -902,7 +902,7 @@ static void ExecBallGame(void) {
BoardModelMotionTimeSet(lotteryMdl[1], 0.0f);
BoardModelAttrSet(gripMdl[0], 0x40000001);
BoardModelAttrSet(gripMdl[1], 0x40000001);
BoardPlayerMotionShiftSet(temp_r27, turnMot, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(temp_r27, turnMot, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
BoardPlayerMotionSpeedSet(temp_r27, 0.0f);
temp_f24 = BoardModelMotionMaxTimeGet(lotteryMdl[1]);
temp_f24 -= 4.0f;
@ -1878,7 +1878,7 @@ static void ExecPrize(void) {
HuAudFXPlay(0x332);
}
if (var_r29 == 7) {
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
if (var_r26 != 0) {
BoardPlayerPosGet(temp_r30, &sp8);
@ -1922,7 +1922,7 @@ static void ExecPrize(void) {
HuAudFXPlay(loseSoundTbl[GWPlayer[temp_r30].character]);
BoardPlayerVoiceEnableSet(temp_r30, var_r29, 0);
}
BoardPlayerMotionShiftSet(temp_r30, var_r29, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(temp_r30, var_r29, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
switch (var_r31) {
case 0:
case 1:
@ -1951,7 +1951,7 @@ static void ExecPrize(void) {
} else {
var_r28 = lotteryMessBase + 8;
}
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[2], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[2], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardWinCreate(2, var_r28, BoardWinPortraitGet());
BoardWinWait();
BoardWinKill();
@ -1968,7 +1968,7 @@ static void ExecLose(s32 arg0) {
temp_r30 = GWPlayer[arg0].character;
loseMot = BoardPlayerMotionCreate(arg0, loseMotTbl[temp_r30]);
BoardPlayerMotionShiftSet(arg0, loseMot, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(arg0, loseMot, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
while (!BoardPlayerMotionEndCheck(arg0)) {
HuPrcVSleep();
@ -2043,14 +2043,14 @@ void BoardLotteryTutorialExec(void) {
while (!BoardModelMotionEndCheck(lotteryMdl[0])) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[3], 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[3], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(10);
while (!BoardModelMotionEndCheck(BoardShopHostGet())) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[0], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardTutorialHookExec(0x1C, 0);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[2], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardLotteryHostGet(), lotteryMot[2], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(30);
BoardModelMotionStart(lotteryMdl[0], 0, 0x40000004);
while (!BoardModelMotionEndCheck(lotteryMdl[0])) {

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

@ -1322,7 +1322,7 @@ static void ExecBoardMG(omObjData *object)
return;
}
if(GWPlayer[GWSystem.player_curr].moving == 0) {
BoardPlayerMotionShiftSet(GWSystem.player_curr, 1, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
if(!_CheckFlag(FLAG_ID_MAKE(1, 21))) {
_SetFlag(FLAG_ID_MAKE(1, 20));
object->func = KillBoardMG;

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

@ -166,7 +166,7 @@ static void MushroomMain(void) {
var_r27 = MAKE_MESSID(5, 2);
}
BoardPlayerMotionShiftSet(curPlayer, 0xC, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(curPlayer, 0xC, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(4);
BoardWinCreate(0, var_r27, -1);
BoardWinWait();

22
src/game/board/player.c
View file

@ -1703,7 +1703,7 @@ void BoardPlayerPosLerpStart(s32 arg0, Vec *arg1, Vec *arg2, s16 arg3)
temp_r21 = BoardPlayerGet(arg0);
if (playerMot[temp_r21->player_idx] != 3) {
var_r25 = BoardModelMotionShiftSet(BoardPlayerModelGet(arg0), 3, 0.0f, 4.0f, 0x40000001);
var_r25 = BoardModelMotionShiftSet(BoardPlayerModelGet(arg0), 3, 0.0f, 4.0f, HU3D_MOTATTR_LOOP);
if (var_r25 == 0) {
playerMot[temp_r21->player_idx] = 3;
}
@ -1909,7 +1909,7 @@ void BoardPlayerIdleSet(s32 arg0)
BoardBowserSuitMotionSetWait();
BoardBowserSuitPlayerModelKill();
}
BoardPlayerMotionShiftSet(arg0, 1, 0.0f, 8.0f, 0x40000001);
BoardPlayerMotionShiftSet(arg0, 1, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
}
static void ExecMotBlend(omObjData *arg0);
@ -1992,7 +1992,7 @@ void BoardPlayerMotBlendSet(s32 arg0, s16 arg1, s16 arg2)
}
else if (var_f21 = 8.0f * temp_f26, abs(sp1C) > 45) {
var_r22 = temp_r26->unk_04h;
BoardPlayerMotionShiftSet(arg0, var_r22, var_f24, var_f21, 0);
BoardPlayerMotionShiftSet(arg0, var_r22, var_f24, var_f21, HU3D_MOTATTR_NONE);
BoardPlayerMotionSpeedSet(arg0, var_f27);
}
OSs16tof32(&arg2, &var_f27);
@ -2387,7 +2387,7 @@ void BoardBowserSuitMotionCreate(void)
void BoardBowserSuitMotionSetWait(void)
{
if (suitCurrMot != 0) {
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[0], 0.0f, 4.0f, 0x40000001);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[0], 0.0f, 4.0f, HU3D_MOTATTR_LOOP);
suitCurrMot = 0;
}
}
@ -2402,13 +2402,13 @@ void BoardBowserSuitMotionSetWalk(void)
void BoardBowserSuitMotionSetWin(void)
{
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[3], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[3], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
suitCurrMot = 3;
}
void BoardBowserSuitMotionSetJump(void)
{
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[2], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[2], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
suitCurrMot = 2;
}
@ -2519,10 +2519,10 @@ static s32 DoSparkSpace(s32 player, s32 pause_cam)
if (GWPlayer[i].space_curr == sp34) {
sp124[sp134++] = i;
sp15C[i] = BoardPlayerMotionCreate(i, sparkMotTbl[GWPlayer[i].character]);
BoardPlayerMotionShiftSet(i, sp15C[i], 0, 8, 0);
BoardPlayerMotionShiftSet(i, sp15C[i], 0, 8, HU3D_MOTATTR_NONE);
HuAudFXPlay(boardSparkSfxTblAlt[GWPlayer[i].character]);
if (GWPlayer[i].bowser_suit) {
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[4], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[4], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
sp128 = i;
}
}
@ -2883,7 +2883,7 @@ static s32 MegaPlayerPassFunc(s32 player, s32 space)
spAC.z /= 60.0f;
BoardPlayerRotYSet(player, 90.0 - (180.0 * (atan2(spAC.z, spAC.x) / M_PI)));
sp98[1] = BoardVecDistXZCalc(&spC4, &spB8);
BoardPlayerMotionShiftSet(player, 4, 0, 8, 0);
BoardPlayerMotionShiftSet(player, 4, 0, 8, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
temp_r24 = 0;
for (temp_f30 = 0; temp_f30 < 60.0f; temp_f30++) {
@ -2906,7 +2906,7 @@ static s32 MegaPlayerPassFunc(s32 player, s32 space)
}
if (spB8.y <= spC4.y) {
spB8.y = spC4.y;
BoardPlayerMotionShiftSet(player, 5, 0, 4, 0);
BoardPlayerMotionShiftSet(player, 5, 0, 4, HU3D_MOTATTR_NONE);
}
BoardPlayerPosSetV(player, &spB8);
HuPrcVSleep();
@ -2987,7 +2987,7 @@ static s32 MegaExecJump(s32 player, s32 space)
BoardPlayerIdleSet(player);
HuPrcSleep(10);
sp90[1] = BoardVecDistXZCalc(&spC4, &spB8);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[3], 0.0f, 8.0f, 0);
BoardModelMotionShiftSet(suitMdl, bowserSuitMot[3], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
BoardModelMotionSpeedSet(suitMdl, 2.0f);
HuPrcSleep(8);
HuAudFXPlay(809);

10
src/game/board/shop.c
View file

@ -273,7 +273,7 @@ static void ExecShop(void) {
HuAudFXPlay(0x330);
HuAudFXPlay(0x32D);
PopupShop();
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[2], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[2], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(4);
BoardPlayerRotSet(shopPlayer, 0.0f, temp_f31, 0.0f);
BoardPlayerMoveBetween(shopPlayer, temp_r28, temp_r25);
@ -366,7 +366,7 @@ static void ExecShop(void) {
if (activeItemTbl[itemCurChoice] != 0xD) {
BoardPlayerItemAdd(shopPlayer, activeItemTbl[itemCurChoice]);
}
BoardPlayerMotionShiftSet(shopPlayer, 0xC, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(shopPlayer, 0xC, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(5);
BoardPlayerMotionEndWait(shopPlayer);
HuPrcSleep(15);
@ -375,7 +375,7 @@ static void ExecShop(void) {
}
BoardAudSeqFadeOut(1, 1000);
BoardModelVisibilitySet(itemMdl, 0);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardStatusShowSet(shopPlayer, 0);
BoardCameraTargetPlayerSet(shopPlayer);
BoardCameraMotionWait();
@ -1148,14 +1148,14 @@ void BoardShopTutorialExec(s32 arg0) {
HuAudFXPlay(0x330);
HuAudFXPlay(0x32D);
PopupShop();
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[2], 0.0f, 4.0f, 0);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[2], 0.0f, 4.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(4);
while (!BoardModelMotionEndCheck(BoardShopHostGet())) {
HuPrcVSleep();
}
BoardModelMotionStart(BoardShopHostGet(), shopMot[0], 0x40000001);
BoardTutorialHookExec(0x1C, 0);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(BoardShopHostGet(), shopMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(30);
CloseShop();
for (i = 0; i < 2; i++) {

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

@ -734,7 +734,7 @@ static s32 ExecPipeSpace(s32 player, s32 space)
if(pos.y <= pos_link.y) {
pos.y = pos_link.y;
if(!mot_disable) {
BoardPlayerMotionShiftSet(player, 3, 0, 4, 0x40000001);
BoardPlayerMotionShiftSet(player, 3, 0, 4, HU3D_MOTATTR_LOOP);
break;
}
} else {

14
src/game/board/star.c
View file

@ -233,7 +233,7 @@ static void ExecStar(void) {
}
if (var_r26 != 0) {
var_f31 /= var_r25;
BoardModelMotionShiftSet(temp_r30, hostMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r30, hostMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardModelMotionSpeedSet(temp_r30, 2.0f);
}
while (!BoardPlayerMotBlendCheck(temp_r31)) {
@ -243,7 +243,7 @@ static void ExecStar(void) {
}
HuPrcVSleep();
}
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardCameraViewSet(3);
BoardCameraMotionWait();
if (GWStarsGet(temp_r31) >= 999) {
@ -337,7 +337,7 @@ block_A:
HuAudFXPlay(0xF);
}
_SetFlag(0x10017);
BoardModelMotionShiftSet(temp_r30, hostMot[0], 0.0f, 10.0f, 0);
BoardModelMotionShiftSet(temp_r30, hostMot[0], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(30);
starDoneF = 1;
BoardAudSeqFadeOut(0, 1000);
@ -348,7 +348,7 @@ block_A:
while (!BoardStatusStopCheck(temp_r31)) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardStarShowNext(temp_r31);
BoardMusStartBoard();
BoardModelRotYSet(temp_r30, 0.0f);
@ -358,7 +358,7 @@ block_B:
var_f31 = -BoardModelRotYGet(temp_r30);
if (var_r26 != 0) {
var_f31 /= var_r25;
BoardModelMotionShiftSet(temp_r30, hostMot[1], 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r30, hostMot[1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardModelMotionSpeedSet(temp_r30, 3.0f);
}
BoardPlayerMotBlendSet(temp_r31, 0, var_r25);
@ -370,7 +370,7 @@ block_B:
HuPrcVSleep();
}
BoardModelRotYSet(temp_r30, 0.0f);
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(temp_r30, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
if (!_CheckFlag(FLAG_ID_MAKE(1, 22))) {
BoardCameraViewSet(1);
BoardCameraTargetPlayerSet(temp_r31);
@ -622,7 +622,7 @@ void BoardStarGive(s32 arg0, Vec *arg1) {
StarInlineFunc02();
StarInlineFunc01();
BoardPlayerVoiceEnableSet(arg0, 7, 0);
BoardPlayerMotionShiftSet(arg0, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(arg0, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuAudFXPlay(boardStarSndTbl[GWPlayer[arg0].character]);
BoardPlayerStarsAdd(arg0, 1);
HuAudFXPlay(8);

8
src/game/board/start.c
View file

@ -331,7 +331,7 @@ static void CreatePlayerStart(void) {
var_r29->trans.y = spC.y + 700.0f;
var_r29->trans.z = spC.z + 100.0f;
BoardPlayerPosSet(playerOrderOld[var_r30->unk00_field2], var_r29->trans.x, var_r29->trans.y, var_r29->trans.z);
BoardPlayerMotionShiftSet(playerOrderOld[var_r30->unk00_field2], 4, 10.0f, 1.0f, 0);
BoardPlayerMotionShiftSet(playerOrderOld[var_r30->unk00_field2], 4, 10.0f, 1.0f, HU3D_MOTATTR_NONE);
}
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardMusStart(0, 0xC, 0x7F, 0);
@ -400,7 +400,7 @@ static void PlayerFall(omObjData *arg0, PlayerStartWork *arg1) {
if (arg0->trans.y < spacePos.y) {
arg0->trans.y = spacePos.y;
arg1->unk02 = 0;
BoardPlayerMotionShiftSet(playerOrderOld[arg1->unk00_field2], 5, 0.0f, 4.0f, 0);
BoardPlayerMotionShiftSet(playerOrderOld[arg1->unk00_field2], 5, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
arg1->unk01 = 0xC;
arg1->unk00_field3 = 1;
}
@ -704,7 +704,7 @@ static void ExecStartRoll(void) {
}
BoardStatusShowSet(i, 1);
SetPlayerStartState(playerOrderOld[i], 6);
BoardPlayerMotionShiftSet(i, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(i, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while (!BoardPlayerMotionEndCheck(i)) {
HuPrcVSleep();
@ -734,7 +734,7 @@ static void ExecStartRoll(void) {
HuPrcSleep(var_r23);
}
for (i = 0; i < 4; i++) {
BoardPlayerMotionShiftSet(i, 7, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(i, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
}
HuAudFXPlay(0xF);
while (1) {