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

Label pause screen and tutorial code

Browse source
This commit is contained in:
gamemasterplc 2023-12-29 13:34:27 -06:00
parent 282e4f6c67
commit 64043934b5
7 changed files with 102 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,13 +80,13 @@ void fn_1_E0(void) {
lbl_1_bss_0->unk0 = 0;
lbl_1_bss_0->unk4 = 0;
lbl_1_bss_0->unk6 = 0;
fn_800B3FD8(&fn_1_1AAC);
BoardTutorialHookSet(&fn_1_1AAC);
fn_1_AEC();
fn_1_1D68();
lbl_1_bss_C = 0;
BoardSpaceInit(MAKE_DATA_NUM(DATADIR_W10, 0));
temp = BoardSpaceFlagSearch(0, 1);
fn_800B4274(temp, 1);
BoardTutorialBlockSetPos(temp, 1);
lbl_1_data_28 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 1), NULL, 0);
fn_8006DDE8(lbl_1_data_28, -1.0f);
BoardModelPosSet(lbl_1_data_28, 0.0f, 0.0f, 0.0f);

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

@ -15,7 +15,7 @@ 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);
BoardModelMotionStart(lbl_1_bss_1E, 1, 0x40000001);
fn_800B42BC(lbl_1_bss_1E);
BoardTutorialHostSet(lbl_1_bss_1E);
BoardModelLayerSet(lbl_1_bss_1E, 6);
lbl_1_bss_18 = HuPrcCreate(fn_1_C20, 0x1FFF, 0x1800, 0);
}
@ -48,7 +48,7 @@ void fn_1_C20(void) {
while (1) {
if (BoardIsKill() != 0) {
BoardModelKill(lbl_1_bss_1E);
fn_800B42BC(-1);
BoardTutorialHostSet(-1);
HuPrcEnd();
}
Hu3D2Dto3D(&lbl_1_data_80[lbl_1_bss_1C], 1, &sp14);

20
src/REL/w10Dll/w10Dll3.c
View file

@ -64,7 +64,7 @@ void fn_1_F6C(void) {
fn_1_1E3C(2, 0x122, 0x8C);
fn_1_BA0(0x2E000F);
fn_1_1FB0();
fn_800B4264(0, 0x50, 1);
BoardTutorialDirInputSet(0, 0x50, 1);
}
void fn_1_FB8(void) {
@ -72,14 +72,14 @@ void fn_1_FB8(void) {
fn_1_BA0(0x2E0010);
fn_1_1FB0();
fn_1_BA0(0x2E0011);
fn_800B4264(-0x50, 0, 1);
BoardTutorialDirInputSet(-0x50, 0, 1);
}
void fn_1_1010(void) {
fn_1_1E3C(4, 0x122, 0x8C);
fn_1_BA0(0x2E0012);
fn_1_1FB0();
fn_800B4264(0, 0x50, 1);
BoardTutorialDirInputSet(0, 0x50, 1);
}
void fn_1_105C(void) {
@ -94,7 +94,7 @@ void fn_1_1098(void) {
void fn_1_10C0(void) {
fn_1_BA0(0x2E0015);
fn_800B4264(-0x50, 0, 1);
BoardTutorialDirInputSet(-0x50, 0, 1);
}
void fn_1_10F8(void) {
@ -119,7 +119,7 @@ void fn_1_11A0(void) {
fn_1_BA0(0x2E0019);
temp = BoardSpaceFlagSearch(0, 1);
fn_800B4274(temp, 0);
BoardTutorialBlockSetPos(temp, 0);
}
void fn_1_11EC(void) {
@ -127,13 +127,13 @@ void fn_1_11EC(void) {
fn_1_BA0(0x2E001A);
temp = BoardSpaceFlagSearch(0, 1);
fn_800B4274(temp, 0);
fn_800B42B4(0);
BoardTutorialBlockSetPos(temp, 0);
BoardTutorialItemSet(0);
}
void fn_1_1240(void) {
fn_1_BA0(0x2E001B);
fn_800B4264(0x50, 0, 1);
BoardTutorialDirInputSet(0x50, 0, 1);
}
void fn_1_1278(void) {
@ -143,7 +143,7 @@ void fn_1_1278(void) {
void fn_1_12A0(void) {
fn_1_BA0(0x2E001D);
fn_80062B74(2, 1);
fn_800B42B4(1);
BoardTutorialItemSet(1);
}
void fn_1_12DC(void) {
@ -230,7 +230,7 @@ void fn_1_13A4(void) {
fn_80070EE8(0, 0x1F3);
BoardKill();
}
fn_800B3FD8(NULL);
BoardTutorialHookSet(NULL);
while (1) {
HuPrcVSleep();
}

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

@ -154,7 +154,7 @@ void fn_1_1984(void) {
OSReport(lbl_1_data_98);
fn_80070EE8(0, 0x1F3);
BoardKill();
fn_800B3FD8(NULL);
BoardTutorialHookSet(NULL);
}
}
}
@ -183,7 +183,7 @@ int fn_1_1AAC(s16 arg0, s32 arg1) {
OSReport(lbl_1_data_98);
fn_80070EE8(0, 0x1F3);
BoardKill();
fn_800B3FD8(NULL);
BoardTutorialHookSet(NULL);
}
}
}

4
src/game/wipe.c
View file

@ -3,7 +3,7 @@
#include "game/memory.h"
#include "game/flag.h"
extern s8 lbl_801D429C;
extern s8 boardTutorialF;
s16 HuSysVWaitGet(s16 old);
@ -111,7 +111,7 @@ void WipeExecAlways(void)
void WipeCreate(s16 mode, s16 type, s16 duration)
{
WipeState *wipe;
if(_CheckFlag(FLAG_ID_MAKE(1, 11)) && lbl_801D429C) {
if(_CheckFlag(FLAG_ID_MAKE(1, 11)) && boardTutorialF) {
return;
}
wipe = &wipeData;