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

16.56% DOL

Browse source
This commit is contained in:
CreateSource 2024-01-01 15:07:08 -05:00
parent 4bce4cbac7
commit d6afb56b46
5 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.py
View file

@ -362,7 +362,7 @@ config.libs = [
Object(NonMatching, "game/board/main.c"), Object(NonMatching, "game/board/main.c"),
Object(NonMatching, "game/board/player.c"), Object(NonMatching, "game/board/player.c"),
Object(NonMatching, "game/board/model.c"), Object(NonMatching, "game/board/model.c"),
Object(NonMatching, "game/board/window.c"), Object(Matching, "game/board/window.c"),
Object(NonMatching, "game/board/speaker.c"), Object(NonMatching, "game/board/speaker.c"),
Object(NonMatching, "game/board/com.c"), Object(NonMatching, "game/board/com.c"),
Object(NonMatching, "game/board/overhead.c"), Object(NonMatching, "game/board/overhead.c"),

3
include/functions.h
View file

@ -43,9 +43,6 @@ void MGSeqKillAll(void);
void MGSeqPracticeStart(void); void MGSeqPracticeStart(void);
void fn_8004D6F4(s16 arg); void fn_8004D6F4(s16 arg);
void BoardWinKill(void);
void BoardWinWait(void);
s32 rand8(void); s32 rand8(void);
void BoardCameraTargetSetModel(s16 model); void BoardCameraTargetSetModel(s16 model);

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

@ -30,6 +30,6 @@ s32 BoardWinPortraitGet(void);
s32 BoardWinPortraitGetStar(void); s32 BoardWinPortraitGetStar(void);
void BoardWinPlayerSet(s32); void BoardWinPlayerSet(s32);
void BoardWinStartComKeySet(void); void BoardWinStartComKeySet(void);
void BoardWinComKeyFuncSet(void (*)()); void BoardWinComKeyFuncSet(void (*));
#endif #endif

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

@ -22,7 +22,7 @@ void fn_1_AEC(void) {
} }
void fn_1_BA0(s32 arg0) { void fn_1_BA0(s32 arg0) {
s32 var_r31; s16 var_r31;
switch (lbl_1_bss_1C) { switch (lbl_1_bss_1C) {
case 0: case 0:

31
src/game/board/window.c
View file

@ -390,16 +390,14 @@ void BoardWinStartComKeySet(void) {
if (BoardPlayerIsAllCom() != 0) { if (BoardPlayerIsAllCom() != 0) {
sp8[0] = sp8[1] = sp8[2] = sp8[3] = 0x100; sp8[0] = sp8[1] = sp8[2] = sp8[3] = 0x100;
goto block_20; } else {
} if (GWSystem.player_curr == -1) {
if (GWSystem.player_curr == -1) { if ((GWPlayer[0].com == 0) || (GWPlayer[1].com == 0) || (GWPlayer[2].com == 0) || (GWPlayer[3].com == 0)) {
if ((GWPlayer[0].com == 0) || (GWPlayer[1].com == 0) || (GWPlayer[2].com == 0) || (GWPlayer[3].com == 0)) { return;
}
} else if (GWPlayer[GWSystem.player_curr].com == 0) {
return; return;
} }
goto block_9;
}
if (GWPlayer[GWSystem.player_curr].com != 0) {
block_9:
if (GWSystem.player_curr != -1) { if (GWSystem.player_curr != -1) {
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
temp_r29 = GWPlayer[var_r31].port; temp_r29 = GWPlayer[var_r31].port;
@ -414,18 +412,17 @@ block_9:
sp8[var_r31] = 0x100; sp8[var_r31] = 0x100;
} }
} }
block_20: }
temp_r28 = GWMessSpeedGet(); temp_r28 = GWMessSpeedGet();
temp_r30 = HuWinKeyWaitNumGet(winMess); temp_r30 = HuWinKeyWaitNumGet(winMess);
if (temp_r30 != 0) { if (temp_r30 != 0) {
HuWinComKeyReset(); HuWinComKeyReset();
for (var_r31 = 0; var_r31 < temp_r30; var_r31++) { for (var_r31 = 0; var_r31 < temp_r30; var_r31++) {
HuWinComKeyWait(sp8[0], sp8[1], sp8[2], sp8[3], (s32)temp_r28); HuWinComKeyWait(sp8[0], sp8[1], sp8[2], sp8[3], (s32)temp_r28);
}
} }
} }
} }
void BoardWinComKeyFuncSet(void (*func)()) { void BoardWinComKeyFuncSet(void (*func)) {
comKeyFunc = func; comKeyFunc = func;
} }