Merge pull request #400 from mrshigure/m445

Matched REL/m445Dll
This commit is contained in:
Liam Coleman 2024-08-13 07:29:41 -05:00 committed by GitHub
commit b9ff02a2d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 2284 additions and 444 deletions

View file

@ -338,93 +338,93 @@ lbl_2_rodata_438 = .rodata:0x00000438; // type:object size:0x8 scope:local data:
lbl_2_rodata_440 = .rodata:0x00000440; // type:object size:0x8 scope:local data:double
lbl_2_rodata_448 = .rodata:0x00000448; // type:object size:0x4 scope:local data:float
lbl_2_rodata_44C = .rodata:0x0000044C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_450 = .rodata:0x00000450; // type:object size:0x4 data:float
lbl_2_rodata_454 = .rodata:0x00000454; // type:object size:0x4 data:float
lbl_2_rodata_458 = .rodata:0x00000458; // type:object size:0x4 data:float
lbl_2_rodata_45C = .rodata:0x0000045C; // type:object size:0x4 data:float
lbl_2_rodata_460 = .rodata:0x00000460; // type:object size:0x4 data:float
lbl_2_rodata_464 = .rodata:0x00000464; // type:object size:0x4 data:float
lbl_2_rodata_468 = .rodata:0x00000468; // type:object size:0x8 data:double
lbl_2_rodata_470 = .rodata:0x00000470; // type:object size:0x4 data:float
lbl_2_rodata_474 = .rodata:0x00000474; // type:object size:0x4 data:float
lbl_2_rodata_478 = .rodata:0x00000478; // type:object size:0x8 data:double
lbl_2_rodata_480 = .rodata:0x00000480; // type:object size:0x8 data:double
lbl_2_rodata_488 = .rodata:0x00000488; // type:object size:0x4 data:float
lbl_2_rodata_48C = .rodata:0x0000048C; // type:object size:0x4 data:float
lbl_2_rodata_490 = .rodata:0x00000490; // type:object size:0x4 data:float
lbl_2_rodata_494 = .rodata:0x00000494; // type:object size:0x4 data:float
lbl_2_rodata_498 = .rodata:0x00000498; // type:object size:0x4 data:float
lbl_2_rodata_49C = .rodata:0x0000049C; // type:object size:0x4 data:float
lbl_2_rodata_4A0 = .rodata:0x000004A0; // type:object size:0x4 data:float
lbl_2_rodata_4A4 = .rodata:0x000004A4; // type:object size:0x4 data:float
lbl_2_rodata_4A8 = .rodata:0x000004A8; // type:object size:0x4 data:float
lbl_2_rodata_4B0 = .rodata:0x000004B0; // type:object size:0x8 data:double
lbl_2_rodata_4B8 = .rodata:0x000004B8; // type:object size:0x8 data:double
lbl_2_rodata_4C0 = .rodata:0x000004C0; // type:object size:0x8 data:double
lbl_2_rodata_4C8 = .rodata:0x000004C8; // type:object size:0x8 data:double
lbl_2_rodata_4D0 = .rodata:0x000004D0; // type:object size:0x4 data:float
lbl_2_rodata_4D4 = .rodata:0x000004D4; // type:object size:0x4 data:float
lbl_2_rodata_4D8 = .rodata:0x000004D8; // type:object size:0x4 data:float
lbl_2_rodata_4DC = .rodata:0x000004DC; // type:object size:0x4 data:float
lbl_2_rodata_4E0 = .rodata:0x000004E0; // type:object size:0x4 data:float
lbl_2_rodata_4E4 = .rodata:0x000004E4; // type:object size:0x4 data:float
lbl_2_rodata_4E8 = .rodata:0x000004E8; // type:object size:0x4 data:float
lbl_2_rodata_4EC = .rodata:0x000004EC; // type:object size:0x4 data:float
lbl_2_rodata_4F0 = .rodata:0x000004F0; // type:object size:0x4 data:float
lbl_2_rodata_4F4 = .rodata:0x000004F4; // type:object size:0x4 data:float
lbl_2_rodata_4F8 = .rodata:0x000004F8; // type:object size:0x4 data:float
lbl_2_rodata_4FC = .rodata:0x000004FC; // type:object size:0x4 data:float
lbl_2_rodata_500 = .rodata:0x00000500; // type:object size:0x8 data:double
lbl_2_rodata_508 = .rodata:0x00000508; // type:object size:0x8 data:double
lbl_2_rodata_510 = .rodata:0x00000510; // type:object size:0x4 data:float
lbl_2_rodata_514 = .rodata:0x00000514; // type:object size:0x4 data:float
lbl_2_rodata_518 = .rodata:0x00000518; // type:object size:0x4 data:float
lbl_2_rodata_51C = .rodata:0x0000051C; // type:object size:0x4 data:float
lbl_2_rodata_520 = .rodata:0x00000520; // type:object size:0x4 data:float
lbl_2_rodata_524 = .rodata:0x00000524; // type:object size:0x4 data:float
lbl_2_rodata_528 = .rodata:0x00000528; // type:object size:0x4 data:float
lbl_2_rodata_52C = .rodata:0x0000052C; // type:object size:0x4 data:float
lbl_2_rodata_530 = .rodata:0x00000530; // type:object size:0x4 data:float
lbl_2_rodata_534 = .rodata:0x00000534; // type:object size:0x4 data:float
lbl_2_rodata_538 = .rodata:0x00000538; // type:object size:0x4 data:float
lbl_2_rodata_53C = .rodata:0x0000053C; // type:object size:0x4 data:float
lbl_2_rodata_540 = .rodata:0x00000540; // type:object size:0x4 data:float
lbl_2_rodata_544 = .rodata:0x00000544; // type:object size:0x4 data:float
lbl_2_rodata_548 = .rodata:0x00000548; // type:object size:0x4 data:float
lbl_2_rodata_54C = .rodata:0x0000054C; // type:object size:0x4 data:float
lbl_2_rodata_550 = .rodata:0x00000550; // type:object size:0x8 data:double
lbl_2_rodata_558 = .rodata:0x00000558; // type:object size:0x4 data:float
lbl_2_rodata_55C = .rodata:0x0000055C; // type:object size:0x4 data:float
lbl_2_rodata_560 = .rodata:0x00000560; // type:object size:0x8 data:double
lbl_2_rodata_568 = .rodata:0x00000568; // type:object size:0x4 data:float
lbl_2_rodata_56C = .rodata:0x0000056C; // type:object size:0x4 data:float
lbl_2_rodata_570 = .rodata:0x00000570; // type:object size:0x4 data:float
lbl_2_rodata_574 = .rodata:0x00000574; // type:object size:0x4 data:float
lbl_2_rodata_578 = .rodata:0x00000578; // type:object size:0x4 data:float
lbl_2_rodata_57C = .rodata:0x0000057C; // type:object size:0x4 data:float
lbl_2_rodata_580 = .rodata:0x00000580; // type:object size:0x4 data:float
lbl_2_rodata_584 = .rodata:0x00000584; // type:object size:0x4 data:float
lbl_2_rodata_588 = .rodata:0x00000588; // type:object size:0x4 data:float
lbl_2_rodata_590 = .rodata:0x00000590; // type:object size:0x8 data:double
lbl_2_rodata_598 = .rodata:0x00000598; // type:object size:0x4 data:float
lbl_2_rodata_59C = .rodata:0x0000059C; // type:object size:0x4 data:float
lbl_2_rodata_5A0 = .rodata:0x000005A0; // type:object size:0x4 data:float
lbl_2_rodata_5A4 = .rodata:0x000005A4; // type:object size:0x4 data:float
lbl_2_rodata_5A8 = .rodata:0x000005A8; // type:object size:0x4 data:float
lbl_2_rodata_5AC = .rodata:0x000005AC; // type:object size:0x4 data:float
lbl_2_rodata_5B0 = .rodata:0x000005B0; // type:object size:0x4 data:float
lbl_2_rodata_5B4 = .rodata:0x000005B4; // type:object size:0x4 data:float
lbl_2_rodata_5B8 = .rodata:0x000005B8; // type:object size:0x8 data:double
lbl_2_rodata_5C0 = .rodata:0x000005C0; // type:object size:0x4 data:float
lbl_2_rodata_5C4 = .rodata:0x000005C4; // type:object size:0x4 data:float
lbl_2_rodata_5C8 = .rodata:0x000005C8; // type:object size:0x4 data:float
lbl_2_rodata_5CC = .rodata:0x000005CC; // type:object size:0x4 data:float
lbl_2_rodata_5D0 = .rodata:0x000005D0; // type:object size:0x4 data:float
lbl_2_rodata_5D4 = .rodata:0x000005D4; // type:object size:0x4 data:float
lbl_2_rodata_5D8 = .rodata:0x000005D8; // type:object size:0x4 data:float
lbl_2_rodata_5DC = .rodata:0x000005DC; // type:object size:0x4 data:float
lbl_2_rodata_5E0 = .rodata:0x000005E0; // type:object size:0x4 data:float
lbl_2_rodata_5E4 = .rodata:0x000005E4; // type:object size:0x4 data:float
lbl_2_rodata_450 = .rodata:0x00000450; // type:object size:0x4 scope:local data:float
lbl_2_rodata_454 = .rodata:0x00000454; // type:object size:0x4 scope:local data:float
lbl_2_rodata_458 = .rodata:0x00000458; // type:object size:0x4 scope:local data:float
lbl_2_rodata_45C = .rodata:0x0000045C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_460 = .rodata:0x00000460; // type:object size:0x4 scope:local data:float
lbl_2_rodata_464 = .rodata:0x00000464; // type:object size:0x4 scope:local data:float
lbl_2_rodata_468 = .rodata:0x00000468; // type:object size:0x8 scope:local data:double
lbl_2_rodata_470 = .rodata:0x00000470; // type:object size:0x4 scope:local data:float
lbl_2_rodata_474 = .rodata:0x00000474; // type:object size:0x4 scope:local data:float
lbl_2_rodata_478 = .rodata:0x00000478; // type:object size:0x8 scope:local data:double
lbl_2_rodata_480 = .rodata:0x00000480; // type:object size:0x8 scope:local data:double
lbl_2_rodata_488 = .rodata:0x00000488; // type:object size:0x4 scope:local data:float
lbl_2_rodata_48C = .rodata:0x0000048C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_490 = .rodata:0x00000490; // type:object size:0x4 scope:local data:float
lbl_2_rodata_494 = .rodata:0x00000494; // type:object size:0x4 scope:local data:float
lbl_2_rodata_498 = .rodata:0x00000498; // type:object size:0x4 scope:local data:float
lbl_2_rodata_49C = .rodata:0x0000049C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4A0 = .rodata:0x000004A0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4A4 = .rodata:0x000004A4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4A8 = .rodata:0x000004A8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4B0 = .rodata:0x000004B0; // type:object size:0x8 scope:local data:double
lbl_2_rodata_4B8 = .rodata:0x000004B8; // type:object size:0x8 scope:local data:double
lbl_2_rodata_4C0 = .rodata:0x000004C0; // type:object size:0x8 scope:local data:double
lbl_2_rodata_4C8 = .rodata:0x000004C8; // type:object size:0x8 scope:local data:double
lbl_2_rodata_4D0 = .rodata:0x000004D0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4D4 = .rodata:0x000004D4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4D8 = .rodata:0x000004D8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4DC = .rodata:0x000004DC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4E0 = .rodata:0x000004E0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4E4 = .rodata:0x000004E4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4E8 = .rodata:0x000004E8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4EC = .rodata:0x000004EC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4F0 = .rodata:0x000004F0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4F4 = .rodata:0x000004F4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4F8 = .rodata:0x000004F8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4FC = .rodata:0x000004FC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_500 = .rodata:0x00000500; // type:object size:0x8 scope:local data:double
lbl_2_rodata_508 = .rodata:0x00000508; // type:object size:0x8 scope:local data:double
lbl_2_rodata_510 = .rodata:0x00000510; // type:object size:0x4 scope:local data:float
lbl_2_rodata_514 = .rodata:0x00000514; // type:object size:0x4 scope:local data:float
lbl_2_rodata_518 = .rodata:0x00000518; // type:object size:0x4 scope:local data:float
lbl_2_rodata_51C = .rodata:0x0000051C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_520 = .rodata:0x00000520; // type:object size:0x4 scope:local data:float
lbl_2_rodata_524 = .rodata:0x00000524; // type:object size:0x4 scope:local data:float
lbl_2_rodata_528 = .rodata:0x00000528; // type:object size:0x4 scope:local data:float
lbl_2_rodata_52C = .rodata:0x0000052C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_530 = .rodata:0x00000530; // type:object size:0x4 scope:local data:float
lbl_2_rodata_534 = .rodata:0x00000534; // type:object size:0x4 scope:local data:float
lbl_2_rodata_538 = .rodata:0x00000538; // type:object size:0x4 scope:local data:float
lbl_2_rodata_53C = .rodata:0x0000053C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_540 = .rodata:0x00000540; // type:object size:0x4 scope:local data:float
lbl_2_rodata_544 = .rodata:0x00000544; // type:object size:0x4 scope:local data:float
lbl_2_rodata_548 = .rodata:0x00000548; // type:object size:0x4 scope:local data:float
lbl_2_rodata_54C = .rodata:0x0000054C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_550 = .rodata:0x00000550; // type:object size:0x8 scope:local data:double
lbl_2_rodata_558 = .rodata:0x00000558; // type:object size:0x4 scope:local data:float
lbl_2_rodata_55C = .rodata:0x0000055C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_560 = .rodata:0x00000560; // type:object size:0x8 scope:local data:double
lbl_2_rodata_568 = .rodata:0x00000568; // type:object size:0x4 scope:local data:float
lbl_2_rodata_56C = .rodata:0x0000056C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_570 = .rodata:0x00000570; // type:object size:0x4 scope:local data:float
lbl_2_rodata_574 = .rodata:0x00000574; // type:object size:0x4 scope:local data:float
lbl_2_rodata_578 = .rodata:0x00000578; // type:object size:0x4 scope:local data:float
lbl_2_rodata_57C = .rodata:0x0000057C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_580 = .rodata:0x00000580; // type:object size:0x4 scope:local data:float
lbl_2_rodata_584 = .rodata:0x00000584; // type:object size:0x4 scope:local data:float
lbl_2_rodata_588 = .rodata:0x00000588; // type:object size:0x4 scope:local data:float
lbl_2_rodata_590 = .rodata:0x00000590; // type:object size:0x8 scope:local data:double
lbl_2_rodata_598 = .rodata:0x00000598; // type:object size:0x4 scope:local data:float
lbl_2_rodata_59C = .rodata:0x0000059C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5A0 = .rodata:0x000005A0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5A4 = .rodata:0x000005A4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5A8 = .rodata:0x000005A8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5AC = .rodata:0x000005AC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5B0 = .rodata:0x000005B0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5B4 = .rodata:0x000005B4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5B8 = .rodata:0x000005B8; // type:object size:0x8 scope:local data:double
lbl_2_rodata_5C0 = .rodata:0x000005C0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5C4 = .rodata:0x000005C4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5C8 = .rodata:0x000005C8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5CC = .rodata:0x000005CC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5D0 = .rodata:0x000005D0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5D4 = .rodata:0x000005D4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5D8 = .rodata:0x000005D8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5DC = .rodata:0x000005DC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5E0 = .rodata:0x000005E0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5E4 = .rodata:0x000005E4; // type:object size:0x4 scope:local data:float
lbl_2_data_0 = .data:0x00000000; // type:object size:0x4 data:float
lbl_2_data_4 = .data:0x00000004; // type:object size:0x10
lbl_2_data_14 = .data:0x00000014; // type:object size:0xC

View file

@ -37,132 +37,132 @@ fn_1_89B8 = .text:0x000089B8; // type:function size:0x60
fn_1_8A18 = .text:0x00008A18; // type:function size:0x33C
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float
lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 data:float
lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 data:float
lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float
lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float
lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float
lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x4 data:float
lbl_1_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 data:float
lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x4 data:float
lbl_1_rodata_44 = .rodata:0x00000044; // type:object size:0x4 data:float
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float
lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 data:float
lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 data:float
lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 data:float
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float
lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float
lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float
lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 data:float
lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 data:float
lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 data:float
lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 data:float
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float
lbl_1_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 data:float
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x4 data:float
lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 data:float
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 data:float
lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float
lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float
lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x8 data:double
lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float
lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float
lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 data:float
lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 data:float
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 data:float
lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 data:float
lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 data:double
lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 data:float
lbl_1_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 data:float
lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 data:float
lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x8 data:double
lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x8 data:double
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x8 data:double
lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 data:double
lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 data:float
lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 data:float
lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 data:float
lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 data:float
lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x8 data:double
lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x8 data:double
lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 data:float
lbl_1_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 data:float
lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 data:float
lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 data:float
lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 data:float
lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 data:float
lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 data:float
lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x8 data:double
lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x8 data:double
lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x8 data:double
lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 data:double
lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float
lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 data:float
lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 data:float
lbl_1_rodata_164 = .rodata:0x00000164; // type:object size:0x4 data:float
lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 data:float
lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 data:float
lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 data:float
lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 data:float
lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 data:float
lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 data:float
lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 data:float
lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 data:float
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x8 data:double
lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float
lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 data:float
lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 data:float
lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 data:float
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float
lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 data:float
lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float
lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x8 data:double
lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 data:float
lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 data:float
lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float
lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 data:float
lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float
lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x40
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
lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float
lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float
lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 scope:local data:float
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x4 scope:local data:float
lbl_1_rodata_44 = .rodata:0x00000044; // type:object size:0x4 scope:local data:float
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 scope:local data:float
lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 scope:local data:float
lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 scope:local data:float
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 scope:local data:float
lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 scope:local data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 scope:local data:float
lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 scope:local data:float
lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 scope:local data:float
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 scope:local data:float
lbl_1_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x4 scope:local data:float
lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 scope:local data:float
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 scope:local data:float
lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 scope:local data:float
lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x8 scope:local data:double
lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 scope:local data:float
lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 scope:local data:float
lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x8 scope:local data:double
lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x8 scope:local data:double
lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 scope:local data:float
lbl_1_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 scope:local data:float
lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 scope:local data:float
lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 scope:local data:float
lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 scope:local data:float
lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x8 scope:local data:double
lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x8 scope:local data:double
lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x8 scope:local data:double
lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 scope:local data:double
lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 scope:local data:float
lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 scope:local data:float
lbl_1_rodata_164 = .rodata:0x00000164; // type:object size:0x4 scope:local data:float
lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 scope:local data:float
lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 scope:local data:float
lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 scope:local data:float
lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 scope:local data:float
lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 scope:local data:float
lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 scope:local data:float
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x8 scope:local data:double
lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 scope:local data:float
lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 scope:local data:float
lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 scope:local data:float
lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x20
lbl_1_data_40 = .data:0x00000040; // type:object size:0x20
lbl_1_data_60 = .data:0x00000060; // type:object size:0x18
lbl_1_data_78 = .data:0x00000078; // type:object size:0x18
lbl_1_data_90 = .data:0x00000090; // type:object size:0x40
lbl_1_data_D0 = .data:0x000000D0; // type:object size:0x40
lbl_1_data_60 = .data:0x00000060; // type:object size:0x18 data:float
lbl_1_data_78 = .data:0x00000078; // type:object size:0x18 data:float
lbl_1_data_90 = .data:0x00000090; // type:object size:0x40 data:float
lbl_1_data_D0 = .data:0x000000D0; // type:object size:0x40 data:float
lbl_1_data_110 = .data:0x00000110; // type:object size:0x40
lbl_1_data_150 = .data:0x00000150; // type:object size:0x12 data:string
lbl_1_data_162 = .data:0x00000162; // type:object size:0x12 data:string
lbl_1_data_174 = .data:0x00000174; // type:object size:0x13 data:string
lbl_1_data_187 = .data:0x00000187; // type:object size:0x13 data:string
lbl_1_data_19A = .data:0x0000019A; // type:object size:0x14 data:string
lbl_1_data_1AE = .data:0x000001AE; // type:object size:0x14 data:string
lbl_1_data_1C2 = .data:0x000001C2; // type:object size:0x10 data:string
lbl_1_data_1D2 = .data:0x000001D2; // type:object size:0x10 data:string
lbl_1_data_1E2 = .data:0x000001E2; // type:object size:0x13 data:string
lbl_1_data_1F5 = .data:0x000001F5; // type:object size:0xF data:string
lbl_1_data_204 = .data:0x00000204; // type:object size:0xE data:string
lbl_1_data_212 = .data:0x00000212; // type:object size:0xE
lbl_1_data_150 = .data:0x00000150; // type:object size:0x12 scope:local data:string
lbl_1_data_162 = .data:0x00000162; // type:object size:0x12 scope:local data:string
lbl_1_data_174 = .data:0x00000174; // type:object size:0x13 scope:local data:string
lbl_1_data_187 = .data:0x00000187; // type:object size:0x13 scope:local data:string
lbl_1_data_19A = .data:0x0000019A; // type:object size:0x14 scope:local data:string
lbl_1_data_1AE = .data:0x000001AE; // type:object size:0x14 scope:local data:string
lbl_1_data_1C2 = .data:0x000001C2; // type:object size:0x10 scope:local data:string
lbl_1_data_1D2 = .data:0x000001D2; // type:object size:0x10 scope:local data:string
lbl_1_data_1E2 = .data:0x000001E2; // type:object size:0x13 scope:local data:string
lbl_1_data_1F5 = .data:0x000001F5; // type:object size:0xF scope:local data:string
lbl_1_data_204 = .data:0x00000204; // type:object size:0xE scope:local data:string
lbl_1_data_212 = .data:0x00000212; // type:object size:0xC scope:local data:string
lbl_1_data_220 = .data:0x00000220; // type:object size:0x40
lbl_1_data_260 = .data:0x00000260; // type:object size:0x20
lbl_1_data_280 = .data:0x00000280; // type:object size:0xF data:string
lbl_1_data_28F = .data:0x0000028F; // type:object size:0xB data:string
lbl_1_data_280 = .data:0x00000280; // type:object size:0xF scope:local data:string
lbl_1_data_28F = .data:0x0000028F; // type:object size:0xB scope:local data:string
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:float
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte
lbl_1_bss_8 = .bss:0x00000008; // 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:0xC data:float
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x28 data:4byte
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:4byte
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 data:4byte
lbl_1_bss_58 = .bss:0x00000058; // type:object size:0x230
lbl_1_bss_288 = .bss:0x00000288; // type:object size:0x300 data:2byte
lbl_1_bss_588 = .bss:0x00000588; // type:object size:0x13C data:4byte
lbl_1_bss_588 = .bss:0x00000588; // type:object size:0x138 data:4byte
lbl_1_bss_6C4 = .bss:0x000006C4; // type:object size:0x4 data:4byte
lbl_1_bss_6C8 = .bss:0x000006C8; // type:object size:0x4 data:4byte
lbl_1_bss_6CC = .bss:0x000006CC; // type:object size:0xC data:4byte

View file

@ -1182,7 +1182,7 @@ config.libs = [
"m445Dll", # Bowser Bop
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m445Dll/main.c"),
Object(Matching, "REL/m445Dll/main.c"),
},
),
Rel(

View file

@ -1696,46 +1696,12 @@ void fn_1_5910(void) {
s8 fn_1_5D58(s32 arg0, s32 arg1) {
UnkBss474Struct* temp_r31;
s8 var_r30;
s8 var_r29;
s8 var_r28;
temp_r31 = &lbl_1_bss_474[arg0];
if (!GWPlayerCfg[arg0].iscom) {
if (arg1 != 0) {
var_r29 = var_r30 = HuPadStkY[temp_r31->unk3C];
} else {
var_r29 = var_r30 = HuPadStkX[temp_r31->unk3C];
}
(void) 1; // Required to match.
(arg1 != 0) ? (var_r30 = HuPadStkY[temp_r31->unk3C]) : (var_r30 = HuPadStkX[temp_r31->unk3C]);
} else {
if (arg1 != 0) {
var_r28 = var_r30 = temp_r31->unk255;
} else {
var_r28 = var_r30 = temp_r31->unk254;
}
}
return var_r30;
}
static inline s8 fn_1_5D58_copy(s32 arg0, s32 arg1) {
UnkBss474Struct* temp_r31;
s8 var_r30;
s8 var_r29;
s8 var_r28;
temp_r31 = &lbl_1_bss_474[arg0];
if (!GWPlayerCfg[arg0].iscom) {
if (arg1 != 0) {
var_r30 = HuPadStkY[temp_r31->unk3C];
} else {
var_r30 = HuPadStkX[temp_r31->unk3C];
}
} else {
if (arg1 != 0) {
var_r30 = temp_r31->unk255;
} else {
var_r30 = temp_r31->unk254;
}
(arg1 != 0) ? (var_r30 = temp_r31->unk255) : (var_r30 = temp_r31->unk254);
}
return var_r30;
}
@ -1743,47 +1709,12 @@ static inline s8 fn_1_5D58_copy(s32 arg0, s32 arg1) {
u8 fn_1_5E10(s32 arg0, s32 arg1) {
UnkBss474Struct* temp_r31;
s8 var_r30;
s8 var_r29;
s8 var_r28;
temp_r31 = &lbl_1_bss_474[arg0];
if (!GWPlayerCfg[arg0].iscom) {
if (arg1 != 0) {
var_r29 = var_r30 = HuPadTrigR[temp_r31->unk3C];
} else {
var_r29 = var_r30 = HuPadTrigL[temp_r31->unk3C];
}
(void) 1; // Required to match.
(arg1 != 0) ? (var_r30 = HuPadTrigR[temp_r31->unk3C]) : (var_r30 = HuPadTrigL[temp_r31->unk3C]);
} else {
if (arg1 != 0) {
var_r28 = var_r30 = temp_r31->unk256;
} else {
var_r28 = var_r30 = temp_r31->unk257;
}
}
return var_r30;
}
static inline u8 fn_1_5E10_copy(s32 arg0, s32 arg1) {
UnkBss474Struct* temp_r31;
s8 var_r30;
s8 var_r29;
s8 var_r28;
temp_r31 = &lbl_1_bss_474[arg0];
if (!GWPlayerCfg[arg0].iscom) {
if (arg1 != 0) {
var_r30 = HuPadTrigR[temp_r31->unk3C];
} else {
var_r30 = HuPadTrigL[temp_r31->unk3C];
}
} else {
if (arg1 != 0) {
var_r30 = temp_r31->unk256;
} else {
var_r30 = temp_r31->unk257;
}
(arg1 != 0) ? (var_r30 = temp_r31->unk256) : (var_r30 = temp_r31->unk257);
}
return var_r30;
}
@ -1793,10 +1724,6 @@ u16 fn_1_5ED0(s32 arg0) {
u16 var_r30;
temp_r31 = &lbl_1_bss_474[arg0];
(void)temp_r31;
(void)temp_r31;
(void)temp_r31;
(void)temp_r31;
if (!GWPlayerCfg[arg0].iscom) {
var_r30 = HuPadBtnDown[temp_r31->unk3C];
} else {
@ -2214,7 +2141,7 @@ void fn_1_7680(void) {
static inline void m411InlineFunc(UnkBss474Struct* temp_r31, UnkBss474DoublyInnerStruct6C* temp_r30) {
Vec sp74;
Vec sp80;
Vec sp80;
float var_f22;
float var_f23;
@ -2340,10 +2267,10 @@ void fn_1_7738(void) {
}
if (sp70 == 0) {
var_r23 = -1;
if (fn_1_5E10_copy(temp_r31->unk34, 0) > 20) {
if (fn_1_5E10(temp_r31->unk34, 0) > 20) {
var_r23 = 1;
}
if (fn_1_5E10_copy(temp_r31->unk34, 1) > 20) {
if (fn_1_5E10(temp_r31->unk34, 1) > 20) {
var_r23 = 0;
}
if (var_r23 != -1) {
@ -2355,10 +2282,6 @@ void fn_1_7738(void) {
spA4.unk08 = var_r23;
spA4.unk0C = &sp70;
}
(void)var_r23;
(void)var_r23;
(void)var_r23;
(void)var_r23;
}
if ((fn_1_5ED0(temp_r31->unk34) & 0x100) && sp70 == 0) {
if (0.0f == temp_r30->unk14) {
@ -2378,10 +2301,10 @@ void fn_1_7738(void) {
fn_1_6428(temp_r31, temp_r26);
}
temp_r31->unk60 = -1.0f;
if (SOME_MACRO(fn_1_5D58_copy(temp_r31->unk34, 0)) != 0
|| SOME_MACRO(fn_1_5D58_copy(temp_r31->unk34, 1)) != 0)
if (SOME_MACRO(fn_1_5D58(temp_r31->unk34, 0)) != 0
|| SOME_MACRO(fn_1_5D58(temp_r31->unk34, 1)) != 0)
{
temp_r31->unk60 = atan2d(fn_1_5D58_copy(temp_r31->unk34, 0), fn_1_5D58_copy(temp_r31->unk34, 1));
temp_r31->unk60 = atan2d(fn_1_5D58(temp_r31->unk34, 0), fn_1_5D58(temp_r31->unk34, 1));
}
if (-1.0f != temp_r31->unk60) {
temp_r30->unk00 += 5 * sind(temp_r31->unk60);
@ -2398,9 +2321,6 @@ void fn_1_7738(void) {
while (TRUE) {
HuPrcVSleep();
}
(void) var_r24;
(void) var_r24;
(void) var_r24;
}
void fn_1_8A80(float arg0, float arg1) {

View file

@ -1106,28 +1106,14 @@ loop_1:
s8 fn_1_4BE4(s32 arg0, s32 arg1)
{
s8 var_r30;
s8 var_r29;
s8 var_r28;
unkStruct3 *temp_r31;
temp_r31 = &lbl_1_bss_4D4[arg0];
if (GWPlayerCfg[arg0].iscom == 0) {
if (arg1 != 0) {
var_r29 = var_r30 = HuPadStkY[temp_r31->unk2C];
}
else {
var_r29 = var_r30 = HuPadStkX[temp_r31->unk2C];
}
(void)var_r30; // used to make the else branch go here instead of returning
(arg1 != 0) ? (var_r30 = HuPadStkY[temp_r31->unk2C]) : (var_r30 = HuPadStkX[temp_r31->unk2C]);
}
else {
if (arg1 != 0) {
var_r28 = var_r30 = temp_r31->unk89;
}
else {
var_r28 = var_r30 = temp_r31->unk88;
}
(arg1 != 0) ? (var_r30 = temp_r31->unk89) : (var_r30 = temp_r31->unk88);
}
return var_r30;
}
@ -1142,22 +1128,13 @@ void fn_1_4C9C(Vec *arg0, f32 arg8, f32 arg9)
arg0->z = (temp_f29 * cosd(arg8));
}
static inline f32 unkInline(void)
{
return 1.0f; // huh?
}
s8 fn_1_4E58(s32 arg0, s32 arg1)
{
Vec spC;
f32 sp8;
f32 temp_f28;
f32 temp_f27;
s8 var_r30;
s8 temp_r29;
s8 temp_r28;
s8 var_r27;
s8 var_r26;
unkStruct3 *temp_r31;
temp_r31 = &lbl_1_bss_4D4[arg0];
@ -1167,40 +1144,19 @@ s8 fn_1_4E58(s32 arg0, s32 arg1)
temp_f28 = fn_1_1D08(atan2d(temp_r29, temp_r28));
temp_f28 -= lbl_1_bss_778;
HuSetVecF(&spC, (f32)temp_r29, 0.0, (f32)temp_r28);
temp_f27 = sqrtf((spC.x * spC.x) + (spC.z * spC.z));
temp_f27 *= unkInline();
spC.x = (temp_f27 * sind(temp_f28));
spC.z = (temp_f27 * cosd(temp_f28));
if (arg1 != 0) {
var_r27 = var_r30 = spC.z;
}
else {
var_r27 = var_r30 = spC.x;
}
(void)var_r30; // used to make the else branch go here instead of returning
}
else if (arg1 != 0) {
var_r26 = var_r30 = temp_r31->unk89;
fn_1_4C9C(&spC, temp_f28, 1.0f);
(arg1 != 0) ? (var_r30 = spC.z) : (var_r30 = spC.x);
}
else {
var_r26 = var_r30 = temp_r31->unk88;
(arg1 != 0) ? (var_r30 = temp_r31->unk89) : (var_r30 = temp_r31->unk88);
}
return var_r30;
}
static inline void DummyInline2(Vec *arg0, float arg1, float arg2)
{
arg1 *= unkInline();
arg0->x = (arg1 * sind(arg2));
arg0->z = (arg1 * cosd(arg2));
}
static inline s8 fn_1_4E58_0(s32 arg0)
{
Vec spC;
float temp;
f32 sp8;
f32 temp_f28;
f32 temp_f27;
s8 var_r30;
@ -1216,7 +1172,7 @@ static inline s8 fn_1_4E58_0(s32 arg0)
temp_f28 = fn_1_1D08(atan2d(temp_r29, temp_r28));
temp_f28 -= lbl_1_bss_778;
HuSetVecF(&spC, (f32)temp_r29, 0.0, (f32)temp_r28);
DummyInline2(&spC, sqrtf((spC.x * spC.x) + (spC.z * spC.z)), temp_f28);
fn_1_4C9C(&spC, temp_f28, 1.0f);
var_r30 = spC.x;
}
else {
@ -1229,7 +1185,6 @@ static inline s8 fn_1_4E58_1(s32 arg0)
{
Vec spC;
float temp;
f32 sp8;
f32 temp_f28;
f32 temp_f27;
s8 var_r30;
@ -1245,7 +1200,7 @@ static inline s8 fn_1_4E58_1(s32 arg0)
temp_f28 = fn_1_1D08(atan2d(temp_r29, temp_r28));
temp_f28 -= lbl_1_bss_778;
HuSetVecF(&spC, (f32)temp_r29, 0.0, (f32)temp_r28);
DummyInline2(&spC, sqrtf((spC.x * spC.x) + (spC.z * spC.z)), temp_f28);
fn_1_4C9C(&spC, temp_f28, 1.0f);
var_r30 = spC.z;
}
else {
@ -1257,26 +1212,14 @@ static inline s8 fn_1_4E58_1(s32 arg0)
u8 fn_1_525C(s32 arg0, s32 arg1)
{
s8 var_r30;
s8 var_r29;
s8 var_r28;
unkStruct3 *temp_r31;
temp_r31 = &lbl_1_bss_4D4[arg0];
if (GWPlayerCfg[arg0].iscom == 0) {
if (arg1 != 0) {
var_r29 = var_r30 = HuPadTrigR[temp_r31->unk2C];
}
else {
var_r29 = var_r30 = HuPadTrigL[temp_r31->unk2C];
}
(void)var_r30; // used to make the else branch go here instead of returning
}
else if (arg1 != 0) {
var_r28 = var_r30 = temp_r31->unk8A;
(arg1 != 0) ? (var_r30 = HuPadTrigR[temp_r31->unk2C]) : (var_r30 = HuPadTrigL[temp_r31->unk2C]);
}
else {
var_r28 = var_r30 = temp_r31->unk8B;
(arg1 != 0) ? (var_r30 = temp_r31->unk8A) : (var_r30 = temp_r31->unk8B);
}
return var_r30;
}

View file

@ -313,8 +313,6 @@ void fn_1_CD8(s32 arg0, s32 arg1, float arg8)
var_r31->unk_00 = arg0;
var_r31->unk_04 = arg1;
var_r31->unk_08 = arg8;
(void)var_r31;
(void)var_r31;
}
void fn_1_D54(ModelData *arg0, ParticleData *arg1, Mtx arg2, s32 arg3)
@ -1389,50 +1387,14 @@ s8 fn_1_5554(s32 arg0, s32 arg1) // similar to m411Dll/main.c::fn_1_5D58
{
UnkM414BssF0Struct *var_r31;
s8 var_r30;
s8 var_r29;
s8 var_r28;
var_r31 = &lbl_1_bss_F0[arg0];
var_r30 = 0;
if (lbl_1_bss_98C < 4) {
if (!GWPlayerCfg[arg0].iscom) {
if (arg1) {
var_r30 = HuPadStkY[var_r31->unk_4C];
var_r29 = var_r30;
} else {
var_r30 = HuPadStkX[var_r31->unk_4C];
var_r29 = var_r30;
}
(void)var_r31;
} else if (arg1) {
var_r30 = var_r31->unk_1FD;
var_r28 = var_r30;
(arg1) ? (var_r30 = HuPadStkY[var_r31->unk_4C]) : (var_r30 = HuPadStkX[var_r31->unk_4C]);
} else {
var_r30 = var_r31->unk_1FC;
var_r28 = var_r30;
}
}
return var_r30;
}
static inline s8 fn_1_5554_inline(s32 arg0, s32 arg1) // similar to m411Dll/main.c::fn_1_5D58
{
UnkM414BssF0Struct *var_r31;
s8 var_r30;
var_r31 = &lbl_1_bss_F0[arg0];
var_r30 = 0;
if (lbl_1_bss_98C < 4) {
if (!GWPlayerCfg[arg0].iscom) {
if (arg1) {
var_r30 = HuPadStkY[var_r31->unk_4C];
} else {
var_r30 = HuPadStkX[var_r31->unk_4C];
}
} else if (arg1) {
var_r30 = var_r31->unk_1FD;
} else {
var_r30 = var_r31->unk_1FC;
(arg1) ? (var_r30 = var_r31->unk_1FD) : (var_r30 = var_r31->unk_1FC);
}
}
return var_r30;
@ -1442,46 +1404,14 @@ u8 fn_1_5624(s32 arg0, s32 arg1)
{
UnkM414BssF0Struct *var_r31;
s8 var_r30;
s8 var_r29;
s8 var_r28;
var_r31 = &lbl_1_bss_F0[arg0];
var_r30 = 0;
if (lbl_1_bss_98C < 4) {
if (!GWPlayerCfg[arg0].iscom) {
if (arg1) {
var_r29 = var_r30 = HuPadTrigR[var_r31->unk_4C];
} else {
var_r29 = var_r30 = HuPadTrigL[var_r31->unk_4C];
}
(void)var_r31;
} else if (arg1) {
var_r28 = var_r30 = var_r31->unk_1FE;
(arg1) ? (var_r30 = HuPadTrigR[var_r31->unk_4C]) : (var_r30 = HuPadTrigL[var_r31->unk_4C]);
} else {
var_r28 = var_r30 = var_r31->unk_1FF;
}
}
return var_r30;
}
static inline u8 fn_1_5624_inline(s32 arg0, s32 arg1)
{
UnkM414BssF0Struct *var_r31;
s8 var_r30;
var_r31 = &lbl_1_bss_F0[arg0];
var_r30 = 0;
if (lbl_1_bss_98C < 4) {
if (!GWPlayerCfg[arg0].iscom) {
if (arg1) {
var_r30 = HuPadTrigR[var_r31->unk_4C];
} else {
var_r30 = HuPadTrigL[var_r31->unk_4C];
}
} else if (arg1) {
var_r30 = var_r31->unk_1FE;
} else {
var_r30 = var_r31->unk_1FF;
(arg1) ? (var_r30 = var_r31->unk_1FE) : (var_r30 = var_r31->unk_1FF);
}
}
return var_r30;
@ -1501,10 +1431,6 @@ u16 fn_1_56FC(s32 arg0)
var_r30 = var_r31->unk_200;
}
}
(void)var_r31;
(void)var_r31;
(void)var_r31;
(void)var_r31;
return var_r30;
}
@ -1738,8 +1664,6 @@ s32 fn_1_654C(s32 arg0, s32 arg1)
if (var_r31 >= 16) {
var_r31 = -1;
}
(void)var_r31;
(void)var_r31;
return var_r31;
}
@ -1911,7 +1835,7 @@ void fn_1_6644(void)
}
}
}
if (fn_1_5554_inline(var_r31->unk_44, 1) > 20 && (var_r31->unk_1F4 == 2 || var_r31->unk_1F4 == 0)) { // wrong
if (fn_1_5554(var_r31->unk_44, 1) > 20 && (var_r31->unk_1F4 == 2 || var_r31->unk_1F4 == 0)) {
Hu3DModelAttrReset(var_r31->unk_20, 0x40000002);
Hu3DModelAttrSet(var_r31->unk_20, 0x40000004);
var_r31->unk_1F4 = 3;
@ -1919,7 +1843,7 @@ void fn_1_6644(void)
Hu3DModelAttrSet(var_r31->unk_12, 0x40000004);
Hu3DMotionSpeedSet(var_r31->unk_12, 2.0f);
}
if (fn_1_5554_inline(var_r31->unk_44, 1) < -20 && (var_r31->unk_1F4 == 1 || var_r31->unk_1F4 == 0)) { // wrong
if (fn_1_5554(var_r31->unk_44, 1) < -20 && (var_r31->unk_1F4 == 1 || var_r31->unk_1F4 == 0)) {
Hu3DModelAttrReset(var_r31->unk_20, 0x40000006);
var_r31->unk_1F4 = 3;
Hu3DModelAttrReset(var_r31->unk_12, 0x40000006);
@ -1927,10 +1851,10 @@ void fn_1_6644(void)
}
if (!var_r31->unk_58) {
var_r28 = -1;
if (fn_1_5624_inline(var_r31->unk_44, 0) > 20 && var_r28 == -1) { // wrong
if (fn_1_5624(var_r31->unk_44, 0) > 20 && var_r28 == -1) {
var_r28 = 1;
}
if (fn_1_5624_inline(var_r31->unk_44, 1) > 20 && var_r28 == -1) { // wrong
if (fn_1_5624(var_r31->unk_44, 1) > 20 && var_r28 == -1) {
var_r28 = 0;
}
if (var_r28 != -1) {
@ -1955,8 +1879,6 @@ void fn_1_6644(void)
var_r30->user_data = &sp9C;
sp9C.unk_00 = var_r31;
sp9C.unk_04 = var_r28;
(void)var_r28;
(void)var_r28;
}
}
var_r31->unk_60 = 37.0 * sind(var_r31->unk_70);

2055
src/REL/m445Dll/main.c Executable file

File diff suppressed because it is too large Load diff