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

match fn_1_14CFC from thefoxcam, link file

Browse source
This commit is contained in:
Rainchus 2025-03-14 15:29:32 -05:00
parent dc4d365f1a
commit 75d49a9e05
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/GMPE01_00/rels/mgmodedll/symbols.txt
View file

@ -490,9 +490,9 @@ lbl_1_data_168 = .data:0x00000168; // type:object size:0x2 data:2byte
lbl_1_data_16A = .data:0x0000016A; // type:object size:0x30 lbl_1_data_16A = .data:0x0000016A; // type:object size:0x30
lbl_1_data_19C = .data:0x0000019C; // type:object size:0x10 lbl_1_data_19C = .data:0x0000019C; // type:object size:0x10
lbl_1_data_1AC = .data:0x000001AC; // type:object size:0x10 lbl_1_data_1AC = .data:0x000001AC; // type:object size:0x10
lbl_1_data_1BC = .data:0x000001BC; // type:object size:0xA data:string lbl_1_data_1BC = .data:0x000001BC; // type:object size:0xA scope:local data:string
lbl_1_data_1C6 = .data:0x000001C6; // type:object size:0xE data:string lbl_1_data_1C6 = .data:0x000001C6; // type:object size:0xE scope:local data:string
lbl_1_data_1D4 = .data:0x000001D4; // type:object size:0xB data:string lbl_1_data_1D4 = .data:0x000001D4; // type:object size:0xB scope:local data:string
lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0x24 scope:local data:string lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0x24 scope:local data:string
lbl_1_data_208 = .data:0x00000208; // type:object size:0x26 scope:local data:string lbl_1_data_208 = .data:0x00000208; // type:object size:0x26 scope:local data:string
lbl_1_data_22E = .data:0x0000022E; // type:object size:0x27 scope:local data:string lbl_1_data_22E = .data:0x0000022E; // type:object size:0x27 scope:local data:string

2
configure.py
View file

@ -1352,7 +1352,7 @@ config.libs = [
Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/free_play.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/free_play.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/record.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/record.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/battle.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/battle.c"),
Object(NonMatching, "REL/mgmodedll/tictactoe.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/tictactoe.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/main.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/main.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/datalist.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/datalist.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/minigame.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01", "GMPJ01_00"), "REL/mgmodedll/minigame.c"),

17
src/REL/mgmodedll/tictactoe.c
View file

@ -300,7 +300,7 @@ void fn_1_14CFC(void)
AnimData *temp_r23; AnimData *temp_r23;
AnimData *temp_r22; AnimData *temp_r22;
s16 temp_r21; s16 temp_r21;
s32 temp_r20; s16 temp_r20;
s16 sp8; s16 sp8;
for(temp_r31=0; temp_r31<4; temp_r31++) { for(temp_r31=0; temp_r31<4; temp_r31++) {
lbl_1_bss_2C1C[temp_r31] = temp_r31; lbl_1_bss_2C1C[temp_r31] = temp_r31;
@ -315,8 +315,8 @@ void fn_1_14CFC(void)
} }
} }
if(lbl_1_bss_3A8 == 0) { if(lbl_1_bss_3A8 == 0) {
temp_r30 = HuSprGrpCreate(25);
lbl_1_bss_3A8 = temp_r30; lbl_1_bss_3A8 = temp_r30 = HuSprGrpCreate(25);
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 84), MEMORY_DEFAULT_NUM)); temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 84), MEMORY_DEFAULT_NUM));
temp_r29 = HuSprCreate(temp_r28, 200, 0); temp_r29 = HuSprCreate(temp_r28, 200, 0);
HuSprGrpMemberSet(temp_r30, 0, temp_r29); HuSprGrpMemberSet(temp_r30, 0, temp_r29);
@ -408,8 +408,8 @@ void fn_1_14CFC(void)
HuSprTPLvlSet(temp_r30, 24, 0); HuSprTPLvlSet(temp_r30, 24, 0);
} }
if(lbl_1_bss_3AA == 0) { if(lbl_1_bss_3AA == 0) {
temp_r30 = HuSprGrpCreate(10);
lbl_1_bss_3AA = temp_r30; lbl_1_bss_3AA = temp_r30 = HuSprGrpCreate(10);
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 15), MEMORY_DEFAULT_NUM)); temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 15), MEMORY_DEFAULT_NUM));
temp_r29 = HuSprCreate(temp_r28, 200, 0); temp_r29 = HuSprCreate(temp_r28, 200, 0);
HuSprGrpMemberSet(temp_r30, 0, temp_r29); HuSprGrpMemberSet(temp_r30, 0, temp_r29);
@ -419,9 +419,8 @@ void fn_1_14CFC(void)
HuSprGrpMemberSet(temp_r30, 1, temp_r29); HuSprGrpMemberSet(temp_r30, 1, temp_r29);
HuSprPosSet(temp_r30, 1, 0, 0); HuSprPosSet(temp_r30, 1, 0, 0);
for(temp_r31=0; temp_r31<4; temp_r31++) { for(temp_r31=0; temp_r31<4; temp_r31++) {
temp_r20 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].character; temp_r20 = lbl_1_bss_2C24[temp_r31] = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].character;
lbl_1_bss_2C24[temp_r31] = temp_r20; temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 16)+temp_r20, MEMORY_DEFAULT_NUM));
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 16)+(s16)temp_r20, MEMORY_DEFAULT_NUM));
temp_r29 = HuSprCreate(temp_r28, 190, 0); temp_r29 = HuSprCreate(temp_r28, 190, 0);
HuSprGrpMemberSet(temp_r30, (temp_r31*2)+2, temp_r29); HuSprGrpMemberSet(temp_r30, (temp_r31*2)+2, temp_r29);
HuSprPosSet(temp_r30, (temp_r31*2)+2, lbl_1_data_19C[temp_r31], 0); HuSprPosSet(temp_r30, (temp_r31*2)+2, lbl_1_data_19C[temp_r31], 0);
@ -958,4 +957,4 @@ void fn_1_17BE0(void)
} }
OSReport("com %d,%d\n", lbl_1_bss_3B0[0], lbl_1_bss_3B0[1]); OSReport("com %d,%d\n", lbl_1_bss_3B0[0], lbl_1_bss_3B0[1]);
} }