This commit is contained in:
CreateSource 2024-06-25 22:45:59 -04:00
commit a6d8b8bb66
114 changed files with 4697 additions and 364 deletions

View file

@ -9,7 +9,7 @@ UpdateMGInterface = .text:0x00001138; // type:function size:0x14 scope:local
CreateMGInterface = .text:0x0000114C; // type:function size:0x1F0 scope:local
_prolog = .text:0x0000133C; // type:function size:0x54 scope:global
_epilog = .text:0x00001390; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000013DC; // type:function size:0x108
ObjectSetup = .text:0x000013DC; // type:function size:0x108
E3MainInit = .text:0x000014E4; // type:function size:0x514
E3LightInit = .text:0x000019F8; // type:function size:0x1AC
GetStickX = .text:0x00001BA4; // type:function size:0x7C scope:local

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x2C
ObjectSetup = .text:0x000000A0; // type:function size:0x2C
fn_1_CC = .text:0x000000CC; // type:function size:0x24
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x1CC
ObjectSetup = .text:0x000000A0; // type:function size:0x1CC
BootProc = .text:0x0000026C; // type:function size:0x78C scope:local
UpdateDemoMess = .text:0x000009F8; // type:function size:0xC8 scope:local
ProgressiveProc = .text:0x00000AC0; // type:function size:0x6B8 scope:local

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x8F4
ObjectSetup = .text:0x000000A0; // type:function size:0x8F4
fn_1_994 = .text:0x00000994; // type:function size:0xE50 scope:local
fn_1_17E4 = .text:0x000017E4; // type:function size:0xA28 scope:local
fn_1_220C = .text:0x0000220C; // type:function size:0x5F8 scope:local

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x66C
ObjectSetup = .text:0x000000A0; // type:function size:0x66C
fn_2_70C = .text:0x0000070C; // type:function size:0x304
fn_2_A10 = .text:0x00000A10; // type:function size:0x88
fn_2_A98 = .text:0x00000A98; // type:function size:0x54

View file

@ -52,7 +52,7 @@ fn_1_7E84 = .text:0x00007E84; // type:function size:0x1C4 scope:local
fn_1_8048 = .text:0x00008048; // type:function size:0x1D0 scope:local
fn_1_8218 = .text:0x00008218; // type:function size:0xE40 scope:local
fn_1_9058 = .text:0x00009058; // type:function size:0x1EC scope:local
ModuleProlog = .text:0x00009244; // type:function size:0x8B0
ObjectSetup = .text:0x00009244; // type:function size:0x8B0
fn_1_9AF4 = .text:0x00009AF4; // type:function size:0xD0 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x384
ObjectSetup = .text:0x000000A0; // type:function size:0x384
fn_1_424 = .text:0x00000424; // type:function size:0x20 scope:local
fn_1_444 = .text:0x00000444; // type:function size:0x3E8 scope:local
fn_1_82C = .text:0x0000082C; // type:function size:0x9E8 scope:local

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x2DC
ObjectSetup = .text:0x000000A0; // type:function size:0x2DC
fn_1_37C = .text:0x0000037C; // type:function size:0x10
fn_1_38C = .text:0x0000038C; // type:function size:0x10
fn_1_39C = .text:0x0000039C; // type:function size:0x64

View file

@ -55,7 +55,7 @@ fn_1_81B4 = .text:0x000081B4; // type:function size:0x93C
fn_1_8AF0 = .text:0x00008AF0; // type:function size:0x798
fn_1_9288 = .text:0x00009288; // type:function size:0x1A88
fn_1_AD10 = .text:0x0000AD10; // type:function size:0x3CC
ModuleProlog = .text:0x0000B0DC; // type:function size:0x4EC
ObjectSetup = .text:0x0000B0DC; // type:function size:0x4EC
fn_1_B5C8 = .text:0x0000B5C8; // type:function size:0x16C
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x318
ObjectSetup = .text:0x000000A0; // type:function size:0x318
fn_1_3B8 = .text:0x000003B8; // type:function size:0x54
fn_1_40C = .text:0x0000040C; // type:function size:0xD00
fn_1_110C = .text:0x0000110C; // type:function size:0x5C
@ -372,23 +372,23 @@ lbl_1_data_8DC = .data:0x000008DC; // type:object size:0x4
lbl_1_data_8E0 = .data:0x000008E0; // type:object size:0x30
lbl_1_data_910 = .data:0x00000910; // type:object size:0x20
lbl_1_data_930 = .data:0x00000930; // type:object size:0x30
lbl_1_data_960 = .data:0x00000960; // type:object size:0x348
lbl_1_data_CA8 = .data:0x00000CA8; // type:object size:0x348
lbl_1_data_960 = .data:0x00000960; // type:object size:0x348 data:float
lbl_1_data_CA8 = .data:0x00000CA8; // type:object size:0x348 data:float
lbl_1_data_FF0 = .data:0x00000FF0; // type:object size:0x10
lbl_1_data_1000 = .data:0x00001000; // type:object size:0x19 data:string
lbl_1_data_1019 = .data:0x00001019; // type:object size:0x19 data:string
lbl_1_data_1032 = .data:0x00001032; // type:object size:0x1A data:string
lbl_1_data_104C = .data:0x0000104C; // type:object size:0x1C
lbl_1_data_104C = .data:0x0000104C; // type:object size:0x1C data:string
lbl_1_data_1068 = .data:0x00001068; // type:object size:0x10
lbl_1_data_1078 = .data:0x00001078; // type:object size:0x28
lbl_1_data_10A0 = .data:0x000010A0; // type:object size:0x80
lbl_1_data_10A0 = .data:0x000010A0; // type:object size:0x80 data:4byte
lbl_1_data_1120 = .data:0x00001120; // type:object size:0x20
lbl_1_data_1140 = .data:0x00001140; // type:object size:0x8
lbl_1_data_1148 = .data:0x00001148; // type:object size:0x1C data:string
lbl_1_data_1164 = .data:0x00001164; // type:object size:0x90
lbl_1_data_1164 = .data:0x00001164; // type:object size:0x90 data:float
lbl_1_data_11F4 = .data:0x000011F4; // type:object size:0x4 data:4byte
lbl_1_data_11F8 = .data:0x000011F8; // type:object size:0x20
lbl_1_data_1218 = .data:0x00001218; // type:object size:0x18
lbl_1_data_11F8 = .data:0x000011F8; // type:object size:0x20 data:float
lbl_1_data_1218 = .data:0x00001218; // type:object size:0x18 data:float
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_8 = .bss:0x00000008; // type:object size:0x4 data:4byte
@ -421,7 +421,8 @@ lbl_1_bss_C8 = .bss:0x000000C8; // type:object size:0x4 data:4byte
lbl_1_bss_CC = .bss:0x000000CC; // type:object size:0x4 data:4byte
lbl_1_bss_D0 = .bss:0x000000D0; // type:object size:0x4 data:4byte
lbl_1_bss_D4 = .bss:0x000000D4; // type:object size:0x4 data:4byte
lbl_1_bss_D8 = .bss:0x000000D8; // type:object size:0x8 data:4byte
lbl_1_bss_D8 = .bss:0x000000D8; // type:object size:0x4 data:4byte
lbl_1_bss_DC = .bss:0x000000DC; // type:object size:0x4 data:4byte
lbl_1_bss_E0 = .bss:0x000000E0; // type:object size:0x18 data:float
lbl_1_bss_F8 = .bss:0x000000F8; // type:object size:0x8 data:4byte
lbl_1_bss_100 = .bss:0x00000100; // type:object size:0x4 data:float

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x54
ObjectSetup = .text:0x000000A0; // type:function size:0x54
fn_1_F4 = .text:0x000000F4; // type:function size:0xA0
fn_1_194 = .text:0x00000194; // type:function size:0x50
fn_1_1E4 = .text:0x000001E4; // type:function size:0x54

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x47C
ObjectSetup = .text:0x000000A0; // type:function size:0x47C
fn_1_51C = .text:0x0000051C; // type:function size:0x50
fn_1_56C = .text:0x0000056C; // type:function size:0x438
fn_1_9A4 = .text:0x000009A4; // type:function size:0x4C

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x394
ObjectSetup = .text:0x000000A0; // type:function size:0x394
fn_1_434 = .text:0x00000434; // type:function size:0xA8
fn_1_4DC = .text:0x000004DC; // type:function size:0x48
fn_1_524 = .text:0x00000524; // type:function size:0x65C

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x444
ObjectSetup = .text:0x000000A0; // type:function size:0x444
fn_1_4E4 = .text:0x000004E4; // type:function size:0xC4
fn_1_5A8 = .text:0x000005A8; // type:function size:0x94
fn_1_63C = .text:0x0000063C; // type:function size:0x16C

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0xDE0
ObjectSetup = .text:0x000000A0; // type:function size:0xDE0
fn_1_E80 = .text:0x00000E80; // type:function size:0x10C
fn_1_F8C = .text:0x00000F8C; // type:function size:0xE8
fn_1_1074 = .text:0x00001074; // type:function size:0x424

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x64C
ObjectSetup = .text:0x000000A0; // type:function size:0x64C
fn_1_6EC = .text:0x000006EC; // type:function size:0x50
fn_1_73C = .text:0x0000073C; // type:function size:0x80
fn_1_7BC = .text:0x000007BC; // type:function size:0xD8

View file

@ -18,12 +18,15 @@ fn_1_B6C4 = .text:0x0000B6C4; // type:function size:0x101C
fn_1_C6E0 = .text:0x0000C6E0; // type:function size:0x4D4
fn_1_CBB4 = .text:0x0000CBB4; // type:function size:0x78C
fn_1_D340 = .text:0x0000D340; // type:function size:0x60
ModuleProlog = .text:0x0000D3A0; // type:function size:0x360
ObjectSetup = .text:0x0000D3A0; // type:function size:0x360
fn_1_D700 = .text:0x0000D700; // type:function size:0x64
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_0 = .rodata:0x00000000; // type:object size:0x10 data:double
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x38 data:float
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x18 data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x18 data:float
lbl_1_rodata_44 = .rodata:0x00000044; // type:object size:0x4 data:float
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x8 data:double
lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x8 data:double
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x8 data:double
@ -172,7 +175,8 @@ lbl_1_rodata_A30 = .rodata:0x00000A30; // type:object size:0x4 data:float
lbl_1_rodata_A34 = .rodata:0x00000A34; // type:object size:0x4 data:float
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_C = .data:0x0000000C; // type:object size:0x2C 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_38 = .data:0x00000038; // type:object size:0x9 data:string
lbl_1_data_41 = .data:0x00000041; // type:object size:0x19 data:string
lbl_1_data_5A = .data:0x0000005A; // type:object size:0x1B data:string
@ -189,13 +193,15 @@ lbl_1_data_10D = .data:0x0000010D; // type:object size:0xF data:string
lbl_1_data_11C = .data:0x0000011C; // type:object size:0x19 data:string
lbl_1_data_135 = .data:0x00000135; // type:object size:0x24 data:string
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0xC 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_10 = .bss:0x00000010; // type:object size:0x4 data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x2 data:2byte
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:0x2 data:2byte
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x8 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:4byte
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:float
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:4byte
lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x10 data:4byte

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x87C
ObjectSetup = .text:0x000000A0; // type:function size:0x87C
fn_1_91C = .text:0x0000091C; // type:function size:0x268
fn_1_B84 = .text:0x00000B84; // type:function size:0x154
fn_1_CD8 = .text:0x00000CD8; // type:function size:0x7C

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x39C
ObjectSetup = .text:0x000000A0; // type:function size:0x39C
fn_1_43C = .text:0x0000043C; // type:function size:0x74
fn_1_4B0 = .text:0x000004B0; // type:function size:0x328
fn_1_7D8 = .text:0x000007D8; // type:function size:0xCE8

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x3B8
ObjectSetup = .text:0x000000A0; // type:function size:0x3B8
fn_1_458 = .text:0x00000458; // type:function size:0xA4
fn_1_4FC = .text:0x000004FC; // type:function size:0xCEC
fn_1_11E8 = .text:0x000011E8; // type:function size:0x58

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x438
ObjectSetup = .text:0x000000A0; // type:function size:0x438
fn_1_4D8 = .text:0x000004D8; // type:function size:0xD8
fn_1_5B0 = .text:0x000005B0; // type:function size:0x250
fn_1_800 = .text:0x00000800; // type:function size:0x190

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x400
ObjectSetup = .text:0x000000A0; // type:function size:0x400
fn_1_4A0 = .text:0x000004A0; // type:function size:0xDC
fn_1_57C = .text:0x0000057C; // type:function size:0x2CC
fn_1_848 = .text:0x00000848; // type:function size:0x288

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x78
ObjectSetup = .text:0x000000A0; // type:function size:0x78
fn_1_118 = .text:0x00000118; // type:function size:0x80
fn_1_198 = .text:0x00000198; // type:function size:0x23C
fn_1_3D4 = .text:0x000003D4; // type:function size:0x68

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x400
ObjectSetup = .text:0x000000A0; // type:function size:0x400
fn_1_4A0 = .text:0x000004A0; // type:function size:0xD8
fn_1_578 = .text:0x00000578; // type:function size:0x20C
fn_1_784 = .text:0x00000784; // type:function size:0x134

View file

@ -9,7 +9,7 @@ fn_1_9410 = .text:0x00009410; // type:function size:0x4F0
fn_1_9900 = .text:0x00009900; // type:function size:0x134C
fn_1_AC4C = .text:0x0000AC4C; // type:function size:0x3B8
fn_1_B004 = .text:0x0000B004; // type:function size:0x54
ModuleProlog = .text:0x0000B058; // type:function size:0x428
ObjectSetup = .text:0x0000B058; // type:function size:0x428
fn_1_B480 = .text:0x0000B480; // type:function size:0xAC
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x278
ObjectSetup = .text:0x000000A0; // type:function size:0x278
fn_1_318 = .text:0x00000318; // type:function size:0x98
fn_1_3B0 = .text:0x000003B0; // type:function size:0xA4C
fn_1_DFC = .text:0x00000DFC; // type:function size:0x64

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x1C4
ObjectSetup = .text:0x000000A0; // type:function size:0x1C4
fn_1_264 = .text:0x00000264; // type:function size:0x1B8
fn_1_41C = .text:0x0000041C; // type:function size:0xAC4
fn_1_EE0 = .text:0x00000EE0; // type:function size:0x60

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x3C0
ObjectSetup = .text:0x000000A0; // type:function size:0x3C0
fn_1_460 = .text:0x00000460; // type:function size:0x20
fn_1_480 = .text:0x00000480; // type:function size:0x464
fn_1_8E4 = .text:0x000008E4; // type:function size:0x664

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x16C
ObjectSetup = .text:0x000000A0; // type:function size:0x16C
fn_1_20C = .text:0x0000020C; // type:function size:0x124
fn_1_330 = .text:0x00000330; // type:function size:0xA88
fn_1_DB8 = .text:0x00000DB8; // type:function size:0x60

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x1FC
ObjectSetup = .text:0x000000A0; // type:function size:0x1FC
fn_1_29C = .text:0x0000029C; // type:function size:0x64
fn_1_300 = .text:0x00000300; // type:function size:0x1364
fn_1_1664 = .text:0x00001664; // type:function size:0x60

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x218
ObjectSetup = .text:0x000000A0; // type:function size:0x218
fn_1_2B8 = .text:0x000002B8; // type:function size:0x1C0
fn_1_478 = .text:0x00000478; // type:function size:0x2154
fn_1_25CC = .text:0x000025CC; // type:function size:0x50

View file

@ -65,7 +65,7 @@ fn_1_B01C = .text:0x0000B01C; // type:function size:0x738
fn_1_B754 = .text:0x0000B754; // type:function size:0x18C
fn_1_B8E0 = .text:0x0000B8E0; // type:function size:0x1D08
fn_1_D5E8 = .text:0x0000D5E8; // type:function size:0x6B4
ModuleProlog = .text:0x0000DC9C; // type:function size:0xCD0
ObjectSetup = .text:0x0000DC9C; // type:function size:0xCD0
fn_1_E96C = .text:0x0000E96C; // type:function size:0x104
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x5BC
ObjectSetup = .text:0x000000A0; // type:function size:0x5BC
fn_1_65C = .text:0x0000065C; // type:function size:0xC4
fn_1_720 = .text:0x00000720; // type:function size:0x334
fn_1_A54 = .text:0x00000A54; // type:function size:0x144

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x384
ObjectSetup = .text:0x000000A0; // type:function size:0x384
fn_1_424 = .text:0x00000424; // type:function size:0x78
fn_1_49C = .text:0x0000049C; // type:function size:0xE0
fn_1_57C = .text:0x0000057C; // type:function size:0x234

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x420
ObjectSetup = .text:0x000000A0; // type:function size:0x420
fn_1_4C0 = .text:0x000004C0; // type:function size:0xC4
fn_1_584 = .text:0x00000584; // type:function size:0x94
fn_1_618 = .text:0x00000618; // type:function size:0x180

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x45C
ObjectSetup = .text:0x000000A0; // type:function size:0x45C
fn_1_4FC = .text:0x000004FC; // type:function size:0x5C
fn_1_558 = .text:0x00000558; // type:function size:0x70C
fn_1_C64 = .text:0x00000C64; // type:function size:0x64

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x43C
ObjectSetup = .text:0x000000A0; // type:function size:0x43C
fn_1_4DC = .text:0x000004DC; // type:function size:0x20
fn_1_4FC = .text:0x000004FC; // type:function size:0x478
fn_1_974 = .text:0x00000974; // type:function size:0x800

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x2C4
ObjectSetup = .text:0x000000A0; // type:function size:0x2C4
fn_1_364 = .text:0x00000364; // type:function size:0x10
fn_1_374 = .text:0x00000374; // type:function size:0x10
fn_1_384 = .text:0x00000384; // type:function size:0x84

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x324
ObjectSetup = .text:0x000000A0; // type:function size:0x324
fn_1_3C4 = .text:0x000003C4; // type:function size:0x70
fn_1_434 = .text:0x00000434; // type:function size:0x70
fn_1_4A4 = .text:0x000004A4; // type:function size:0x224

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x2D4
ObjectSetup = .text:0x000000A0; // type:function size:0x2D4
fn_1_374 = .text:0x00000374; // type:function size:0x10
fn_1_384 = .text:0x00000384; // type:function size:0x10
fn_1_394 = .text:0x00000394; // type:function size:0xB4

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x380
ObjectSetup = .text:0x000000A0; // type:function size:0x380
fn_1_420 = .text:0x00000420; // type:function size:0xC4
fn_1_4E4 = .text:0x000004E4; // type:function size:0xA0
fn_1_584 = .text:0x00000584; // type:function size:0x14C

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x3D0
ObjectSetup = .text:0x000000A0; // type:function size:0x3D0
fn_1_470 = .text:0x00000470; // type:function size:0x370C
fn_1_3B7C = .text:0x00003B7C; // type:function size:0x1270
fn_1_4DEC = .text:0x00004DEC; // type:function size:0x7C4

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x418
ObjectSetup = .text:0x000000A0; // type:function size:0x418
fn_1_4B8 = .text:0x000004B8; // type:function size:0x54
fn_1_50C = .text:0x0000050C; // type:function size:0x4
fn_1_510 = .text:0x00000510; // type:function size:0x10

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x9C
ObjectSetup = .text:0x000000A0; // type:function size:0x9C
fn_1_13C = .text:0x0000013C; // type:function size:0x168
m446FlowCreate = .text:0x000002A4; // type:function size:0x158
fn_1_3FC = .text:0x000003FC; // type:function size:0xB8

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x8C
ObjectSetup = .text:0x000000A0; // type:function size:0x8C
fn_1_12C = .text:0x0000012C; // type:function size:0x8C
fn_1_1B8 = .text:0x000001B8; // type:function size:0x284
fn_1_43C = .text:0x0000043C; // type:function size:0x54

View file

@ -12,7 +12,7 @@ fn_1_7DC4 = .text:0x00007DC4; // type:function size:0x3FC
fn_1_81C0 = .text:0x000081C0; // type:function size:0xC10
fn_1_8DD0 = .text:0x00008DD0; // type:function size:0x738
fn_1_9508 = .text:0x00009508; // type:function size:0x154
ModuleProlog = .text:0x0000965C; // type:function size:0x4A4
ObjectSetup = .text:0x0000965C; // type:function size:0x4A4
fn_1_9B00 = .text:0x00009B00; // type:function size:0x120
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte

View file

@ -14,7 +14,7 @@ fn_1_7ECC = .text:0x00007ECC; // type:function size:0xC8
fn_1_7F94 = .text:0x00007F94; // type:function size:0x5A4
fn_1_8538 = .text:0x00008538; // type:function size:0xFC0
fn_1_94F8 = .text:0x000094F8; // type:function size:0xE0
ModuleProlog = .text:0x000095D8; // type:function size:0x460
ObjectSetup = .text:0x000095D8; // type:function size:0x460
fn_1_9A38 = .text:0x00009A38; // type:function size:0x9C
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x71C
ObjectSetup = .text:0x000000A0; // type:function size:0x71C
fn_1_7BC = .text:0x000007BC; // type:function size:0x9C
fn_1_858 = .text:0x00000858; // type:function size:0xC0
fn_1_918 = .text:0x00000918; // type:function size:0x214

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x3A0
ObjectSetup = .text:0x000000A0; // type:function size:0x3A0
fn_1_440 = .text:0x00000440; // type:function size:0x20
fn_1_460 = .text:0x00000460; // type:function size:0x3E8
fn_1_848 = .text:0x00000848; // type:function size:0x7B4

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x270
ObjectSetup = .text:0x000000A0; // type:function size:0x270
fn_1_310 = .text:0x00000310; // type:function size:0x10
fn_1_320 = .text:0x00000320; // type:function size:0x10
fn_1_330 = .text:0x00000330; // type:function size:0x148

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x300
ObjectSetup = .text:0x000000A0; // type:function size:0x300
fn_1_3A0 = .text:0x000003A0; // type:function size:0x10
fn_1_3B0 = .text:0x000003B0; // type:function size:0x10
fn_1_3C0 = .text:0x000003C0; // type:function size:0xD8

View file

@ -9,7 +9,7 @@ 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
ModuleProlog = .text:0x00007664; // type:function size:0x480
ObjectSetup = .text:0x00007664; // type:function size:0x480
fn_1_7AE4 = .text:0x00007AE4; // type:function size:0x9C
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte

View file

@ -9,7 +9,7 @@ fn_1_5014 = .text:0x00005014; // type:function size:0x9C8
fn_1_59DC = .text:0x000059DC; // type:function size:0x938
fn_1_6314 = .text:0x00006314; // type:function size:0x548
fn_1_685C = .text:0x0000685C; // type:function size:0xC0
ModuleProlog = .text:0x0000691C; // type:function size:0x480
ObjectSetup = .text:0x0000691C; // type:function size:0x480
fn_1_6D9C = .text:0x00006D9C; // type:function size:0xD0
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x138
ObjectSetup = .text:0x000000A0; // type:function size:0x138
fn_1_1D8 = .text:0x000001D8; // type:function size:0x468
fn_1_640 = .text:0x00000640; // type:function size:0xFC
fn_1_73C = .text:0x0000073C; // type:function size:0x73C

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x428
ObjectSetup = .text:0x000000A0; // type:function size:0x428
fn_1_4C8 = .text:0x000004C8; // type:function size:0x128
fn_1_5F0 = .text:0x000005F0; // type:function size:0x20C
fn_1_7FC = .text:0x000007FC; // type:function size:0x14C

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x400
ObjectSetup = .text:0x000000A0; // type:function size:0x400
fn_1_4A0 = .text:0x000004A0; // type:function size:0x1014
fn_1_14B4 = .text:0x000014B4; // type:function size:0x80
fn_1_1534 = .text:0x00001534; // type:function size:0x80

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x21C
ObjectSetup = .text:0x000000A0; // type:function size:0x21C
fn_1_2BC = .text:0x000002BC; // type:function size:0x44 scope:local
fn_1_300 = .text:0x00000300; // type:function size:0xB88 scope:local
fn_1_E88 = .text:0x00000E88; // type:function size:0x328 scope:local

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x3C4
ObjectSetup = .text:0x000000A0; // type:function size:0x3C4
fn_1_464 = .text:0x00000464; // type:function size:0x294
fn_1_6F8 = .text:0x000006F8; // type:function size:0x6F8
fn_1_DF0 = .text:0x00000DF0; // type:function size:0xD1C

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x1FC
ObjectSetup = .text:0x000000A0; // type:function size:0x1FC
fn_1_29C = .text:0x0000029C; // type:function size:0xC9C
fn_1_F38 = .text:0x00000F38; // type:function size:0x64
fn_1_F9C = .text:0x00000F9C; // type:function size:0x1158

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x374
ObjectSetup = .text:0x000000A0; // type:function size:0x374
fn_1_414 = .text:0x00000414; // type:function size:0x5E0
fn_1_9F4 = .text:0x000009F4; // type:function size:0xFC
fn_1_AF0 = .text:0x00000AF0; // type:function size:0x9C

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0xC0
ObjectSetup = .text:0x000000A0; // type:function size:0xC0
OptionFadeSprite = .text:0x00000160; // type:function size:0x110
FadeSprite = .text:0x00000270; // type:function size:0xE4 scope:local
OptionFadeModel = .text:0x00000354; // type:function size:0x114 scope:local

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0xA4
ObjectSetup = .text:0x000000A0; // type:function size:0xA4
fn_1_144 = .text:0x00000144; // type:function size:0x110
fn_1_254 = .text:0x00000254; // type:function size:0xE0
fn_1_334 = .text:0x00000334; // type:function size:0x128

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x438
ObjectSetup = .text:0x000000A0; // type:function size:0x438
fn_1_4D8 = .text:0x000004D8; // type:function size:0x3B0
fn_1_888 = .text:0x00000888; // type:function size:0x2F0
fn_1_B78 = .text:0x00000B78; // type:function size:0x13D4

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x4B8
ObjectSetup = .text:0x000000A0; // type:function size:0x4B8
CopyPlayerCfg = .text:0x00000558; // type:function size:0x60 scope:local
CalcBtns = .text:0x000005B8; // type:function size:0x324 scope:local
DrawPage = .text:0x000008DC; // type:function size:0x170 scope:local

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x218
ObjectSetup = .text:0x000000A0; // type:function size:0x218
ExitProc = .text:0x000002B8; // type:function size:0x60 scope:local
CreateStaff = .text:0x00000318; // type:function size:0x3DC scope:local
MoveStaff = .text:0x000006F4; // type:function size:0x3AC scope:local
@ -9,10 +9,8 @@ ShowPicture = .text:0x00000BCC; // type:function size:0x1C4 scope:local
MainProc = .text:0x00000D90; // type:function size:0x500 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float
lbl_1_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local data:float
lbl_1_rodata_8 = .rodata:0x00000008; // type:object size:0x4 scope:local data:float
lbl_1_rodata_C = .rodata:0x0000000C; // type:object size:0x4 scope:local data:float
__fakeHalf = .rodata:0x00000000; // type:object size:0x8 data:double
__fakeThree = .rodata:0x00000008; // type:object size:0x8 data:double
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float
lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float
lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x6C
ObjectSetup = .text:0x000000A0; // type:function size:0x6C
GetBtns = .text:0x0000010C; // type:function size:0x58 scope:local
SubchrMain = .text:0x00000164; // type:function size:0x654 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte

View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
ModuleProlog = .text:0x000000A0; // type:function size:0x384
ObjectSetup = .text:0x000000A0; // type:function size:0x384
fn_1_424 = .text:0x00000424; // type:function size:0x1350
fn_1_1774 = .text:0x00001774; // type:function size:0x57C
fn_1_1CF0 = .text:0x00001CF0; // type:function size:0xB0

View file

@ -862,7 +862,7 @@ config.libs = [
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m406Dll/main.c"),
Object(Matching, "REL/m406Dll/map.c"),
Object(NonMatching, "REL/m406Dll/player.c"),
Object(Matching, "REL/m406Dll/player.c"),
},
),
Rel(

View file

@ -14,7 +14,7 @@ typedef void (*VoidFunc)(void);
extern const VoidFunc _ctors[];
extern const VoidFunc _dtors[];
extern void ModuleProlog(void);
extern void ObjectSetup(void);
extern void ModuleEpilog(void);
#ifdef __cplusplus

View file

@ -4,16 +4,36 @@
#include "game/object.h"
#include "game/process.h"
typedef struct UnkM406Struct2 {
/* 0x00 */ float unk_00;
/* 0x04 */ float unk_04;
/* 0x08 */ Vec unk_08;
/* 0x14 */ Vec unk_14;
} UnkM406Struct2; /* size = 0x20 */
s32 fn_1_122C(void);
void fn_1_123C(void);
void fn_1_1274(s32 arg0);
void fn_1_1284(void);
void fn_1_12BC(void);
omObjData *fn_1_2308(Process *arg0);
void fn_1_2BEC(void);
void fn_1_3064(s32 arg0);
void fn_1_696C(float arg8);
void fn_1_6B5C(void);
void fn_1_69C0(Vec *arg0);
s32 fn_1_6A44(Vec arg0);
void fn_1_6BB4(Vec *arg0);
void fn_1_82C8(Mtx arg0, s32 arg1, float arg8);
s32 fn_1_94C0(Mtx arg0, s32 arg1, s32 arg2);
void fn_1_B104(float arg8);
void fn_1_B25C(void);
void fn_1_B41C(void);
void fn_1_D65C(Process *arg0);
void fn_1_D8B0(void);
extern UnkM406Struct2 *lbl_1_bss_B8;
extern s32 lbl_1_bss_B4;
#endif

View file

@ -297,7 +297,7 @@ extern f32 lbl_1_data_250;
////// FUNCTIONS //////
// main.c
extern void ModuleProlog(void);
extern void ObjectSetup(void);
extern void fn_1_3C4(omObjData* object);
extern void fn_1_434(omObjData* object);
extern s32 fn_1_4A4(void);
@ -393,4 +393,4 @@ extern void fn_1_F168(void);
extern void fn_1_F228(void);
extern u16 fn_1_F4C0(unkObjStruct*, u16);
extern void fn_1_F4D4(unkObjStruct*, u16, u16);
extern s32 fn_1_F4FC(s32);
extern s32 fn_1_F4FC(s32);

View file

@ -234,7 +234,7 @@ extern Vec lbl_1_data_4B4[3];
////// PROTOTYPES //////
// main.c
extern void ModuleProlog(void);
extern void ObjectSetup(void);
extern void fn_1_13C(omObjData*);
extern unkStruct* m446FlowCreate(void);
extern void fn_1_3FC(unkStruct*);
@ -363,4 +363,4 @@ extern unkStruct9* m446StageCreate(void);
extern void fn_1_83F0(unkStruct9*);
extern void fn_1_84AC(unkStruct9*);
extern void fn_1_852C(unkStruct9*);
extern void fn_1_860C(unkStruct9*);
extern void fn_1_860C(unkStruct9*);

View file

@ -1,15 +0,0 @@
#ifndef STAFFDLL_H
#define STAFFDLL_H
#include "dolphin/types.h"
typedef struct UnkStaffDllStruct {
/* 0x00 */ u32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ float unk_08;
/* 0x0C */ u32 unk_0C;
/* 0x10 */ s32 unk_10;
/* 0x14 */ s32 unk_14;
} UnkStaffDllStruct;
#endif

View file

@ -156,7 +156,7 @@ typedef struct hsf_face {
} strip;
s16 indices[4][4];
};
float nbt[3];
Vec nbt;
} HsfFace;
typedef struct hsf_transform {

View file

@ -187,8 +187,8 @@ s16 Hu3DGLightCreate(f32, f32, f32, f32, f32, f32, u8, u8, u8);
s16 Hu3DGLightCreateV(Vec*, Vec*, GXColor*);
s16 Hu3DLLightCreate(s16, f32, f32, f32, f32, f32, f32, u8, u8, u8);
s16 Hu3DLLightCreateV(s16, Vec*, Vec*, GXColor*);
void Hu3DGLightSpotSet(s16, u16, f32);
void Hu3DLLightSpotSet(s16, s16, u16, f32);
void Hu3DGLightSpotSet(s16, f32, u16);
void Hu3DLLightSpotSet(s16, s16, f32, u16);
void Hu3DGLightInfinitytSet(s16);
void Hu3DLLightInfinitytSet(s16, s16);
void Hu3DGLightPointSet(s16, f32, f32, u16);

View file

@ -100,7 +100,7 @@ static s32 charSfxTbl[] = {
743
};
void ModuleProlog(void)
void ObjectSetup(void)
{
e3EvtNo = omovlevtno;
HuAudSndGrpSetSet(0);
@ -1699,4 +1699,4 @@ struct unkstruct_4C0 {
struct unkstruct_4C0 lbl_2_data_4C0[] = {
lbl_2_data_478, 60,
lbl_2_data_49C, 60
};
};

View file

@ -2,10 +2,10 @@
#include "dolphin/os.h"
#include "rel_sqrt_consts.h"
void ModuleProlog(void) {
void ObjectSetup(void) {
OSReport("minigame dll setup\n");
}
unsigned char fn_1_CC(void) {
return rand8();
}
}

View file

@ -48,7 +48,7 @@ static BOOL TitleProc(void);
void *logoReadNintendo(void);
void ModuleProlog(void)
void ObjectSetup(void)
{
omOvlHisData *history;
OSReport("******* Boot ObjectSetup *********\n");
@ -549,4 +549,3 @@ static BOOL TitleProc(void)
HuSprAttrSet(titleGroup, 3, HUSPR_ATTR_DISPOFF);
return 0;
}

View file

@ -6,7 +6,7 @@ s32 _prolog(void) {
(**ctors)();
ctors++;
}
ModuleProlog();
ObjectSetup();
return 0;
}

View file

@ -50,7 +50,7 @@ static void fn_1_2FA0(void);
static void fn_1_4174(omObjData *object);
static void fn_1_4528(omObjData *object);
void ModuleProlog(void)
void ObjectSetup(void)
{
s32 i;
omOvlHisData *his;
@ -1175,4 +1175,4 @@ static void fn_1_5B64(ModelData *model, Mtx mtx)
GXPosition3f32(2000.0f, 0, 2000.0f);
GXPosition3f32(-2000.0f, 0, 2000.0f);
GXEnd();
}
}

View file

@ -120,7 +120,7 @@ void fn_2_D088(omObjData *object);
void fn_2_DBCC(s16 arg0);
void ModuleProlog(void)
void ObjectSetup(void)
{
s32 i;
omObjData *object;
@ -3496,4 +3496,4 @@ void fn_2_FF98(omObjData *object)
omDelObjEx(HuPrcCurrentGet(), object);
}
}
}

View file

@ -1852,7 +1852,7 @@ static void fn_1_9058(omObjData *arg0) {
arg0->func = fn_1_8218;
}
void ModuleProlog(void) {
void ObjectSetup(void) {
Vec sp20;
omObjData *temp_r30;
s32 i;

View file

@ -165,7 +165,7 @@ static Vec lbl_1_data_20_unused = { 0.0f, 4000.0f, -2000.0f };
static Vec lbl_1_data_2C_unused = { 0.0f, 1.0f, 0.0f };
static u8 lbl_1_data_38_unused[0xC] = { 0 };
void ModuleProlog(void) {
void ObjectSetup(void) {
LightData *var_r28;
Process *temp_r31;
omObjData *var_r29;

View file

@ -233,7 +233,7 @@ void fn_1_6440(omObjData *object);
void fn_1_648C(s32 arg0, s32 arg1, float arg8);
void fn_1_66DC(omObjData *object);
void ModuleProlog(void)
void ObjectSetup(void)
{
CameraData *var_r30;
Process *var_r31;

View file

@ -2380,7 +2380,7 @@ void fn_1_AD10(omObjData *arg0) {
arg0->func = fn_1_9288;
}
void ModuleProlog(void) {
void ObjectSetup(void) {
Vec sp8;
s32 temp_r29;
s32 i;

View file

@ -108,7 +108,7 @@ s32 lbl_1_bss_8;
omObjData *lbl_1_bss_4;
s32 lbl_1_bss_0;
void ModuleProlog(void)
void ObjectSetup(void)
{
Vec sp14;
Vec sp8;

View file

@ -21,13 +21,6 @@ typedef struct UnkM406Struct {
/* 0x2C */ float unk_2C;
} UnkM406Struct; /* size = 0x30 */
typedef struct UnkM406Struct2 {
/* 0x00 */ float unk_00;
/* 0x04 */ float unk_04;
/* 0x08 */ Vec unk_08;
/* 0x14 */ Vec unk_14;
} UnkM406Struct2; /* size = 0x20 */
typedef struct UnkM406Struct3 {
/* 0x00 */ s32 unk_00;
/* 0x04 */ float unk_04;
@ -492,7 +485,8 @@ omObjData *fn_1_2308(Process *arg0)
if (var_r31 < 6) {
var_r30 = Hu3DModelCreateFile(lbl_1_data_7C4[var_r31]);
lbl_1_bss_CC->model[var_r31 + 7] = var_r30;
} else {
}
else {
var_r30 = -1;
lbl_1_bss_CC->model[var_r31 + 7] = var_r30;
}
@ -519,7 +513,8 @@ omObjData *fn_1_2308(Process *arg0)
for (var_r31 = 0; var_r31 < 3; var_r31++) {
if (var_r31 == 0) {
lbl_1_bss_C4->model[var_r31] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 34));
} else {
}
else {
lbl_1_bss_C4->model[var_r31] = Hu3DModelLink(*lbl_1_bss_C4->model);
}
Hu3DModelShadowSet(lbl_1_bss_C4->model[var_r31]);
@ -599,7 +594,8 @@ void fn_1_2C24(omObjData *object)
if (object->model[var_r29] != -1) {
Hu3DModelAttrSet(object->model[var_r29], 1);
}
} else {
}
else {
if (object->model[var_r30] != -1) {
Hu3DModelAttrReset(object->model[var_r30], 1);
}
@ -614,7 +610,8 @@ void fn_1_2C24(omObjData *object)
var_f31 = 25000.0f;
if (fabs(Center.z - var_f31) < 15000.0) {
Hu3DModelAttrSet(object->model[var_r29], 1);
} else {
}
else {
Hu3DModelAttrReset(object->model[var_r29], 1);
}
}
@ -625,7 +622,8 @@ void fn_1_2C24(omObjData *object)
for (var_r30 = 0; var_r30 < 3; var_r30++) {
if (fabs(Center.z - lbl_1_data_780[var_r30].z) > 10000.0) {
Hu3DModelAttrSet(lbl_1_bss_C4->model[var_r30], 1);
} else {
}
else {
Hu3DModelAttrReset(lbl_1_bss_C4->model[var_r30], 1);
}
}
@ -749,7 +747,8 @@ void fn_1_3158(void)
}
if (var_r29 == 1 || var_r29 == 103) {
var_r27->unk_14 = 0.6f;
} else {
}
else {
var_r27->unk_14 = 1.0f;
}
var_r27->unk_18.x = var_r27->unk_18.y = var_r27->unk_18.z = 0.0f;
@ -842,22 +841,26 @@ void fn_1_3158(void)
var_r30->unk_01 = 1;
if (var_r29 < 6) {
var_r30->unk_08 = (6 - var_r29) / 6.0f;
} else {
}
else {
var_r30->unk_08 = 1.0f;
}
} else {
}
else {
var_r30->unk_01 = 0;
var_r30->unk_08 = 0.0f;
}
if (!var_r25 || var_r25 == 34 || !var_r29) {
var_r30->unk_00 = 0;
var_r30->unk_04 = 0.0f;
} else {
}
else {
var_r30->unk_00 = 1;
if (var_r29 < 3) {
var_r30->unk_04 = 0.5f + (0.5f * (var_r29 / 3.0f));
var_r30->unk_04 = sind(90.0f * var_r30->unk_04);
} else {
}
else {
var_r30->unk_04 = 1.0f;
}
}
@ -870,7 +873,8 @@ void fn_1_3158(void)
var_f31 = var_r25 / 6.0f;
var_r30->unk_04 = var_r30->unk_04 * sind(90.0f * var_f31);
var_r30->unk_0C = var_r30->unk_0C * sind(90.0f * var_f31);
} else if (var_r25 > 28) {
}
else if (var_r25 > 28) {
var_f31 = (var_r25 - 28) / 6.0f;
var_r30->unk_04 = var_r30->unk_04 * cosd(90.0f * var_f31);
var_r30->unk_0C = var_r30->unk_0C * cosd(90.0f * var_f31);
@ -996,13 +1000,15 @@ void fn_1_4084(void)
sp28.y = 0.5f * (var_r31->unk_34.y + var_r31->unk_40.y);
sp28.z = 0.5f * (var_r31->unk_34.z + var_r31->unk_40.z);
var_r31->unk_20 = HuAudFXEmiterPlay(1337, &sp28);
} else if (var_r31->unk_20 != -1) {
}
else if (var_r31->unk_20 != -1) {
sp28.x = 0.5f * (var_r31->unk_34.x + var_r31->unk_40.x);
sp28.y = 0.5f * (var_r31->unk_34.y + var_r31->unk_40.y);
sp28.z = 0.5f * (var_r31->unk_34.z + var_r31->unk_40.z);
HuAudFXEmiterUpDate(var_r31->unk_20, &sp28);
}
} else if (var_r31->unk_20 != -1) {
}
else if (var_r31->unk_20 != -1) {
HuAudFXStop(var_r31->unk_20);
var_r31->unk_20 = -1;
}
@ -1010,7 +1016,8 @@ void fn_1_4084(void)
if (var_r31->unk_0C > var_r31->unk_18) {
var_r31->unk_1C = var_r31->unk_0C - var_r31->unk_18;
var_r31->unk_0C = var_r31->unk_18;
} else {
}
else {
var_r31->unk_1C = 0.0f;
}
var_r28 = var_r31->unk_84;
@ -1025,10 +1032,12 @@ void fn_1_4084(void)
var_r30 = 0;
sp1C = lbl_1_data_F0[var_r30];
sp10 = lbl_1_data_438[var_r30];
} else if (var_r30 < (lbl_1_bss_B4 - 1)) {
}
else if (var_r30 < (lbl_1_bss_B4 - 1)) {
fn_1_D488(sp8, &lbl_1_data_F0[var_r30], &lbl_1_data_F0[var_r30 + 1], &sp1C);
fn_1_D488(sp8, &lbl_1_data_438[var_r30], &lbl_1_data_438[var_r30 + 1], &sp10);
} else {
}
else {
var_r30 = lbl_1_bss_B4 - 1;
sp1C = lbl_1_data_F0[var_r30];
sp10 = lbl_1_data_438[var_r30];
@ -1151,11 +1160,11 @@ void fn_1_4964(ModelData *arg0)
GXColor *var_r19;
var_r30 = arg0->unk_120;
(void)var_f31;
(void)var_f31;
(void)var_f31;
(void)var_f31;
(void)var_f31;
(void)var_f31;
(void)var_f31;
(void)var_f31;
if (var_r30->unk_28) {
if (!omPauseChk()) {
fn_1_67CC(arg0);
@ -1241,12 +1250,13 @@ void fn_1_4964(ModelData *arg0)
fn_1_71C4(spC4, spA0, 100.0f + (50.0f * (0.007874016f * (frand() & 0x7F))), -0.1f, sp3C);
}
var_r29 = var_r30->unk_2C;
memset(lbl_1_bss_48, 0, sizeof(UnkM406Struct5));
memset(lbl_1_bss_48, 0, sizeof(UnkM406Struct5));
for (var_r27 = 0; var_r27 < 105; var_r27++, var_r29++) {
fn_1_D488(var_r29->unk_04, &var_r30->unk_84[var_r29->unk_00], &var_r30->unk_84[var_r29->unk_00 + 1], &var_r29->unk_18);
if (var_r29->unk_08 >= 0) {
var_r29->unk_08--;
} else {
}
else {
var_r29->unk_24 = fn_1_7B2C(var_r29->unk_0C);
if (var_r29->unk_24 == NULL) {
var_r29->unk_24 = &lbl_1_bss_48;
@ -1261,12 +1271,14 @@ void fn_1_4964(ModelData *arg0)
sp3C.a = 0xFF;
if (frand() & 1) {
var_f31 = 0.05f;
} else {
}
else {
var_f31 = -0.05f;
}
var_r29->unk_10 = 0.01f * (100.0f * (0.007874016f * (frand() & 0x7F)));
var_r29->unk_0C = fn_1_79F8(spC4, spA0, 75.0f + (var_r29->unk_14 * (75.0f * (0.007874016f * (frand() & 0x7F)))), var_f31, sp3C);
} else {
}
else {
var_r29->unk_18.y += var_r29->unk_10;
var_r29->unk_24->unk_30 = var_r29->unk_18;
}
@ -1277,13 +1289,15 @@ void fn_1_4964(ModelData *arg0)
if ((frand() & 3) == 0) {
var_f31 = 45.0f + (30.0f * (0.007874016f * (frand() & 0x7F)));
var_f29 = 0.75f + (0.75f * (0.007874016f * (frand() & 0x7F)));
} else {
}
else {
var_f31 = -(15.0f * (0.007874016f * (frand() & 0x7F)));
var_f29 = 1.75f + (0.75f * (0.007874016f * (frand() & 0x7F)));
}
if (var_r30->unk_10 != 0.0f) {
var_f30 = 15.000001f / var_r30->unk_10;
} else {
}
else {
var_f30 = 1.0f;
}
spA0.y = var_f30 * ((7.5000005f * var_f29) * sind(var_f31));
@ -1324,49 +1338,52 @@ void fn_1_4964(ModelData *arg0)
default:
break;
}
} else {
}
else {
Hu3DModelAttrSet(var_r31->unk_00, 1);
var_r31->unk_08 = -1;
var_r31->unk_0C--;
}
} else if (var_r31->unk_08 >= 0) {
}
else if (var_r31->unk_08 >= 0) {
var_r24 = fn_1_66F4(var_r30->unk_0C + var_r31->unk_18, &sp38);
if (var_r24 >= 0 && var_r24 < (lbl_1_bss_B4 - 1)) {
fn_1_D488(sp38, &lbl_1_data_F0[var_r24], &lbl_1_data_F0[var_r24+1], &spB8);
fn_1_D488(sp38, &lbl_1_data_F0[var_r24], &lbl_1_data_F0[var_r24 + 1], &spB8);
fn_1_D488(sp38, &lbl_1_data_438[var_r24], &lbl_1_data_438[var_r24 + 1], &spAC);
fn_1_D488(var_r31->unk_10, &spB8, &spAC, &var_r31->unk_3C);
Hu3DModelAttrReset(var_r31->unk_00, 1);
} else {
}
else {
Hu3DModelAttrSet(var_r31->unk_00, 1);
var_r31->unk_08 = -1;
continue;
continue;
}
switch (var_r31->unk_04) {
case 0:
var_r31->unk_18 = var_r31->unk_1C * sind(5.0f * var_r31->unk_08);
var_r31->unk_20 = var_r31->unk_20 - var_r31->unk_2C;
Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_3C.x, var_r31->unk_3C.y, var_r31->unk_3C.z);
Hu3DModelRotSet(var_r31->unk_00, var_r31->unk_20, var_r31->unk_24, 0.0f);
break;
case 1:
var_r31->unk_18 = var_r31->unk_1C * sind((float)var_r31->unk_08);
var_r31->unk_20 = var_r31->unk_20 - var_r31->unk_2C;
var_r31->unk_14 = var_r31->unk_14 + var_r31->unk_28;
if (var_r31->unk_14 < 0.0f) {
var_f30 = 0.65 + (0.15 * (0.007874016f * (frand() & 0x7F)));
var_f30 = var_f30;
var_r31->unk_14 = 0.0f;
var_r31->unk_28 = var_r31->unk_28 * -var_f30;
}
var_r31->unk_28 = var_r31->unk_28 - 0.32666668f;
var_r31->unk_3C.y += var_r31->unk_14;
Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_3C.x, var_r31->unk_3C.y, var_r31->unk_3C.z);
Hu3DModelRotSet(var_r31->unk_00, var_r31->unk_20, var_r31->unk_24, 0.0f);
break;
default:
break;
}
switch (var_r31->unk_04) {
case 0:
var_r31->unk_18 = var_r31->unk_1C * sind(5.0f * var_r31->unk_08);
var_r31->unk_20 = var_r31->unk_20 - var_r31->unk_2C;
Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_3C.x, var_r31->unk_3C.y, var_r31->unk_3C.z);
Hu3DModelRotSet(var_r31->unk_00, var_r31->unk_20, var_r31->unk_24, 0.0f);
break;
case 1:
var_r31->unk_18 = var_r31->unk_1C * sind((float)var_r31->unk_08);
var_r31->unk_20 = var_r31->unk_20 - var_r31->unk_2C;
var_r31->unk_14 = var_r31->unk_14 + var_r31->unk_28;
if (var_r31->unk_14 < 0.0f) {
var_f30 = 0.65 + (0.15 * (0.007874016f * (frand() & 0x7F)));
var_f30 = var_f30;
var_r31->unk_14 = 0.0f;
var_r31->unk_28 = var_r31->unk_28 * -var_f30;
}
var_r31->unk_28 = var_r31->unk_28 - 0.32666668f;
var_r31->unk_3C.y += var_r31->unk_14;
Hu3DModelPosSet(var_r31->unk_00, var_r31->unk_3C.x, var_r31->unk_3C.y, var_r31->unk_3C.z);
Hu3DModelRotSet(var_r31->unk_00, var_r31->unk_20, var_r31->unk_24, 0.0f);
break;
default:
break;
}
}
if (var_r31->unk_18 < (-0.1f * var_r31->unk_1C)) {
var_r31->unk_08 = -1;
@ -1444,7 +1461,8 @@ void fn_1_64F8(UnkM406Struct2 *arg0)
PSVECSubtract(&var_r28->unk_14, &var_r31->unk_14, &var_r31->unk_08);
var_r31->unk_00 = PSVECMag(&var_r31->unk_08);
PSVECNormalize(&var_r31->unk_08, &var_r31->unk_08);
} else {
}
else {
var_r31->unk_00 = 100000.0f;
var_r31->unk_08.x = 0.0f;
var_r31->unk_08.y = 0.0f;
@ -1490,7 +1508,8 @@ void fn_1_67CC(ModelData *arg0)
if (var_r31->unk_04 != 3 || var_r31->unk_0C > 0) {
Hu3DModelAttrSet(var_r31->unk_00, 1);
var_r31->unk_0C--;
} else {
}
else {
var_r31->unk_20 = var_r31->unk_20 - var_r31->unk_2C;
var_r31->unk_3C.x += var_r31->unk_30.x;
var_r31->unk_3C.y += var_r31->unk_30.y;
@ -1533,7 +1552,7 @@ void fn_1_69C0(Vec *arg0)
}
}
s32 fn_1_6A44(Vec *arg0)
s32 fn_1_6A44(Vec arg0)
{
Vec sp20;
Vec sp14;
@ -1553,7 +1572,7 @@ s32 fn_1_6A44(Vec *arg0)
PSVECScale(&sp8, &sp8, 0.5f);
PSVECSubtract(&var_r31->unk_34, &sp8, &sp20);
PSVECSubtract(&var_r31->unk_40, &sp8, &sp14);
var_f31 = fn_1_D5CC(&sp20, &sp14, arg0->x - sp8.x, arg0->z - sp8.z);
var_f31 = fn_1_D5CC(&sp20, &sp14, arg0.x - sp8.x, arg0.z - sp8.z);
if (var_f31 <= 0.0f) {
return 0;
}
@ -1795,7 +1814,8 @@ void fn_1_77F0(void)
var_r31 = var_r29->unk_3C;
if (fn_1_122C() < 3) {
var_r29->unk_22 |= 1;
} else {
}
else {
var_r29->unk_22 &= 0xFFFFFFFE;
}
for (var_r28 = 0; var_r28 < var_r29->unk_26; var_r28++, var_r31++) {
@ -2039,24 +2059,23 @@ void fn_1_7F80(void)
void fn_1_8100(void) { }
s32 fn_1_8104(Vec arg0, Vec arg1, float arg8, GXColor arg2)
{
UnkM406Struct5 *var_r31;
UnkM406Unk120Struct2 *var_r30;
UnkM406Struct6 *var_r28;
UnkM406Struct6 *var_r28;
s32 var_r29;
ModelData *var_r27;
var_r28 = lbl_1_bss_A4;
var_r28 = lbl_1_bss_A4;
var_r27 = &Hu3DData[var_r28->unk_00];
var_r30 = var_r27->unk_120;
var_r31 = var_r30->unk_3C;
for (var_r29 = 0; var_r29 < var_r30->unk_26; var_r29++, var_r31++) {
if (var_r31->unk_28 <= 0.0f) {
break;
}
}
@ -2090,7 +2109,6 @@ s32 fn_1_8104(Vec arg0, Vec arg1, float arg8, GXColor arg2)
return var_r29;
}
void fn_1_8244(s32 arg0, s32 arg1, float arg8, float arg9)
{
UnkM406Struct5 *var_r31;
@ -2212,7 +2230,8 @@ void fn_1_8F98(void)
PSMTXIdentity(var_r31->unk_1C);
if (var_r30 == 0) {
var_r31->unk_04 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 59));
} else {
}
else {
var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_A0->unk_04);
}
Hu3DModelLayerSet(var_r31->unk_04, 3);
@ -2230,7 +2249,8 @@ void fn_1_8F98(void)
PSMTXIdentity(var_r31->unk_1C);
if (var_r30 == 0) {
var_r31->unk_04 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M406, 60));
} else {
}
else {
var_r31->unk_04 = Hu3DModelLink(lbl_1_bss_A0[64].unk_04);
}
Hu3DModelLayerSet(var_r31->unk_04, 3);
@ -2338,7 +2358,8 @@ s32 fn_1_94C0(Mtx arg0, s32 arg1, s32 arg2)
sp40.y += sp64.y;
sp40.z += sp64.z;
mtxRotCat(spA0, 0.0f, 180.0f + (45.0f * (0.007874016f * (frand() & 0x7F))), 0.0f);
} else {
}
else {
sp4C = sp64;
sp4C.x = -25.0f;
sp4C.z = -50.0f;
@ -2380,7 +2401,8 @@ s32 fn_1_94C0(Mtx arg0, s32 arg1, s32 arg2)
if (var_r28 >= 64) {
return -1;
}
} else {
}
else {
for (var_r28 = 0, var_r31 = &lbl_1_bss_A0[64]; var_r28 < 64; var_r28++, var_r31++) {
if (!var_r31->unk_00) {
break;
@ -2533,15 +2555,17 @@ void fn_1_A2C8(ModelData *arg0, UnkM406Unk120Struct2 *arg1, Mtx arg2)
var_r31->unk_30.y = -27000.0f + (var_f26 * sp18.y);
var_r31->unk_30.z = -63000.0f + (var_f26 * sp18.z);
var_r31->unk_28 = (0.3f + (0.7f * (var_f25 * var_f25)))
* (lbl_1_data_8A4[var_r29->unk_02] * (0.699999988079071 + (0.30000001192092896 * (1.52587890625e-05 * (float)(frand() & 0xFFFF)))));
* (lbl_1_data_8A4[var_r29->unk_02]
* (0.699999988079071 + (0.30000001192092896 * (1.52587890625e-05 * (float)(frand() & 0xFFFF)))));
var_r31->unk_3C.r = (s32)(160.0 * (1.52587890625e-05 * (float)(frand() & 0xFFFF))) + 0x20;
var_r31->unk_3C.g = (s32)(96.0 * (1.52587890625e-05 * (float)(frand() & 0xFFFF))) + 0x20;
var_r31->unk_3C.b = (s32)(128.0 * (1.52587890625e-05 * (float)(frand() & 0xFFFF))) + 0x20;
var_r31->unk_3C.a
= ((1.0 - (0.4 * var_f25)) * (255.0f * lbl_1_data_8B4[var_r29->unk_02])) - (int)(16.0 * (1.52587890625e-05 * (float)(frand() & 0xFFFF)));
var_r31->unk_3C.a = ((1.0 - (0.4 * var_f25)) * (255.0f * lbl_1_data_8B4[var_r29->unk_02]))
- (int)(16.0 * (1.52587890625e-05 * (float)(frand() & 0xFFFF)));
}
var_r29->unk_04++;
} else {
}
else {
var_r31->unk_30.x = 0.0f;
var_r31->unk_30.y = -27000.0f;
var_r31->unk_30.z = -63000.0f;
@ -2881,18 +2905,22 @@ void fn_1_BC18(ModelData *arg0, float (*arg1)[4])
if (shadowModelDrawF) {
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ONE, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO);
GXSetZMode(GX_FALSE, GX_LEQUAL, GX_FALSE);
} else {
}
else {
var_r21 = var_r31->unk_38->bmp->dataFmt & 0xF;
if (var_r21 == 7 || var_r21 == 8) {
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ONE, GX_CC_RASC, GX_CC_ZERO);
} else {
}
else {
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_TEXC, GX_CC_RASC, GX_CC_ZERO);
}
if (var_r31->unk_22 & 1) {
GXSetZMode(GX_FALSE, GX_LEQUAL, GX_FALSE);
} else if (arg0->attr & 2) {
}
else if (arg0->attr & 2) {
GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
} else {
}
else {
GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE);
}
}
@ -2947,7 +2975,8 @@ void fn_1_BC18(ModelData *arg0, float (*arg1)[4])
var_r30++;
var_r30->x = var_r30->y = var_r30->z = 0.0f;
var_r30++;
} else if (!var_r29->unk_2C) {
}
else if (!var_r29->unk_2C) {
var_r27 = &sp98[0];
var_r24 = &sp38[0];
PSVECScale(var_r24++, var_r27, var_r29->unk_28);
@ -2958,7 +2987,8 @@ void fn_1_BC18(ModelData *arg0, float (*arg1)[4])
PSVECAdd(var_r27++, &var_r29->unk_30, var_r30++);
PSVECScale(var_r24++, var_r27, var_r29->unk_28);
PSVECAdd(var_r27++, &var_r29->unk_30, var_r30++);
} else {
}
else {
PSVECScale(lbl_1_data_8E0, &sp98[0], var_r29->unk_28);
PSVECScale(&lbl_1_data_8E0[1], &sp98[1], var_r29->unk_28);
PSVECScale(&lbl_1_data_8E0[2], &sp98[2], var_r29->unk_28);
@ -2983,7 +3013,8 @@ void fn_1_BC18(ModelData *arg0, float (*arg1)[4])
var_r28->y = (0.25f * var_r19) + lbl_1_data_910[var_r25].y;
}
}
} else {
}
else {
for (var_r26 = 0; var_r26 < var_r31->unk_26; var_r26++, var_r29++) {
for (var_r25 = 0; var_r25 < 4; var_r25++, var_r28++) {
var_r28->x = 4.0f * lbl_1_data_910[var_r25].x;
@ -3113,7 +3144,8 @@ void fn_1_C86C(ModelData *arg0, Mtx arg1)
GXSetZCompLoc(GX_FALSE);
if (arg0->attr & 2) {
GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE);
} else {
}
else {
GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE);
}
switch (var_r31->unk_20) {
@ -3156,7 +3188,8 @@ void fn_1_C86C(ModelData *arg0, Mtx arg1)
var_r30++;
var_r30->x = var_r30->y = var_r30->z = 0.0f;
var_r30++;
} else {
}
else {
var_r28 = (Vec *)&sp6C;
var_r27 = (Vec *)&sp3C;
PSVECScale(var_r27++, var_r28, var_r29->unk_28);
@ -3332,13 +3365,15 @@ void fn_1_D13C(LightData *arg0, s16 arg1, Mtx arg2, Mtx arg3, float arg8)
PSMTXMultVec(arg2, &arg0->unk_28, &sp24);
PSMTXMultVec(arg3, &arg0->unk_1C, &sp18);
GXInitLightPos(&sp30, sp18.x, sp18.y, sp18.z);
} else {
}
else {
GXInitLightPos(&sp30, arg0->unk_1C.x, arg0->unk_1C.y, arg0->unk_1C.z);
sp24 = arg0->unk_28;
}
if (arg8 == 0.0f) {
GXInitLightDir(&sp30, sp24.x, sp24.y, sp24.z);
} else {
}
else {
GXInitSpecularDir(&sp30, sp24.x, sp24.y, sp24.z);
GXInitLightAttn(&sp30, 0.0f, 0.0f, 1.0f, arg8 / 2, 0.0f, 1.0f - (arg8 / 2));
}

2081
src/REL/m406Dll/player.c Normal file

File diff suppressed because it is too large Load diff

View file

@ -112,7 +112,7 @@ inline void SetDominationDataStuff(omObjData* arg0, s32 val0, s32 val1) {
temp_r29->unk_20 = val1;
}
void ModuleProlog(void) {
void ObjectSetup(void) {
lbl_1_bss_0[0] = omInitObjMan(0x2F8, 0x2000);
omGameSysInit(lbl_1_bss_0[0]);
fn_1_4980(lbl_1_bss_0[0]);
@ -488,4 +488,4 @@ void fn_1_1460(omObjData* arg0) {
CharModelVoiceEnableSet(temp_r30->unk_01, arg0->motion[7], 0);
CharModelMotionShiftSet(temp_r30->unk_01, arg0->motion[7], 0.0f, 10.0f, 0);
SetDominationDataStuff(arg0, 0, 0);
}
}

View file

@ -79,7 +79,7 @@ void fn_1_9F0(omObjData *object);
void fn_1_25D4(Process *objman);
void ModuleProlog(void)
void ObjectSetup(void)
{
s32 temp_r31;
Process *temp_r30;
@ -1680,4 +1680,4 @@ float fn_1_883C(float arg0, float arg1, float arg2)
temp_f31 += 360.0f;
}
return temp_f31;
}
}

View file

@ -59,7 +59,7 @@ void fn_1_1A7C(omObjData *object);
omObjFunc fn_1_216C(Process *objman, omObjData *object);
void fn_1_2188(omObjData *object);
void ModuleProlog(void)
void ObjectSetup(void)
{
Mtx sp20;
Vec sp14;

2195
src/REL/m413Dll/main.c Normal file

File diff suppressed because it is too large Load diff

View file

@ -172,7 +172,7 @@ s32 lbl_1_data_C4[][3] = {
{ 0, 0, 0 },
};
void ModuleProlog(void)
void ObjectSetup(void)
{
s32 var_r31;
s32 var_r30;

View file

@ -68,7 +68,7 @@ void fn_1_4FC(omObjData *object);
void fn_1_1260(Process *objman);
void fn_1_6E5C(omObjData *object);
void ModuleProlog(void)
void ObjectSetup(void)
{
Process *objman;
Vec pos;
@ -1840,4 +1840,4 @@ void fn_1_72EC(omObjData *object)
VECSubtract(&Center, &sp14, &sp8);
VECNormalize(&sp8, &sp8);
HuAudFXListnerUpdate(&sp14, &sp8);
}
}

View file

@ -54,7 +54,7 @@ s16 lbl_1_bss_8[4];
s32 lbl_1_bss_4;
s32 lbl_1_bss_0;
void ModuleProlog(void)
void ObjectSetup(void)
{
Mtx sp38;
Vec sp2C = { 0.0f, 0.0f, 0.0f };

View file

@ -322,7 +322,7 @@ u8 lbl_1_bss_18[4];
Vec lbl_1_bss_C;
Vec lbl_1_bss_0;
void ModuleProlog(void)
void ObjectSetup(void)
{
Process *var_r31;
LightData *var_r30;
@ -2848,7 +2848,7 @@ s16 fn_1_7DC8(s16 arg0)
var_r26 = var_r23->unk_120;
var_r22 = Hu3DHookFuncCreate(var_r23->hook);
var_r27 = &Hu3DData[var_r22];
var_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(UnkModelDataUnk120Struct), var_r27->unk_48); // TODO fix
var_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(UnkModelDataUnk120Struct), var_r27->unk_48);
var_r27->unk_120 = var_r31;
var_r31->unk_38 = var_r26->unk_38;
var_r31->unk_24 = var_r26->unk_24;

View file

@ -2760,7 +2760,7 @@ void fn_1_D5E8(omObjData *object)
object->func = fn_1_B8E0;
}
void ModuleProlog(void)
void ObjectSetup(void)
{
s32 temp_r31;
omObjData *temp_r28;
@ -2885,4 +2885,4 @@ void fn_1_E96C(omObjData *object)
CharModelKill(lbl_1_data_0[GWPlayerCfg[temp_r31].character]);
}
omOvlReturnEx(1, 1);
}
}

View file

@ -105,7 +105,7 @@ void fn_1_A44(omObjData *object);
void fn_1_2110(omObjData *object);
void ModuleProlog(void)
void ObjectSetup(void)
{
Vec sp2C;
Vec sp20;
@ -2210,4 +2210,4 @@ s32 fn_1_7A78(s32 arg0, s16 arg1)
sp10.unk00 = 1;
sp10.unk04 = arg1;
return msmSeSetParam(arg0, &sp10);
}
}

View file

@ -59,7 +59,7 @@ void fn_1_1104(Process *objman);
void fn_1_1684(void);
void fn_1_16B4(void);
void ModuleProlog(void)
void ObjectSetup(void)
{
s32 i;
Process *objman;
@ -618,4 +618,4 @@ s32 fn_1_1D8C(void)
void fn_1_1D9C(void)
{
lbl_1_bss_3A8 = 1;
}
}

View file

@ -55,7 +55,7 @@ unkStruct lbl_1_data_78[3] = {
{ 1040.0f, { 200.0f, 21.0f, 0.0f }, { -6.0f, 0.0f, 0.0f } },
};
void ModuleProlog(void) {
void ObjectSetup(void) {
Vec sp8;
LightData* var_r30;
Process* var_r31;
@ -2541,4 +2541,4 @@ void fn_1_AA94(void) {
OSReport("CRot x = %.2f: y = %.2f: z = %.2f \n", CRot.x, CRot.y, CRot.z);
}
}
}
}

Some files were not shown because too many files have changed in this diff Show more