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

Matched REL/w06/bowser

Browse source
This commit is contained in:
mrshigure 2024-04-06 12:33:46 -07:00
parent 4e2c3b7631
commit bc0f33b800
5 changed files with 1313 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

144
config/GMPE01_00/rels/w06Dll/symbols.txt
View file

@ -98,25 +98,25 @@ fn_1_8F20 = .text:0x00008F20; // type:function size:0x2B8
fn_1_91D8 = .text:0x000091D8; // type:function size:0xBC fn_1_91D8 = .text:0x000091D8; // type:function size:0xBC
fn_1_9294 = .text:0x00009294; // type:function size:0x44 fn_1_9294 = .text:0x00009294; // type:function size:0x44
fn_1_92D8 = .text:0x000092D8; // type:function size:0xF0 fn_1_92D8 = .text:0x000092D8; // type:function size:0xF0
fn_1_93C8 = .text:0x000093C8; // type:function size:0x10C fn_1_93C8 = .text:0x000093C8; // type:function size:0x10C scope:local
fn_1_94D4 = .text:0x000094D4; // type:function size:0xD8 fn_1_94D4 = .text:0x000094D4; // type:function size:0xD8 scope:local
fn_1_95AC = .text:0x000095AC; // type:function size:0x8B0 fn_1_95AC = .text:0x000095AC; // type:function size:0x8B0 scope:local
fn_1_9E5C = .text:0x00009E5C; // type:function size:0x5AC fn_1_9E5C = .text:0x00009E5C; // type:function size:0x5AC scope:local
fn_1_A408 = .text:0x0000A408; // type:function size:0x744 fn_1_A408 = .text:0x0000A408; // type:function size:0x744 scope:local
fn_1_AB4C = .text:0x0000AB4C; // type:function size:0x730 fn_1_AB4C = .text:0x0000AB4C; // type:function size:0x730 scope:local
fn_1_B27C = .text:0x0000B27C; // type:function size:0x424 fn_1_B27C = .text:0x0000B27C; // type:function size:0x424 scope:local
fn_1_B6A0 = .text:0x0000B6A0; // type:function size:0x240 fn_1_B6A0 = .text:0x0000B6A0; // type:function size:0x240 scope:local
fn_1_B8E0 = .text:0x0000B8E0; // type:function size:0x230 fn_1_B8E0 = .text:0x0000B8E0; // type:function size:0x230 scope:local
fn_1_BB10 = .text:0x0000BB10; // type:function size:0x1F8 fn_1_BB10 = .text:0x0000BB10; // type:function size:0x1F8 scope:local
fn_1_BD08 = .text:0x0000BD08; // type:function size:0x3C fn_1_BD08 = .text:0x0000BD08; // type:function size:0x3C scope:local
fn_1_BD44 = .text:0x0000BD44; // type:function size:0x48 fn_1_BD44 = .text:0x0000BD44; // type:function size:0x48 scope:local
fn_1_BD8C = .text:0x0000BD8C; // type:function size:0x37C fn_1_BD8C = .text:0x0000BD8C; // type:function size:0x37C scope:local
fn_1_C108 = .text:0x0000C108; // type:function size:0x1AC fn_1_C108 = .text:0x0000C108; // type:function size:0x1AC
fn_1_C2B4 = .text:0x0000C2B4; // type:function size:0x158 fn_1_C2B4 = .text:0x0000C2B4; // type:function size:0x158
fn_1_C40C = .text:0x0000C40C; // type:function size:0x5B0 fn_1_C40C = .text:0x0000C40C; // type:function size:0x5B0 scope:local
fn_1_C9BC = .text:0x0000C9BC; // type:function size:0xD0 fn_1_C9BC = .text:0x0000C9BC; // type:function size:0xD0 scope:local
fn_1_CA8C = .text:0x0000CA8C; // type:function size:0x40 fn_1_CA8C = .text:0x0000CA8C; // type:function size:0x40 scope:local
fn_1_CACC = .text:0x0000CACC; // type:function size:0x1C4 fn_1_CACC = .text:0x0000CACC; // type:function size:0x1C4 scope:local
fn_1_CC90 = .text:0x0000CC90; // type:function size:0x7C fn_1_CC90 = .text:0x0000CC90; // type:function size:0x7C
fn_1_CD0C = .text:0x0000CD0C; // type:function size:0x398 fn_1_CD0C = .text:0x0000CD0C; // type:function size:0x398
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte _ctors = .ctors:0x00000000; // type:label scope:global data:4byte
@ -230,44 +230,44 @@ lbl_1_rodata_214 = .rodata:0x00000214; // type:object size:0x4 scope:local data:
lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 scope:local data:float lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 scope:local data:float
lbl_1_rodata_21C = .rodata:0x0000021C; // type:object size:0x4 scope:local data:float lbl_1_rodata_21C = .rodata:0x0000021C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x8 scope:local data:float lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x8 scope:local data:float
lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 data:float lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 scope:local data:float
lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 data:float lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x4 data:float lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x4 scope:local data:float
lbl_1_rodata_234 = .rodata:0x00000234; // type:object size:0x4 data:float lbl_1_rodata_234 = .rodata:0x00000234; // type:object size:0x4 scope:local data:float
lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x4 data:float lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x4 scope:local data:float
lbl_1_rodata_23C = .rodata:0x0000023C; // type:object size:0x4 data:float lbl_1_rodata_23C = .rodata:0x0000023C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x8 data:double lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x8 scope:local data:double
lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x8 data:double lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x8 scope:local data:double
lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x4 data:float lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x4 scope:local data:float
lbl_1_rodata_254 = .rodata:0x00000254; // type:object size:0x4 data:float lbl_1_rodata_254 = .rodata:0x00000254; // type:object size:0x4 scope:local data:float
lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x4 data:float lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x4 scope:local data:float
lbl_1_rodata_25C = .rodata:0x0000025C; // type:object size:0x4 data:float lbl_1_rodata_25C = .rodata:0x0000025C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x4 data:float lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x4 scope:local data:float
lbl_1_rodata_264 = .rodata:0x00000264; // type:object size:0x4 data:float lbl_1_rodata_264 = .rodata:0x00000264; // type:object size:0x4 scope:local data:float
lbl_1_rodata_268 = .rodata:0x00000268; // type:object size:0x4 data:float lbl_1_rodata_268 = .rodata:0x00000268; // type:object size:0x4 scope:local data:float
lbl_1_rodata_26C = .rodata:0x0000026C; // type:object size:0x4 data:float lbl_1_rodata_26C = .rodata:0x0000026C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_270 = .rodata:0x00000270; // type:object size:0x4 data:float lbl_1_rodata_270 = .rodata:0x00000270; // type:object size:0x4 scope:local data:float
lbl_1_rodata_274 = .rodata:0x00000274; // type:object size:0x4 data:float lbl_1_rodata_274 = .rodata:0x00000274; // type:object size:0x4 scope:local data:float
lbl_1_rodata_278 = .rodata:0x00000278; // type:object size:0x4 data:float lbl_1_rodata_278 = .rodata:0x00000278; // type:object size:0x4 scope:local data:float
lbl_1_rodata_27C = .rodata:0x0000027C; // type:object size:0x4 data:float lbl_1_rodata_27C = .rodata:0x0000027C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_280 = .rodata:0x00000280; // type:object size:0x4 data:float lbl_1_rodata_280 = .rodata:0x00000280; // type:object size:0x4 scope:local data:float
lbl_1_rodata_284 = .rodata:0x00000284; // type:object size:0x4 data:float lbl_1_rodata_284 = .rodata:0x00000284; // type:object size:0x4 scope:local data:float
lbl_1_rodata_288 = .rodata:0x00000288; // type:object size:0x4 data:float lbl_1_rodata_288 = .rodata:0x00000288; // type:object size:0x4 scope:local data:float
lbl_1_rodata_28C = .rodata:0x0000028C; // type:object size:0x4 data:float lbl_1_rodata_28C = .rodata:0x0000028C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_290 = .rodata:0x00000290; // type:object size:0x4 data:float lbl_1_rodata_290 = .rodata:0x00000290; // type:object size:0x4 scope:local data:float
lbl_1_rodata_298 = .rodata:0x00000298; // type:object size:0x8 data:double lbl_1_rodata_298 = .rodata:0x00000298; // type:object size:0x8 scope:local data:double
lbl_1_rodata_2A0 = .rodata:0x000002A0; // type:object size:0x4 data:float lbl_1_rodata_2A0 = .rodata:0x000002A0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2A4 = .rodata:0x000002A4; // type:object size:0x4 data:float lbl_1_rodata_2A4 = .rodata:0x000002A4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2A8 = .rodata:0x000002A8; // type:object size:0x4 data:float lbl_1_rodata_2A8 = .rodata:0x000002A8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2AC = .rodata:0x000002AC; // type:object size:0x4 data:float lbl_1_rodata_2AC = .rodata:0x000002AC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x4 data:float lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2B4 = .rodata:0x000002B4; // type:object size:0x4 data:float lbl_1_rodata_2B4 = .rodata:0x000002B4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x8 data:double lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x4 data:float lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2C4 = .rodata:0x000002C4; // type:object size:0x4 data:float lbl_1_rodata_2C4 = .rodata:0x000002C4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x8 data:double lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x4 data:float lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2D4 = .rodata:0x000002D4; // type:object size:0x4 data:float lbl_1_rodata_2D4 = .rodata:0x000002D4; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0xF0 scope:local lbl_1_data_0 = .data:0x00000000; // type:object size:0xF0 scope:local
lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x2 scope:local data:2byte lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x2 scope:local data:2byte
lbl_1_data_F2 = .data:0x000000F2; // type:object size:0x2 scope:local data:2byte lbl_1_data_F2 = .data:0x000000F2; // type:object size:0x2 scope:local data:2byte
@ -319,19 +319,19 @@ lbl_1_data_434 = .data:0x00000434; // type:object size:0x18 scope:local
lbl_1_data_44C = .data:0x0000044C; // type:object size:0xC scope:local lbl_1_data_44C = .data:0x0000044C; // type:object size:0xC scope:local
lbl_1_data_458 = .data:0x00000458; // type:object size:0x20 scope:local lbl_1_data_458 = .data:0x00000458; // type:object size:0x20 scope:local
lbl_1_data_478 = .data:0x00000478; // type:object size:0x20 scope:local lbl_1_data_478 = .data:0x00000478; // type:object size:0x20 scope:local
lbl_1_data_498 = .data:0x00000498; // type:object size:0x2 data:2byte lbl_1_data_498 = .data:0x00000498; // type:object size:0x2 scope:local data:2byte
lbl_1_data_49A = .data:0x0000049A; // type:object size:0x2 data:2byte lbl_1_data_49A = .data:0x0000049A; // type:object size:0x2 scope:local data:2byte
lbl_1_data_49C = .data:0x0000049C; // type:object size:0x2 data:2byte lbl_1_data_49C = .data:0x0000049C; // type:object size:0x2 scope:local data:2byte
lbl_1_data_49E = .data:0x0000049E; // type:object size:0x2 data:2byte lbl_1_data_49E = .data:0x0000049E; // type:object size:0x2 scope:local data:2byte
lbl_1_data_4A0 = .data:0x000004A0; // type:object size:0x2 data:2byte lbl_1_data_4A0 = .data:0x000004A0; // type:object size:0x2 scope:local data:2byte
lbl_1_data_4A2 = .data:0x000004A2; // type:object size:0x2 data:2byte lbl_1_data_4A2 = .data:0x000004A2; // type:object size:0x2 scope:local data:2byte
lbl_1_data_4A4 = .data:0x000004A4; // type:object size:0x8 lbl_1_data_4A4 = .data:0x000004A4; // type:object size:0x8 scope:local data:byte
lbl_1_data_4AC = .data:0x000004AC; // type:object size:0x20 lbl_1_data_4AC = .data:0x000004AC; // type:object size:0x20 scope:local
lbl_1_data_4CC = .data:0x000004CC; // type:object size:0x20 lbl_1_data_4CC = .data:0x000004CC; // type:object size:0x20 scope:local
lbl_1_data_4EC = .data:0x000004EC; // type:object size:0x24 lbl_1_data_4EC = .data:0x000004EC; // type:object size:0x24 scope:local
lbl_1_data_510 = .data:0x00000510; // type:object size:0x20 lbl_1_data_510 = .data:0x00000510; // type:object size:0x20 scope:local
lbl_1_data_530 = .data:0x00000530; // type:object size:0x6 data:string lbl_1_data_530 = .data:0x00000530; // type:object size:0x6 scope:local data:string
lbl_1_data_536 = .data:0x00000536; // type:object size:0xB data:string lbl_1_data_536 = .data:0x00000536; // type:object size:0xB 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 scope:local data:4byte lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 scope:local data:4byte lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 scope:local data:4byte
@ -369,7 +369,7 @@ lbl_1_bss_D6 = .bss:0x000000D6; // type:object size:0xC scope:local
lbl_1_bss_E2 = .bss:0x000000E2; // type:object size:0x2 scope:local data:2byte lbl_1_bss_E2 = .bss:0x000000E2; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_E4 = .bss:0x000000E4; // type:object size:0x2 scope:local data:2byte lbl_1_bss_E4 = .bss:0x000000E4; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_E6 = .bss:0x000000E6; // type:object size:0x1 scope:local data:byte lbl_1_bss_E6 = .bss:0x000000E6; // type:object size:0x1 scope:local data:byte
lbl_1_bss_E8 = .bss:0x000000E8; // type:object size:0x4 data:4byte lbl_1_bss_E8 = .bss:0x000000E8; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_EC = .bss:0x000000EC; // type:object size:0x4 data:4byte lbl_1_bss_EC = .bss:0x000000EC; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_F0 = .bss:0x000000F0; // type:object size:0x4 data:4byte lbl_1_bss_F0 = .bss:0x000000F0; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_F4 = .bss:0x000000F4; // type:object size:0x1 data:byte lbl_1_bss_F4 = .bss:0x000000F4; // type:object size:0x1 scope:local data:byte

2
configure.py
View file

@ -1297,7 +1297,7 @@ config.libs = [
Object(Matching, "REL/w06Dll/mg_coin.c"), Object(Matching, "REL/w06Dll/mg_coin.c"),
Object(Matching, "REL/w06Dll/fire.c"), Object(Matching, "REL/w06Dll/fire.c"),
Object(Matching, "REL/w06Dll/bridge.c"), Object(Matching, "REL/w06Dll/bridge.c"),
Object(NonMatching, "REL/w06Dll/bowser.c"), Object(Matching, "REL/w06Dll/bowser.c"),
} }
), ),
Rel('w10Dll', Rel('w10Dll',

12
include/REL/w06Dll.h
View file

@ -12,20 +12,26 @@ typedef struct {
u8 unk00_field0 : 1; u8 unk00_field0 : 1;
u8 unk00_field1 : 1; u8 unk00_field1 : 1;
u8 unk00_field2 : 1; u8 unk00_field2 : 1;
u8 unk00_field3 : 1;
u8 unk00_field4 : 1;
}; };
s8 unk01; s8 unk01;
s8 unk02; s8 unk02;
s8 unk03;
s8 unk04;
u8 unk05;
s16 unk06;
} UnkW06BoardData; } UnkW06BoardData;
extern void fn_1_D70(void); extern void fn_1_D70(void);
extern void fn_1_F6C(void); extern void fn_1_F6C(void);
extern void fn_1_1054(void); // return s32? extern void fn_1_1054(void);
extern void fn_1_4878(void); extern void fn_1_4878(void);
extern void fn_1_4A10(void); extern void fn_1_4A10(void);
extern void fn_1_4A60(void); // return s32? extern void fn_1_4A60(void);
extern void fn_1_6EF0(void); // return s32? extern void fn_1_6EF0(void);
extern void fn_1_7BB0(void); extern void fn_1_7BB0(void);
extern void fn_1_7F3C(void); extern void fn_1_7F3C(void);

1228
src/REL/w06Dll/bowser.c Executable file
View file

File diff suppressed because it is too large Load diff

6
src/REL/w06Dll/main.c
View file

@ -229,15 +229,15 @@ static s32 fn_1_900(void) {
var_r30 = GWPlayer[GWSystem.player_curr].space_curr; var_r30 = GWPlayer[GWSystem.player_curr].space_curr;
temp_r31 = BoardSpaceFlagGet(0, var_r30) & 0x600000; temp_r31 = BoardSpaceFlagGet(0, var_r30) & 0x600000;
if (temp_r31 == 0x200000) { if (temp_r31 == 0x200000) {
fn_1_1054(); // TODO: return? fn_1_1054();
} else if (temp_r31 == 0x400000) { } else if (temp_r31 == 0x400000) {
fn_1_4A60(); // TODO: return? fn_1_4A60();
} }
} }
static s32 fn_1_984(void) { static s32 fn_1_984(void) {
if (BoardPlayerSizeGet(GWSystem.player_curr) != 2) { if (BoardPlayerSizeGet(GWSystem.player_curr) != 2) {
fn_1_6EF0(); // TODO: return? fn_1_6EF0();
} }
} }