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

Ported m437Dll

Browse source
This commit is contained in:
dbalatoni13 2024-11-17 16:46:21 +01:00
parent 5561cdf32e
commit 4e5aa07dbc
8 changed files with 386 additions and 370 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/REL/m402Dll/main.c
View file

@ -22,6 +22,7 @@
#include "dolphin.h"
#include "ext_math.h"
#include "version.h"
#undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x))
@ -1671,7 +1672,7 @@ static void fn_1_8218(omObjData *arg0)
}
break;
case 1006:
MGSeqParamSet(lbl_1_bss_1A8, 1, (lbl_1_bss_1B0 + 59) / 60);
MGSeqParamSet(lbl_1_bss_1A8, 1, (lbl_1_bss_1B0 + REFRESH_RATE - 1) / REFRESH_RATE);
lbl_1_bss_1B0--;
if (lbl_1_bss_1B0 < 0 || lbl_1_bss_26 >= 0) {
lbl_1_bss_1B0 = 1800;

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

@ -11,6 +11,7 @@
#include "game/sprite.h"
#include "game/wipe.h"
#include "string.h"
#include "version.h"
typedef struct UnkM426Struct {
/* 0x00 */ s32 unk_00;
@ -457,7 +458,7 @@ void fn_1_330(omObjData *object)
}
break;
case 5:
var_r25 = (lbl_1_bss_58 + 59) / 60;
var_r25 = (lbl_1_bss_58 + REFRESH_RATE - 1) / REFRESH_RATE;
if (var_r25 < 0) {
var_r25 = 0;
}

25
src/REL/m437Dll/main.c
View file

@ -18,6 +18,7 @@
#include "dolphin.h"
#include "math.h"
#include "string.h"
#include "version.h"
typedef struct {
/* 0x000 */ omObjData *unk00;
@ -524,7 +525,7 @@ void fn_1_1184(s32 arg0)
{
if (lbl_1_bss_8 == 0) {
lbl_1_bss_8 = 1;
lbl_1_bss_4 = arg0 * 60;
lbl_1_bss_4 = arg0 * REFRESH_RATE;
}
}
@ -553,14 +554,14 @@ void fn_1_1218(omObjData *arg0)
switch (lbl_1_bss_8) {
case 1:
if (lbl_1_data_12C == -1) {
lbl_1_data_12C = MGSeqCreate(1, lbl_1_bss_4 / 60, -1, -1);
lbl_1_data_12C = MGSeqCreate(1, lbl_1_bss_4 / REFRESH_RATE, -1, -1);
}
lbl_1_bss_8 = 2;
break;
case 2:
lbl_1_bss_4--;
if (lbl_1_data_12C != -1) {
MGSeqParamSet(lbl_1_data_12C, 1, (lbl_1_bss_4 + 59) / 60);
MGSeqParamSet(lbl_1_data_12C, 1, (lbl_1_bss_4 + REFRESH_RATE - 1) / REFRESH_RATE);
}
if (lbl_1_bss_4 <= 0) {
lbl_1_bss_4 = 30;
@ -1019,7 +1020,7 @@ void fn_1_2BBC(omObjData *arg0)
fn_1_230(1, 10, 4.0f);
}
if (temp_r30->unk04 == 0) {
if (temp_r30->unk14++ >= 300) {
if (temp_r30->unk14++ >= 5 * REFRESH_RATE) {
temp_r30->unk14 = 0;
if (rand8() % 2 != 0) {
fn_1_2BAC(1);
@ -2272,9 +2273,9 @@ void fn_1_9320(void)
HuAudFXPlay(0x6D2);
fn_1_4BAC(2, 10, 0, 1);
fn_1_2A10(var_r31, MAKE_MESSID(29, 4));
fn_1_280C(var_r31, 60);
fn_1_280C(var_r31, REFRESH_RATE);
fn_1_2BAC(3);
fn_1_280C(var_r31, 60);
fn_1_280C(var_r31, REFRESH_RATE);
fn_1_4BAC(0, 30, 1, 1);
fn_1_27A4(var_r31);
lbl_1_bss_C = 1;
@ -2726,9 +2727,9 @@ void fn_1_BE80(void)
HuAudFXPlay(0x6D2);
fn_1_4928(1);
fn_1_2A10(var_r30, sp1C[temp_r27]);
fn_1_280C(var_r30, 60);
fn_1_280C(var_r30, REFRESH_RATE);
lbl_1_bss_C = 1;
fn_1_280C(var_r30, 60);
fn_1_280C(var_r30, REFRESH_RATE);
fn_1_27A4(var_r30);
HuPrcEnd();
}
@ -2747,9 +2748,9 @@ void fn_1_C248(void)
HuAudFXPlay(0x6D2);
fn_1_4928(1);
fn_1_2A10(var_r31, sp1C[temp_r27]);
fn_1_280C(var_r31, 60);
fn_1_280C(var_r31, REFRESH_RATE);
lbl_1_bss_C = 1;
fn_1_280C(var_r31, 60);
fn_1_280C(var_r31, REFRESH_RATE);
fn_1_27A4(var_r31);
HuPrcEnd();
}
@ -2814,7 +2815,7 @@ void fn_1_D03C(void)
var_r31 = fn_1_20F8((580.0f - sp10[0]) / 2, 100.0f, sp10[0], sp10[1], 2);
HuAudFXPlay(0x6D6);
fn_1_2A10(var_r31, sp18[temp_r28]);
fn_1_280C(var_r31, 120);
fn_1_280C(var_r31, 2 * REFRESH_RATE);
fn_1_27A4(var_r31);
HuPrcEnd();
}
@ -2830,7 +2831,7 @@ void fn_1_D3C0(void)
HuAudFXPlay(0x6D6);
fn_1_4BAC(1, 10, 0, 1);
fn_1_2A10(var_r31, MAKE_MESSID(29, 92));
fn_1_280C(var_r31, 120);
fn_1_280C(var_r31, 2 * REFRESH_RATE);
fn_1_4BAC(0, 30, 1, 1);
fn_1_27A4(var_r31);
lbl_1_bss_C = 1;

3
src/REL/m441Dll/main.c
View file

@ -21,6 +21,7 @@
#include "game/sprite.h"
#include "ext_math.h"
#include "version.h"
#undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x))
@ -1876,7 +1877,7 @@ void fn_1_8D58(omObjData *object)
break;
case 1004:
MGSeqParamSet(lbl_1_bss_19C, 1, (lbl_1_bss_1A4 + 59) / 60);
MGSeqParamSet(lbl_1_bss_19C, 1, (lbl_1_bss_1A4 + REFRESH_RATE - 1) / REFRESH_RATE);
lbl_1_bss_1A4--;
if (lbl_1_bss_1A4 < 0) {
object->work[0] = 1005;

3
src/REL/m448Dll/main.c
View file

@ -20,6 +20,7 @@
#include "dolphin.h"
#include "ext_math.h"
#include "version.h"
typedef struct {
/* 0x00 */ s32 unk00;
@ -1431,7 +1432,7 @@ void fn_1_7148(omObjData *arg0)
case 1005:
lbl_1_bss_84++;
if (lbl_1_data_19A != -1) {
MGSeqParamSet(lbl_1_data_19A, 1, ((lbl_1_bss_0 < 0 ? 0 : lbl_1_bss_0) + 59) / 60);
MGSeqParamSet(lbl_1_data_19A, 1, ((lbl_1_bss_0 < 0 ? 0 : lbl_1_bss_0) + REFRESH_RATE - 1) / REFRESH_RATE);
lbl_1_bss_0--;
if (lbl_1_bss_0 <= -30) {
MGSeqParamSet(lbl_1_data_19A, 2, -1);