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

Merge remote-tracking branch 'upstream/main'

Browse source
This commit is contained in:
M0liusX 2024-02-03 14:44:16 -06:00
commit 67e9549885
39 changed files with 6553 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/REL/bootDll/main.c
View file

@ -478,12 +478,12 @@ static void TitleInit(void)
sprite_data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 2));
sprite = HuSprCreate(sprite_data, 2, 0);
HuSprGrpMemberSet(titleGroup, 2, sprite);
HuSprAttrSet(titleGroup, 2, SPRITE_ATTR_HIDDEN|SPIRTE_ATTR_BILINEAR);
HuSprAttrSet(titleGroup, 2, SPRITE_ATTR_HIDDEN|SPRITE_ATTR_BILINEAR);
HuSprPosSet(titleGroup, 2, 288, 380);
sprite_data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 9));
sprite = HuSprCreate(sprite_data, 0, 0);
HuSprGrpMemberSet(titleGroup, 3, sprite);
HuSprAttrSet(titleGroup, 3, SPRITE_ATTR_HIDDEN|SPIRTE_ATTR_BILINEAR);
HuSprAttrSet(titleGroup, 3, SPRITE_ATTR_HIDDEN|SPRITE_ATTR_BILINEAR);
HuSprPosSet(titleGroup, 3, 288, 200);
}

2
src/REL/m401Dll/m401Dll.h
View file

@ -1,6 +1,7 @@
#include "common.h"
#include "REL/executor.h"
#include <dolphin/mtx.h>
#include "game/objsub.h"
// global data //
typedef struct unkStruct18FC10 {
@ -94,7 +95,6 @@ extern void espBankSet(s16, s16);
extern void espDrawNoSet(s16, s16);
extern void WipeCreate(s16, s16, s16);
extern u8 WipeStatGet(void);
extern void omGameSysInit(omObjData*);
extern f32 PSVECNormalize(Vec3f*, Vec3f*);
// local data //

12
src/REL/w03Dll/main.c
View file

@ -11,8 +11,8 @@
#include "board_unsplit.h"
#include "game/hsfman.h"
void BoardModelPosSet(s16, f32, f32, f32);
s32 BoardModelMotionStart(s16, s32, s32);
s32 BoardModelPosSet(s16, f32, f32, f32);
s32 BoardModelMotionStart(s16, s32, u32);
void fn_8005B150(void*, void*);
void fn_1_740(void);
@ -26,7 +26,7 @@ void fn_1_AF8(void);
void fn_1_DEC(void);
void fn_1_10B0(void);
s32 fn_1_12C8(void);
void fn_8006DDE8(s16, f32);
s32 fn_8006DDE8(s16, f32);
void fn_1_10E4(omObjData* arg0);
extern Process *boardObjMan;
typedef void (*VoidFunc)(void);
@ -35,7 +35,7 @@ extern const VoidFunc _dtors[];
f32 BoardModelMotionTimeGet(s16);
s16 BoardModelCreate(s32, void*, s32);
s16 BoardModelCreate(s32, s32*, s32);
void BoardModelKill(s16);
void BoardModelMotionStartEndSet(s16, s32, s32);
void Hu3DFogSet(f32, f32, u8, u8, u8);
@ -142,10 +142,10 @@ void BoardCreate(void) {
fn_8006DDE8(lbl_1_data_1E2, -1.0f);
BoardModelPosSet(lbl_1_data_1E2, 0.0f, 0.0f, 0.0f);
BoardModelMotionStart(lbl_1_data_1E2, 0, 0x40000001);
lbl_1_data_1E4 = BoardModelCreate(0x77001B, &lbl_1_data_20C, 0);
lbl_1_data_1E4 = BoardModelCreate(0x77001B, lbl_1_data_20C, 0);
BoardModelPosSet(lbl_1_data_1E4, 0.0f, 0.0f, 0.0f);
BoardModelMotionStart(lbl_1_data_1E4, 1, 0x40000001);
lbl_1_data_1E6 = BoardModelCreate(0x2000D, &lbl_1_data_214, 0);
lbl_1_data_1E6 = BoardModelCreate(0x2000D, lbl_1_data_214, 0);
BoardModelPosSet(lbl_1_data_1E6, 0.0f, 0.0f, 0.0f);
BoardModelMotionStart(lbl_1_data_1E6, 1, 0x40000001);

2
src/REL/w03Dll/mg_item.c
View file

@ -6,6 +6,7 @@
#include "REL/w03Dll.h"
#include "game/board/space.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/board/player.h"
#include "math.h"
#include "board_unsplit.h"
@ -67,7 +68,6 @@ s32 BoardVecDAngleCalcRange(float *value, float min, float range);
void BoardCameraQuakeSet(s32 duration, float strength);
s16 MGSeqCreate(s32, ...);
u8 MGSeqStatGet(s16);
void omVibrate(s16, s16, s16, s16);
f32 BoardPlayerRotYGet(s32);
f32 BoardModelMotionTimeGet(s16);
s32 BoardVecMinDistCheck(Vec *vec1, Vec *vec2, float min_dist);

2
src/REL/w03Dll/statue.c
View file

@ -10,6 +10,7 @@
#include "board_unsplit.h"
#include "game/hsfman.h"
#include "game/board/main.h"
#include "game/objsub.h"
void fn_1_1358(void);
void fn_1_152C(void);
@ -29,7 +30,6 @@ s32 BoardPlayerMotBlendCheck(s32);
f32 BoardPlayerRotYGet(s32);
void BoardConfettiCreate(Point3d*, s16, f32);
double atan2(double y, double x);
void omVibrate(s16, s16, s16, s16);
f32 BoardModelMotionTimeGet(s16);
//DATA

2
src/REL/w10Dll/host.c
View file

@ -14,7 +14,7 @@ Vec lbl_1_data_80[2] = {
void fn_1_AEC(void) {
lbl_1_bss_1C = 0;
lbl_1_bss_1E = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 15), &lbl_1_data_78, 0);
lbl_1_bss_1E = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 15), lbl_1_data_78, 0);
BoardModelMotionStart(lbl_1_bss_1E, 1, 0x40000001);
BoardTutorialHostSet(lbl_1_bss_1E);
BoardModelLayerSet(lbl_1_bss_1E, 6);