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

Merge branch 'mariopartyrd:main' into main

Browse source
This commit is contained in:
dbalatoni13 2025-01-05 22:25:34 +01:00 • committed by GitHub
commit b80bb6adfd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.py
View file

@ -1059,7 +1059,7 @@ config.libs = [
Rel( Rel(
"m426Dll", # Revers-a-Bomb "m426Dll", # Revers-a-Bomb
objects={ objects={
Object(NonMatching, "REL/m426Dll/main.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m426Dll/main.c"),
}, },
), ),
Rel( Rel(

8
src/REL/m426Dll/main.c
View file

@ -780,7 +780,6 @@ void fn_1_125C(omObjData *object)
object->func = NULL; object->func = NULL;
} }
// TODO https://decomp.me/scratch/1aZdv
void fn_1_16F8(omObjData *object) void fn_1_16F8(omObjData *object)
{ {
s32 spA8[3]; s32 spA8[3];
@ -813,7 +812,7 @@ void fn_1_16F8(omObjData *object)
s32 var_r24; s32 var_r24;
s32 var_r23; s32 var_r23;
s32 var_r22; s32 var_r22;
s32 var_r21; // this is weird, used as a temporary s32 var_r21;
sp18 = 0; sp18 = 0;
sp14 = 0; sp14 = 0;
@ -827,7 +826,7 @@ void fn_1_16F8(omObjData *object)
} }
if (var_r31->unk_14) { if (var_r31->unk_14) {
sp20 = sp1C = 0.0f; sp20 = sp1C = 0.0f;
sp10 = 0; var_r21 = sp10 = 0;
fn_1_2F5C(object, &sp20, &sp1C, &sp10); fn_1_2F5C(object, &sp20, &sp1C, &sp10);
} }
else { else {
@ -850,8 +849,7 @@ void fn_1_16F8(omObjData *object)
else { else {
if (!lbl_1_bss_40) { if (!lbl_1_bss_40) {
sp20 = sp1C = 0.0f; sp20 = sp1C = 0.0f;
var_r21 = sp10 = 0;
sp10 = 0;
} }
if (fabs(sp20) > 8.0) { if (fabs(sp20) > 8.0) {
var_f30 = 0.25f * sp20; var_f30 = 0.25f * sp20;