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:
CreateSource 2024-11-16 00:20:22 -05:00 • committed by GitHub
commit 268de216a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 12178 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/OdemuExi2/DebuggerDriver.c
View file

@ -2,7 +2,6 @@
#include <dolphin/hw_regs.h>
#include <dolphin/os.h>
typedef void (*MTRCallbackType)(int);
static MTRCallbackType MTRCallback;
@ -268,8 +267,13 @@ u32 DBQueryData(void)
if (!RecvDataLeng) {
interrupts = OSDisableInterrupts();
CheckMailBox();
#if VERSION > 0
OSRestoreInterrupts(interrupts);
}
#else
}
OSRestoreInterrupts(interrupts);
#endif
return RecvDataLeng;
}

4
src/REL/m414Dll/main.c
View file

@ -1582,7 +1582,7 @@ void fn_1_5A3C(void)
var_f31 = Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29])
- (var_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]);
}
Hu3DMotionTimeSet(var_r31->unk_00->unk_00[var_r29], var_f31 >= 0.0f ? var_f31 : -var_f31);
Hu3DMotionTimeSet(var_r31->unk_00->unk_00[var_r29], ABS_INV(var_f31));
}
HuPrcVSleep();
}
@ -1597,7 +1597,7 @@ void fn_1_5A3C(void)
var_f31 = Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29])
- (var_f27 / var_f29) * Hu3DMotionMaxTimeGet(var_r31->unk_00->unk_00[var_r29]);
}
Hu3DMotionTimeSet(var_r31->unk_00->unk_00[var_r29], var_f31 >= 0.0f ? var_f31 : -var_f31);
Hu3DMotionTimeSet(var_r31->unk_00->unk_00[var_r29], ABS_INV(var_f31));
}
HuPrcVSleep();
}

12
src/REL/m432Dll/main.c
View file

@ -1579,7 +1579,7 @@ void fn_1_6F28(UnkBss0Struct *arg0)
fn_1_40C0(&var_r30->unk_00);
var_f23 = var_r30->unk_00.unk_6C.y - arg0->unk_19C.y;
arg0->unk_190.y += 0.03f * var_f23;
if (50.0f > (0.0f > var_f23 ? -var_f23 : var_f23)) {
if (50.0f > ABS(var_f23)) {
arg0->unk_1B4++;
arg0->unk_1A8 = arg0->unk_1C0;
arg0->unk_1A8.y += 900.0f;
@ -1684,7 +1684,7 @@ void fn_1_7C1C(UnkBss0Struct *var_r31, UnkM432DllStruct *var_r30, UnkM432DllStru
var_f30 = var_r31->unk_1EC / var_r31->unk_1E8;
if (265.0f > var_f30) {
var_f31 = 0.2f * (265.0f - var_f30);
if (1.0f <= (0.0f > var_f31 ? -var_f31 : var_f31)) {
if (1.0f <= ABS(var_f31)) {
var_r31->unk_28.z -= var_f31;
}
}
@ -2808,7 +2808,7 @@ void fn_1_ED0C(omObjData *object)
if ((var_r31->unk_180 == 0x7D3) && ((var_r31->unk_13C.x != 0.0f) || (var_r31->unk_13C.z != 0.0f))) {
var_f30 = var_r31->unk_13C.x - var_r31->unk_00.unk_6C.x;
var_f31 = var_r31->unk_13C.z - var_r31->unk_00.unk_6C.z;
if (var_r31->unk_00.unk_BC < (0.0f > var_f31 ? -var_f31 : var_f31)) {
if (var_r31->unk_00.unk_BC < ABS(var_f31)) {
var_f30 = 0.0f;
}
var_f26 = sqrtf((var_f30 * var_f30) + (var_f31 * var_f31));
@ -2969,8 +2969,8 @@ void fn_1_10250(omObjData *object)
case 0x7DB:
var_f31 = var_r31->unk_13C.x - var_r31->unk_00.unk_6C.x;
var_f30 = var_r31->unk_13C.z - var_r31->unk_00.unk_6C.z;
if (1.0f > (0.0f > var_f31 ? -var_f31 : var_f31)) {
if (1.0f > (0.0f > var_f30 ? -var_f30 : var_f30)) {
if (1.0f > ABS(var_f31)) {
if (1.0f > ABS(var_f30)) {
var_r31->unk_180++;
var_r31->unk_160 = 0.0f;
var_r31->unk_164 = var_r31->unk_00.unk_6C.y;
@ -2978,7 +2978,7 @@ void fn_1_10250(omObjData *object)
break;
}
}
if (1.0f < (0.0f > var_f31 ? -var_f31 : var_f31)) {
if (1.0f < ABS(var_f31)) {
var_f30 = 0.0f;
}
var_f24 = sqrtf((var_f31 * var_f31) + (var_f30 * var_f30));

45
src/REL/m444dll/pinball.c
View file

@ -714,6 +714,14 @@ float fn_1_CB70(Vec *arg0, Vec *arg1, Vec *arg2);
s16 fn_1_B1E8(Vec *arg0, Vec *arg1, s16 arg2)
{
Vec sp4C;
Vec sp40;
Vec sp34;
Vec sp28;
Vec sp1C;
Vec sp10;
s32 spC;
float temp_f31;
float temp_f30;
float temp_f28;
@ -724,17 +732,8 @@ s16 fn_1_B1E8(Vec *arg0, Vec *arg1, s16 arg2)
s32 temp_r27;
Vec *temp_r25;
u8 temp_r24;
s16 temp_r23;
Vec sp4C;
Vec sp40;
Vec sp34;
Vec sp28;
Vec sp1C;
Vec sp10;
s32 spC;
temp_r23 = -1;
s16 temp_r23 = -1;
spC = 1;
temp_f28 = VECMag(arg1);
sp1C = *arg1;
@ -845,6 +844,12 @@ s16 fn_1_B1E8(Vec *arg0, Vec *arg1, s16 arg2)
if (temp_f31 < 0.0f) {
temp_f28 -= temp_f31;
temp_f31 = ABS(temp_f31);
#if VERSION > 0
if (temp_f31 == 0.0) {
sp1C.x = sp1C.y = sp1C.z = 0.0f;
break;
}
#endif
}
sp34 = sp40;
sp34.z = 1;
@ -881,6 +886,13 @@ s16 fn_1_B1E8(Vec *arg0, Vec *arg1, s16 arg2)
}
}
temp_f31 = VECMag(arg1);
#if VERSION > 0
if (VECMag(&sp1C) == 0.0) {
sp1C.x = 0.0f;
sp1C.y = 1.0f;
sp1C.z = 0.0f;
}
#endif
VECNormalize(&sp1C, &sp1C);
VECScale(&sp1C, arg1, temp_f31);
if (temp_r27 != 0) {
@ -894,12 +906,16 @@ s16 fn_1_B1E8(Vec *arg0, Vec *arg1, s16 arg2)
VECSubtract(temp_r28, arg0, &sp34);
temp_f30 = VECMag(&sp34);
if (temp_f30 < 3.0f && VECMag(arg1) < 1.0f) {
arg1->x = arg1->y = arg1->z = 0;
arg1->x = arg1->y = arg1->z = 0.0f;
*arg0 = *temp_r28;
temp_r23 = temp_r30;
break;
}
if (temp_f30 < 20.0f) {
if (temp_f30 < 20.0f
#if VERSION > 0
&& !(temp_f30 < 0.000001)
#endif
) {
VECScale(arg1, arg1, 0.9f);
VECNormalize(&sp34, &sp34);
VECScale(&sp34, &sp34, 0.1 * (20.0f - temp_f30));
@ -909,6 +925,11 @@ s16 fn_1_B1E8(Vec *arg0, Vec *arg1, s16 arg2)
}
if (temp_r30 == lbl_1_data_3A4[arg2]) {
arg1->y += 0.3;
#if VERSION > 0
if (VECMag((Vec *)&arg1) < 0.000001) {
arg1->y += 0.3;
}
#endif
}
if (arg0->x >= lbl_1_bss_77C.x - 13.0f) {
arg0->x = lbl_1_bss_77C.x - 13.0f - 1.0f;

21
src/REL/nisDll/main.c Normal file
View file

@ -0,0 +1,21 @@
#include "game/object.h"
void fn_1_68(omObjData *object);
void ObjectSetup(void)
{
Process *process = omInitObjMan(0xA, 0x2000);
omObjData *object = omAddObjEx(process, 0, 0, 0, -1, fn_1_68);
u32 *work = object->work;
}
void fn_1_68(omObjData *object)
{
s8 *work = (s8 *)object->work;
if (*work != 0) {
(void)work;
return;
}
}
#include "src/REL/executor.c"