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

Matched game/board/lottery + some unsplit cleanup

Browse source
This commit is contained in:
mrshigure 2024-02-28 06:16:45 -08:00
parent 1da8985530
commit 08e6ce1a45
25 changed files with 2080 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/audio.c
View file

@ -190,7 +190,7 @@ void HuAudFXListnerSetEX(Vec* arg0, Vec* arg1, float sndDist, float sndSpeed, fl
}
}
void HuAudFXListnerUpdate(s32 arg0, s32 arg1) {
void HuAudFXListnerUpdate(Vec *arg0, Vec *arg1) {
if (omSysExitReq == 0) {
msmSeUpdataListener(arg0, arg1);
}

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

@ -1,5 +1,6 @@
#include "game/board/basic_space.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/player.h"
#include "game/board/tutorial.h"
#include "game/data.h"
@ -37,7 +38,6 @@ static void CoinChgDisappear(omObjData*, coinChg*);
extern void BoardCameraViewSet(s32);
extern void BoardPlayerPosGet(s32, Vec*);
extern void BoardModelPosGet(s16, Vec*);
extern void BoardPlayerMotionEndWait(s32);
extern void BoardPlayerCoinsAdd(s32, s32);
extern void BoardRotateDiceNumbers(s32);

2013
src/game/board/lottery.c Executable file
View file

File diff suppressed because it is too large Load diff

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

@ -8,7 +8,9 @@
#include "string.h"
#include "game/hsfman.h"
#include "game/hsfdraw.h"
#include "game/board/lottery.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/pause.h"
#include "game/board/player.h"
#include "game/board/tutorial.h"
@ -58,7 +60,6 @@ static CameraView camViewTbl[] = {
};
extern void BoardModelPosGet(s16 model, Vec *pos);
extern s32 BoardSpacePosGet(s32 layer, s32 space, Vec *pos);
extern void BoardMGSetupPlayClear(void);

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

@ -1,6 +1,8 @@
#include "game/gamework_data.h"
#include "game/flag.h"
#include "game/board/lottery.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/player.h"
#include "game/board/space.h"
#include "game/board/star.h"
@ -14,9 +16,6 @@
#include "string.h"
extern s16 BoardModelCreate(s32 file, s32 *data, s32 arg3);
extern s16 BoardModelIDGet(s16 model);
static BoardSpace spaceData[2][256];
s16 boardSpaceStarTbl[8];
static GXTexObj spaceHiliteTex;
@ -834,7 +833,7 @@ static void DrawSpaces(ModelData *model, Mtx matrix)
if(player_pos.y-space_curr->pos.y < 0.0f) {
y_dist = -(player_pos.y-space_curr->pos.y);
} else {
y_dist = player_pos.y-space_curr->pos.y;
y_dist = player_pos.y-space_curr->pos.y;
}
if(y_dist < 10.0f) {
space_hilite = space_curr;

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

@ -717,8 +717,8 @@ void BoardStarShowNext(s32 arg0) {
Hu3D2Dto3D(&sp44, 1, &sp44);
BoardModelPosSetV(BoardStarHostMdlGet(), &sp44);
BoardCameraRotGet(&sp2C);
PSMTXRotRad(sp5C, 'y', 0.17453292f);
PSMTXRotRad(sp8C, 'x', 0.017453292f * sp2C.x);
PSMTXRotRad(sp5C, 'y', MTXDegToRad(10.0f));
PSMTXRotRad(sp8C, 'x', MTXDegToRad(sp2C.x));
PSMTXConcat(sp8C, sp5C, spBC);
BoardModelMtxSet(BoardStarHostMdlGet(), &spBC);
BoardModelRotSet(BoardStarHostMdlGet(), 0.0f, 0.0f, 0.0f);

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

@ -578,8 +578,8 @@ static void UpdateOverheadView(omObjData *arg0) {
sp20.y = var_r29[1];
sp20.z = 1000.0f;
BoardCameraRotGet(&sp8);
PSMTXRotRad(sp5C, 0x78, sp8.x * 0.017453292f);
PSMTXRotRad(sp2C, 0x79, sp8.y * 0.017453292f);
PSMTXRotRad(sp5C, 'x', MTXDegToRad(sp8.x));
PSMTXRotRad(sp2C, 'y', MTXDegToRad(sp8.y));
PSMTXConcat(sp2C, sp5C, sp2C);
BoardModelMtxSet(temp_r31->unk04, &sp2C);
Hu3D2Dto3D(&sp20, 1, &sp20);

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

@ -1,5 +1,6 @@
#include "game/board/warp.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/player.h"
#include "game/board/tutorial.h"
#include "game/wipe.h"
@ -21,10 +22,6 @@ extern void BoardCharWheelInit(s32, s32);
extern void BoardCharWheelSpeedSet(f32);
extern void BoardCharWheelWait(void);
extern s32 BoardCharWheelResultGet(void);
extern f32 BoardModelMotionTimeGet(s16);
extern void BoardModelHookReset(s16);
extern s32 BoardModelHookSet(s16, char*, s16);
extern s32 BoardModelMotionEndCheck(s16);
static Vec warpPos;