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

Merge pull request #176 from gamemasterplc/main

Browse source 
Several fixes
This commit is contained in:
gamemasterplc 2024-02-10 16:08:25 -06:00 • committed by GitHub
commit f4032c8798
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/GMPE01_00/rels/mpexDll/splits.txt
View file

@ -26,5 +26,5 @@ REL/mpexDll/charsel.c:
REL/mpexDll/mgname.c: REL/mpexDll/mgname.c:
.text start:0x0001CB80 end:0x0001D198 .text start:0x0001CB80 end:0x0001D198
.rodata start:0x00000610 end:0x00000618 .rodata start:0x00000610 end:0x00000620
.data start:0x00000788 end:0x00000788 .data start:0x00000788 end:0x00000AA0

4
config/GMPE01_00/symbols.txt
View file

@ -5137,7 +5137,7 @@ VolumeTable = .data:0x801311E8; // type:object size:0x100 scope:local
lbl_801312E8 = .data:0x801312E8; // type:object size:0x4D lbl_801312E8 = .data:0x801312E8; // type:object size:0x4D
lbl_80131335 = .data:0x80131335; // type:object size:0x1B lbl_80131335 = .data:0x80131335; // type:object size:0x1B
mgInfoTbl = .data:0x80131350; // type:object size:0xE00 data:2byte mgInfoTbl = .data:0x80131350; // type:object size:0xE00 data:2byte
saveComment = .data:0x80132150; // type:object size:0x40 scope:local commentTbl = .data:0x80132150; // type:object size:0x40 scope:local
lbl_80132190 = .data:0x80132190; // type:object size:0xC data:string lbl_80132190 = .data:0x80132190; // type:object size:0xC data:string
lbl_8013219C = .data:0x8013219C; // type:object size:0xC data:string lbl_8013219C = .data:0x8013219C; // type:object size:0xC data:string
lbl_801321A8 = .data:0x801321A8; // type:object size:0xC data:string lbl_801321A8 = .data:0x801321A8; // type:object size:0xC data:string
@ -5153,7 +5153,7 @@ wrongdisc_en = .data:0x8013839C; // type:object size:0x1384 noreloc
jumptable_80139720 = .data:0x80139720; // type:object size:0x34 scope:local jumptable_80139720 = .data:0x80139720; // type:object size:0x34 scope:local
bmpMes$493 = .data:0x80139754; // type:object size:0x18 scope:local bmpMes$493 = .data:0x80139754; // type:object size:0x18 scope:local
lbl_8013976C = .data:0x8013976C; // type:object size:0x13 data:string lbl_8013976C = .data:0x8013976C; // type:object size:0x13 data:string
lbl_8013977F = .data:0x8013977F; // type:object size:0x19 lbl_8013977F = .data:0x8013977F; // type:object size:0x12 data:string
camViewTbl = .data:0x80139798; // type:object size:0x24 scope:local camViewTbl = .data:0x80139798; // type:object size:0x24 scope:local
jumptable_801397BC = .data:0x801397BC; // type:object size:0x24 scope:local jumptable_801397BC = .data:0x801397BC; // type:object size:0x24 scope:local
confettiLightTbl = .data:0x801397E0; // type:object size:0x48 scope:local confettiLightTbl = .data:0x801397E0; // type:object size:0x48 scope:local

2
include/game/hsfformat.h
View file

@ -286,7 +286,7 @@ typedef struct hsf_object_data {
HsfBuffer **vertexShape; HsfBuffer **vertexShape;
u32 clusterCnt; u32 clusterCnt;
HsfCluster **cluster; HsfCluster **cluster;
u32 hook; u32 cenvCnt;
HsfCenv *cenv; HsfCenv *cenv;
void *file[2]; void *file[2];
} HsfObjectData; } HsfObjectData;

2
include/game/object.h
View file

@ -51,7 +51,7 @@ typedef struct om_obj_data {
/* 0x40 */ s16 *model; /* 0x40 */ s16 *model;
/* 0x44 */ u16 mtncnt; /* 0x44 */ u16 mtncnt;
/* 0x48 */ s16 *motion; /* 0x48 */ s16 *motion;
/* 0x4C */ int work[4]; /* 0x4C */ u32 work[4];
/* 0x5C */ void *data; /* 0x5C */ void *data;
} omObjData; } omObjData;

2
src/game/ClusterExec.c
View file

@ -119,7 +119,7 @@ void ClusterProc(ModelData *arg0) {
temp_r31 = temp_r23->object; temp_r31 = temp_r23->object;
temp_r31 += var_r29->target; temp_r31 += var_r29->target;
Vertextop = temp_r31->data.vertex->data; Vertextop = temp_r31->data.vertex->data;
if (temp_r31->data.hook) { if (temp_r31->data.cenvCnt) {
for (k = 0; k < temp_r31->data.vertex->count; k++) { for (k = 0; k < temp_r31->data.vertex->count; k++) {
Vertextop[k].x = ((Vec*) temp_r31->data.file[0])[k].x; Vertextop[k].x = ((Vec*) temp_r31->data.file[0])[k].x;
Vertextop[k].y = ((Vec*) temp_r31->data.file[0])[k].y; Vertextop[k].y = ((Vec*) temp_r31->data.file[0])[k].y;

2
src/game/EnvelopeExec.c
View file

@ -179,7 +179,7 @@ static void SetEnvelopMain(HsfData *arg0) {
normtop = var_r31->data.file[1]; normtop = var_r31->data.file[1];
normenv = temp_r28->data; normenv = temp_r28->data;
var_r25 = var_r31->data.cenv; var_r25 = var_r31->data.cenv;
for (j = 0; j < var_r31->data.hook; j++, var_r25++) { for (j = 0; j < var_r31->data.cenvCnt; j++, var_r25++) {
SetEnvelop(var_r25); SetEnvelop(var_r25);
} }
sp10 = temp_r30->data; sp10 = temp_r30->data;

2
src/game/fault.c
View file

@ -25,7 +25,7 @@ static RGBColor XFB_Colors[5] = {
#include "Ascii8x8_1bpp.inc" #include "Ascii8x8_1bpp.inc"
XFBGeometry XFB_Geometry; static XFBGeometry XFB_Geometry;
static s32 (*XFB_putc)(u8 c, s32 x, s32 y); static s32 (*XFB_putc)(u8 c, s32 x, s32 y);

6
src/game/hsfdraw.c
View file

@ -240,7 +240,7 @@ static void objMesh(ModelData *arg0, HsfObject *arg1) {
temp_r25 = arg1->constData; temp_r25 = arg1->constData;
if (!(temp_r25->flags & 0x1000)) { if (!(temp_r25->flags & 0x1000)) {
if (CancelTRXF == 0) { if (CancelTRXF == 0) {
if (arg1->data.hook != 0 && hookIdx == -1) { if (arg1->data.cenvCnt != 0 && hookIdx == -1) {
temp_r21 = arg1 - temp_r20->object; temp_r21 = arg1 - temp_r20->object;
PSMTXConcat(MTXBuf[0], temp_r20->matrix->data[temp_r21 + temp_r20->matrix->base_idx], MTXBuf[MTXIdx]); PSMTXConcat(MTXBuf[0], temp_r20->matrix->data[temp_r21 + temp_r20->matrix->base_idx], MTXBuf[MTXIdx]);
} else { } else {
@ -2770,7 +2770,7 @@ static s32 MakeCalcNBT(HsfObject *arg0, HsfFace *arg1, s16 arg2, s16 arg3) {
temp_r27 = arg1->indices[arg2][1]; temp_r27 = arg1->indices[arg2][1];
temp_r25 = arg1->indices[arg2][0]; temp_r25 = arg1->indices[arg2][0];
temp_r24 = arg1->indices[arg3][0]; temp_r24 = arg1->indices[arg3][0];
if (arg0->data.hook != 0) { if (arg0->data.cenvCnt != 0) {
temp_r29 = arg0->data.normal->data; temp_r29 = arg0->data.normal->data;
sp10.x = temp_r29[temp_r27].x; sp10.x = temp_r29[temp_r27].x;
sp10.y = temp_r29[temp_r27].y; sp10.y = temp_r29[temp_r27].y;
@ -2801,7 +2801,7 @@ static s32 MakeNBT(HsfObject *arg0, HsfFace *arg1, s16 arg2, s16 arg3) {
spC = arg0->data.vertex->data; spC = arg0->data.vertex->data;
temp_r28 = arg1->indices[arg2][1]; temp_r28 = arg1->indices[arg2][1];
if (arg0->data.hook != 0) { if (arg0->data.cenvCnt != 0) {
temp_r30 = arg0->data.normal->data; temp_r30 = arg0->data.normal->data;
sp10.x = temp_r30[temp_r28].x; sp10.x = temp_r30[temp_r28].x;
sp10.y = temp_r30[temp_r28].y; sp10.y = temp_r30[temp_r28].y;

2
src/game/minigame_seq.c
View file

@ -3556,7 +3556,7 @@ void MGSeqPracticeExitCheck(omObjData *object)
s16 input; s16 input;
s16 i; s16 i;
mgQuitExtraF = 0; mgQuitExtraF = 0;
if((u32)object->work[0] == 0) { if(object->work[0] == 0) {
if(omMgIndexGet(omcurovl) == -1) { if(omMgIndexGet(omcurovl) == -1) {
omDelObjEx(HuPrcCurrentGet(), object); omDelObjEx(HuPrcCurrentGet(), object);
return; return;

6
src/game/saveload.c
View file

@ -27,7 +27,7 @@ s32 saveExecF;
u8 curBoxNo; u8 curBoxNo;
s16 curSlotNo; s16 curSlotNo;
u8 saveComment[2][32] = { static u8 commentTbl[2][32] = {
"Mario Party 4", "Mario Party 4",
"File 0 00/00/0000" "File 0 00/00/0000"
}; };
@ -258,10 +258,10 @@ void SLSaveDataMake(s32 erase, OSTime *time) {
} }
} }
for (i = 0; i < 0x20; i++) { for (i = 0; i < 0x20; i++) {
buf[i] = (&saveComment[0][0])[i]; buf[i] = (&commentTbl[0][0])[i];
} }
for (i = 0; i < 0x20; i++) { for (i = 0; i < 0x20; i++) {
(&buf[0x20])[i] = (&saveComment[0][0])[i+32]; (&buf[0x20])[i] = (&commentTbl[0][0])[i+32];
} }
anim_data = HuSprAnimReadFile(WIN_CARD_BANNER_ANM); anim_data = HuSprAnimReadFile(WIN_CARD_BANNER_ANM);
memcpy(buf + offsetof(SaveBufData, banner), anim_data->bmp->data, CARD_BANNER_WIDTH*CARD_BANNER_HEIGHT); memcpy(buf + offsetof(SaveBufData, banner), anim_data->bmp->data, CARD_BANNER_WIDTH*CARD_BANNER_HEIGHT);