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

Merge pull request #189 from gamemasterplc/main

Browse source 
Finish matching board/item.c
This commit is contained in:
gamemasterplc 2024-02-28 19:42:34 -06:00 • committed by GitHub
commit f03ab7a35a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 994 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.py
View file

@ -377,7 +377,7 @@ config.libs = [
Object(Matching, "game/board/roll.c"), Object(Matching, "game/board/roll.c"),
Object(Matching, "game/board/ui.c"), Object(Matching, "game/board/ui.c"),
Object(Matching, "game/board/block.c"), Object(Matching, "game/board/block.c"),
Object(NonMatching, "game/board/item.c"), Object(Matching, "game/board/item.c"),
Object(NonMatching, "game/board/bowser.c"), Object(NonMatching, "game/board/bowser.c"),
Object(NonMatching, "game/board/battle.c"), Object(NonMatching, "game/board/battle.c"),
Object(NonMatching, "game/board/fortune.c"), Object(NonMatching, "game/board/fortune.c"),

3
include/game/board/player.h
View file

@ -82,7 +82,7 @@ void BoardPlayerScaleSetV(s32, Vec*);
void BoardPlayerScaleSet(s32, f32, f32, f32); void BoardPlayerScaleSet(s32, f32, f32, f32);
s16 BoardPlayerCurrMotionGet(s32); s16 BoardPlayerCurrMotionGet(s32);
s32 BoardPlayerMotionCreate(s32, s32); s32 BoardPlayerMotionCreate(s32, s32);
void BoardPlayerMotionKill(s32, s32); s32 BoardPlayerMotionKill(s32, s32);
s32 BoardPlayerMotionEndCheck(s32); s32 BoardPlayerMotionEndCheck(s32);
void BoardPlayerMotionEndWait(s32); void BoardPlayerMotionEndWait(s32);
void BoardPlayerMotionStart(s32, s32, s32); void BoardPlayerMotionStart(s32, s32, s32);
@ -114,6 +114,7 @@ void BoardPlayerZoomRestore(s32);
void BoardJunctionMaskSet(s32); void BoardJunctionMaskSet(s32);
void BoardJunctionMaskReset(s32); void BoardJunctionMaskReset(s32);
void BoardJunctionMaskZero(void); void BoardJunctionMaskZero(void);
void BoardPlayerVoiceEnableSet(s32, s32, s32);
void InitJunction(s32, s32, f32); void InitJunction(s32, s32, f32);
static void UpdateJunctionGfx(omObjData*); static void UpdateJunctionGfx(omObjData*);
static void StopJunctionPlayer(s32); static void StopJunctionPlayer(s32);

2
include/game/board/star.h
View file

@ -11,4 +11,6 @@ void BoardStarExec(s32 arg0, BoardSpace *arg1);
void BoardStarGive(s32 arg0, Vec *arg1); void BoardStarGive(s32 arg0, Vec *arg1);
void BoardStarShowNext(s32 arg0); void BoardStarShowNext(s32 arg0);
extern s32 boardStarSndTbl[];
#endif #endif

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

File diff suppressed because it is too large Load diff

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

@ -21,7 +21,7 @@ extern f32 BoardModelRotYGet(s16);
extern void BoardModelScaleGet(s16, s32*); extern void BoardModelScaleGet(s16, s32*);
extern void BoardModelVoiceEnableSet(s16, s32, s32); extern void BoardModelVoiceEnableSet(s16, s32, s32);
extern s32 BoardModelMotionCreate(s16, s32); extern s32 BoardModelMotionCreate(s16, s32);
extern void BoardModelMotionKill(s16, s32); extern s32 BoardModelMotionKill(s16, s32);
extern s32 BoardModelMotionEndCheck(s16); extern s32 BoardModelMotionEndCheck(s16);
extern s32 BoardModelMotionShiftSet(s16, s32, f32, f32, u32); extern s32 BoardModelMotionShiftSet(s16, s32, f32, f32, u32);
extern void BoardModelMotionTimeSet(s16, f32); extern void BoardModelMotionTimeSet(s16, f32);
@ -514,8 +514,8 @@ s32 BoardPlayerMotionCreate(s32 arg0, s32 arg1) {
return BoardModelMotionCreate(BoardPlayerModelGet(arg0), arg1); return BoardModelMotionCreate(BoardPlayerModelGet(arg0), arg1);
} }
void BoardPlayerMotionKill(s32 arg0, s32 arg1) { s32 BoardPlayerMotionKill(s32 arg0, s32 arg1) {
BoardModelMotionKill(BoardPlayerModelGet(arg0), arg1); return BoardModelMotionKill(BoardPlayerModelGet(arg0), arg1);
} }
s32 BoardPlayerMotionEndCheck(s32 arg0) { s32 BoardPlayerMotionEndCheck(s32 arg0) {