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-01-24 17:40:43 -05:00 • committed by GitHub
commit 97ca2be753
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 2914 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1982,8 +1982,6 @@ static float last5GfxPosTbl[2][3][2] = {
static void UpdateLast5Gfx(omObjData *object);
void BoardSpriteCreate(s32 file, s16 prio, AnimData **anim, s16 *sprite);
void BoardLast5GfxInit(void)
{
Last5GfxWork *work;
@ -2011,7 +2009,7 @@ void BoardLast5GfxInit(void)
lastF = 0;
}
for(i=0; i<3; i++) {
s16 prio;
s32 prio;
s32 spr_file;
if(i == 1) {

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

@ -1030,7 +1030,7 @@ static inline GetLinkCount(s32 playerIdx, s32 boardIdx) {
return linkCount;
}
void InitJunction(s32 arg0, s32 arg1, f32 arg8) {
static void InitJunction(s32 arg0, s32 arg1, f32 arg8) {
Point3d sp68;
Point3d sp5C;
Point3d sp50;

1997
src/game/board/ui.c Executable file
View file

File diff suppressed because it is too large Load diff

2
src/game/objmain.c
View file

@ -85,7 +85,7 @@ static void omWatchOverlayProc(void)
omovlstat = omnextovlstat;
omnextovl = OVL_INVALID;
if(_CheckFlag(FLAG_ID_MAKE(1, 12))) {
MGSeqPracticeStart();
MGSeqPracticeInit();
}
omSysPauseEnable(TRUE);
omcurdll = omDLLStart(omcurovl, 0);

2
src/game/sprman.c
View file

@ -555,7 +555,7 @@ void HuSprGrpTPLvlSet(short group, float tp_lvl)
}
}
void HuSprGrpDrawNoSet(short group, int draw_no)
s32 HuSprGrpDrawNoSet(short group, int draw_no)
{
SpriteGroupData *group_ptr = &HuSprGrpData[group];
short i;