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

Match w06Dll/fire.c in PAL

Browse source
This commit is contained in:
gamemasterplc 2024-11-16 12:20:08 -06:00
parent dbc5a28f40
commit d0a6fa54a0
2 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.py
View file

@ -1510,7 +1510,7 @@ config.libs = [
Object(Matching, "REL/w06Dll/main.c"), Object(Matching, "REL/w06Dll/main.c"),
Object(Matching, "REL/w06Dll/mg_item.c"), Object(Matching, "REL/w06Dll/mg_item.c"),
Object(Matching, "REL/w06Dll/mg_coin.c"), Object(Matching, "REL/w06Dll/mg_coin.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w06Dll/fire.c"), Object(Matching, "REL/w06Dll/fire.c"),
Object(Matching, "REL/w06Dll/bridge.c"), Object(Matching, "REL/w06Dll/bridge.c"),
Object(Matching, "REL/w06Dll/bowser.c"), Object(Matching, "REL/w06Dll/bowser.c"),
}, },

29
src/REL/w06Dll/fire.c
View file

@ -49,6 +49,24 @@ static s16 lbl_1_data_22A = -1;
static s16 lbl_1_data_22C = -1; static s16 lbl_1_data_22C = -1;
static s16 lbl_1_data_22E = -1; static s16 lbl_1_data_22E = -1;
#if VERSION_PAL
static s32 lbl_1_data_230[] = {
MAKE_MESSID(8, 0),
MAKE_MESSID(8, 1),
MAKE_MESSID(8, 2),
MAKE_MESSID(8, 3),
MAKE_MESSID(8, 4),
MAKE_MESSID(8, 5),
MAKE_MESSID(8, 6),
MAKE_MESSID(8, 7),
MAKE_MESSID(8, 8),
MAKE_MESSID(8, 9),
MAKE_MESSID(8, 10),
MAKE_MESSID(8, 11),
MAKE_MESSID(8, 12),
MAKE_MESSID(8, 13)
};
#else
static s32 lbl_1_data_230[] = { static s32 lbl_1_data_230[] = {
MAKE_MESSID(8, 14), MAKE_MESSID(8, 14),
MAKE_MESSID(8, 15), MAKE_MESSID(8, 15),
@ -65,7 +83,7 @@ static s32 lbl_1_data_230[] = {
MAKE_MESSID(8, 26), MAKE_MESSID(8, 26),
MAKE_MESSID(8, 27) MAKE_MESSID(8, 27)
}; };
#endif
void fn_1_6EF0(void) { void fn_1_6EF0(void) {
BoardRollDispSet(0); BoardRollDispSet(0);
lbl_1_bss_90 = HuPrcChildCreate(fn_1_6F80, 0x2003, 0x3800, 0, boardMainProc); lbl_1_bss_90 = HuPrcChildCreate(fn_1_6F80, 0x2003, 0x3800, 0, boardMainProc);
@ -203,6 +221,9 @@ static void fn_1_74BC(s32 arg0) {
static void fn_1_7574(void) { static void fn_1_7574(void) {
s32 temp_r3; s32 temp_r3;
s32 temp_r29; s32 temp_r29;
#if VERSION_PAL
s32 playerNo = GWSystem.player_curr;
#endif
s32 temp_r28; s32 temp_r28;
s32 i; s32 i;
@ -218,11 +239,17 @@ static void fn_1_7574(void) {
BoardWinCreate(0, MAKE_MESSID(48, 16), -1); BoardWinCreate(0, MAKE_MESSID(48, 16), -1);
BoardWinInsertMesSet(temp_r28, 0); BoardWinInsertMesSet(temp_r28, 0);
BoardWinInsertMesSet(lbl_1_data_230[temp_r29], 1); BoardWinInsertMesSet(lbl_1_data_230[temp_r29], 1);
#if VERSION_PAL
GWSystem.player_curr = i;
#endif
BoardWinPlayerSet(i); BoardWinPlayerSet(i);
BoardWinWait(); BoardWinWait();
BoardWinKill(); BoardWinKill();
} }
} }
#if VERSION_PAL
GWSystem.player_curr = playerNo;
#endif
} }
static void fn_1_7674(s32 arg0) { static void fn_1_7674(s32 arg0) {