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

match m407dll, some cleanup as well

Browse source
This commit is contained in:
Rainchus 2024-04-06 14:00:15 -05:00
parent 34a7ca2006
commit 4e2c3b7631
12 changed files with 692 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/game/board/mg_setup.c
View file

@ -1026,8 +1026,7 @@ static GXColor hiliteColTbl[3] = {
};
static void UpdateMGList(bitcopy* arg0, omObjData* arg1) {
f32 sp1C;
f32 sp18;
f32 sp18[2];
s32 sp14;
f32 var_f26;
f32 var_f25;
@ -1056,14 +1055,14 @@ static void UpdateMGList(bitcopy* arg0, omObjData* arg1) {
for (var_r23 = 0; var_r23 < arg0->field01_bit0; var_r23++) {
HuWinMesSizeCancelCRSet(1);
HuWinMesMaxSizeGet(1, &sp18, activeMG[var_r23].unk_04);
HuWinMesMaxSizeGet(1, &sp18[0], activeMG[var_r23].unk_04);
var_f25 = 152.0f;
var_f24 = 280.0f + (var_r23 * 0x18);
temp_r3 = HuWinCreate(var_f25, var_f24, sp18, sp1C, 0);
temp_r3 = HuWinCreate(var_f25, var_f24, sp18[0], sp18[1], 0);
HuWinBGTPLvlSet(temp_r3, 0.0f);
HuWinMesSpeedSet(temp_r3, 0);
HuWinDispOff(temp_r3);
HuWinAttrSet(temp_r3, 0x100U);
HuWinAttrSet(temp_r3, 0x100);
if (activeMG[var_r23].unk_03 != 0) {
sp14 = activeMG[var_r23].unk_04;
} else {

4
src/game/code_8003FF68.c
View file

@ -81,7 +81,7 @@ void fn_8003FF68(unkArg0* arg0) {
for (j = 0; var_r31->unk_00 != -1U; var_r31++, j++) {
if (var_r31->unk_06 == 0) {
temp = HuDataSelHeapReadNum(var_r31->unk_00, 0x10000000, HEAP_DATA);
temp = HuDataSelHeapReadNum(var_r31->unk_00, MEMORY_DEFAULT_NUM, HEAP_DATA);
model = Hu3DModelCreate(temp);
lbl_80192060[j] = model;
Hu3DModelAttrSet(model, var_r31->unk_04);
@ -93,7 +93,7 @@ void fn_8003FF68(unkArg0* arg0) {
lbl_80192160[j] = temp_r27->unk_08;
}
} else if (var_r31->unk_06 == 1) {
temp = HuDataSelHeapReadNum(var_r31->unk_00, 0x10000000, HEAP_DATA);
temp = HuDataSelHeapReadNum(var_r31->unk_00, MEMORY_DEFAULT_NUM, HEAP_DATA);
lbl_80192160[j] = Hu3DMotionCreate(temp);
}
}