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

Ported m442Dll/main.c, score.c needs bss fixing

Browse source
This commit is contained in:
dbalatoni13 2024-11-18 03:13:05 +01:00
parent 9693b314e0
commit e51cba8941
4 changed files with 267 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

15
config/GMPP01_00/rels/m442Dll/splits.txt
View file

@ -5,3 +5,18 @@ Sections:
.rodata type:rodata align:8 .rodata type:rodata align:8
.data type:data align:8 .data type:data align:8
.bss type:bss align:8 .bss type:bss align:8
REL/executor.c:
.text start:0x00000000 end:0x000000A0
REL/m442Dll/main.c:
.text start:0x000000A0 end:0x000091B8
.rodata start:0x00000000 end:0x000001D0
.data start:0x00000000 end:0x00000268
.bss start:0x00000000 end:0x00011F48
REL/m442Dll/score.c:
.text start:0x000091B8 end:0x0000997C
.rodata start:0x000001D0 end:0x00000200
.data start:0x00000268 end:0x00000274
.bss start:0x00011F48 end:0x00011F58

386
config/GMPP01_00/rels/m442Dll/symbols.txt
View file

@ -1,222 +1,234 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global _prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global
fn_1_A0 = .text:0x000000A0; // type:function size:0x2D4 ObjectSetup = .text:0x000000A0; // type:function size:0x2D4
fn_1_374 = .text:0x00000374; // type:function size:0x10 fn_1_374 = .text:0x00000374; // type:function size:0x10
fn_1_384 = .text:0x00000384; // type:function size:0x10 fn_1_384 = .text:0x00000384; // type:function size:0x10
fn_1_394 = .text:0x00000394; // type:function size:0xB4 fn_1_394 = .text:0x00000394; // type:function size:0xB4
fn_1_448 = .text:0x00000448; // type:function size:0x5E8 fn_1_448 = .text:0x00000448; // type:function size:0x5E8
fn_1_A30 = .text:0x00000A30; // type:function size:0x60 fn_1_A30 = .text:0x00000A30; // type:function size:0x60
fn_1_A90 = .text:0x00000A90; // type:function size:0x31C fn_1_A90 = .text:0x00000A90; // type:function size:0x31C
fn_1_DAC = .text:0x00000DAC; // type:function size:0x68 fn_1_D9C = .text:0x00000DAC; // type:function size:0x68
fn_1_E14 = .text:0x00000E14; // type:function size:0x84 fn_1_E04 = .text:0x00000E14; // type:function size:0x84
fn_1_E98 = .text:0x00000E98; // type:function size:0x380 fn_1_E88 = .text:0x00000E98; // type:function size:0x380
fn_1_1218 = .text:0x00001218; // type:function size:0x30 fn_1_1200 = .text:0x00001218; // type:function size:0x30
fn_1_1248 = .text:0x00001248; // type:function size:0xDE0 fn_1_1230 = .text:0x00001248; // type:function size:0xDE0
fn_1_2028 = .text:0x00002028; // type:function size:0x244 fn_1_2010 = .text:0x00002028; // type:function size:0x244
fn_1_226C = .text:0x0000226C; // type:function size:0xF9C fn_1_2254 = .text:0x0000226C; // type:function size:0xF9C
fn_1_3208 = .text:0x00003208; // type:function size:0x3B0 fn_1_31FC = .text:0x00003208; // type:function size:0x3B0
fn_1_35B8 = .text:0x000035B8; // type:function size:0xAC fn_1_35AC = .text:0x000035B8; // type:function size:0xAC
fn_1_3664 = .text:0x00003664; // type:function size:0x160 fn_1_3658 = .text:0x00003664; // type:function size:0x160
fn_1_37C4 = .text:0x000037C4; // type:function size:0x150 fn_1_37B8 = .text:0x000037C4; // type:function size:0x150
fn_1_3914 = .text:0x00003914; // type:function size:0x1DC fn_1_3908 = .text:0x00003914; // type:function size:0x1DC
fn_1_3AF0 = .text:0x00003AF0; // type:function size:0x13C fn_1_3AE4 = .text:0x00003AF0; // type:function size:0x13C
fn_1_3C2C = .text:0x00003C2C; // type:function size:0x74 fn_1_3C20 = .text:0x00003C2C; // type:function size:0x74
fn_1_3CA0 = .text:0x00003CA0; // type:function size:0x180 fn_1_3C94 = .text:0x00003CA0; // type:function size:0x180
fn_1_3E20 = .text:0x00003E20; // type:function size:0x50 fn_1_3E14 = .text:0x00003E20; // type:function size:0x50
fn_1_3E70 = .text:0x00003E70; // type:function size:0x58 fn_1_3E64 = .text:0x00003E70; // type:function size:0x58
fn_1_3EC8 = .text:0x00003EC8; // type:function size:0x4 fn_1_3EBC = .text:0x00003EC8; // type:function size:0x4
fn_1_3ECC = .text:0x00003ECC; // type:function size:0x4A4 fn_1_3EC0 = .text:0x00003ECC; // type:function size:0x4A4
fn_1_4370 = .text:0x00004370; // type:function size:0x4 fn_1_4364 = .text:0x00004370; // type:function size:0x4
fn_1_4374 = .text:0x00004374; // type:function size:0xDC fn_1_4368 = .text:0x00004374; // type:function size:0xDC
fn_1_4450 = .text:0x00004450; // type:function size:0x418 fn_1_4444 = .text:0x00004450; // type:function size:0x418
fn_1_4868 = .text:0x00004868; // type:function size:0xC6C fn_1_485C = .text:0x00004868; // type:function size:0xC6C
fn_1_54D4 = .text:0x000054D4; // type:function size:0x450 fn_1_54C8 = .text:0x000054D4; // type:function size:0x450
fn_1_5924 = .text:0x00005924; // type:function size:0xA8 fn_1_5918 = .text:0x00005924; // type:function size:0xA8
fn_1_59CC = .text:0x000059CC; // type:function size:0x88 fn_1_59C0 = .text:0x000059CC; // type:function size:0x88
fn_1_5A54 = .text:0x00005A54; // type:function size:0x494 fn_1_5A48 = .text:0x00005A54; // type:function size:0x494
fn_1_5EE8 = .text:0x00005EE8; // type:function size:0x5D8 fn_1_5EDC = .text:0x00005EE8; // type:function size:0x5D8
fn_1_64C0 = .text:0x000064C0; // type:function size:0x700 fn_1_64B4 = .text:0x000064C0; // type:function size:0x700
fn_1_6BC0 = .text:0x00006BC0; // type:function size:0x114 fn_1_6BB4 = .text:0x00006BC0; // type:function size:0x114
fn_1_6CD4 = .text:0x00006CD4; // type:function size:0x5C fn_1_6CC8 = .text:0x00006CD4; // type:function size:0x5C
fn_1_6D30 = .text:0x00006D30; // type:function size:0x5A0 fn_1_6D24 = .text:0x00006D30; // type:function size:0x5A0
fn_1_72D0 = .text:0x000072D0; // type:function size:0x318 fn_1_72C4 = .text:0x000072D0; // type:function size:0x318
fn_1_75E8 = .text:0x000075E8; // type:function size:0x158 fn_1_75DC = .text:0x000075E8; // type:function size:0x158
fn_1_7740 = .text:0x00007740; // type:function size:0x114 fn_1_7734 = .text:0x00007740; // type:function size:0x114
fn_1_7854 = .text:0x00007854; // type:function size:0x48 fn_1_7848 = .text:0x00007854; // type:function size:0x48
fn_1_789C = .text:0x0000789C; // type:function size:0x3FC fn_1_7890 = .text:0x0000789C; // type:function size:0x3FC
fn_1_7C98 = .text:0x00007C98; // type:function size:0x230 fn_1_7C8C = .text:0x00007C98; // type:function size:0x230
fn_1_7EC8 = .text:0x00007EC8; // type:function size:0x664 fn_1_7EBC = .text:0x00007EC8; // type:function size:0x664
fn_1_852C = .text:0x0000852C; // type:function size:0xC8 fn_1_8520 = .text:0x0000852C; // type:function size:0xC8
fn_1_85F4 = .text:0x000085F4; // type:function size:0x104 fn_1_85E8 = .text:0x000085F4; // type:function size:0x104
fn_1_86F8 = .text:0x000086F8; // type:function size:0x4C fn_1_86EC = .text:0x000086F8; // type:function size:0x4C
fn_1_8744 = .text:0x00008744; // type:function size:0x250 fn_1_8738 = .text:0x00008744; // type:function size:0x250
fn_1_8994 = .text:0x00008994; // type:function size:0x764 fn_1_8988 = .text:0x00008994; // type:function size:0x764
fn_1_90F8 = .text:0x000090F8; // type:function size:0x10 fn_1_90EC = .text:0x000090F8; // type:function size:0x10
fn_1_9108 = .text:0x00009108; // type:function size:0xB0 fn_1_90FC = .text:0x00009108; // type:function size:0xB0
fn_1_91B8 = .text:0x000091B8; // type:function size:0x28C fn_1_91AC = .text:0x000091B8; // type:function size:0x28C
fn_1_9444 = .text:0x00009444; // type:function size:0x74 fn_1_9438 = .text:0x00009444; // type:function size:0x74
fn_1_94B8 = .text:0x000094B8; // type:function size:0x50 fn_1_94AC = .text:0x000094B8; // type:function size:0x50
fn_1_9508 = .text:0x00009508; // type:function size:0x24 fn_1_94FC = .text:0x00009508; // type:function size:0x24
fn_1_952C = .text:0x0000952C; // type:function size:0x30 fn_1_9520 = .text:0x0000952C; // type:function size:0x30
fn_1_955C = .text:0x0000955C; // type:function size:0x1BC fn_1_9550 = .text:0x0000955C; // type:function size:0x1BC
fn_1_9718 = .text:0x00009718; // type:function size:0x78 fn_1_970C = .text:0x00009718; // type:function size:0x78
fn_1_9790 = .text:0x00009790; // type:function size:0x88 fn_1_9784 = .text:0x00009790; // type:function size:0x88
fn_1_9818 = .text:0x00009818; // type:function size:0x164 fn_1_980C = .text:0x00009818; // type:function size:0x164
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte _ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors: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:0x4 data:float __fakeHalf = .rodata:0x00000000; // type:object size:0x8 data:double
lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 data:float __fakeThree = .rodata:0x00000008; // type:object size:0x8 data:double
lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 data:float lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float
lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float
lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 scope:local data:float
lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x10 data:4byte lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 scope:local data:float
lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 data:float lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x10 scope:local data:4byte
lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x8 data:double lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 scope:local data:float
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x8 scope:local data:double
lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 scope:local data:float
lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 data:float lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 scope:local data:float
lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 data:float lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 scope:local data:float
lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x8 data:double lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 scope:local data:float
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 data:double lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x8 scope:local data:double
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 data:float lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 scope:local data:float
lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 scope:local data:double
lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 scope:local data:float
lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 data:float lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x8 data:double lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x8 data:double lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 data:float lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 data:float lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 data:double lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x8 data:double lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 data:float lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 data:float lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 data:float lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 data:float lbl_1_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 data:float lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 data:float lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x8 data:double lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 data:double lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x8 data:double lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x8 data:double lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 data:float lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:float lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x8 scope:local data:double
lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 data:float lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 scope:local data:float
lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 data:float lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 data:float lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 scope:local data:float
lbl_1_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 data:float lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 scope:local data:float
lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 data:float lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 scope:local data:float
lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x8 data:double lbl_1_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 data:float lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 scope:local data:float
lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 data:float lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 scope:local data:float
lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 data:float lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 scope:local data:float
lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 data:float lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x4 data:float lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x8 scope:local data:double
lbl_1_rodata_144 = .rodata:0x00000144; // type:object size:0x4 data:float lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 scope:local data:float
lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x8 data:double lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 data:double lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x4 scope:local data:float
lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float lbl_1_rodata_144 = .rodata:0x00000144; // type:object size:0x4 scope:local data:float
lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0xC data:4byte lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 scope:local data:float
lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 data:float lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 data:float lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 scope:local data:double
lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x8 data:double lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 scope:local data:float
lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x8 data:double lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 scope:local data:4byte
lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x8 data:double lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x8 scope:local data:double
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x8 data:double lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 scope:local data:float
lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0xC scope:local data:float
lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 data:float lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 scope:local data:float
lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x8 data:double lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x8 data:double lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 data:float lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x8 data:double lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x8 data:double lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x8 data:float lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 data:float lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 data:float lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 data:float lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 data:float lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 data:float lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 data:float lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x8 data:double lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 data:float lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x4 data:float lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x4 data:float lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1FC = .rodata:0x000001FC; // type:object size:0x4 data:float lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1FC = .rodata:0x000001FC; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x54 data:float lbl_1_data_0 = .data:0x00000000; // type:object size:0x54 data:float
lbl_1_data_54 = .data:0x00000054; // type:object size:0xC data:float lbl_1_data_54 = .data:0x00000054; // type:object size:0xC data:float
lbl_1_data_60 = .data:0x00000060; // type:object size:0xC data:float lbl_1_data_60 = .data:0x00000060; // type:object size:0xC data:float
lbl_1_data_6C = .data:0x0000006C; // type:object size:0x4 lbl_1_data_6C = .data:0x0000006C; // type:object size:0x4 data:byte
lbl_1_data_70 = .data:0x00000070; // type:object size:0xC lbl_1_data_70 = .data:0x00000070; // type:object size:0xC data:float
lbl_1_data_7C = .data:0x0000007C; // type:object size:0xC lbl_1_data_7C = .data:0x0000007C; // type:object size:0xC data:float
lbl_1_data_88 = .data:0x00000088; // type:object size:0x24 lbl_1_data_88 = .data:0x00000088; // type:object size:0x23 scope:local data:string
lbl_1_data_AC = .data:0x000000AC; // type:object size:0x4 data:4byte lbl_1_data_AC = .data:0x000000AC; // type:object size:0x4 data:4byte
jumptable_1_data_B0 = .data:0x000000B0; // type:object size:0x30 scope:local jumptable_1_data_B0 = .data:0x000000B0; // type:object size:0x30 scope:local
lbl_1_data_E0 = .data:0x000000E0; // type:object size:0x1C data:string lbl_1_data_E0 = .data:0x000000E0; // type:object size:0x1C scope:local data:string
lbl_1_data_FC = .data:0x000000FC; // type:object size:0x1C lbl_1_data_FC = .data:0x000000FC; // type:object size:0x1C data:4byte
lbl_1_data_118 = .data:0x00000118; // type:object size:0x8 lbl_1_data_118 = .data:0x00000118; // type:object size:0x8 data:4byte
lbl_1_data_120 = .data:0x00000120; // type:object size:0x30 lbl_1_data_120 = .data:0x00000120; // type:object size:0x30 data:float
lbl_1_data_150 = .data:0x00000150; // type:object size:0x1A lbl_1_data_150 = .data:0x00000150; // type:object size:0x19 scope:local data:string
lbl_1_data_16A = .data:0x0000016A; // type:object size:0x20 lbl_1_data_16A = .data:0x0000016A; // type:object size:0x20 data:2byte
lbl_1_data_18A = .data:0x0000018A; // type:object size:0x16 lbl_1_data_18A = .data:0x0000018A; // type:object size:0x14 data:2byte
lbl_1_data_1A0 = .data:0x000001A0; // type:object size:0xC lbl_1_data_1A0 = .data:0x000001A0; // type:object size:0xC data:4byte
lbl_1_data_1AC = .data:0x000001AC; // type:object size:0xC data:string lbl_1_data_1AC = .data:0x000001AC; // type:object size:0xC scope:local data:string
lbl_1_data_1B8 = .data:0x000001B8; // type:object size:0x1 data:byte lbl_1_data_1B8 = .data:0x000001B8; // type:object size:0x4 data:byte
lbl_1_data_1BC = .data:0x000001BC; // type:object size:0x1 data:byte lbl_1_data_1BC = .data:0x000001BC; // type:object size:0x4 data:byte
lbl_1_data_1C0 = .data:0x000001C0; // type:object size:0x30 lbl_1_data_1C0 = .data:0x000001C0; // type:object size:0x30 data:float
lbl_1_data_1F0 = .data:0x000001F0; // type:object size:0x1 data:byte lbl_1_data_1F0 = .data:0x000001F0; // type:object size:0x4 data:byte
lbl_1_data_1F4 = .data:0x000001F4; // type:object size:0x24 lbl_1_data_1F4 = .data:0x000001F4; // type:object size:0x18 data:float
lbl_1_data_218 = .data:0x00000218; // type:object size:0x1 data:byte lbl_1_data_20C = .data:0x0000020C; // type:object size:0xC data:byte
lbl_1_data_21C = .data:0x0000021C; // type:object size:0x20 lbl_1_data_218 = .data:0x00000218; // type:object size:0x4 data:byte
lbl_1_data_23C = .data:0x0000023C; // type:object size:0xC lbl_1_data_21C = .data:0x0000021C; // type:object size:0x20 data:2byte
lbl_1_data_248 = .data:0x00000248; // type:object size:0x8 lbl_1_data_23C = .data:0x0000023C; // type:object size:0xC data:4byte
lbl_1_data_248 = .data:0x00000248; // type:object size:0x8 data:2byte
lbl_1_data_250 = .data:0x00000250; // type:object size:0x8 data:float lbl_1_data_250 = .data:0x00000250; // type:object size:0x8 data:float
lbl_1_data_258 = .data:0x00000258; // type:object size:0x10 lbl_1_data_258 = .data:0x00000258; // type:object size:0x10
lbl_1_data_268 = .data:0x00000268; // type:object size:0xC lbl_1_data_268 = .data:0x00000268; // type:object size:0xC
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x2 data:2byte lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x2 data:2byte
lbl_1_bss_12 = .bss:0x00000012; // type:object size:0x2 data:2byte lbl_1_bss_12 = .bss:0x00000012; // type:object size:0x2 data:2byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0xC data:float lbl_1_bss_14 = .bss:0x00000014; // type:object size:0xC data:float
lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 data:4byte lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x3C data:4byte
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x3C lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0xC000 data:2byte
lbl_1_bss_60 = .bss:0x00000060; // type:object size:0xC000 data:2byte lbl_1_bss_C05C = .bss:0x0000C05C; // type:object size:0x28 data:2byte
lbl_1_bss_C060 = .bss:0x0000C060; // type:object size:0x28 data:2byte lbl_1_bss_C084 = .bss:0x0000C084; // type:object size:0x974
lbl_1_bss_C088 = .bss:0x0000C088; // type:object size:0x974 lbl_1_bss_C9F8 = .bss:0x0000C9F8; // type:object size:0x5000 data:4byte
lbl_1_bss_C9FC = .bss:0x0000C9FC; // type:object size:0x5000 data:4byte lbl_1_bss_119F8 = .bss:0x000119F8; // type:object size:0x4 data:4byte
lbl_1_bss_119FC = .bss:0x000119FC; // type:object size:0x4 data:4byte lbl_1_bss_119FC = .bss:0x000119FC; // type:object size:0x271
lbl_1_bss_11A00 = .bss:0x00011A00; // type:object size:0x271 lbl_1_bss_11C6D = .bss:0x00011C6D; // type:object size:0x271
lbl_1_bss_11C71 = .bss:0x00011C71; // type:object size:0x273 lbl_1_bss_11EE0 = .bss:0x00011EE0; // type:object size:0x4 data:4byte
lbl_1_bss_11EE4 = .bss:0x00011EE4; // type:object size:0x4 data:4byte lbl_1_bss_11EE4 = .bss:0x00011EE4; // type:object size:0x4 data:4byte
lbl_1_bss_11EE8 = .bss:0x00011EE8; // type:object size:0x4 data:4byte lbl_1_bss_11EE8 = .bss:0x00011EE8; // type:object size:0x2 data:2byte
lbl_1_bss_11EEC = .bss:0x00011EEC; // type:object size:0x2 data:2byte lbl_1_bss_11EEC = .bss:0x00011EEC; // type:object size:0x10 data:2byte
lbl_1_bss_11EF0 = .bss:0x00011EF0; // type:object size:0x10 lbl_1_bss_11EFC = .bss:0x00011EFC; // type:object size:0x4 data:4byte
lbl_1_bss_11F00 = .bss:0x00011F00; // type:object size:0x4 data:4byte lbl_1_bss_11F00 = .bss:0x00011F00; // type:object size:0x4 data:4byte
lbl_1_bss_11F04 = .bss:0x00011F04; // type:object size:0x4 data:4byte lbl_1_bss_11F04 = .bss:0x00011F04; // type:object size:0xC data:4byte
lbl_1_bss_11F08 = .bss:0x00011F08; // type:object size:0xC lbl_1_bss_11F10 = .bss:0x00011F10; // type:object size:0x4 data:4byte
lbl_1_bss_11F14 = .bss:0x00011F14; // type:object size:0x4 data:4byte lbl_1_bss_11F14 = .bss:0x00011F14; // type:object size:0x2 data:2byte
lbl_1_bss_11F16 = .bss:0x00011F16; // type:object size:0x2 data:2byte
lbl_1_bss_11F18 = .bss:0x00011F18; // type:object size:0x2 data:2byte lbl_1_bss_11F18 = .bss:0x00011F18; // type:object size:0x2 data:2byte
lbl_1_bss_11F1A = .bss:0x00011F1A; // type:object size:0x2 data:2byte lbl_1_bss_11F1A = .bss:0x00011F1A; // type:object size:0x2 data:2byte
lbl_1_bss_11F1C = .bss:0x00011F1C; // type:object size:0x2 data:2byte lbl_1_bss_11F1C = .bss:0x00011F1C; // type:object size:0x2 data:2byte
lbl_1_bss_11F1E = .bss:0x00011F1E; // type:object size:0x2 data:2byte lbl_1_bss_11F1E = .bss:0x00011F1E; // type:object size:0x2 data:2byte
lbl_1_bss_11F20 = .bss:0x00011F20; // type:object size:0x2 data:2byte lbl_1_bss_11F20 = .bss:0x00011F20; // type:object size:0x4 data:4byte
lbl_1_bss_11F24 = .bss:0x00011F24; // type:object size:0x4 data:4byte lbl_1_bss_11F24 = .bss:0x00011F24; // type:object size:0x4 data:4byte
lbl_1_bss_11F28 = .bss:0x00011F28; // type:object size:0x4 data:4byte lbl_1_bss_11F28 = .bss:0x00011F28; // type:object size:0x4 data:4byte
lbl_1_bss_11F2C = .bss:0x00011F2C; // type:object size:0x4 data:4byte lbl_1_bss_11F2C = .bss:0x00011F2C; // type:object size:0x4 data:4byte
lbl_1_bss_11F30 = .bss:0x00011F30; // type:object size:0x4 data:4byte lbl_1_bss_11F30 = .bss:0x00011F30; // type:object size:0x4 data:4byte
lbl_1_bss_11F34 = .bss:0x00011F34; // type:object size:0x8 data:4byte lbl_1_bss_11F34 = .bss:0x00011F34; // type:object size:0x4 data:4byte
lbl_1_bss_11F38 = .bss:0x00011F38; // type:object size:0x4 data:4byte
lbl_1_bss_11F3C = .bss:0x00011F3C; // type:object size:0x4 data:4byte lbl_1_bss_11F3C = .bss:0x00011F3C; // type:object size:0x4 data:4byte
lbl_1_bss_11F40 = .bss:0x00011F40; // type:object size:0x4 data:4byte lbl_1_bss_11F40 = .bss:0x00011F40; // type:object size:0x4 data:4byte
lbl_1_bss_11F44 = .bss:0x00011F44; // type:object size:0xC data:4byte lbl_1_bss_11F44 = .bss:0x00011F44; // type:object size:0x4 data:4byte
lbl_1_bss_11F48 = .bss:0x00011F48; // type:object size:0x4 data:4byte
lbl_1_bss_11F4C = .bss:0x00011F4C; // type:object size:0x4 data:4byte
lbl_1_bss_11F50 = .bss:0x00011F50; // type:object size:0x4 data:4byte lbl_1_bss_11F50 = .bss:0x00011F50; // type:object size:0x4 data:4byte
lbl_1_bss_11F54 = .bss:0x00011F54; // type:object size:0x4 data:4byte lbl_1_bss_11F54 = .bss:0x00011F54; // type:object size:0x4 data:4byte

2
configure.py
View file

@ -1155,7 +1155,7 @@ config.libs = [
Rel( Rel(
"m442Dll", # Barrel Baron "m442Dll", # Barrel Baron
objects={ objects={
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m442Dll/main.c"), Object(Matching, "REL/m442Dll/main.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m442Dll/score.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m442Dll/score.c"),
}, },
), ),

86
src/REL/m442Dll/main.c
View file

@ -1,3 +1,4 @@
#include "version.h"
#define HUSPR_USE_OLD_DEFS #define HUSPR_USE_OLD_DEFS
#include "ext_math.h" #include "ext_math.h"
#include "game/audio.h" #include "game/audio.h"
@ -213,6 +214,9 @@ M442StructBssC084 lbl_1_bss_C084[11][11];
M442StructBssC05C lbl_1_bss_C05C[2]; M442StructBssC05C lbl_1_bss_C05C[2];
M442StructBss5C lbl_1_bss_5C[0x400]; M442StructBss5C lbl_1_bss_5C[0x400];
float lbl_1_bss_20[0xF]; float lbl_1_bss_20[0xF];
#if VERSION_PAL
s32 lbl_1_bss_20_pal;
#endif
Vec lbl_1_bss_14; Vec lbl_1_bss_14;
s16 lbl_1_bss_12; s16 lbl_1_bss_12;
s16 lbl_1_bss_10; s16 lbl_1_bss_10;
@ -268,9 +272,9 @@ u32 fn_1_384(void)
void fn_1_394(omObjData *object) void fn_1_394(omObjData *object)
{ {
lbl_1_bss_11F30 = 0; lbl_1_bss_11F30 = 0;
lbl_1_bss_11F24 = 60; lbl_1_bss_11F24 = REFRESH_RATE;
lbl_1_bss_11F1C = 60; lbl_1_bss_11F1C = 60;
lbl_1_bss_11F1A = 60; lbl_1_bss_11F1A = REFRESH_RATE;
lbl_1_bss_11F18 = -1; lbl_1_bss_11F18 = -1;
lbl_1_bss_11F16 = 0; lbl_1_bss_11F16 = 0;
lbl_1_bss_11EE8 = 0; lbl_1_bss_11EE8 = 0;
@ -286,19 +290,19 @@ void fn_1_448(omObjData *object)
switch (lbl_1_bss_11F30) { switch (lbl_1_bss_11F30) {
case 0: case 0:
if (lbl_1_bss_11F24 == 60) { if (lbl_1_bss_11F24 == REFRESH_RATE) {
HuAudFXPlay(0x71B); HuAudFXPlay(0x71B);
HuAudFXPlay(0x71F); HuAudFXPlay(0x71F);
} }
if (--lbl_1_bss_11F24 == 0) { if (--lbl_1_bss_11F24 == 0) {
lbl_1_bss_11F30 = 1; lbl_1_bss_11F30 = 1;
lbl_1_bss_11F24 = 0x78; lbl_1_bss_11F24 = 2 * REFRESH_RATE;
} }
break; break;
case 1: case 1:
if (--lbl_1_bss_11F24 == 0) { if (--lbl_1_bss_11F24 == 0) {
lbl_1_bss_11F30 = 2; lbl_1_bss_11F30 = 2;
lbl_1_bss_11F24 = 0x78; lbl_1_bss_11F24 = 2 * REFRESH_RATE;
} }
break; break;
case 2: case 2:
@ -320,7 +324,7 @@ void fn_1_448(omObjData *object)
if (--lbl_1_bss_11F1A == 0) { if (--lbl_1_bss_11F1A == 0) {
lbl_1_bss_11F1C -= 1; lbl_1_bss_11F1C -= 1;
MGSeqParamSet(lbl_1_bss_10, 1, lbl_1_bss_11F1C); MGSeqParamSet(lbl_1_bss_10, 1, lbl_1_bss_11F1C);
lbl_1_bss_11F1A = 0x3C; lbl_1_bss_11F1A = REFRESH_RATE;
} }
if (lbl_1_bss_11F1C == 0 || lbl_1_bss_11EE4 == 0) { if (lbl_1_bss_11F1C == 0 || lbl_1_bss_11EE4 == 0) {
lbl_1_bss_11F30 = 5; lbl_1_bss_11F30 = 5;
@ -337,13 +341,13 @@ void fn_1_448(omObjData *object)
if (GWMGRecordGet(4) < lbl_1_bss_11EE8) { if (GWMGRecordGet(4) < lbl_1_bss_11EE8) {
GWMGRecordSet(4, lbl_1_bss_11EE8); GWMGRecordSet(4, lbl_1_bss_11EE8);
lbl_1_bss_11F30 = 6; lbl_1_bss_11F30 = 6;
lbl_1_bss_11F24 = 60; lbl_1_bss_11F24 = REFRESH_RATE;
lbl_1_bss_12 = MGSeqCreate(0xE, lbl_1_bss_11EE8); lbl_1_bss_12 = MGSeqCreate(0xE, lbl_1_bss_11EE8);
fn_1_94AC(1); fn_1_94AC(1);
} }
else { else {
lbl_1_bss_11F30 = 9; lbl_1_bss_11F30 = 9;
lbl_1_bss_11F24 = 60; lbl_1_bss_11F24 = REFRESH_RATE;
} }
mgRecordExtra = lbl_1_bss_11EE8; mgRecordExtra = lbl_1_bss_11EE8;
} }
@ -351,7 +355,7 @@ void fn_1_448(omObjData *object)
case 6: case 6:
if (MGSeqStatGet(lbl_1_bss_12) == 0) { if (MGSeqStatGet(lbl_1_bss_12) == 0) {
lbl_1_bss_11F30 = 9; lbl_1_bss_11F30 = 9;
lbl_1_bss_11F24 = 60; lbl_1_bss_11F24 = REFRESH_RATE;
} }
break; break;
case 9: case 9:
@ -363,7 +367,7 @@ void fn_1_448(omObjData *object)
else { else {
HuAudSStreamPlay(4); HuAudSStreamPlay(4);
} }
lbl_1_bss_11F24 = 0xD2; lbl_1_bss_11F24 = 3.5f * REFRESH_RATE;
} }
break; break;
case 11: case 11:
@ -410,6 +414,10 @@ void fn_1_A90(Process *arg0)
lbl_1_bss_11F28[0] = lbl_1_bss_11F28[1] = lbl_1_bss_11F28[2] = lbl_1_bss_11F28[3] = -1; lbl_1_bss_11F28[0] = lbl_1_bss_11F28[1] = lbl_1_bss_11F28[2] = lbl_1_bss_11F28[3] = -1;
lbl_1_bss_11F20 = 0; lbl_1_bss_11F20 = 0;
#if VERSION_PAL
lbl_1_bss_20_pal = fn_1_90FC();
#endif
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
if (GWPlayerCfg[var_r31].iscom != 1) { if (GWPlayerCfg[var_r31].iscom != 1) {
break; break;
@ -495,7 +503,11 @@ void fn_1_E88(omObjData *object)
memset(var_r30, 0, sizeof(M442MainWork)); memset(var_r30, 0, sizeof(M442MainWork));
var_r30->unk_02 = lbl_1_bss_11F20++; var_r30->unk_02 = lbl_1_bss_11F20++;
var_r30->unk_04 = GWPlayerCfg[var_r30->unk_02].pad_idx; var_r30->unk_04 = GWPlayerCfg[var_r30->unk_02].pad_idx;
#if VERSION_NTSC
var_r30->unk_0C = fn_1_90FC(); var_r30->unk_0C = fn_1_90FC();
#else
var_r30->unk_0C = lbl_1_bss_20_pal;
#endif
var_r26 = GWPlayerCfg[var_r30->unk_02].character; var_r26 = GWPlayerCfg[var_r30->unk_02].character;
var_r30->unk_10 = var_r26; var_r30->unk_10 = var_r26;
var_r30->unk_12 = GWPlayerCfg[var_r30->unk_02].diff; var_r30->unk_12 = GWPlayerCfg[var_r30->unk_02].diff;
@ -740,7 +752,7 @@ void fn_1_1230(omObjData *object)
var_r30->unk_06 = var_f29 * sind(var_r30->unk_18); var_r30->unk_06 = var_f29 * sind(var_r30->unk_18);
var_r30->unk_07 = var_f29 * -cosd(var_r30->unk_18); var_r30->unk_07 = var_f29 * -cosd(var_r30->unk_18);
if (++var_r30->unk_7C > 300) { if (++var_r30->unk_7C > 5 * REFRESH_RATE) {
var_r30->unk_00_field2 = 1; var_r30->unk_00_field2 = 1;
var_r30->unk_7C = 0; var_r30->unk_7C = 0;
} }
@ -863,18 +875,18 @@ void fn_1_2254(omObjData *object)
if (var_f27 > 72.0f) { if (var_f27 > 72.0f) {
var_f27 = 72.0f; var_f27 = 72.0f;
} }
var_f26 = (10.0f * var_f27) / 72.0f; var_f26 = ((VERSION_NTSC ? 10.0f : 12.0f) * var_f27) / 72.0f;
var_r31->unk_24.x = var_f31 * var_f26; var_r31->unk_24.x = var_f31 * var_f26;
var_r31->unk_24.z = var_f30 * var_f26; var_r31->unk_24.z = var_f30 * var_f26;
var_r31->unk_1C = var_f26; var_r31->unk_1C = var_f26;
object->rot.y = fn_1_85E8(object->rot.y, atan2d(var_r31->unk_24.x, var_r31->unk_24.z), 0.5f); object->rot.y = fn_1_85E8(object->rot.y, atan2d(var_r31->unk_24.x, var_r31->unk_24.z), 0.5f);
if (var_r31->unk_1C < 7.5f) { if (var_r31->unk_1C < (450.0f / REFRESH_RATE)) {
var_r29 = 1; var_r29 = 1;
var_f28 = var_r31->unk_1C / 7.5f; var_f28 = var_r31->unk_1C / (450.0f / REFRESH_RATE);
} }
else { else {
var_r29 = 2; var_r29 = 2;
var_f28 = var_r31->unk_1C / 10.0f; var_f28 = var_r31->unk_1C / (VERSION_NTSC ? 10.0f : 12.0f);
} }
} }
else { else {
@ -935,7 +947,7 @@ void fn_1_2254(omObjData *object)
} }
if ((var_r31->unk_48 >= 0) && (lbl_1_bss_C9F8[var_r31->unk_48].unk_0C < 3)) { if ((var_r31->unk_48 >= 0) && (lbl_1_bss_C9F8[var_r31->unk_48].unk_0C < 3)) {
lbl_1_bss_C9F8[var_r31->unk_48].unk_0C += 1; lbl_1_bss_C9F8[var_r31->unk_48].unk_0C += 1;
lbl_1_bss_C9F8[var_r31->unk_48].unk_0E = 120; lbl_1_bss_C9F8[var_r31->unk_48].unk_0E = 2 * REFRESH_RATE;
HuAudFXPlay(0x71C); HuAudFXPlay(0x71C);
if (lbl_1_bss_C9F8[var_r31->unk_48].unk_0C == 3) { if (lbl_1_bss_C9F8[var_r31->unk_48].unk_0C == 3) {
var_r31->unk_00_field2 = 1; var_r31->unk_00_field2 = 1;
@ -998,21 +1010,27 @@ void fn_1_2254(omObjData *object)
} }
switch (var_r31->unk_40) { switch (var_r31->unk_40) {
case 0: case 0:
var_r31->unk_44 = 0.75 + sind(((90.0f * (var_r31->unk_42 % 15)) / 15.0f)); var_r31->unk_44 = 0.75 + sind(((90.0f * (var_r31->unk_42 % (REFRESH_RATE / 4))) / (float)(REFRESH_RATE / 4)));
if ((var_r31->unk_42 % 20) == 0) { if (VERSION_NTSC ? 1 : var_r31->unk_0C == 1) {
omVibrate(var_r31->unk_02, 0xC, 0xC, 0); if ((var_r31->unk_42 % (REFRESH_RATE / 3)) == 0) {
omVibrate(var_r31->unk_02, 0xC, 0xC, 0);
}
} }
break; break;
case 1: case 1:
var_r31->unk_44 = 0.75 + (0.75 * sind(((90.0f * (var_r31->unk_42 % 30)) / 30.0f))); var_r31->unk_44 = 0.75 + (0.75 * sind(((90.0f * (var_r31->unk_42 % (REFRESH_RATE / 2))) / (0.5f * REFRESH_RATE))));
if ((var_r31->unk_42 % 20) == 0) { if (VERSION_NTSC ? 1 : var_r31->unk_0C == 1) {
omVibrate(var_r31->unk_02, 0xC, 4, 2); if ((var_r31->unk_42 % (REFRESH_RATE / 3)) == 0) {
omVibrate(var_r31->unk_02, 0xC, 4, 2);
}
} }
break; break;
case 2: case 2:
var_r31->unk_44 = 0.75 + (0.5 * sind(((90.0f * (var_r31->unk_42 % 60)) / 60.0f))); var_r31->unk_44 = 0.75 + (0.5 * sind(((90.0f * (var_r31->unk_42 % REFRESH_RATE)) / (1.0f * REFRESH_RATE))));
if ((var_r31->unk_42 % 20) == 0) { if (VERSION_NTSC ? 1 : var_r31->unk_0C == 1) {
omVibrate(var_r31->unk_02, 12, 6, 6); if ((var_r31->unk_42 % (REFRESH_RATE / 3)) == 0) {
omVibrate(var_r31->unk_02, 12, 6, 6);
}
} }
break; break;
} }
@ -1273,7 +1291,7 @@ void fn_1_3C20(omObjData *object)
Hu3DMotionOverlayReset(object->model[0]); Hu3DMotionOverlayReset(object->model[0]);
Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(object->model[3], HU3D_ATTR_DISPOFF);
var_r30->unk_3C = 10; var_r30->unk_3C = REFRESH_RATE / 5.5;
object->func = fn_1_3C94; object->func = fn_1_3C94;
} }
@ -1414,7 +1432,7 @@ void fn_1_4444(s32 arg0)
lbl_1_bss_5C[arg0].unk_04 = 0.0f; lbl_1_bss_5C[arg0].unk_04 = 0.0f;
lbl_1_bss_5C[arg0].unk_08 = 100.0f * (18.0f * ((frand() & 0x1FF) - 256.0f)) / 256; lbl_1_bss_5C[arg0].unk_08 = 100.0f * (18.0f * ((frand() & 0x1FF) - 256.0f)) / 256;
lbl_1_bss_5C[arg0].unk_0C = lbl_1_bss_5C[arg0].unk_00; lbl_1_bss_5C[arg0].unk_0C = lbl_1_bss_5C[arg0].unk_00;
lbl_1_bss_5C[arg0].unk_10 = 0.41666666f + (1.6666666f * (frand() & 0xFF) / 256); lbl_1_bss_5C[arg0].unk_10 = (25.0f / REFRESH_RATE) + ((100.0f / REFRESH_RATE) * (frand() & 0xFF) / 256);
lbl_1_bss_5C[arg0].unk_18 = lbl_1_bss_5C[arg0].unk_1A = (frand() & 0x3F) + 0x20; lbl_1_bss_5C[arg0].unk_18 = lbl_1_bss_5C[arg0].unk_1A = (frand() & 0x3F) + 0x20;
lbl_1_bss_5C[arg0].unk_1C = 0.1f + (0.9f * (frand() & 0xFF) / 256); lbl_1_bss_5C[arg0].unk_1C = 0.1f + (0.9f * (frand() & 0xFF) / 256);
lbl_1_bss_5C[arg0].unk_20 = 360.0f * (frand() & 0xFF) / 256; lbl_1_bss_5C[arg0].unk_20 = 360.0f * (frand() & 0xFF) / 256;
@ -1965,7 +1983,7 @@ void fn_1_72C4(omObjData *object)
Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(object->model[1], HU3D_ATTR_DISPOFF);
var_r31->unk_02 = 1; var_r31->unk_02 = 1;
var_r31->unk_18 = 0.0f; var_r31->unk_18 = 0.0f;
var_r31->unk_0C = 60; var_r31->unk_0C = REFRESH_RATE;
} }
break; break;
case 1: case 1:
@ -1973,7 +1991,7 @@ void fn_1_72C4(omObjData *object)
var_r31->unk_18 += 0.05f; var_r31->unk_18 += 0.05f;
} }
var_r31->unk_02 = 2; var_r31->unk_02 = 2;
var_r31->unk_0C = var_r31->unk_0E = 45; var_r31->unk_0C = var_r31->unk_0E = 0.75 * REFRESH_RATE;
var_r31->unk_10 = HuAudFXPlay(lbl_1_data_23C[var_r31->unk_14]); var_r31->unk_10 = HuAudFXPlay(lbl_1_data_23C[var_r31->unk_14]);
break; break;
case 2: case 2:
@ -2070,11 +2088,11 @@ void fn_1_7890(ModelData *model, ParticleData *particle, Mtx matrix)
var_r31->unk34.x = 100.0 * (0.20000000298023224 * sind(var_f31)); var_r31->unk34.x = 100.0 * (0.20000000298023224 * sind(var_f31));
var_r31->unk34.y = 0.0f; var_r31->unk34.y = 0.0f;
var_r31->unk34.z = 100.0 * (0.20000000298023224 * cosd(var_f31)); var_r31->unk34.z = 100.0 * (0.20000000298023224 * cosd(var_f31));
var_f30 = 1.6666666f + (2.5f * (frand() & 0xFF) / 256); var_f30 = (100.0f / REFRESH_RATE) + ((150.0f / REFRESH_RATE) * (frand() & 0xFF) / 256);
var_f31 = 360.0f * (frand() & 0xFF) / 256; var_f31 = 360.0f * (frand() & 0xFF) / 256;
var_r31->unk08.x = var_f30 * sind(var_f31); var_r31->unk08.x = var_f30 * sind(var_f31);
var_r31->unk08.z = var_f30 * cosd(var_f31); var_r31->unk08.z = var_f30 * cosd(var_f31);
var_r31->unk08.y = 16.666666f * (frand() & 0xFF) / 256; var_r31->unk08.y = (1000.0f / REFRESH_RATE) * (frand() & 0xFF) / 256;
var_r31->unk40.r = var_r31->unk40.g = var_r31->unk40.b = var_r31->unk40.a = 0xFF; var_r31->unk40.r = var_r31->unk40.g = var_r31->unk40.b = var_r31->unk40.a = 0xFF;
} }
} }
@ -2085,7 +2103,7 @@ void fn_1_7890(ModelData *model, ParticleData *particle, Mtx matrix)
var_r28++; var_r28++;
} }
else { else {
var_r31->unk08.y += -0.50000006f; var_r31->unk08.y += VERSION_NTSC ? -0.50000006f : -0.6f;
var_r31->unk34.x += var_r31->unk08.x; var_r31->unk34.x += var_r31->unk08.x;
var_r31->unk34.y += var_r31->unk08.y; var_r31->unk34.y += var_r31->unk08.y;
var_r31->unk34.z += var_r31->unk08.z; var_r31->unk34.z += var_r31->unk08.z;
@ -2210,7 +2228,7 @@ void fn_1_8988(omObjData *arg0)
case 1: case 1:
fn_1_8738(0, 1, sind((90.0f * lbl_1_data_250[0]))); fn_1_8738(0, 1, sind((90.0f * lbl_1_data_250[0])));
if (lbl_1_data_250[0] < 1.0f) { if (lbl_1_data_250[0] < 1.0f) {
lbl_1_data_250[0] += 0.016666668f; lbl_1_data_250[0] += 1.0f / REFRESH_RATE;
if (lbl_1_data_250[0] > 1.0f) { if (lbl_1_data_250[0] > 1.0f) {
lbl_1_data_250[0] = 1.0f; lbl_1_data_250[0] = 1.0f;
return; return;
@ -2222,7 +2240,7 @@ void fn_1_8988(omObjData *arg0)
case 2: case 2:
fn_1_8738(1, 2, 1.0 - cosd((90.0f * lbl_1_data_250[1]))); fn_1_8738(1, 2, 1.0 - cosd((90.0f * lbl_1_data_250[1])));
if (lbl_1_data_250[1] < 1.0f) { if (lbl_1_data_250[1] < 1.0f) {
lbl_1_data_250[1] += 0.016666668f; lbl_1_data_250[1] += 1.0f / REFRESH_RATE;
if (lbl_1_data_250[1] > 1.0f) { if (lbl_1_data_250[1] > 1.0f) {
lbl_1_data_250[1] = 1.0f; lbl_1_data_250[1] = 1.0f;
return; return;