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

Matched last function in m413Dll (#507)

Browse source
This commit is contained in:
mrshigure 2025-01-04 23:01:04 -08:00 • committed by GitHub
parent d95b1af697
commit d7cb16e6cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
config/GMPE01_00/rels/m413Dll/symbols.txt
View file

@ -177,21 +177,21 @@ lbl_1_data_0 = .data:0x00000000; // type:object size:0x4 data:4byte
lbl_1_data_4 = .data:0x00000004; // type:object size:0x8 data:4byte lbl_1_data_4 = .data:0x00000004; // type:object size:0x8 data:4byte
lbl_1_data_C = .data:0x0000000C; // type:object size:0x10 data:4byte lbl_1_data_C = .data:0x0000000C; // type:object size:0x10 data:4byte
lbl_1_data_1C = .data:0x0000001C; // type:object size:0x1C data:float lbl_1_data_1C = .data:0x0000001C; // type:object size:0x1C data:float
lbl_1_data_38 = .data:0x00000038; // type:object size:0x9 data:string lbl_1_data_38 = .data:0x00000038; // type:object size:0x9 scope:local data:string
lbl_1_data_41 = .data:0x00000041; // type:object size:0x19 data:string lbl_1_data_41 = .data:0x00000041; // type:object size:0x19 scope:local data:string
lbl_1_data_5A = .data:0x0000005A; // type:object size:0x1B data:string lbl_1_data_5A = .data:0x0000005A; // type:object size:0x1B scope:local data:string
lbl_1_data_75 = .data:0x00000075; // type:object size:0x10 data:string lbl_1_data_75 = .data:0x00000075; // type:object size:0x10 scope:local data:string
lbl_1_data_85 = .data:0x00000085; // type:object size:0x10 data:string lbl_1_data_85 = .data:0x00000085; // type:object size:0x10 scope:local data:string
lbl_1_data_95 = .data:0x00000095; // type:object size:0x10 data:string lbl_1_data_95 = .data:0x00000095; // type:object size:0x10 scope:local data:string
lbl_1_data_A5 = .data:0x000000A5; // type:object size:0x10 data:string lbl_1_data_A5 = .data:0x000000A5; // type:object size:0x10 scope:local data:string
lbl_1_data_B5 = .data:0x000000B5; // type:object size:0x11 data:string lbl_1_data_B5 = .data:0x000000B5; // type:object size:0x11 scope:local data:string
lbl_1_data_C6 = .data:0x000000C6; // type:object size:0x11 data:string lbl_1_data_C6 = .data:0x000000C6; // type:object size:0x11 scope:local data:string
lbl_1_data_D7 = .data:0x000000D7; // type:object size:0x12 data:string lbl_1_data_D7 = .data:0x000000D7; // type:object size:0x12 scope:local data:string
lbl_1_data_E9 = .data:0x000000E9; // type:object size:0x12 data:string lbl_1_data_E9 = .data:0x000000E9; // type:object size:0x12 scope:local data:string
lbl_1_data_FB = .data:0x000000FB; // type:object size:0x12 data:string lbl_1_data_FB = .data:0x000000FB; // type:object size:0x12 scope:local data:string
lbl_1_data_10D = .data:0x0000010D; // type:object size:0xF data:string lbl_1_data_10D = .data:0x0000010D; // type:object size:0xF scope:local data:string
lbl_1_data_11C = .data:0x0000011C; // type:object size:0x19 data:string lbl_1_data_11C = .data:0x0000011C; // type:object size:0x19 scope:local data:string
lbl_1_data_135 = .data:0x00000135; // type:object size:0x24 data:string lbl_1_data_135 = .data:0x00000135; // type:object size:0x24 scope:local data:string
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x8 data:4byte lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x8 data:4byte

2
configure.py
View file

@ -965,7 +965,7 @@ config.libs = [
Rel( Rel(
"m413Dll", # Bob-omb Breakers "m413Dll", # Bob-omb Breakers
objects={ objects={
Object(NonMatching, "REL/m413Dll/main.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m413Dll/main.c"),
}, },
), ),
Rel( Rel(

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

@ -781,7 +781,7 @@ void fn_1_19C8(omObjData *object)
temp_r26 = (temp_r26 >= 4) ? (temp_r26 - 4) : ((temp_r26 < 0) ? (temp_r26 + 4) : temp_r26); temp_r26 = (temp_r26 >= 4) ? (temp_r26 - 4) : ((temp_r26 < 0) ? (temp_r26 + 4) : temp_r26);
temp_r31->unk74++; temp_r31->unk74++;
if (temp_r31->unk1C == -1) { if (temp_r31->unk1C == -1) {
s32 sp20C[4] = { 120, 50, 25, 2 }; s32 sp20C[4] = { 120, 60, 25, 2 };
s32 sp200[3] = { 60, 45, 25 }; s32 sp200[3] = { 60, 45, 25 };
temp_r31->unk90 = (temp_r31->unk8C == temp_r31->unk48[0]->unk18 && temp_r31->unk8C != temp_r31->unk7C) ? (temp_r31->unk90 + 1) : 0; temp_r31->unk90 = (temp_r31->unk8C == temp_r31->unk48[0]->unk18 && temp_r31->unk8C != temp_r31->unk7C) ? (temp_r31->unk90 + 1) : 0;
temp_r31->unk8C = temp_r31->unk48[0]->unk18; temp_r31->unk8C = temp_r31->unk48[0]->unk18;
@ -1466,7 +1466,6 @@ void fn_1_8AC8(StructBss2A6C *arg0, StructSp14C8 *arg1)
} }
} }
// decomp.me link is https://decomp.me/scratch/PbkiW
void fn_1_8C10(omObjData *object) void fn_1_8C10(omObjData *object)
{ {
s32 temp_r31; s32 temp_r31;
@ -1672,7 +1671,7 @@ void fn_1_8C10(omObjData *object)
temp_f26 = lbl_1_bss_B8.unkC.x; temp_f26 = lbl_1_bss_B8.unkC.x;
temp_f27 *= lbl_1_bss_B8.unk4 * 2; temp_f27 *= lbl_1_bss_B8.unk4 * 2;
temp_f26 *= lbl_1_bss_B8.unk4 * 2; temp_f26 *= lbl_1_bss_B8.unk4 * 2;
lbl_1_bss_B8.unk0 = lbl_1_bss_B8.unk0 == 0; lbl_1_bss_B8.unk0 = !lbl_1_bss_B8.unk0;
lbl_1_bss_B8.unk4 = (lbl_1_bss_B8.unk4 > 24) ? 23 : ((lbl_1_bss_B8.unk4 - 1 > 0) ? lbl_1_bss_B8.unk4 - 1 : 0); lbl_1_bss_B8.unk4 = (lbl_1_bss_B8.unk4 > 24) ? 23 : ((lbl_1_bss_B8.unk4 - 1 > 0) ? lbl_1_bss_B8.unk4 - 1 : 0);
Hu3DCameraPosSet(1, temp_f27, 37.139069 + temp_f26, 2599.7346f, 0, 1, 0, temp_f27, 50.0f + temp_f26, 0); Hu3DCameraPosSet(1, temp_f27, 37.139069 + temp_f26, 2599.7346f, 0, 1, 0, temp_f27, 50.0f + temp_f26, 0);
} }