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

Label most of rest of board code

Browse source 
start.c and last5.c are still unabled.
This commit is contained in:
gamemasterplc 2024-01-18 11:29:30 -06:00
parent 819795c422
commit 270e67e011
7 changed files with 281 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -174,7 +174,7 @@ void BoardCreate(void) {
BoardSpaceWalkMiniEventFuncSet(&fn_1_A74);
BoardSpaceLandEventFuncSet((void*)&fn_1_AF8);
BoardStarHostSet(lbl_1_data_1E4);
fn_800A4F6C(lbl_1_data_1E6);
BoardBooHouseHostSet(lbl_1_data_1E6);
BoardLotteryHostSet(lbl_1_data_1E6);
BoardShopHostSet(lbl_1_data_1E6);
BoardJunctionMaskSet(0x0000C000);

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

@ -128,7 +128,7 @@ void BoardCreate(void) {
BoardSpaceWalkMiniEventFuncSet(&fn_1_91C);
BoardSpaceLandEventFuncSet(&fn_1_908);
BoardStarHostSet(lbl_1_data_2C);
fn_800A4F6C(lbl_1_data_32);
BoardBooHouseHostSet(lbl_1_data_32);
BoardShopHostSet(lbl_1_data_2E);
BoardLotteryHostSet(lbl_1_data_30);
HuWinMesMaxSizeGet(1, spC, 0x2E003A);

6
src/REL/w10Dll/scene.c
View file

@ -176,7 +176,7 @@ void fn_1_13A4(void) {
for (i = 0; i < 4; i++) {
GWPlayer[i].color = 1;
}
fn_800A4C88();
BoardMGSetupTutorialExec();
BoardStatusShowSetAll(0);
fn_1_C10(0);
fn_1_BA0(0x2E002B);
@ -206,7 +206,7 @@ void fn_1_13A4(void) {
BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30);
BoardCameraMotionWait();
fn_1_BA0(0x2E0030);
fn_800A6B10();
BoardBooHouseTutorialExec();
BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30);
BoardCameraMotionWait();
fn_1_BA0(0x2E0032);
@ -227,7 +227,7 @@ void fn_1_13A4(void) {
fn_1_BA0(0x2E0039);
if (lbl_1_bss_C == 0) {
lbl_1_bss_C = 1;
fn_80070EE8(0, 0x1F3);
BoardAudSeqFadeOut(0, 0x1F3);
BoardKill();
}
BoardTutorialHookSet(NULL);

4
src/REL/w10Dll/tutorial.c
View file

@ -153,7 +153,7 @@ void fn_1_1984(void) {
if (i != 4) {
lbl_1_bss_C = 1;
OSReport(lbl_1_data_98);
fn_80070EE8(0, 0x1F3);
BoardAudSeqFadeOut(0, 0x1F3);
BoardKill();
BoardTutorialHookSet(NULL);
}
@ -182,7 +182,7 @@ int fn_1_1AAC(s16 arg0, s32 arg1) {
if (i != 4) {
lbl_1_bss_C = 1;
OSReport(lbl_1_data_98);
fn_80070EE8(0, 0x1F3);
BoardAudSeqFadeOut(0, 0x1F3);
BoardKill();
BoardTutorialHookSet(NULL);
}

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

@ -23,7 +23,7 @@ static omObjData *last5GfxObj;
static omObjData *confettiObj;
static omObjData *filterObj;
void *boardTurnStartFunc;
u32 lbl_801D3F00;
void *boardBowserHook;
u32 lbl_801D3EFC;
u32 lbl_801D3EF8;
BoardFunc boardTurnFunc;
@ -55,7 +55,7 @@ static CameraView camViewTbl[] = {
extern void BoardModelPosGet(s16 model, Vec *pos);
extern void BoardSpacePosGet(s32 layer, s32 space, Vec *pos);
extern void fn_800A4A7C(void);
extern void BoardMGSetupPlayClear(void);
extern void fn_800A6EE4(void);
extern s8 boardTutorialF;
@ -116,7 +116,7 @@ void BoardCommonInit(BoardFunc create, BoardFunc destroy)
_ClearFlag(FLAG_ID_MAKE(1, 9));
_ClearFlag(FLAG_ID_MAKE(0, 8));
_ClearFlag(FLAG_ID_MAKE(0, 10));
fn_800A4A7C();
BoardMGSetupPlayClear();
}
nextOvl = OVL_INVALID;
@ -136,7 +136,7 @@ void BoardCommonInit(BoardFunc create, BoardFunc destroy)
destroyFunc = destroy;
boardTurnFunc = NULL;
lbl_801D3EFC = 0;
lbl_801D3F00 = 0;
boardBowserHook = NULL;
lbl_801D3EF8 = 0;
boardTurnStartFunc = NULL;
boardObjMan = omInitObjMan(64, 8192);
@ -664,7 +664,7 @@ static void CreateBoard(void)
BoardLightSetExec();
BoardLotteryInit();
BoardShopInit();
fn_800A4F7C();
BoardBooHouseCreate();
BoardCameraInit();
BoardStatusCreate();
CharModelKillIndex(-1);
@ -710,7 +710,7 @@ static void DestroyBoard(void)
HuAudAllStop();
fn_80085EB4();
BoardStatusKill();
fn_800A5030();
BoardBooHouseKill();
BoardShopKill();
BoardLotteryKill();
BoardSpaceDestroy();