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

fix file splits for w10Dll

Browse source
This commit is contained in:
Rainchus 2023-11-29 14:24:40 -06:00
parent e850a6331f
commit 720ed706f1
4 changed files with 45 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/GMPE01_00/rels/w10Dll/splits.txt
View file

@ -10,14 +10,15 @@ REL/w10Dll/w10Dll_init.c:
.text start:0x00000000 end:0x000000E0
REL/w10Dll/w10Dll.c:
.text start:0x000000E0 end:0x00000C20
.text start:0x000000E0 end:0x00000AEC
.rodata start:0x00000000 end:0x00000038
.data start:0x00000000 end:0x00000098
.data start:0x00000000 end:0x00000078
.bss start:0x00000000 end:0x00000038
REL/w10Dll/w10Dll2.c:
.text start:0x00000C20 end:0x00000D2C
.text start:0x00000AEC end:0x00000D2C
.rodata start:0x00000038 end:0x00000048
.data start:0x00000078 end:0x00000098
REL/w10Dll/w10Dll3.c:
.text start:0x00000D2C end:0x0000176C

2
include/REL/w10Dll.h
View file

@ -192,5 +192,5 @@ extern s16 lbl_1_data_32;
extern s32 lbl_1_data_54[2];
extern s32 lbl_1_data_5C[2];
extern s32 lbl_1_data_64[2];
extern s32 lbl_1_data_6C[3]; //HACK: should be 2
extern s32 lbl_1_data_6C[2];
extern BoardState lbl_8018FCF8;

44
src/REL/w10Dll/w10Dll.c
View file

@ -52,21 +52,9 @@ s32 lbl_1_data_64[2] = {
-1
};
//HACK: should be just 2 entries but there is 0 padding
s32 lbl_1_data_6C[3] = {
s32 lbl_1_data_6C[2] = {
0x0002000E,
-1,
0
};
s32 lbl_1_data_78[2] = {
0x007B0010,
-1
};
Vec3f lbl_1_data_80[2] = {
{70.0f, 355.0f, 200.f},
{70.0f, 175.0f, 200.f},
};
//RODATA
@ -256,33 +244,3 @@ s32 fn_1_920(s32 arg0, f32 arg8, f32 arg9) {
}
return var_r31;
}
void fn_1_AEC(void) {
lbl_1_bss_1C = 0;
lbl_1_bss_1E = fn_8006D9A4(0x7B000F, &lbl_1_data_78, 0);
fn_8006E2B8(lbl_1_bss_1E, 1, 0x40000001);
fn_800B42BC(lbl_1_bss_1E);
fn_8006F61C(lbl_1_bss_1E, 6);
lbl_1_bss_18 = HuPrcCreate(fn_1_C20, 0x1FFF, 0x1800, 0);
}
void fn_1_BA0(s32 arg0) {
s32 var_r31;
switch (lbl_1_bss_1C) {
case 0:
var_r31 = 5;
break;
case 1:
var_r31 = 6;
break;
}
BoardMessCreate(var_r31, arg0, -1);
BoardMessWait();
BoardMessKill();
}
void fn_1_C10(s16 arg0) {
lbl_1_bss_1C = arg0;
}

39
src/REL/w10Dll/w10Dll2.c
View file

@ -1,5 +1,44 @@
#include "REL/w10Dll.h"
s32 lbl_1_data_78[2] = {
0x007B0010,
-1
};
Vec3f lbl_1_data_80[2] = {
{70.0f, 355.0f, 200.f},
{70.0f, 175.0f, 200.f},
};
void fn_1_AEC(void) {
lbl_1_bss_1C = 0;
lbl_1_bss_1E = fn_8006D9A4(0x7B000F, &lbl_1_data_78, 0);
fn_8006E2B8(lbl_1_bss_1E, 1, 0x40000001);
fn_800B42BC(lbl_1_bss_1E);
fn_8006F61C(lbl_1_bss_1E, 6);
lbl_1_bss_18 = HuPrcCreate(fn_1_C20, 0x1FFF, 0x1800, 0);
}
void fn_1_BA0(s32 arg0) {
s32 var_r31;
switch (lbl_1_bss_1C) {
case 0:
var_r31 = 5;
break;
case 1:
var_r31 = 6;
break;
}
BoardMessCreate(var_r31, arg0, -1);
BoardMessWait();
BoardMessKill();
}
void fn_1_C10(s16 arg0) {
lbl_1_bss_1C = arg0;
}
void fn_1_C20(void) {
Mtx sp20;
Vec3f sp14;