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

Merge pull request #403 from gamemasterplc/main

Browse source 
Fix record value type to be unsigned
This commit is contained in:
Liam Coleman 2024-08-18 08:03:21 -05:00 • committed by GitHub
commit 00fdf20be1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/game/gamework.h
View file

@ -9,8 +9,8 @@ void GWInit(void);
void GWGameStatReset(void); void GWGameStatReset(void);
s32 GWMessSpeedGet(void); s32 GWMessSpeedGet(void);
s32 GWMessDelayGet(void); s32 GWMessDelayGet(void);
void GWMGRecordSet(s32 index, s32 value); void GWMGRecordSet(s32 index, u32 value);
s32 GWMGRecordGet(s32 index); u32 GWMGRecordGet(s32 index);
void GWCharColorGet(s32 character, GXColor *color); void GWCharColorGet(s32 character, GXColor *color);
void GWBoardPlayCountSet(s32 board, u8 value); void GWBoardPlayCountSet(s32 board, u8 value);
void GWBoardPlayCountAdd(s32 board, u8 value); void GWBoardPlayCountAdd(s32 board, u8 value);

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

@ -213,7 +213,7 @@ void ObjectSetup(void) {
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
HuAudSndGrpSet(0x1C); HuAudSndGrpSet(0x1C);
lbl_1_bss_2 = 0; lbl_1_bss_2 = 0;
if (GWMGRecordGet(9) == 0U) { if (GWMGRecordGet(9) == 0) {
GWMGRecordSet(9, 5); GWMGRecordSet(9, 5);
} }
} }
@ -401,7 +401,7 @@ static void fn_1_82C(omObjData *arg0) {
lbl_1_bss_28 = 90; lbl_1_bss_28 = 90;
break; break;
} }
if (GWMGRecordGet(9) < lbl_1_bss_0 - 1) { if ((s32)GWMGRecordGet(9) < lbl_1_bss_0 - 1) {
GWMGRecordSet(9, lbl_1_bss_0 - 1); GWMGRecordSet(9, lbl_1_bss_0 - 1);
lbl_1_bss_30 = 8; lbl_1_bss_30 = 8;
break; break;

5
src/REL/m405Dll/main.c
View file

@ -2288,10 +2288,7 @@ void fn_1_9288(omObjData *arg0) {
} }
if (lbl_1_bss_7C >= 0 && !GWPlayerCfg[lbl_1_bss_7C].iscom && lbl_1_bss_738 > lbl_1_bss_73C) { if (lbl_1_bss_7C >= 0 && !GWPlayerCfg[lbl_1_bss_7C].iscom && lbl_1_bss_738 > lbl_1_bss_73C) {
arg0->work[0] = 1007; arg0->work[0] = 1007;
lbl_1_bss_728 = 0.0f; fn_1_798(0);
lbl_1_bss_738 = lbl_1_bss_73C;
GWMGRecordSet(0, lbl_1_bss_738);
fn_1_580(lbl_1_bss_6E8, 7, lbl_1_bss_73C);
} }
lbl_1_bss_736 = -1; lbl_1_bss_736 = -1;
lbl_1_bss_80 = 0.0f; lbl_1_bss_80 = 0.0f;

7
src/REL/m442Dll/main.c
View file

@ -2,6 +2,8 @@
#include "ext_math.h" #include "ext_math.h"
#include "game/audio.h" #include "game/audio.h"
#include "game/chrman.h" #include "game/chrman.h"
#include "game/gamework.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/hsfdraw.h" #include "game/hsfdraw.h"
#include "game/hsfmotion.h" #include "game/hsfmotion.h"
@ -123,9 +125,6 @@ typedef struct M442MainWork2 {
/* 0x18 */ float unk_18; /* 0x18 */ float unk_18;
} M442MainWork2; /* size = 0x1C */ } M442MainWork2; /* size = 0x1C */
void GWMGRecordSet(s32 index, s32 value);
u32 GWMGRecordGet(s32 index);
void fn_1_A30(omObjData *object); void fn_1_A30(omObjData *object);
void fn_1_A90(Process *arg0); void fn_1_A90(Process *arg0);
void fn_1_D9C(void); void fn_1_D9C(void);
@ -250,7 +249,7 @@ void ObjectSetup(void)
fn_1_A90(var_r31); fn_1_A90(var_r31);
fn_1_3E64(var_r31); fn_1_3E64(var_r31);
fn_1_6BB4(var_r31); fn_1_6BB4(var_r31);
if (!GWMGRecordGet(4)) { if (GWMGRecordGet(4) == 0) {
GWMGRecordSet(4, 0); GWMGRecordSet(4, 0);
} }
fn_1_91AC(var_r31, GWMGRecordGet(4)); fn_1_91AC(var_r31, GWMGRecordGet(4));

4
src/game/gamework.c
View file

@ -147,14 +147,14 @@ s32 GWMessDelayGet(void)
return GWSystem.mess_delay; return GWSystem.mess_delay;
} }
void GWMGRecordSet(s32 index, s32 value) void GWMGRecordSet(s32 index, u32 value)
{ {
if(!_CheckFlag(FLAG_ID_MAKE(1, 12))) { if(!_CheckFlag(FLAG_ID_MAKE(1, 12))) {
GWGameStat.mg_record[index] = value; GWGameStat.mg_record[index] = value;
} }
} }
s32 GWMGRecordGet(s32 index) u32 GWMGRecordGet(s32 index)
{ {
return GWGameStat.mg_record[index]; return GWGameStat.mg_record[index];
} }