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

Merge pull request #311 from gamemasterplc/main

Browse source 
Fix paths to m446dll files
This commit is contained in:
Liam Coleman 2024-05-24 07:21:03 -05:00 • committed by GitHub
commit 747b228df5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
config/GMPE01_00/rels/m446dll/splits.txt
View file

@ -9,49 +9,49 @@ Sections:
REL/executor.c: REL/executor.c:
.text start:0x00000000 end:0x000000A0 .text start:0x00000000 end:0x000000A0
REL/m446dll/main.c: REL/m446Dll/main.c:
.text start:0x000000A0 end:0x00001C64 .text start:0x000000A0 end:0x00001C64
.rodata start:0x00000000 end:0x00000058 .rodata start:0x00000000 end:0x00000058
.data start:0x00000000 end:0x00000150 .data start:0x00000000 end:0x00000150
.bss start:0x00000000 end:0x00000018 .bss start:0x00000000 end:0x00000018
REL/m446dll/card.c: REL/m446Dll/card.c:
.text start:0x00001C64 end:0x00003064 .text start:0x00001C64 end:0x00003064
.rodata start:0x00000058 end:0x000000D0 .rodata start:0x00000058 end:0x000000D0
.data start:0x00000150 end:0x000001A8 .data start:0x00000150 end:0x000001A8
.bss start:0x00000018 end:0x00000020 .bss start:0x00000018 end:0x00000020
REL/m446dll/deck.c: REL/m446Dll/deck.c:
.text start:0x00003064 end:0x00003924 .text start:0x00003064 end:0x00003924
.rodata start:0x000000D0 end:0x00000138 .rodata start:0x000000D0 end:0x00000138
.data start:0x000001A8 end:0x000001E8 .data start:0x000001A8 end:0x000001E8
.bss start:0x00000020 end:0x00000028 .bss start:0x00000020 end:0x00000028
REL/m446dll/table.c: REL/m446Dll/table.c:
.text start:0x00003924 end:0x0000480C .text start:0x00003924 end:0x0000480C
.rodata start:0x00000138 end:0x00000170 .rodata start:0x00000138 end:0x00000170
.data start:0x000001E8 end:0x00000228 .data start:0x000001E8 end:0x00000228
.bss start:0x00000028 end:0x00000030 .bss start:0x00000028 end:0x00000030
REL/m446dll/player.c: REL/m446Dll/player.c:
.text start:0x0000480C end:0x00006778 .text start:0x0000480C end:0x00006778
.rodata start:0x00000170 end:0x00000208 .rodata start:0x00000170 end:0x00000208
.data start:0x00000228 end:0x00000370 .data start:0x00000228 end:0x00000370
.bss start:0x00000030 end:0x00000038 .bss start:0x00000030 end:0x00000038
REL/m446dll/camera.c: REL/m446Dll/camera.c:
.text start:0x00006778 end:0x000072E0 .text start:0x00006778 end:0x000072E0
.rodata start:0x00000208 end:0x00000268 .rodata start:0x00000208 end:0x00000268
.data start:0x00000370 end:0x000003C8 .data start:0x00000370 end:0x000003C8
.bss start:0x00000038 end:0x00000098 .bss start:0x00000038 end:0x00000098
REL/m446dll/cursor.c: REL/m446Dll/cursor.c:
.text start:0x000072E0 end:0x00007BF0 .text start:0x000072E0 end:0x00007BF0
.rodata start:0x00000268 end:0x000002A0 .rodata start:0x00000268 end:0x000002A0
.data start:0x000003C8 end:0x00000410 .data start:0x000003C8 end:0x00000410
.bss start:0x00000098 end:0x000000A0 .bss start:0x00000098 end:0x000000A0
REL/m446dll/stage.c: REL/m446Dll/stage.c:
.text start:0x00007BF0 end:0x00008618 .text start:0x00007BF0 end:0x00008618
.rodata start:0x000002A0 end:0x000002D8 .rodata start:0x000002A0 end:0x000002D8
.data start:0x00000410 end:0x000004F6 .data start:0x00000410 end:0x000004F6

16
configure.py
View file

@ -1188,14 +1188,14 @@ config.libs = [
"m446dll", "m446dll",
objects={ objects={
Object(Matching, "REL/executor.c"), Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m446dll/main.c"), Object(NonMatching, "REL/m446Dll/main.c"),
Object(Matching, "REL/m446dll/card.c"), Object(Matching, "REL/m446Dll/card.c"),
Object(Matching, "REL/m446dll/deck.c"), Object(Matching, "REL/m446Dll/deck.c"),
Object(Matching, "REL/m446dll/table.c"), Object(Matching, "REL/m446Dll/table.c"),
Object(Matching, "REL/m446dll/player.c"), Object(Matching, "REL/m446Dll/player.c"),
Object(NonMatching, "REL/m446dll/camera.c"), Object(NonMatching, "REL/m446Dll/camera.c"),
Object(NonMatching, "REL/m446dll/cursor.c"), Object(NonMatching, "REL/m446Dll/cursor.c"),
Object(NonMatching, "REL/m446dll/stage.c"), Object(NonMatching, "REL/m446Dll/stage.c"),
}, },
), ),
Rel( Rel(

1
include/REL/m446Dll.h
View file

@ -242,7 +242,6 @@ extern void fn_1_34A0(unkStruct5*, unkStruct4**, s32, s32);
extern s32 m446DeckPushCard(unkStruct5*, unkStruct4*, s32); extern s32 m446DeckPushCard(unkStruct5*, unkStruct4*, s32);
extern s32 m446DeckPopCard(unkStruct2**, unkStruct4**); extern s32 m446DeckPopCard(unkStruct2**, unkStruct4**);
extern void fn_1_38B0(unkStruct2**); extern void fn_1_38B0(unkStruct2**);
extern void fn_1_38E0(u32);
extern s32 fn_1_38F0(void); extern s32 fn_1_38F0(void);
// table.c // table.c
extern s32 fn_1_3924(void); extern s32 fn_1_3924(void);

14
src/REL/m446Dll/main.c
View file

@ -70,7 +70,7 @@ void fn_1_13C(omObjData* arg0) {
HuWinInit(1); HuWinInit(1);
Hu3DLighInit(); Hu3DLighInit();
frand(); frand();
fn_1_38E0(0); fn_1_38E0();
fn_1_6778(); fn_1_6778();
fn_1_7BF0(); fn_1_7BF0();
fn_1_2064(); fn_1_2064();
@ -388,7 +388,7 @@ void fn_1_C0C(unkStruct* arg0) {
void fn_1_CA0(unkStruct* arg0) { void fn_1_CA0(unkStruct* arg0) {
s32 var_r29; s32 var_r29;
unkStruct6 *var_r30; unkStruct8 *var_r30;
var_r30 = arg0->unk2C[arg0->unk1C]; var_r30 = arg0->unk2C[arg0->unk1C];
switch (arg0->unk10) { switch (arg0->unk10) {
@ -512,7 +512,7 @@ void fn_1_CA0(unkStruct* arg0) {
break; break;
case 15: case 15:
if (arg0->unk34->unk70 == 0 && arg0->unk34->unk78 == 0 && arg0->unk34->unk74 == 0 && arg0->unk34->unk4 == 0) { if (arg0->unk34->unk70 == 0 && arg0->unk34->unk78 == 0 && arg0->unk34->unk74 == 0 && arg0->unk34->unk4 == 0) {
fn_1_3EB4(var_r30, arg0->unk34, 4); fn_1_3EB4((unkStruct6 *)var_r30, arg0->unk34, 4);
fn_1_2688(arg0->unk34); fn_1_2688(arg0->unk34);
for (var_r29 = 0; var_r29 < 3; var_r29++) { for (var_r29 = 0; var_r29 < 3; var_r29++) {
fn_1_5648(var_r30, var_r29, &arg0->unk34); fn_1_5648(var_r30, var_r29, &arg0->unk34);
@ -554,7 +554,7 @@ void fn_1_CA0(unkStruct* arg0) {
break; break;
case 18: case 18:
if (arg0->unk14++ >= 60) { if (arg0->unk14++ >= 60) {
fn_1_31D8(arg0->unk28, &arg0->unk38[0], &arg0->unk94, 1); fn_1_31D8((unkStruct2 **)arg0->unk28, &arg0->unk38[0], &arg0->unk94, 1);
arg0->unk10 = 19; arg0->unk10 = 19;
arg0->unk14 = 0; arg0->unk14 = 0;
} }
@ -569,7 +569,7 @@ void fn_1_CA0(unkStruct* arg0) {
case 20: case 20:
if (arg0->unk14++ >= 120) { if (arg0->unk14++ >= 120) {
for (var_r29 = 0; var_r29 < 3; var_r29++) { for (var_r29 = 0; var_r29 < 3; var_r29++) {
m446DeckPopCard(arg0->unk28, &arg0->unk34); m446DeckPopCard((unkStruct2 **)arg0->unk28, &arg0->unk34);
m446PlayerAppendCard(var_r30, arg0->unk34, 1); m446PlayerAppendCard(var_r30, arg0->unk34, 1);
fn_1_2EC0(arg0->unk34, 0); fn_1_2EC0(arg0->unk34, 0);
} }
@ -591,7 +591,7 @@ void fn_1_CA0(unkStruct* arg0) {
if (arg0->unk34->unk70 == 0 && arg0->unk34->unk78 == 0 && arg0->unk34->unk74 == 0 && arg0->unk34->unk4 == 0) { if (arg0->unk34->unk70 == 0 && arg0->unk34->unk78 == 0 && arg0->unk34->unk74 == 0 && arg0->unk34->unk4 == 0) {
fn_1_46AC(arg0->unk20); fn_1_46AC(arg0->unk20);
while (m446DeckPopCard(arg0->unk28, &arg0->unk34)) { while (m446DeckPopCard((unkStruct2 **)arg0->unk28, &arg0->unk34)) {
fn_1_3BF0(arg0->unk20, arg0->unk34, 1); fn_1_3BF0(arg0->unk20, arg0->unk34, 1);
} }
fn_1_46D0(arg0->unk20); fn_1_46D0(arg0->unk20);
@ -683,7 +683,7 @@ void fn_1_19D4(void) {
} }
if (var_r30 == 0) { if (var_r30 == 0) {
var_r29 = 0; var_r29 = 0;
while (temp_r27 = lbl_1_rodata_18[var_r29++], temp_r27 != 0) { while ((temp_r27 = lbl_1_rodata_18[var_r29++]) != 0) {
HuWinMesColSet(temp_r3, 0); HuWinMesColSet(temp_r3, 0);
HuWinMesSet(temp_r3, temp_r27); HuWinMesSet(temp_r3, temp_r27);
fn_1_18EC(temp_r3, 0x3C); fn_1_18EC(temp_r3, 0x3C);