Some naming progress on m457Dll

Changed some names in present and option
This commit is contained in:
dbalatoni13 2025-03-14 21:55:13 +01:00
parent 35849f7ac5
commit bd5d89e77c
10 changed files with 917 additions and 880 deletions

View file

@ -1,16 +1,16 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
fn_1_A0 = .text:0x000000A0; // type:function size:0x3CC
fn_1_46C = .text:0x0000046C; // type:function size:0x2858
fn_1_2CC4 = .text:0x00002CC4; // type:function size:0x283C
fn_1_5500 = .text:0x00005500; // type:function size:0x220
fn_1_5720 = .text:0x00005720; // type:function size:0x29C
fn_1_59BC = .text:0x000059BC; // type:function size:0xB3C
fn_1_64F8 = .text:0x000064F8; // type:function size:0xAB8
fn_1_6FB0 = .text:0x00006FB0; // type:function size:0x5F4
fn_1_75A4 = .text:0x000075A4; // type:function size:0xC0
CameraPrintDebug = .text:0x000000A0; // type:function size:0x3CC scope:local
M457PlayerExec = .text:0x0000046C; // type:function size:0x2858 scope:local
M457GameExec = .text:0x00002CC4; // type:function size:0x283C scope:local
WrestleMesMain = .text:0x00005500; // type:function size:0x220 scope:local
ShoveMesMain = .text:0x00005720; // type:function size:0x29C scope:local
M457Main = .text:0x000059BC; // type:function size:0xB3C scope:local
M457GameSetup = .text:0x000064F8; // type:function size:0xAB8 scope:local
M457PlayerSetup = .text:0x00006FB0; // type:function size:0x5F4 scope:local
M457Setup = .text:0x000075A4; // type:function size:0xC0 scope:local
ObjectSetup = .text:0x00007664; // type:function size:0x480
fn_1_7AE4 = .text:0x00007AE4; // type:function size:0x9C
M457Exit = .text:0x00007AE4; // type:function size:0x9C scope:local
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x8 scope:local data:double
@ -121,59 +121,59 @@ lbl_1_rodata_570 = .rodata:0x00000570; // type:object size:0x4 scope:local data:
lbl_1_rodata_574 = .rodata:0x00000574; // type:object size:0x4 scope:local data:float
lbl_1_rodata_578 = .rodata:0x00000578; // type:object size:0x4 scope:local data:float
lbl_1_rodata_57C = .rodata:0x0000057C; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x5C
lbl_1_data_5C = .data:0x0000005C; // type:object size:0x5C data:4byte
lbl_1_data_B8 = .data:0x000000B8; // type:object size:0x30
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x30
lbl_1_data_118 = .data:0x00000118; // type:object size:0x30
lbl_1_data_148 = .data:0x00000148; // type:object size:0xC data:byte
lbl_1_data_154 = .data:0x00000154; // type:object size:0x30
lbl_1_data_184 = .data:0x00000184; // type:object size:0x30
lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x6C data:float
lbl_1_data_220 = .data:0x00000220; // type:object size:0x6C data:float
lbl_1_data_28C = .data:0x0000028C; // type:object size:0x18 data:float
lbl_1_data_2A4 = .data:0x000002A4; // type:object size:0x2 data:2byte
lbl_1_data_2A6 = .data:0x000002A6; // type:object size:0x2 data:2byte
lbl_1_data_2A8 = .data:0x000002A8; // type:object size:0x4 data:4byte
lbl_1_data_2AC = .data:0x000002AC; // type:object size:0x4 data:4byte
lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x2 data:2byte
lbl_1_data_2B4 = .data:0x000002B4; // type:object size:0x4 data:4byte
lbl_1_data_2B8 = .data:0x000002B8; // type:object size:0x4 data:4byte
sprDataNumTbl = .data:0x00000000; // type:object size:0x5C scope:local
sprIdTbl = .data:0x0000005C; // type:object size:0x5C scope:local data:4byte
lbl_1_data_B8 = .data:0x000000B8; // type:object size:0x30 scope:local
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x30 scope:local
lbl_1_data_118 = .data:0x00000118; // type:object size:0x30 scope:local
lbl_1_data_148 = .data:0x00000148; // type:object size:0xC scope:local data:byte
lbl_1_data_154 = .data:0x00000154; // type:object size:0x30 scope:local
lbl_1_data_184 = .data:0x00000184; // type:object size:0x30 scope:local
lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x6C scope:local data:float
sparkDataTbl = .data:0x00000220; // type:object size:0x6C scope:local data:float
lbl_1_data_28C = .data:0x0000028C; // type:object size:0x18 scope:local data:float
lbl_1_data_2A4 = .data:0x000002A4; // type:object size:0x2 scope:local data:2byte
lbl_1_data_2A6 = .data:0x000002A6; // type:object size:0x2 scope:local data:2byte
backgroundMusNo = .data:0x000002A8; // type:object size:0x4 scope:local data:4byte
windSeNo = .data:0x000002AC; // type:object size:0x4 scope:local data:4byte
lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x2 scope:local data:2byte
invincibilitySeNo = .data:0x000002B4; // type:object size:0x4 scope:local data:4byte
lbl_1_data_2B8 = .data:0x000002B8; // type:object size:0x4 scope:local data:4byte
lbl_1_data_2BC = .data:0x000002BC; // type:object size:0x9 scope:local data:string
lbl_1_data_2C5 = .data:0x000002C5; // type:object size:0x3 scope:local data:string
jumptable_1_data_2C8 = .data:0x000002C8; // type:object size:0x2C scope:local
jumptable_1_data_2F4 = .data:0x000002F4; // type:object size:0x48 scope:local
lbl_1_data_33C = .data:0x0000033C; // type:object size:0x4 data:4byte
lbl_1_data_340 = .data:0x00000340; // type:object size:0x4 data:float
lbl_1_data_344 = .data:0x00000344; // type:object size:0x4 data:float
lbl_1_data_348 = .data:0x00000348; // type:object size:0x4 data:float
lbl_1_data_33C = .data:0x0000033C; // type:object size:0x4 scope:local data:4byte
lbl_1_data_340 = .data:0x00000340; // type:object size:0x4 scope:local data:float
lbl_1_data_344 = .data:0x00000344; // type:object size:0x4 scope:local data:float
lbl_1_data_348 = .data:0x00000348; // type:object size:0x4 scope:local data:float
jumptable_1_data_34C = .data:0x0000034C; // type:object size:0x20 scope:local
jumptable_1_data_36C = .data:0x0000036C; // type:object size:0x2C scope:local
lbl_1_data_398 = .data:0x00000398; // type:object size:0x12 scope:local data:string
lbl_1_data_3AA = .data:0x000003AA; // type:object size:0x19 scope:local data:string
lbl_1_data_3C3 = .data:0x000003C3; // type:object size:0x24 scope:local data:string
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x4 data:4byte
lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte
lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x4 data:4byte
lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 data:4byte
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x4 data:4byte
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:float
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:float
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:float
lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:float
lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:4byte
lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte
lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x4 data:4byte
lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 data:4byte
lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0x4 data:4byte
lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 data:4byte
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 data:4byte
lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x4 data:4byte
lbl_1_bss_60 = .bss:0x00000060; // type:object size:0x4 data:4byte
lbl_1_bss_64 = .bss:0x00000064; // type:object size:0x4 data:4byte
lbl_1_bss_68 = .bss:0x00000068; // type:object size:0x8 data:4byte
lbl_1_bss_70 = .bss:0x00000070; // type:object size:0x4 data:4byte
lbl_1_bss_74 = .bss:0x00000074; // type:object size:0x4 data:4byte
lbl_1_bss_78 = .bss:0x00000078; // type:object size:0x50 data:4byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 scope:local data:4byte
m457MesEndF = .bss:0x00000010; // type:object size:0x4 scope:local data:4byte
againstBrowserF = .bss:0x00000014; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 scope:local data:float
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 scope:local data:float
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 scope:local data:float
lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 scope:local data:float
lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x4 scope:local data:4byte
lightId = .bss:0x00000048; // type:object size:0x4 scope:local data:4byte
objman = .bss:0x0000004C; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 scope:local data:4byte
gameState = .bss:0x0000005C; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_60 = .bss:0x00000060; // type:object size:0x4 scope:local data:4byte
gameObj = .bss:0x00000064; // type:object size:0x4 scope:local data:4byte
playerObj = .bss:0x00000068; // type:object size:0x8 scope:local data:4byte
omViewObj = .bss:0x00000070; // type:object size:0x4 scope:local data:4byte
mainObj = .bss:0x00000074; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_78 = .bss:0x00000078; // type:object size:0x50 scope:local data:4byte

View file

@ -1,16 +1,16 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
fn_1_A0 = .text:0x000000A0; // type:function size:0x3CC
fn_1_46C = .text:0x0000046C; // type:function size:0x2858
fn_1_2CC4 = .text:0x00002CC4; // type:function size:0x281C
fn_1_5500 = .text:0x000054E0; // type:function size:0x220
fn_1_5720 = .text:0x00005700; // type:function size:0x29C
fn_1_59BC = .text:0x0000599C; // type:function size:0xB3C
fn_1_64F8 = .text:0x000064D8; // type:function size:0xAB8
fn_1_6FB0 = .text:0x00006F90; // type:function size:0x5F4
fn_1_75A4 = .text:0x00007584; // type:function size:0xC0
CameraPrintDebug = .text:0x000000A0; // type:function size:0x3CC scope:local
M457PlayerExec = .text:0x0000046C; // type:function size:0x2858 scope:local
M457GameExec = .text:0x00002CC4; // type:function size:0x281C scope:local
WrestleMesMain = .text:0x000054E0; // type:function size:0x220 scope:local
ShoveMesMain = .text:0x00005700; // type:function size:0x29C scope:local
M457Main = .text:0x0000599C; // type:function size:0xB3C scope:local
M457GameSetup = .text:0x000064D8; // type:function size:0xAB8 scope:local
M457PlayerSetup = .text:0x00006F90; // type:function size:0x5F4 scope:local
M457Setup = .text:0x00007584; // type:function size:0xC0 scope:local
ObjectSetup = .text:0x00007644; // type:function size:0x480
fn_1_7AE4 = .text:0x00007AC4; // type:function size:0x9C
M457Exit = .text:0x00007AC4; // type:function size:0x9C scope:local
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x8 scope:local data:double
@ -120,59 +120,59 @@ lbl_1_rodata_568 = .rodata:0x00000568; // type:object size:0x4 scope:local data:
lbl_1_rodata_56C = .rodata:0x0000056C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_570 = .rodata:0x00000570; // type:object size:0x4 scope:local data:float
lbl_1_rodata_574 = .rodata:0x00000574; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x5C
lbl_1_data_5C = .data:0x0000005C; // type:object size:0x5C data:4byte
lbl_1_data_B8 = .data:0x000000B8; // type:object size:0x30
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x30
lbl_1_data_118 = .data:0x00000118; // type:object size:0x30
lbl_1_data_148 = .data:0x00000148; // type:object size:0xC
lbl_1_data_154 = .data:0x00000154; // type:object size:0x30
lbl_1_data_184 = .data:0x00000184; // type:object size:0x30
lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x6C
lbl_1_data_220 = .data:0x00000220; // type:object size:0x6C
lbl_1_data_28C = .data:0x0000028C; // type:object size:0x18 data:float
lbl_1_data_2A4 = .data:0x000002A4; // type:object size:0x2 data:2byte
lbl_1_data_2A6 = .data:0x000002A6; // type:object size:0x2 data:2byte
lbl_1_data_2A8 = .data:0x000002A8; // type:object size:0x4 data:4byte
lbl_1_data_2AC = .data:0x000002AC; // type:object size:0x4 data:4byte
lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x2 data:2byte
lbl_1_data_2B4 = .data:0x000002B4; // type:object size:0x4 data:4byte
lbl_1_data_2B8 = .data:0x000002B8; // type:object size:0x4 data:4byte
sprDataNumTbl = .data:0x00000000; // type:object size:0x5C scope:local
sprIdTbl = .data:0x0000005C; // type:object size:0x5C data:4byte scope:local
lbl_1_data_B8 = .data:0x000000B8; // type:object size:0x30 scope:local
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x30 scope:local
lbl_1_data_118 = .data:0x00000118; // type:object size:0x30 scope:local
lbl_1_data_148 = .data:0x00000148; // type:object size:0xC scope:local
lbl_1_data_154 = .data:0x00000154; // type:object size:0x30 scope:local
lbl_1_data_184 = .data:0x00000184; // type:object size:0x30 scope:local
lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x6C scope:local
sparkDataTbl = .data:0x00000220; // type:object size:0x6C scope:local
lbl_1_data_28C = .data:0x0000028C; // type:object size:0x18 data:float scope:local
lbl_1_data_2A4 = .data:0x000002A4; // type:object size:0x2 data:2byte scope:local
lbl_1_data_2A6 = .data:0x000002A6; // type:object size:0x2 data:2byte scope:local
backgroundMusNo = .data:0x000002A8; // type:object size:0x4 data:4byte scope:local
windSeNo = .data:0x000002AC; // type:object size:0x4 data:4byte scope:local
lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x2 data:2byte scope:local
invincibilitySeNo = .data:0x000002B4; // type:object size:0x4 data:4byte scope:local
lbl_1_data_2B8 = .data:0x000002B8; // type:object size:0x4 data:4byte scope:local
lbl_1_data_2BC = .data:0x000002BC; // type:object size:0x9 scope:local data:string
lbl_1_data_2C5 = .data:0x000002C5; // type:object size:0x3 scope:local data:string
jumptable_1_data_2C8 = .data:0x000002C8; // type:object size:0x2C scope:local
jumptable_1_data_2F4 = .data:0x000002F4; // type:object size:0x48 scope:local
lbl_1_data_33C = .data:0x0000033C; // type:object size:0x4 data:4byte
lbl_1_data_340 = .data:0x00000340; // type:object size:0x4 data:float
lbl_1_data_344 = .data:0x00000344; // type:object size:0x4 data:float
lbl_1_data_348 = .data:0x00000348; // type:object size:0x4 data:float
lbl_1_data_33C = .data:0x0000033C; // type:object size:0x4 data:4byte scope:local
lbl_1_data_340 = .data:0x00000340; // type:object size:0x4 data:float scope:local
lbl_1_data_344 = .data:0x00000344; // type:object size:0x4 data:float scope:local
lbl_1_data_348 = .data:0x00000348; // type:object size:0x4 data:float scope:local
jumptable_1_data_34C = .data:0x0000034C; // type:object size:0x20 scope:local
jumptable_1_data_36C = .data:0x0000036C; // type:object size:0x2C scope:local
lbl_1_data_398 = .data:0x00000398; // type:object size:0x12 scope:local data:string
lbl_1_data_3AA = .data:0x000003AA; // type:object size:0x19 scope:local data:string
lbl_1_data_3C3 = .data:0x000003C3; // type:object size:0x24 scope:local data:string
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x4 data:4byte
lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte
lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x4 data:4byte
lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 data:4byte
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x4 data:4byte
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:float
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:float
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:float
lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:float
lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:4byte
lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte
lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x4 data:4byte
lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 data:4byte
lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0x4 data:4byte
lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 data:4byte
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 data:4byte
lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x4 data:4byte
lbl_1_bss_60 = .bss:0x00000060; // type:object size:0x4 data:4byte
lbl_1_bss_64 = .bss:0x00000064; // type:object size:0x4 data:4byte
lbl_1_bss_68 = .bss:0x00000068; // type:object size:0x8 data:4byte
lbl_1_bss_70 = .bss:0x00000070; // type:object size:0x4 data:4byte
lbl_1_bss_74 = .bss:0x00000074; // type:object size:0x4 data:4byte
lbl_1_bss_78 = .bss:0x00000078; // type:object size:0x50 data:4byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte scope:local
m457MesEndF = .bss:0x00000010; // type:object size:0x4 data:4byte scope:local
againstBrowserF = .bss:0x00000014; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:float scope:local
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:float scope:local
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:float scope:local
lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:float scope:local
lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x4 data:4byte scope:local
lightId = .bss:0x00000048; // type:object size:0x4 data:4byte scope:local
objman = .bss:0x0000004C; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 data:4byte scope:local
gameState = .bss:0x0000005C; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_60 = .bss:0x00000060; // type:object size:0x4 data:4byte scope:local
gameObj = .bss:0x00000064; // type:object size:0x4 data:4byte scope:local
playerObj = .bss:0x00000068; // type:object size:0x8 data:4byte scope:local
omViewObj = .bss:0x00000070; // type:object size:0x4 data:4byte scope:local
mainObj = .bss:0x00000074; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_78 = .bss:0x00000078; // type:object size:0x50 data:4byte scope:local

View file

@ -1,16 +1,16 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
fn_1_A0 = .text:0x000000A0; // type:function size:0x3CC
fn_1_46C = .text:0x0000046C; // type:function size:0x2858
fn_1_2CC4 = .text:0x00002CC4; // type:function size:0x2654
fn_1_5500 = .text:0x00005318; // type:function size:0x220
fn_1_5720 = .text:0x00005538; // type:function size:0x510
fn_1_59BC = .text:0x00005A48; // type:function size:0xB34
fn_1_64F8 = .text:0x0000657C; // type:function size:0xAB8
fn_1_6FB0 = .text:0x00007034; // type:function size:0x5F4
fn_1_75A4 = .text:0x00007628; // type:function size:0xC0
CameraPrintDebug = .text:0x000000A0; // type:function size:0x3CC scope:local
M457PlayerExec = .text:0x0000046C; // type:function size:0x2858 scope:local
M457GameExec = .text:0x00002CC4; // type:function size:0x2654 scope:local
WrestleMesMain = .text:0x00005318; // type:function size:0x220 scope:local
ShoveMesMain = .text:0x00005538; // type:function size:0x510 scope:local
M457Main = .text:0x00005A48; // type:function size:0xB34 scope:local
M457GameSetup = .text:0x0000657C; // type:function size:0xAB8 scope:local
M457PlayerSetup = .text:0x00007034; // type:function size:0x5F4 scope:local
M457Setup = .text:0x00007628; // type:function size:0xC0 scope:local
ObjectSetup = .text:0x000076E8; // type:function size:0x480
fn_1_7AE4 = .text:0x00007B68; // type:function size:0x9C
M457Exit = .text:0x00007B68; // type:function size:0x9C scope:local
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x8 scope:local data:double
@ -119,59 +119,59 @@ lbl_1_rodata_558 = .rodata:0x00000558; // type:object size:0x4 scope:local data:
lbl_1_rodata_55C = .rodata:0x0000055C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_560 = .rodata:0x00000560; // type:object size:0x4 scope:local data:float
lbl_1_rodata_564 = .rodata:0x00000564; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x5C
lbl_1_data_5C = .data:0x0000005C; // type:object size:0x5C data:4byte
lbl_1_data_B8 = .data:0x000000B8; // type:object size:0x30
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x30
lbl_1_data_118 = .data:0x00000118; // type:object size:0x30
lbl_1_data_148 = .data:0x00000148; // type:object size:0xC
lbl_1_data_154 = .data:0x00000154; // type:object size:0x30
lbl_1_data_184 = .data:0x00000184; // type:object size:0x30
lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x6C
lbl_1_data_220 = .data:0x00000220; // type:object size:0x6C
lbl_1_data_28C = .data:0x0000028C; // type:object size:0x18 data:float
lbl_1_data_2A4 = .data:0x000002A4; // type:object size:0x2 data:2byte
lbl_1_data_2A6 = .data:0x000002A6; // type:object size:0x2 data:2byte
lbl_1_data_2A8 = .data:0x000002A8; // type:object size:0x4 data:4byte
lbl_1_data_2AC = .data:0x000002AC; // type:object size:0x4 data:4byte
lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x2 data:2byte
lbl_1_data_2B4 = .data:0x000002B4; // type:object size:0x4 data:4byte
lbl_1_data_2B8 = .data:0x000002B8; // type:object size:0x4 data:4byte
sprDataNumTbl = .data:0x00000000; // type:object size:0x5C scope:local
sprIdTbl = .data:0x0000005C; // type:object size:0x5C data:4byte scope:local
lbl_1_data_B8 = .data:0x000000B8; // type:object size:0x30 scope:local
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x30 scope:local
lbl_1_data_118 = .data:0x00000118; // type:object size:0x30 scope:local
lbl_1_data_148 = .data:0x00000148; // type:object size:0xC scope:local
lbl_1_data_154 = .data:0x00000154; // type:object size:0x30 scope:local
lbl_1_data_184 = .data:0x00000184; // type:object size:0x30 scope:local
lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x6C scope:local
sparkDataTbl = .data:0x00000220; // type:object size:0x6C scope:local
lbl_1_data_28C = .data:0x0000028C; // type:object size:0x18 data:float scope:local
lbl_1_data_2A4 = .data:0x000002A4; // type:object size:0x2 data:2byte scope:local
lbl_1_data_2A6 = .data:0x000002A6; // type:object size:0x2 data:2byte scope:local
backgroundMusNo = .data:0x000002A8; // type:object size:0x4 data:4byte scope:local
windSeNo = .data:0x000002AC; // type:object size:0x4 data:4byte scope:local
lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x2 data:2byte scope:local
invincibilitySeNo = .data:0x000002B4; // type:object size:0x4 data:4byte scope:local
lbl_1_data_2B8 = .data:0x000002B8; // type:object size:0x4 data:4byte scope:local
lbl_1_data_2BC = .data:0x000002BC; // type:object size:0x9 scope:local data:string
lbl_1_data_2C5 = .data:0x000002C5; // type:object size:0x3 scope:local data:string
jumptable_1_data_2C8 = .data:0x000002C8; // type:object size:0x2C scope:local
jumptable_1_data_2F4 = .data:0x000002F4; // type:object size:0x48 scope:local
lbl_1_data_33C = .data:0x0000033C; // type:object size:0x4 data:4byte
lbl_1_data_340 = .data:0x00000340; // type:object size:0x4 data:float
lbl_1_data_344 = .data:0x00000344; // type:object size:0x4 data:float
lbl_1_data_348 = .data:0x00000348; // type:object size:0x4 data:float
lbl_1_data_33C = .data:0x0000033C; // type:object size:0x4 data:4byte scope:local
lbl_1_data_340 = .data:0x00000340; // type:object size:0x4 data:float scope:local
lbl_1_data_344 = .data:0x00000344; // type:object size:0x4 data:float scope:local
lbl_1_data_348 = .data:0x00000348; // type:object size:0x4 data:float scope:local
jumptable_1_data_34C = .data:0x0000034C; // type:object size:0x20 scope:local
jumptable_1_data_36C = .data:0x0000036C; // type:object size:0x2C scope:local
lbl_1_data_398 = .data:0x00000398; // type:object size:0x12 scope:local data:string
lbl_1_data_3AA = .data:0x000003AA; // type:object size:0x19 scope:local data:string
lbl_1_data_3C3 = .data:0x000003C3; // type:object size:0x24 scope:local data:string
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x4 data:4byte
lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte
lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x4 data:4byte
lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 data:4byte
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x4 data:4byte
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:float
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:float
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:float
lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:float
lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:4byte
lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte
lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x4 data:4byte
lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 data:4byte
lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0x4 data:4byte
lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 data:4byte
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 data:4byte
lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x4 data:4byte
lbl_1_bss_60 = .bss:0x00000060; // type:object size:0x4 data:4byte
lbl_1_bss_64 = .bss:0x00000064; // type:object size:0x4 data:4byte
lbl_1_bss_68 = .bss:0x00000068; // type:object size:0x8 data:4byte
lbl_1_bss_70 = .bss:0x00000070; // type:object size:0x4 data:4byte
lbl_1_bss_74 = .bss:0x00000074; // type:object size:0x4 data:4byte
lbl_1_bss_78 = .bss:0x00000078; // type:object size:0x50 data:4byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte scope:local
m457MesEndF = .bss:0x00000010; // type:object size:0x4 data:4byte scope:local
againstBrowserF = .bss:0x00000014; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:float scope:local
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:float scope:local
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:float scope:local
lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:float scope:local
lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x4 data:4byte scope:local
lightId = .bss:0x00000048; // type:object size:0x4 data:4byte scope:local
objman = .bss:0x0000004C; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 data:4byte scope:local
gameState = .bss:0x0000005C; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_60 = .bss:0x00000060; // type:object size:0x4 data:4byte scope:local
gameObj = .bss:0x00000064; // type:object size:0x4 data:4byte scope:local
playerObj = .bss:0x00000068; // type:object size:0x8 data:4byte scope:local
omViewObj = .bss:0x00000070; // type:object size:0x4 data:4byte scope:local
mainObj = .bss:0x00000074; // type:object size:0x4 data:4byte scope:local
lbl_1_bss_78 = .bss:0x00000078; // type:object size:0x50 data:4byte scope:local

File diff suppressed because it is too large Load diff

View file

@ -9,7 +9,6 @@
#include "game/saveload.h"
#include "game/wipe.h"
#include "ext_math.h"
s16 lbl_1_bss_3B8;
@ -316,8 +315,8 @@ void fn_1_14CFC(void)
}
}
if (lbl_1_bss_3A8 == 0) {
temp_r30 = HuSprGrpCreate(25);
lbl_1_bss_3A8 = temp_r30;
lbl_1_bss_3A8 = temp_r30 = HuSprGrpCreate(25);
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 84), MEMORY_DEFAULT_NUM));
temp_r29 = HuSprCreate(temp_r28, 200, 0);
HuSprGrpMemberSet(temp_r30, 0, temp_r29);
@ -412,8 +411,8 @@ void fn_1_14CFC(void)
HuSprTPLvlSet(temp_r30, 24, 0);
}
if (lbl_1_bss_3AA == 0) {
temp_r30 = HuSprGrpCreate(10);
lbl_1_bss_3AA = temp_r30;
lbl_1_bss_3AA = temp_r30 = HuSprGrpCreate(10);
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 15), MEMORY_DEFAULT_NUM));
temp_r29 = HuSprCreate(temp_r28, 200, 0);
HuSprGrpMemberSet(temp_r30, 0, temp_r29);
@ -423,9 +422,8 @@ void fn_1_14CFC(void)
HuSprGrpMemberSet(temp_r30, 1, temp_r29);
HuSprPosSet(temp_r30, 1, 0, 0);
for (temp_r31 = 0; temp_r31 < 4; temp_r31++) {
temp_r20 = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].character;
lbl_1_bss_2C24[temp_r31] = temp_r20;
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 16) + (s16)temp_r20, MEMORY_DEFAULT_NUM));
temp_r20 = lbl_1_bss_2C24[temp_r31] = GWPlayerCfg[lbl_1_bss_2C1C[temp_r31]].character;
temp_r28 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_MGMODE, 16) + temp_r20, MEMORY_DEFAULT_NUM));
temp_r29 = HuSprCreate(temp_r28, 190, 0);
HuSprGrpMemberSet(temp_r30, (temp_r31 * 2) + 2, temp_r29);
HuSprPosSet(temp_r30, (temp_r31 * 2) + 2, lbl_1_data_19C[temp_r31], 0);

View file

@ -13,15 +13,15 @@ typedef struct {
} StateWork; /* size = 0x0C */
typedef struct {
/* 0x00 */ Vec src;
/* 0x00 */ Vec pos;
/* 0x0C */ Vec dest;
/* 0x18 */ GXColor color;
} UnkLightDataStruct; /* size = 0x1C */ // TODO same as m446Dll::unkStruct10 and present::UnkPresentStruct3
typedef struct UnkShadowDataStruct {
/* 0x00 */ Vec pos;
/* 0x0C */ Vec up;
/* 0x18 */ Vec target;
/* 0x00 */ Vec camPos;
/* 0x0C */ Vec camUp;
/* 0x18 */ Vec camTarget;
} UnkShadowDataStruct; /* size = 0x24 */
static void ExecState(omObjData *object);
@ -51,12 +51,12 @@ omObjData *OptionStateCreate(void)
optionRoom = OptionRoomCreate();
work->window = OptionWinCreate(0);
Hu3DLighInit();
work->light = Hu3DGLightCreateV(&lightTbl.src, &lightTbl.dest, &lightTbl.color);
work->light = Hu3DGLightCreateV(&lightTbl.pos, &lightTbl.dest, &lightTbl.color);
Hu3DGLightInfinitytSet(work->light);
lightData = &Hu3DGlobalLight[work->light];
Hu3DShadowCreate(30.0f, 20.0f, 5000.0f);
Hu3DShadowTPLvlSet(0.45f);
Hu3DShadowPosSet(&shadowPosTbl.pos, &shadowPosTbl.up, &shadowPosTbl.target);
Hu3DShadowPosSet(&shadowPosTbl.camPos, &shadowPosTbl.camUp, &shadowPosTbl.camTarget);
return object;
}

View file

@ -113,16 +113,16 @@ float PresentCameraZoomGet(omObjData *object)
{
CameraWork *work = object->data;
float var_f31 = work->zoom;
return var_f31;
float zoom = work->zoom;
return zoom;
}
float PresentCameraRotGet(omObjData *object)
{
CameraWork *work = object->data;
float var_f31 = work->rot;
return var_f31;
float rot = work->rot;
return rot;
}
void PresentCameraPosGet(omObjData *object, float *x, float *y, float *z)

View file

@ -144,20 +144,20 @@ static void FadeModel(void)
BOOL PresentPadCheck(u16 btn)
{
u32 var_r31 = HuPadBtnDown[0] & btn;
return var_r31 != 0;
u32 pressed = HuPadBtnDown[0] & btn;
return pressed != 0;
}
BOOL PresentPadDStkRepCheck(u16 dir)
{
u32 var_r31 = HuPadDStkRep[0] & dir;
return var_r31 != 0;
u32 pressed = HuPadDStkRep[0] & dir;
return pressed != 0;
}
BOOL PresentPadDStkCheck(u16 dir)
{
u32 var_r31 = HuPadDStk[0] & dir;
return var_r31 != 0;
u32 pressed = HuPadDStk[0] & dir;
return pressed != 0;
}
static void SceneMain(omObjData *object)

View file

@ -13,14 +13,14 @@ typedef struct StateWork {
} StateWork; /* size = 0x08 */
typedef struct UnkShadowDataStruct {
/* 0x00 */ Vec pos;
/* 0x0C */ Vec up;
/* 0x18 */ Vec target;
/* 0x00 */ Vec camPos;
/* 0x0C */ Vec camUp;
/* 0x18 */ Vec camTarget;
} UnkShadowDataStruct; /* size = 0x24 */
omObjData *presentGuide;
static UnkShadowDataStruct shadowPosTbl = {
static UnkShadowDataStruct shadow = {
{ 0.0f, 3000.0f, 1.0f },
{ 0.0f, 1.0f, 0.0f },
{ 0.0f, 0.0f, 0.0f },
@ -45,7 +45,7 @@ omObjData *PresentStateCreate(void)
work->window = PresentWinCreate(0);
Hu3DShadowCreate(30.0f, 20.0f, 5000.0f);
Hu3DShadowTPLvlSet(0.45f);
Hu3DShadowPosSet(&shadowPosTbl.pos, &shadowPosTbl.up, &shadowPosTbl.target);
Hu3DShadowPosSet(&shadow.camPos, &shadow.camUp, &shadow.camTarget);
if (omovlevtno > 0) {
OSReport("*** PRESENTROOM ( PRESENT GET MODE ) ***\n");

View file

@ -61,7 +61,7 @@ typedef struct PresentWork {
} PresentWork; /* size = 0x364 */
typedef struct UnkLightDataStruct {
/* 0x00 */ Vec src;
/* 0x00 */ Vec pos;
/* 0x0C */ Vec dest;
/* 0x18 */ GXColor color;
} UnkLightDataStruct; /* size = 0x1C */ // same as option::state::UnkLightDataStruct
@ -357,7 +357,7 @@ omObjData *PresentCreate(void)
{
s32 i;
s32 j;
s16 light;
s16 lightId;
LightData *lightData;
omObjData *object = omAddObjEx(presentObjMan, 1003, 0, 0, 1, NULL);
@ -382,10 +382,10 @@ omObjData *PresentCreate(void)
work->presentUnlockedF[PRESENT_MAX - 1] = TRUE;
}
Hu3DLighInit();
light = Hu3DGLightCreateV(&lightTbl.src, &lightTbl.dest, &lightTbl.color);
Hu3DGLightInfinitytSet(light);
Hu3DGLightStaticSet(light, 1);
lightData = &Hu3DGlobalLight[light];
lightId = Hu3DGLightCreateV(&lightTbl.pos, &lightTbl.dest, &lightTbl.color);
Hu3DGLightInfinitytSet(lightId);
Hu3DGLightStaticSet(lightId, 1);
lightData = &Hu3DGlobalLight[lightId];
lightData->unk_00 |= 0x8000;
for (i = 0; i < PRESENT_MDL_MAX; i++) {
@ -410,7 +410,7 @@ omObjData *PresentCreate(void)
RotateCamera(object);
PresentExecModeSet(object, PRESENT_MODE_NONE);
(void)light;
(void)lightId;
return object;
}