diff --git a/src/REL/m401Dll/asm/auto_00_00000000_text.s b/src/REL/m401Dll/asm/auto_00_00000000_text.s index 95e5c816..6ce7f254 100644 --- a/src/REL/m401Dll/asm/auto_00_00000000_text.s +++ b/src/REL/m401Dll/asm/auto_00_00000000_text.s @@ -1,322 +1,3 @@ -.fn fn_2_21F8, global -/* 000021F8 000022B8 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 000021FC 000022BC 7C 08 02 A6 */ mflr r0 -/* 00002200 000022C0 90 01 00 74 */ stw r0, 0x74(r1) -/* 00002204 000022C4 93 E1 00 6C */ stw r31, 0x6c(r1) -/* 00002208 000022C8 93 C1 00 68 */ stw r30, 0x68(r1) -/* 0000220C 000022CC 93 A1 00 64 */ stw r29, 0x64(r1) -/* 00002210 000022D0 93 81 00 60 */ stw r28, 0x60(r1) -/* 00002214 000022D4 7C 7F 1B 78 */ mr r31, r3 -/* 00002218 000022D8 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 0000221C 000022DC A8 63 00 00 */ lha r3, 0x0(r3) -/* 00002220 000022E0 3C 80 00 00 */ lis r4, lbl_2_data_124@ha -/* 00002224 000022E4 38 84 00 00 */ addi r4, r4, lbl_2_data_124@l -/* 00002228 000022E8 80 84 00 00 */ lwz r4, 0x0(r4) -/* 0000222C 000022EC 48 00 00 01 */ bl fn_80021444 -/* 00002230 000022F0 7C 7D 1B 78 */ mr r29, r3 -/* 00002234 000022F4 38 00 00 02 */ li r0, 0x2 -/* 00002238 000022F8 90 1D 00 04 */ stw r0, 0x4(r29) -/* 0000223C 000022FC 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 00002240 00002300 A8 63 00 00 */ lha r3, 0x0(r3) -/* 00002244 00002304 38 80 00 01 */ li r4, 0x1 -/* 00002248 00002308 48 00 00 01 */ bl fn_8002127C -/* 0000224C 0000230C 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 00002250 00002310 A8 63 00 02 */ lha r3, 0x2(r3) -/* 00002254 00002314 38 80 00 01 */ li r4, 0x1 -/* 00002258 00002318 48 00 00 01 */ bl fn_8002127C -/* 0000225C 0000231C 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 00002260 00002320 A8 63 00 00 */ lha r3, 0x0(r3) -/* 00002264 00002324 3C 80 40 00 */ lis r4, 0x4000 -/* 00002268 00002328 38 84 00 01 */ addi r4, r4, 0x1 -/* 0000226C 0000232C 48 00 00 01 */ bl fn_80021228 -/* 00002270 00002330 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 00002274 00002334 A8 63 00 02 */ lha r3, 0x2(r3) -/* 00002278 00002338 3C 80 40 00 */ lis r4, 0x4000 -/* 0000227C 0000233C 38 84 00 01 */ addi r4, r4, 0x1 -/* 00002280 00002340 48 00 00 01 */ bl fn_80021228 -/* 00002284 00002344 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 00002288 00002348 A8 63 00 06 */ lha r3, 0x6(r3) -/* 0000228C 0000234C 38 80 00 01 */ li r4, 0x1 -/* 00002290 00002350 48 00 00 01 */ bl fn_8002127C -/* 00002294 00002354 3C 60 00 00 */ lis r3, lbl_2_rodata_10@ha -/* 00002298 00002358 38 63 00 00 */ addi r3, r3, lbl_2_rodata_10@l -/* 0000229C 0000235C C0 03 00 00 */ lfs f0, 0x0(r3) -/* 000022A0 00002360 3C 60 00 00 */ lis r3, lbl_2_bss_44@ha -/* 000022A4 00002364 38 63 00 00 */ addi r3, r3, lbl_2_bss_44@l -/* 000022A8 00002368 D0 03 00 00 */ stfs f0, 0x0(r3) -/* 000022AC 0000236C 3C 60 00 00 */ lis r3, lbl_2_rodata_94@ha -/* 000022B0 00002370 38 63 00 00 */ addi r3, r3, lbl_2_rodata_94@l -/* 000022B4 00002374 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 000022B8 00002378 3C 60 00 00 */ lis r3, lbl_2_bss_44@ha -/* 000022BC 0000237C 38 63 00 00 */ addi r3, r3, lbl_2_bss_44@l -/* 000022C0 00002380 D0 03 00 04 */ stfs f0, 0x4(r3) -/* 000022C4 00002384 3C 60 00 00 */ lis r3, lbl_2_rodata_10@ha -/* 000022C8 00002388 38 63 00 00 */ addi r3, r3, lbl_2_rodata_10@l -/* 000022CC 0000238C C0 03 00 00 */ lfs f0, 0x0(r3) -/* 000022D0 00002390 3C 60 00 00 */ lis r3, lbl_2_bss_44@ha -/* 000022D4 00002394 38 63 00 00 */ addi r3, r3, lbl_2_bss_44@l -/* 000022D8 00002398 D0 03 00 08 */ stfs f0, 0x8(r3) -/* 000022DC 0000239C 3C 60 00 00 */ lis r3, lbl_2_rodata_10@ha -/* 000022E0 000023A0 38 63 00 00 */ addi r3, r3, lbl_2_rodata_10@l -/* 000022E4 000023A4 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 000022E8 000023A8 3C 60 00 00 */ lis r3, lbl_2_bss_38@ha -/* 000022EC 000023AC 38 63 00 00 */ addi r3, r3, lbl_2_bss_38@l -/* 000022F0 000023B0 D0 03 00 00 */ stfs f0, 0x0(r3) -/* 000022F4 000023B4 3C 60 00 00 */ lis r3, lbl_2_rodata_B0@ha -/* 000022F8 000023B8 38 63 00 00 */ addi r3, r3, lbl_2_rodata_B0@l -/* 000022FC 000023BC C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002300 000023C0 3C 60 00 00 */ lis r3, lbl_2_bss_38@ha -/* 00002304 000023C4 38 63 00 00 */ addi r3, r3, lbl_2_bss_38@l -/* 00002308 000023C8 D0 03 00 04 */ stfs f0, 0x4(r3) -/* 0000230C 000023CC 3C 60 00 00 */ lis r3, lbl_2_rodata_D4@ha -/* 00002310 000023D0 38 63 00 00 */ addi r3, r3, lbl_2_rodata_D4@l -/* 00002314 000023D4 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002318 000023D8 3C 60 00 00 */ lis r3, lbl_2_bss_38@ha -/* 0000231C 000023DC 38 63 00 00 */ addi r3, r3, lbl_2_bss_38@l -/* 00002320 000023E0 D0 03 00 08 */ stfs f0, 0x8(r3) -/* 00002324 000023E4 3C 60 00 00 */ lis r3, lbl_2_rodata_10@ha -/* 00002328 000023E8 38 63 00 00 */ addi r3, r3, lbl_2_rodata_10@l -/* 0000232C 000023EC C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002330 000023F0 3C 60 00 00 */ lis r3, lbl_2_bss_2C@ha -/* 00002334 000023F4 38 63 00 00 */ addi r3, r3, lbl_2_bss_2C@l -/* 00002338 000023F8 D0 03 00 00 */ stfs f0, 0x0(r3) -/* 0000233C 000023FC 3C 60 00 00 */ lis r3, lbl_2_rodata_1C@ha -/* 00002340 00002400 38 63 00 00 */ addi r3, r3, lbl_2_rodata_1C@l -/* 00002344 00002404 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002348 00002408 3C 60 00 00 */ lis r3, lbl_2_bss_2C@ha -/* 0000234C 0000240C 38 63 00 00 */ addi r3, r3, lbl_2_bss_2C@l -/* 00002350 00002410 D0 03 00 04 */ stfs f0, 0x4(r3) -/* 00002354 00002414 3C 60 00 00 */ lis r3, lbl_2_rodata_10@ha -/* 00002358 00002418 38 63 00 00 */ addi r3, r3, lbl_2_rodata_10@l -/* 0000235C 0000241C C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002360 00002420 3C 60 00 00 */ lis r3, lbl_2_bss_2C@ha -/* 00002364 00002424 38 63 00 00 */ addi r3, r3, lbl_2_bss_2C@l -/* 00002368 00002428 D0 03 00 08 */ stfs f0, 0x8(r3) -/* 0000236C 0000242C 38 60 00 01 */ li r3, 0x1 -/* 00002370 00002430 3C 80 00 00 */ lis r4, lbl_2_bss_44@ha -/* 00002374 00002434 38 84 00 00 */ addi r4, r4, lbl_2_bss_44@l -/* 00002378 00002438 3C A0 00 00 */ lis r5, lbl_2_bss_2C@ha -/* 0000237C 0000243C 38 A5 00 00 */ addi r5, r5, lbl_2_bss_2C@l -/* 00002380 00002440 3C C0 00 00 */ lis r6, lbl_2_bss_38@ha -/* 00002384 00002444 38 C6 00 00 */ addi r6, r6, lbl_2_bss_38@l -/* 00002388 00002448 48 00 00 01 */ bl fn_80022144 -/* 0000238C 0000244C 38 60 00 01 */ li r3, 0x1 -/* 00002390 00002450 3C 80 00 00 */ lis r4, lbl_2_bss_12C@ha -/* 00002394 00002454 38 84 00 00 */ addi r4, r4, lbl_2_bss_12C@l -/* 00002398 00002458 C0 24 00 00 */ lfs f1, 0x0(r4) -/* 0000239C 0000245C 3C 80 00 00 */ lis r4, lbl_2_bss_128@ha -/* 000023A0 00002460 38 84 00 00 */ addi r4, r4, lbl_2_bss_128@l -/* 000023A4 00002464 C0 44 00 00 */ lfs f2, 0x0(r4) -/* 000023A8 00002468 3C 80 00 00 */ lis r4, lbl_2_bss_124@ha -/* 000023AC 0000246C 38 84 00 00 */ addi r4, r4, lbl_2_bss_124@l -/* 000023B0 00002470 C0 64 00 00 */ lfs f3, 0x0(r4) -/* 000023B4 00002474 3C 80 00 00 */ lis r4, lbl_2_rodata_10C@ha -/* 000023B8 00002478 38 84 00 00 */ addi r4, r4, lbl_2_rodata_10C@l -/* 000023BC 0000247C C0 84 00 00 */ lfs f4, 0x0(r4) -/* 000023C0 00002480 48 00 00 01 */ bl Hu3DCameraPerspectiveSet -/* 000023C4 00002484 3C 60 00 00 */ lis r3, lbl_2_bss_54@ha -/* 000023C8 00002488 38 A3 00 00 */ addi r5, r3, lbl_2_bss_54@l -/* 000023CC 0000248C 3C 60 00 00 */ lis r3, lbl_2_bss_44@ha -/* 000023D0 00002490 38 83 00 00 */ addi r4, r3, lbl_2_bss_44@l -/* 000023D4 00002494 80 64 00 00 */ lwz r3, 0x0(r4) -/* 000023D8 00002498 80 04 00 04 */ lwz r0, 0x4(r4) -/* 000023DC 0000249C 90 65 00 00 */ stw r3, 0x0(r5) -/* 000023E0 000024A0 90 05 00 04 */ stw r0, 0x4(r5) -/* 000023E4 000024A4 80 04 00 08 */ lwz r0, 0x8(r4) -/* 000023E8 000024A8 90 05 00 08 */ stw r0, 0x8(r5) -/* 000023EC 000024AC 38 60 00 00 */ li r3, 0x0 -/* 000023F0 000024B0 48 00 AC 99 */ bl fn_2_D088 -/* 000023F4 000024B4 3C 60 00 00 */ lis r3, lbl_2_bss_44@ha -/* 000023F8 000024B8 38 83 00 00 */ addi r4, r3, lbl_2_bss_44@l -/* 000023FC 000024BC 80 64 00 00 */ lwz r3, 0x0(r4) -/* 00002400 000024C0 80 04 00 04 */ lwz r0, 0x4(r4) -/* 00002404 000024C4 90 61 00 20 */ stw r3, 0x20(r1) -/* 00002408 000024C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 0000240C 000024CC 80 04 00 08 */ lwz r0, 0x8(r4) -/* 00002410 000024D0 90 01 00 28 */ stw r0, 0x28(r1) -/* 00002414 000024D4 3C 60 00 00 */ lis r3, lbl_2_bss_38@ha -/* 00002418 000024D8 38 63 00 00 */ addi r3, r3, lbl_2_bss_38@l -/* 0000241C 000024DC 3C 80 00 00 */ lis r4, lbl_2_bss_44@ha -/* 00002420 000024E0 38 84 00 00 */ addi r4, r4, lbl_2_bss_44@l -/* 00002424 000024E4 38 A1 00 2C */ addi r5, r1, 0x2c -/* 00002428 000024E8 48 00 00 01 */ bl PSVECSubtract -/* 0000242C 000024EC 38 61 00 2C */ addi r3, r1, 0x2c -/* 00002430 000024F0 38 81 00 2C */ addi r4, r1, 0x2c -/* 00002434 000024F4 48 00 00 01 */ bl fn_800BBFB0 -/* 00002438 000024F8 38 61 00 20 */ addi r3, r1, 0x20 -/* 0000243C 000024FC 38 81 00 2C */ addi r4, r1, 0x2c -/* 00002440 00002500 3C A0 00 00 */ lis r5, lbl_2_bss_88@ha -/* 00002444 00002504 38 A5 00 00 */ addi r5, r5, lbl_2_bss_88@l -/* 00002448 00002508 C0 25 00 00 */ lfs f1, 0x0(r5) -/* 0000244C 0000250C 3C A0 00 00 */ lis r5, lbl_2_bss_84@ha -/* 00002450 00002510 38 A5 00 00 */ addi r5, r5, lbl_2_bss_84@l -/* 00002454 00002514 C0 45 00 00 */ lfs f2, 0x0(r5) -/* 00002458 00002518 38 A0 01 2C */ li r5, 0x12c -/* 0000245C 0000251C 38 C0 01 2C */ li r6, 0x12c -/* 00002460 00002520 38 E0 01 2C */ li r7, 0x12c -/* 00002464 00002524 48 00 00 01 */ bl fn_80032D3C -/* 00002468 00002528 3C 60 00 00 */ lis r3, lbl_2_rodata_C0@ha -/* 0000246C 0000252C 38 63 00 00 */ addi r3, r3, lbl_2_rodata_C0@l -/* 00002470 00002530 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002474 00002534 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 00002478 00002538 3C 60 00 00 */ lis r3, lbl_2_rodata_110@ha -/* 0000247C 0000253C 38 63 00 00 */ addi r3, r3, lbl_2_rodata_110@l -/* 00002480 00002540 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002484 00002544 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 00002488 00002548 3C 60 00 00 */ lis r3, lbl_2_rodata_114@ha -/* 0000248C 0000254C 38 63 00 00 */ addi r3, r3, lbl_2_rodata_114@l -/* 00002490 00002550 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002494 00002554 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 00002498 00002558 38 61 00 14 */ addi r3, r1, 0x14 -/* 0000249C 0000255C 38 80 00 03 */ li r4, 0x3 -/* 000024A0 00002560 48 00 E5 E9 */ bl fn_2_10A88 -/* 000024A4 00002564 3C 80 00 00 */ lis r4, lbl_2_bss_D8@ha -/* 000024A8 00002568 38 84 00 00 */ addi r4, r4, lbl_2_bss_D8@l -/* 000024AC 0000256C 90 64 00 00 */ stw r3, 0x0(r4) -/* 000024B0 00002570 38 60 05 0B */ li r3, 0x50b -/* 000024B4 00002574 38 81 00 14 */ addi r4, r1, 0x14 -/* 000024B8 00002578 48 00 00 01 */ bl fn_80032EAC -/* 000024BC 0000257C 3C 80 00 00 */ lis r4, lbl_2_bss_90@ha -/* 000024C0 00002580 38 84 00 00 */ addi r4, r4, lbl_2_bss_90@l -/* 000024C4 00002584 90 64 00 00 */ stw r3, 0x0(r4) -/* 000024C8 00002588 3C 60 00 00 */ lis r3, lbl_2_rodata_118@ha -/* 000024CC 0000258C 38 63 00 00 */ addi r3, r3, lbl_2_rodata_118@l -/* 000024D0 00002590 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 000024D4 00002594 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 000024D8 00002598 3C 60 00 00 */ lis r3, lbl_2_rodata_11C@ha -/* 000024DC 0000259C 38 63 00 00 */ addi r3, r3, lbl_2_rodata_11C@l -/* 000024E0 000025A0 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 000024E4 000025A4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 000024E8 000025A8 3C 60 00 00 */ lis r3, lbl_2_rodata_120@ha -/* 000024EC 000025AC 38 63 00 00 */ addi r3, r3, lbl_2_rodata_120@l -/* 000024F0 000025B0 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 000024F4 000025B4 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 000024F8 000025B8 38 61 00 14 */ addi r3, r1, 0x14 -/* 000024FC 000025BC 38 80 00 03 */ li r4, 0x3 -/* 00002500 000025C0 48 00 E5 89 */ bl fn_2_10A88 -/* 00002504 000025C4 3C 80 00 00 */ lis r4, lbl_2_bss_D4@ha -/* 00002508 000025C8 38 84 00 00 */ addi r4, r4, lbl_2_bss_D4@l -/* 0000250C 000025CC 90 64 00 00 */ stw r3, 0x0(r4) -/* 00002510 000025D0 38 60 05 0B */ li r3, 0x50b -/* 00002514 000025D4 38 81 00 14 */ addi r4, r1, 0x14 -/* 00002518 000025D8 48 00 00 01 */ bl fn_80032EAC -/* 0000251C 000025DC 3C 80 00 00 */ lis r4, lbl_2_bss_90@ha -/* 00002520 000025E0 38 84 00 00 */ addi r4, r4, lbl_2_bss_90@l -/* 00002524 000025E4 90 64 00 04 */ stw r3, 0x4(r4) -/* 00002528 000025E8 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 0000252C 000025EC A8 63 00 04 */ lha r3, 0x4(r3) -/* 00002530 000025F0 38 80 00 01 */ li r4, 0x1 -/* 00002534 000025F4 48 00 00 01 */ bl fn_8002127C -/* 00002538 000025F8 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 0000253C 000025FC A8 63 00 04 */ lha r3, 0x4(r3) -/* 00002540 00002600 3C 80 C0 00 */ lis r4, 0xc000 -/* 00002544 00002604 38 84 00 01 */ addi r4, r4, 0x1 -/* 00002548 00002608 48 00 00 01 */ bl fn_80021228 -/* 0000254C 0000260C 3B 80 00 04 */ li r28, 0x4 -/* 00002550 00002610 3B C0 00 00 */ li r30, 0x0 -/* 00002554 00002614 48 00 01 64 */ b .L_000026B8 -.L_00002558: -/* 00002558 00002618 48 00 00 01 */ bl fn_800325F4 -/* 0000255C 0000261C 54 60 06 3E */ clrlwi r0, r3, 24 -/* 00002560 00002620 3C 60 00 00 */ lis r3, lbl_2_rodata_F0@ha -/* 00002564 00002624 38 63 00 00 */ addi r3, r3, lbl_2_rodata_F0@l -/* 00002568 00002628 C8 23 00 00 */ lfd f1, 0x0(r3) -/* 0000256C 0000262C 90 01 00 3C */ stw r0, 0x3c(r1) -/* 00002570 00002630 3C 00 43 30 */ lis r0, 0x4330 -/* 00002574 00002634 90 01 00 38 */ stw r0, 0x38(r1) -/* 00002578 00002638 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 0000257C 0000263C EC 20 08 28 */ fsubs f1, f0, f1 -/* 00002580 00002640 3C 60 00 00 */ lis r3, lbl_2_rodata_124@ha -/* 00002584 00002644 38 63 00 00 */ addi r3, r3, lbl_2_rodata_124@l -/* 00002588 00002648 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 0000258C 0000264C EC 20 00 72 */ fmuls f1, f0, f1 -/* 00002590 00002650 3C 60 00 00 */ lis r3, lbl_2_rodata_BC@ha -/* 00002594 00002654 38 63 00 00 */ addi r3, r3, lbl_2_rodata_BC@l -/* 00002598 00002658 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 0000259C 0000265C EC 20 00 72 */ fmuls f1, f0, f1 -/* 000025A0 00002660 3C 60 00 00 */ lis r3, lbl_2_rodata_11C@ha -/* 000025A4 00002664 38 63 00 00 */ addi r3, r3, lbl_2_rodata_11C@l -/* 000025A8 00002668 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 000025AC 0000266C EC 00 08 2A */ fadds f0, f0, f1 -/* 000025B0 00002670 D0 01 00 08 */ stfs f0, 0x8(r1) -/* 000025B4 00002674 48 00 00 01 */ bl fn_800325F4 -/* 000025B8 00002678 54 60 06 3E */ clrlwi r0, r3, 24 -/* 000025BC 0000267C 3C 60 00 00 */ lis r3, lbl_2_rodata_F0@ha -/* 000025C0 00002680 38 63 00 00 */ addi r3, r3, lbl_2_rodata_F0@l -/* 000025C4 00002684 C8 23 00 00 */ lfd f1, 0x0(r3) -/* 000025C8 00002688 90 01 00 44 */ stw r0, 0x44(r1) -/* 000025CC 0000268C 3C 00 43 30 */ lis r0, 0x4330 -/* 000025D0 00002690 90 01 00 40 */ stw r0, 0x40(r1) -/* 000025D4 00002694 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 000025D8 00002698 EC 20 08 28 */ fsubs f1, f0, f1 -/* 000025DC 0000269C 3C 60 00 00 */ lis r3, lbl_2_rodata_40@ha -/* 000025E0 000026A0 38 63 00 00 */ addi r3, r3, lbl_2_rodata_40@l -/* 000025E4 000026A4 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 000025E8 000026A8 EC 20 00 72 */ fmuls f1, f0, f1 -/* 000025EC 000026AC 3C 60 00 00 */ lis r3, lbl_2_rodata_BC@ha -/* 000025F0 000026B0 38 63 00 00 */ addi r3, r3, lbl_2_rodata_BC@l -/* 000025F4 000026B4 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 000025F8 000026B8 EC 20 00 72 */ fmuls f1, f0, f1 -/* 000025FC 000026BC 3C 60 00 00 */ lis r3, lbl_2_rodata_128@ha -/* 00002600 000026C0 38 63 00 00 */ addi r3, r3, lbl_2_rodata_128@l -/* 00002604 000026C4 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002608 000026C8 EC 00 08 2A */ fadds f0, f0, f1 -/* 0000260C 000026CC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 00002610 000026D0 48 00 00 01 */ bl fn_800325F4 -/* 00002614 000026D4 54 60 06 3E */ clrlwi r0, r3, 24 -/* 00002618 000026D8 3C 60 00 00 */ lis r3, lbl_2_rodata_F0@ha -/* 0000261C 000026DC 38 63 00 00 */ addi r3, r3, lbl_2_rodata_F0@l -/* 00002620 000026E0 C8 23 00 00 */ lfd f1, 0x0(r3) -/* 00002624 000026E4 90 01 00 4C */ stw r0, 0x4c(r1) -/* 00002628 000026E8 3C 00 43 30 */ lis r0, 0x4330 -/* 0000262C 000026EC 90 01 00 48 */ stw r0, 0x48(r1) -/* 00002630 000026F0 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 00002634 000026F4 EC 20 08 28 */ fsubs f1, f0, f1 -/* 00002638 000026F8 3C 60 00 00 */ lis r3, lbl_2_rodata_134@ha -/* 0000263C 000026FC 38 63 00 00 */ addi r3, r3, lbl_2_rodata_134@l -/* 00002640 00002700 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002644 00002704 EC 20 00 72 */ fmuls f1, f0, f1 -/* 00002648 00002708 3C 60 00 00 */ lis r3, lbl_2_rodata_BC@ha -/* 0000264C 0000270C 38 63 00 00 */ addi r3, r3, lbl_2_rodata_BC@l -/* 00002650 00002710 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 00002654 00002714 EC 60 00 72 */ fmuls f3, f0, f1 -/* 00002658 00002718 3C 60 00 00 */ lis r3, lbl_2_rodata_12C@ha -/* 0000265C 0000271C 38 63 00 00 */ addi r3, r3, lbl_2_rodata_12C@l -/* 00002660 00002720 C0 43 00 00 */ lfs f2, 0x0(r3) -/* 00002664 00002724 1C 1E 01 04 */ mulli r0, r30, 0x104 -/* 00002668 00002728 3C 60 00 00 */ lis r3, lbl_2_rodata_58@ha -/* 0000266C 0000272C 38 63 00 00 */ addi r3, r3, lbl_2_rodata_58@l -/* 00002670 00002730 C8 23 00 00 */ lfd f1, 0x0(r3) -/* 00002674 00002734 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 00002678 00002738 90 01 00 54 */ stw r0, 0x54(r1) -/* 0000267C 0000273C 3C 00 43 30 */ lis r0, 0x4330 -/* 00002680 00002740 90 01 00 50 */ stw r0, 0x50(r1) -/* 00002684 00002744 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 00002688 00002748 EC 00 08 28 */ fsubs f0, f0, f1 -/* 0000268C 0000274C EC 22 00 28 */ fsubs f1, f2, f0 -/* 00002690 00002750 3C 60 00 00 */ lis r3, lbl_2_rodata_130@ha -/* 00002694 00002754 38 63 00 00 */ addi r3, r3, lbl_2_rodata_130@l -/* 00002698 00002758 C0 03 00 00 */ lfs f0, 0x0(r3) -/* 0000269C 0000275C EC 01 00 28 */ fsubs f0, f1, f0 -/* 000026A0 00002760 EC 00 18 2A */ fadds f0, f0, f3 -/* 000026A4 00002764 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 000026A8 00002768 38 61 00 08 */ addi r3, r1, 0x8 -/* 000026AC 0000276C 38 80 00 00 */ li r4, 0x0 -/* 000026B0 00002770 48 00 E3 D9 */ bl fn_2_10A88 -/* 000026B4 00002774 3B DE 00 01 */ addi r30, r30, 0x1 -.L_000026B8: -/* 000026B8 00002778 7C 1E E0 00 */ cmpw r30, r28 -/* 000026BC 0000277C 41 80 FE 9C */ blt .L_00002558 -/* 000026C0 00002780 83 E1 00 6C */ lwz r31, 0x6c(r1) -/* 000026C4 00002784 83 C1 00 68 */ lwz r30, 0x68(r1) -/* 000026C8 00002788 83 A1 00 64 */ lwz r29, 0x64(r1) -/* 000026CC 0000278C 83 81 00 60 */ lwz r28, 0x60(r1) -/* 000026D0 00002790 80 01 00 74 */ lwz r0, 0x74(r1) -/* 000026D4 00002794 7C 08 03 A6 */ mtlr r0 -/* 000026D8 00002798 38 21 00 70 */ addi r1, r1, 0x70 -/* 000026DC 0000279C 4E 80 00 20 */ blr -.endfn fn_2_21F8 - .fn fn_2_26E0, global /* 000026E0 000027A0 94 21 FF B0 */ stwu r1, -0x50(r1) /* 000026E4 000027A4 7C 08 02 A6 */ mflr r0 diff --git a/src/REL/m401Dll/m401Dll.c b/src/REL/m401Dll/m401Dll.c index 1a22e873..a8f9c97a 100644 --- a/src/REL/m401Dll/m401Dll.c +++ b/src/REL/m401Dll/m401Dll.c @@ -20,7 +20,7 @@ void fn_2_A0(void) { temp_r29 = &lbl_8018BFC0; Hu3DCameraViewportSet(1, 0.0f, 0.0f, 640.0, 480.0, 0.0f, 1.0f); lbl_2_bss_114 = fn_8002F454(lbl_2_bss_1C, 0x3E8, 3, 0, -1, &fn_2_BD90); - lbl_2_bss_114->unk_4C = 0; + *lbl_2_bss_114->model = 0; lbl_2_bss_110 = fn_8002F454(lbl_2_bss_1C, 0xA, 0, 0, -1, &fn_2_70C); fn_8002F9C4(lbl_2_bss_1C, 0, 4); lbl_2_bss_118[0] = fn_8002FAC0(lbl_2_bss_1C, 0); @@ -83,7 +83,7 @@ void fn_2_70C(unkStructBSS114* arg0) { case 2: if (lbl_2_bss_114 == NULL) { lbl_2_bss_114 = fn_8002F454(HuPrcCurrentGet(), 0x3E8, 0, 0, -1, &fn_2_C130); - lbl_2_bss_114->unk_4C = 0; + *lbl_2_bss_114->model = 0; var_r29 = 0; lbl_2_bss_BA = 0; for (i = 0; i < 4; i++) { @@ -340,194 +340,194 @@ void fn_2_1858(s16 arg0, s16 arg1) { } } -void fn_2_1A38(unkStructBSS114* arg0) { - Vec3f sp20; - Vec3f sp14; - Vec3f sp8; - unkStructBSS114 *temp; - unkStructBSS114 *temp2; +// void fn_2_1A38(unkStructBSS114* arg0) { +// Vec3f sp20; +// Vec3f sp14; +// Vec3f sp8; +// unkStructBSS114 *temp; +// unkStructBSS114 *temp2; - temp = fn_80021444(arg0->unk_40->unk_00[0], lbl_2_data_124); - temp->unk_04 = 2; +// temp = fn_80021444(arg0->unk_40->unk_00[0], lbl_2_data_124); +// temp->unk_04 = 2; - sp20.x = -2500.0f; - sp20.y = 150.0f; - sp20.z = -6800.0f; - sp14.x = 50.0f; - sp14.y = 50.0f; - sp14.z = 50.0f; - sp8.x = 1500.0f; - sp8.y = 150.0f; - sp8.z = -4800.0f; - temp2 = fn_2_FC40(0x12, &sp20, &sp14, &sp8); - fn_2_E6BC(temp2->unk_4C, 5.0f, 1.5f, 0.2f, 0.8f, 3.0f); -} +// sp20.x = -2500.0f; +// sp20.y = 150.0f; +// sp20.z = -6800.0f; +// sp14.x = 50.0f; +// sp14.y = 50.0f; +// sp14.z = 50.0f; +// sp8.x = 1500.0f; +// sp8.y = 150.0f; +// sp8.z = -4800.0f; +// temp2 = fn_2_FC40(0x12, &sp20, &sp14, &sp8); +// fn_2_E6BC(temp2->unk_4C, 5.0f, 1.5f, 0.2f, 0.8f, 3.0f); +// } -void fn_2_1B80(unkStructBSS114* arg0) { - Vec3f sp14; - Vec3f sp8; - unkStructBSS114* temp; - unkStructBSS114* temp2; +// void fn_2_1B80(unkStructBSS114* arg0) { +// Vec3f sp14; +// Vec3f sp8; +// unkStructBSS114* temp; +// unkStructBSS114* temp2; - temp = fn_80021444(arg0->unk_40->unk_00[0], lbl_2_data_124[1]); - temp->unk_04 = 2; - sp14.x = -1000.0f; - sp14.y = 0.0f; - sp14.z = -9100.0f; - sp8.x = 150.0f; - sp8.y = 100.0f; - sp8.z = 100.0f; - temp2 = fn_2_FC40(0xE, &sp14, &sp8, &sp14); - fn_8002FB20(temp2, 3.0f, 0.0f, 0.0f); - fn_8002FB30(temp2, 0.0f, 0.0f, 50.0f); - fn_2_E6BC(temp2->unk_4C, 4.5f, 2.5f, 0.08f, 0.9f, 1.0f); -} +// temp = fn_80021444(arg0->unk_40->unk_00[0], lbl_2_data_124[1]); +// temp->unk_04 = 2; +// sp14.x = -1000.0f; +// sp14.y = 0.0f; +// sp14.z = -9100.0f; +// sp8.x = 150.0f; +// sp8.y = 100.0f; +// sp8.z = 100.0f; +// temp2 = fn_2_FC40(0xE, &sp14, &sp8, &sp14); +// fn_8002FB20(temp2, 3.0f, 0.0f, 0.0f); +// fn_8002FB30(temp2, 0.0f, 0.0f, 50.0f); +// fn_2_E6BC(temp2->unk_4C, 4.5f, 2.5f, 0.08f, 0.9f, 1.0f); +// } -void fn_2_1CF0(unkStructBSS114* arg0) { - Vec3f sp20; - Vec3f sp14; - Vec3f sp8; - unkStructBSS114 *temp; +// void fn_2_1CF0(unkStructBSS114* arg0) { +// Vec3f sp20; +// Vec3f sp14; +// Vec3f sp8; +// unkStructBSS114 *temp; - temp = fn_80021444(arg0->unk_40->unk_00[0], lbl_2_data_124[2]); - temp->unk_04 = 2; - sp20.x = 500.0f; - sp20.y = 0.0f; - sp20.z = -24300.0f; - sp14.x = 200.0f; - sp14.y = 100.0f; - sp14.z = 100.0f; - sp8.x = 1000.0f; - sp8.y = 0.0f; - sp8.z = -16300.0f; - fn_2_FC40(0x28, &sp20, &sp14, &sp8); -} +// temp = fn_80021444(arg0->unk_40->unk_00[0], lbl_2_data_124[2]); +// temp->unk_04 = 2; +// sp20.x = 500.0f; +// sp20.y = 0.0f; +// sp20.z = -24300.0f; +// sp14.x = 200.0f; +// sp14.y = 100.0f; +// sp14.z = 100.0f; +// sp8.x = 1000.0f; +// sp8.y = 0.0f; +// sp8.z = -16300.0f; +// fn_2_FC40(0x28, &sp20, &sp14, &sp8); +// } -void fn_2_1DE8(unkStructBSS114* arg0) { - Vec3f sp2C; - Vec3f sp20; - Vec3f sp14; - Vec3f sp8; - unkStructBSS114 *temp2; - unkStructBSS114 *temp; +// void fn_2_1DE8(unkStructBSS114* arg0) { +// Vec3f sp2C; +// Vec3f sp20; +// Vec3f sp14; +// Vec3f sp8; +// unkStructBSS114 *temp2; +// unkStructBSS114 *temp; - temp = fn_80021444(arg0->unk_40->unk_00[0], lbl_2_data_124[3]); - temp->unk_04 = 2; - sp2C.x = 0.0f; - sp2C.y = -150.0f + 0.003921569f * (300.0f * fn_800325F4()); - sp2C.z = -23000.0f; - fn_2_91AC(lbl_2_bss_100.unk_00, &sp2C); - sp2C.x = 0.0f; - sp2C.y = -150.0f + 0.003921569f * (300.0f * fn_800325F4()); - sp2C.z = -25000.0f; - fn_2_91AC(lbl_2_bss_100.unk_04, &sp2C); - sp2C.x = 5500.0f; - sp2C.y = 0.0f; - sp2C.z = -29800.0f; - sp20.x = 100.0f; - sp20.y = 100.0f; - sp20.z = 100.0f; - sp14.x = -1500.0f; - sp14.y = 0.0f; - sp14.z = -24900.0f; - temp2 = fn_2_FC40(0x14, &sp2C, &sp20, &sp14); - fn_2_E6BC(temp2->unk_4C, 6.0f, 1.5f, 0.2f, 0.8f, 3.5f); - sp8.x = -650.0f; - sp8.y = -360.0f; - sp8.z = -26300.0f; - lbl_2_bss_D0 = fn_2_10A88(&sp8, 3); - lbl_2_bss_90[0] = fn_80032EAC(0x50B, &sp8); -} +// temp = fn_80021444(arg0->unk_40->unk_00[0], lbl_2_data_124[3]); +// temp->unk_04 = 2; +// sp2C.x = 0.0f; +// sp2C.y = -150.0f + 0.003921569f * (300.0f * fn_800325F4()); +// sp2C.z = -23000.0f; +// fn_2_91AC(lbl_2_bss_100.unk_00, &sp2C); +// sp2C.x = 0.0f; +// sp2C.y = -150.0f + 0.003921569f * (300.0f * fn_800325F4()); +// sp2C.z = -25000.0f; +// fn_2_91AC(lbl_2_bss_100.unk_04, &sp2C); +// sp2C.x = 5500.0f; +// sp2C.y = 0.0f; +// sp2C.z = -29800.0f; +// sp20.x = 100.0f; +// sp20.y = 100.0f; +// sp20.z = 100.0f; +// sp14.x = -1500.0f; +// sp14.y = 0.0f; +// sp14.z = -24900.0f; +// temp2 = fn_2_FC40(0x14, &sp2C, &sp20, &sp14); +// fn_2_E6BC(temp2->unk_4C, 6.0f, 1.5f, 0.2f, 0.8f, 3.5f); +// sp8.x = -650.0f; +// sp8.y = -360.0f; +// sp8.z = -26300.0f; +// lbl_2_bss_D0 = fn_2_10A88(&sp8, 3); +// lbl_2_bss_90[0] = fn_80032EAC(0x50B, &sp8); +// } -void fn_2_20B0(unkStructBSS114* arg0) { - Vec3f sp8; - unkStructBSS114* temp; +// void fn_2_20B0(omObjData* arg0) { +// Vec3f sp8; +// omObjData* temp; - temp = fn_80021444(arg0->unk_40->unk_00[0], lbl_2_data_124[4]); - temp->unk_04 = 2; - fn_8002127C(arg0->unk_40->unk_08[1][0], 1); - sp8.x = 0.0f; - sp8.y = -370.0f; - sp8.z = -43000.0f; - lbl_2_bss_8 = fn_2_10A88(&sp8, 3); - lbl_2_bss_90[1] = fn_80032EAC(0x50B, &sp8); - sp8.x = 380.0f; - sp8.y = -440.0f; - sp8.z = -32000.0f; - lbl_2_bss_CC = fn_2_10A88(&sp8, 3); - lbl_2_bss_90[2] = fn_80032EAC(0x50B, &sp8); - fn_8002127C(arg0->unk_40->unk_00[2], 1); - fn_80021228(arg0->unk_40->unk_00[2], -0x3FFFFFFF); -} +// temp = fn_80021444(arg0->model[0], lbl_2_data_124[4]); +// temp->unk_04 = 2; +// fn_8002127C(arg0->unk_40->unk_08[1][0], 1); +// sp8.x = 0.0f; +// sp8.y = -370.0f; +// sp8.z = -43000.0f; +// lbl_2_bss_8 = fn_2_10A88(&sp8, 3); +// lbl_2_bss_90[1] = fn_80032EAC(0x50B, &sp8); +// sp8.x = 380.0f; +// sp8.y = -440.0f; +// sp8.z = -32000.0f; +// lbl_2_bss_CC = fn_2_10A88(&sp8, 3); +// lbl_2_bss_90[2] = fn_80032EAC(0x50B, &sp8); +// fn_8002127C(arg0->unk_40->unk_00[2], 1); +// fn_80021228(arg0->unk_40->unk_00[2], -0x3FFFFFFF); +// } -void fn_2_21F8(unkStructBSS114* arg0) { - Vec3f sp2C; - Vec3f sp20; - Vec3f sp14; - Vec3f sp8; - s32 i; - s32 var_r30_2; - unkStructBSS114* temp; +// void fn_2_21F8(omObjData* arg0) { +// Vec3f sp2C; +// Vec3f sp20; +// Vec3f sp14; +// Vec3f sp8; +// s32 i; +// s32 var_r30_2; +// unkStructBSS114* temp; - temp = fn_80021444(arg0->unk_40->unk_00[0], *lbl_2_data_124); - temp->unk_04 = 2; +// temp = fn_80021444(arg0->model[0], *lbl_2_data_124); +// temp->unk_04 = 2; - fn_8002127C(arg0->unk_40->unk_00[0], 1); - fn_8002127C(arg0->unk_40->unk_00[1], 1); - fn_80021228(arg0->unk_40->unk_00[0], 0x40000001); - fn_80021228(arg0->unk_40->unk_00[1], 0x40000001); - fn_8002127C(arg0->unk_40->unk_00[3], 1); - lbl_2_bss_44.x = 0.0f; - lbl_2_bss_44.y = 100.0f; - lbl_2_bss_44.z = 0.0f; - lbl_2_bss_38.x = 0.0f; - lbl_2_bss_38.y = 1000.0f; - lbl_2_bss_38.z = -1500.0f; - lbl_2_bss_2C.x = 0.0f; - lbl_2_bss_2C.y = 1.0f; - lbl_2_bss_2C.z = 0.0f; - fn_80022144(1, &lbl_2_bss_44, &lbl_2_bss_2C, &lbl_2_bss_38); - Hu3DCameraPerspectiveSet(1, lbl_2_bss_12C, lbl_2_bss_128, lbl_2_bss_124, 1.2f); - lbl_2_bss_54.unk_00 = lbl_2_bss_44; - fn_2_D088(NULL); - sp20 = lbl_2_bss_44; - PSVECSubtract(&lbl_2_bss_38, &lbl_2_bss_44, &sp2C); - fn_800BBFB0(&sp2C, &sp2C); - fn_80032D3C(&sp20, &sp2C, lbl_2_bss_88, lbl_2_bss_84, 0x12C, 0x12C, 0x12C); - sp14.x = 300.0f; - sp14.y = -450.0f; - sp14.z = -3100.0f; - lbl_2_bss_D8 = fn_2_10A88(&sp14, 3); - lbl_2_bss_90[0] = fn_80032EAC(0x50B, &sp14); - sp14.x = -300.0f; - sp14.y = -340.0f; - sp14.z = -4720.0f; - lbl_2_bss_D4 = fn_2_10A88(&sp14, 3); - lbl_2_bss_90[1] = fn_80032EAC(0x50B, &sp14); - fn_8002127C(arg0->unk_40->unk_00[2], 1); - fn_80021228(arg0->unk_40->unk_00[2], -0x3FFFFFFF); +// fn_8002127C(arg0->model[0], 1); +// fn_8002127C(arg0->model[1], 1); +// fn_80021228(arg0->model[0], 0x40000001); +// fn_80021228(arg0->model[1], 0x40000001); +// fn_8002127C(arg0->model[3], 1); +// lbl_2_bss_44.x = 0.0f; +// lbl_2_bss_44.y = 100.0f; +// lbl_2_bss_44.z = 0.0f; +// lbl_2_bss_38.x = 0.0f; +// lbl_2_bss_38.y = 1000.0f; +// lbl_2_bss_38.z = -1500.0f; +// lbl_2_bss_2C.x = 0.0f; +// lbl_2_bss_2C.y = 1.0f; +// lbl_2_bss_2C.z = 0.0f; +// fn_80022144(1, &lbl_2_bss_44, &lbl_2_bss_2C, &lbl_2_bss_38); +// Hu3DCameraPerspectiveSet(1, lbl_2_bss_12C, lbl_2_bss_128, lbl_2_bss_124, 1.2f); +// lbl_2_bss_54.unk_00 = lbl_2_bss_44; +// fn_2_D088(NULL); +// sp20 = lbl_2_bss_44; +// PSVECSubtract(&lbl_2_bss_38, &lbl_2_bss_44, &sp2C); +// fn_800BBFB0(&sp2C, &sp2C); +// fn_80032D3C(&sp20, &sp2C, lbl_2_bss_88, lbl_2_bss_84, 0x12C, 0x12C, 0x12C); +// sp14.x = 300.0f; +// sp14.y = -450.0f; +// sp14.z = -3100.0f; +// lbl_2_bss_D8 = fn_2_10A88(&sp14, 3); +// lbl_2_bss_90[0] = fn_80032EAC(0x50B, &sp14); +// sp14.x = -300.0f; +// sp14.y = -340.0f; +// sp14.z = -4720.0f; +// lbl_2_bss_D4 = fn_2_10A88(&sp14, 3); +// lbl_2_bss_90[1] = fn_80032EAC(0x50B, &sp14); +// fn_8002127C(arg0->model[2], 1); +// fn_80021228(arg0->model[2], -0x3FFFFFFF); - var_r30_2 = 4; - for (i = 0; i < var_r30_2; i++) { - sp8.x = -340.0f + (0.003921569f * (680.0f * fn_800325F4())); - sp8.y = -250.0f + (0.003921569f * (500.0f * fn_800325F4())); - sp8.z = ((-1550.0f - (f32) (i * 0x104)) - 40.0f) + (0.003921569f * (80.0f * fn_800325F4())); - fn_2_10A88(&sp8, 0); - } -} +// var_r30_2 = 4; +// for (i = 0; i < var_r30_2; i++) { +// sp8.x = -340.0f + (0.003921569f * (680.0f * fn_800325F4())); +// sp8.y = -250.0f + (0.003921569f * (500.0f * fn_800325F4())); +// sp8.z = ((-1550.0f - (f32) (i * 0x104)) - 40.0f) + (0.003921569f * (80.0f * fn_800325F4())); +// fn_2_10A88(&sp8, 0); +// } +// } -void fn_2_33B4(unkStructBSS114* arg0) { - fn_800210CC(arg0->unk_40->unk_00[3], 110.0f, 5.0 * fn_800EB910(M_PI * (f64) lbl_2_bss_10 / 180.0), -1500.0); +void fn_2_33B4(omObjData* arg0) { + fn_800210CC(arg0->model[3], 110.0f, 5.0 * fn_800EB910(M_PI * (f64) lbl_2_bss_10 / 180.0), -1500.0); lbl_2_bss_10 += 2.0f; if (lbl_2_bss_10 >= 360.0f) { lbl_2_bss_10 -= 360.0f; } } -void fn_2_14738(unkStructBSS114* arg0) { +void fn_2_14738(omObjData* arg0) { fn_8002FB10(arg0, lbl_2_bss_6C.x, lbl_2_bss_6C.y, lbl_2_bss_6C.z); - if (arg0->unk_4C == 1U) { - fn_80021228(arg0->unk_40->unk_00[0], 1); + if (arg0->work[0] == 1U) { + fn_80021228(*arg0->model, 1); fn_8002F7AC(HuPrcCurrentGet(), arg0); } } diff --git a/src/REL/m401Dll/m401Dll.h b/src/REL/m401Dll/m401Dll.h index a7ffcfcb..66644720 100644 --- a/src/REL/m401Dll/m401Dll.h +++ b/src/REL/m401Dll/m401Dll.h @@ -1,5 +1,6 @@ #include "common.h" #include "REL/executor.h" +#include // global data // typedef struct unkStruct18FC10 { @@ -68,8 +69,8 @@ void fn_80024348(Vec3f*, Vec3f*, Vec3f*); void fn_800243AC(f32); void fn_800240EC(f32, f32, u8, u8, u8); void fn_8002EF20(s16, s16); -unkStructBSS114* fn_8002F454(void*, s16, s16, s16, s16, void*); -void fn_8002F7AC(s32*, unkStructBSS114*); +omObjData* fn_8002F454(void*, s16, s16, s16, s16, void*); +void fn_8002F7AC(s32*, omObjData*); void fn_8002F9C4(void*, s16, s16); unkStructBSS114* fn_8002FAC0(void*, s16); void fn_8002FB10(void*, f32, f32, f32); @@ -144,13 +145,13 @@ extern s32 lbl_2_bss_D4; extern s32 lbl_2_bss_D8; extern unkStructBSS114* lbl_2_bss_E0; extern s32 lbl_2_bss_F4; -extern void* lbl_2_bss_F8; -extern void* lbl_2_bss_FC; +extern omObjData* lbl_2_bss_F8; +extern omObjData* lbl_2_bss_FC; extern unkStructBSS100 lbl_2_bss_100; -extern unkStructBSS114* lbl_2_bss_108; -extern unkStructBSS114* lbl_2_bss_10C; -extern unkStructBSS114* lbl_2_bss_110; -extern unkStructBSS114* lbl_2_bss_114; +extern omObjData* lbl_2_bss_108; +extern omObjData* lbl_2_bss_10C; +extern omObjData* lbl_2_bss_110; +extern omObjData* lbl_2_bss_114; extern unkStructBSS114** lbl_2_bss_118; extern s32 lbl_2_bss_11C; extern s16 lbl_2_bss_120;