diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-07-07 11:31:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-07 21:31:29 +0300 |
| commit | 6eca7a83b940ad23ccb1c6e4c64ad763f690d4c3 (patch) | |
| tree | 880a1de813f0cf4ce2c0d90c427ab854370d44a5 | |
| parent | 8599b135d627ef5b7e3c300f8af10aa9109b4d5c (diff) | |
obj_lv5YIblltray done (#2173)
* d_a_obj_lv5yiblltray done
* remove asm
41 files changed, 601 insertions, 2706 deletions
diff --git a/Progress.md b/Progress.md index e46ef30f84..552b541711 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 50.747495% | 1825156 | 3596544 +.text | 50.755503% | 1825444 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 55.938211% | 2249092 | 4020672 +Total | 55.945374% | 2249380 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 55.938211% | 2249092 | 4020672 -RELs | 38.860853% | 4469124 | 11500324 -Total | 43.284696% | 6718216 | 15520996 +main.dol | 55.945374% | 2249380 | 4020672 +RELs | 38.946451% | 4478968 | 11500324 +Total | 43.349976% | 6728348 | 15520996 ## RELs @@ -510,7 +510,7 @@ d_a_obj_lv5FloorBoard | 47.577093% | 2592 | 5448 d_a_obj_lv5IceWall | 39.937435% | 3064 | 7672 d_a_obj_lv5SwIce | 46.408046% | 2584 | 5568 d_a_obj_lv5ychndlr | 40.267765% | 3128 | 7768 -d_a_obj_lv5yiblltray | 33.403583% | 3804 | 11388 +d_a_obj_lv5yiblltray | 100.000000% | 11388 | 11388 d_a_obj_lv6ChangeGate | 41.732283% | 3816 | 9144 d_a_obj_lv6FurikoTrap | 45.967742% | 2736 | 5952 d_a_obj_lv6Lblock | 46.958175% | 1976 | 4208 @@ -734,7 +734,7 @@ d_a_tag_howl | 100.000000% | 1892 | 1892 d_a_tag_hstop | 100.000000% | 3424 | 3424 d_a_tag_instruction | 100.000000% | 712 | 712 d_a_tag_kago_fall | 100.000000% | 4108 | 4108 -d_a_tag_kmsg | 32.037997% | 1484 | 4632 +d_a_tag_kmsg | 34.801382% | 1612 | 4632 d_a_tag_lantern | 100.000000% | 2384 | 2384 d_a_tag_lightball | 100.000000% | 2112 | 2112 d_a_tag_lv2prchk | 100.000000% | 2776 | 2776 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 38.879392% | 4471256 | 11500324 +Total | 38.946451% | 4478968 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/CreateHeap__16daObjYIblltray_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/CreateHeap__16daObjYIblltray_cFv.s deleted file mode 100644 index feacca904e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/CreateHeap__16daObjYIblltray_cFv.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_80C6EDA8: -/* 80C6EDA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6EDAC 7C 08 02 A6 */ mflr r0 -/* 80C6EDB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6EDB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6EDB8 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6EDBC 7C 7F 1B 78 */ mr r31, r3 -/* 80C6EDC0 3C 60 80 C7 */ lis r3, l_arcName@ha /* 0x80C70A38@ha */ -/* 80C6EDC4 38 63 0A 38 */ addi r3, r3, l_arcName@l /* 0x80C70A38@l */ -/* 80C6EDC8 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6EDCC 38 80 00 09 */ li r4, 9 -/* 80C6EDD0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6EDD4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6EDD8 3F C5 00 02 */ addis r30, r5, 2 -/* 80C6EDDC 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80C6EDE0 7F C5 F3 78 */ mr r5, r30 -/* 80C6EDE4 38 C0 00 80 */ li r6, 0x80 -/* 80C6EDE8 4B 3C D5 05 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C6EDEC 3C 80 00 08 */ lis r4, 8 -/* 80C6EDF0 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C6EDF4 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C6EDF8 4B 3A 5E 5D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C6EDFC 90 7F 06 20 */ stw r3, 0x620(r31) -/* 80C6EE00 80 1F 06 20 */ lwz r0, 0x620(r31) -/* 80C6EE04 28 00 00 00 */ cmplwi r0, 0 -/* 80C6EE08 40 82 00 0C */ bne lbl_80C6EE14 -/* 80C6EE0C 38 60 00 00 */ li r3, 0 -/* 80C6EE10 48 00 00 AC */ b lbl_80C6EEBC -lbl_80C6EE14: -/* 80C6EE14 3C 60 80 C7 */ lis r3, l_arcName@ha /* 0x80C70A38@ha */ -/* 80C6EE18 38 63 0A 38 */ addi r3, r3, l_arcName@l /* 0x80C70A38@l */ -/* 80C6EE1C 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6EE20 38 80 00 08 */ li r4, 8 -/* 80C6EE24 7F C5 F3 78 */ mr r5, r30 -/* 80C6EE28 38 C0 00 80 */ li r6, 0x80 -/* 80C6EE2C 4B 3C D4 C1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C6EE30 3C 80 00 08 */ lis r4, 8 -/* 80C6EE34 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C6EE38 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C6EE3C 4B 3A 5E 19 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C6EE40 90 7F 0A 34 */ stw r3, 0xa34(r31) -/* 80C6EE44 80 1F 0A 34 */ lwz r0, 0xa34(r31) -/* 80C6EE48 28 00 00 00 */ cmplwi r0, 0 -/* 80C6EE4C 40 82 00 0C */ bne lbl_80C6EE58 -/* 80C6EE50 38 60 00 00 */ li r3, 0 -/* 80C6EE54 48 00 00 68 */ b lbl_80C6EEBC -lbl_80C6EE58: -/* 80C6EE58 3C 60 80 C7 */ lis r3, l_arcName@ha /* 0x80C70A38@ha */ -/* 80C6EE5C 38 63 0A 38 */ addi r3, r3, l_arcName@l /* 0x80C70A38@l */ -/* 80C6EE60 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6EE64 38 80 00 05 */ li r4, 5 -/* 80C6EE68 7F C5 F3 78 */ mr r5, r30 -/* 80C6EE6C 38 C0 00 80 */ li r6, 0x80 -/* 80C6EE70 4B 3C D4 7D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C6EE74 7C 64 1B 78 */ mr r4, r3 -/* 80C6EE78 38 7F 0A 38 */ addi r3, r31, 0xa38 -/* 80C6EE7C 38 A0 00 01 */ li r5, 1 -/* 80C6EE80 38 C0 00 02 */ li r6, 2 -/* 80C6EE84 3C E0 80 C7 */ lis r7, lit_3719@ha /* 0x80C709C8@ha */ -/* 80C6EE88 C0 27 09 C8 */ lfs f1, lit_3719@l(r7) /* 0x80C709C8@l */ -/* 80C6EE8C 38 E0 00 00 */ li r7, 0 -/* 80C6EE90 39 00 FF FF */ li r8, -1 -/* 80C6EE94 39 20 00 00 */ li r9, 0 -/* 80C6EE98 4B 39 E9 45 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80C6EE9C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6EEA0 40 82 00 0C */ bne lbl_80C6EEAC -/* 80C6EEA4 38 60 00 00 */ li r3, 0 -/* 80C6EEA8 48 00 00 14 */ b lbl_80C6EEBC -lbl_80C6EEAC: -/* 80C6EEAC 3C 60 80 C7 */ lis r3, lit_3694@ha /* 0x80C709C0@ha */ -/* 80C6EEB0 C0 03 09 C0 */ lfs f0, lit_3694@l(r3) /* 0x80C709C0@l */ -/* 80C6EEB4 D0 1F 0A 44 */ stfs f0, 0xa44(r31) -/* 80C6EEB8 38 60 00 01 */ li r3, 1 -lbl_80C6EEBC: -/* 80C6EEBC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6EEC0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6EEC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6EEC8 7C 08 03 A6 */ mtlr r0 -/* 80C6EECC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6EED0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Create__16daObjYIblltray_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Create__16daObjYIblltray_cFv.s deleted file mode 100644 index 23dca57067..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Create__16daObjYIblltray_cFv.s +++ /dev/null @@ -1,194 +0,0 @@ -lbl_80C6EEFC: -/* 80C6EEFC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C6EF00 7C 08 02 A6 */ mflr r0 -/* 80C6EF04 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C6EF08 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C6EF0C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80C6EF10 7C 7E 1B 78 */ mr r30, r3 -/* 80C6EF14 3C 60 80 C7 */ lis r3, l_cull_box@ha /* 0x80C709A0@ha */ -/* 80C6EF18 3B E3 09 A0 */ addi r31, r3, l_cull_box@l /* 0x80C709A0@l */ -/* 80C6EF1C 38 7E 05 F0 */ addi r3, r30, 0x5f0 -/* 80C6EF20 80 9E 06 20 */ lwz r4, 0x620(r30) -/* 80C6EF24 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C6EF28 4B 6D 75 89 */ bl PSMTXCopy -/* 80C6EF2C 38 1E 05 F0 */ addi r0, r30, 0x5f0 -/* 80C6EF30 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80C6EF34 80 7E 00 B0 */ lwz r3, 0xb0(r30) -/* 80C6EF38 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 80C6EF3C 40 82 00 A0 */ bne lbl_80C6EFDC -/* 80C6EF40 54 64 FE 3E */ rlwinm r4, r3, 0x1f, 0x18, 0x1f -/* 80C6EF44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6EF48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6EF4C 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C6EF50 7C 05 07 74 */ extsb r5, r0 -/* 80C6EF54 4B 3C 64 0D */ bl isSwitch__10dSv_info_cCFii -/* 80C6EF58 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6EF5C 40 82 00 40 */ bne lbl_80C6EF9C -/* 80C6EF60 38 00 1A 4F */ li r0, 0x1a4f -/* 80C6EF64 B0 1E 04 DC */ sth r0, 0x4dc(r30) -/* 80C6EF68 38 60 00 00 */ li r3, 0 -/* 80C6EF6C 90 7E 06 40 */ stw r3, 0x640(r30) -/* 80C6EF70 A8 1E 0A 40 */ lha r0, 0xa40(r30) -/* 80C6EF74 C8 3F 00 38 */ lfd f1, 0x38(r31) -/* 80C6EF78 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6EF7C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C6EF80 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6EF84 90 01 00 08 */ stw r0, 8(r1) -/* 80C6EF88 C8 01 00 08 */ lfd f0, 8(r1) -/* 80C6EF8C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6EF90 D0 1E 0A 48 */ stfs f0, 0xa48(r30) -/* 80C6EF94 98 7E 0A 3C */ stb r3, 0xa3c(r30) -/* 80C6EF98 48 00 00 DC */ b lbl_80C6F074 -lbl_80C6EF9C: -/* 80C6EF9C 38 00 E5 B1 */ li r0, -6735 -/* 80C6EFA0 B0 1E 04 DC */ sth r0, 0x4dc(r30) -/* 80C6EFA4 38 00 00 04 */ li r0, 4 -/* 80C6EFA8 90 1E 06 40 */ stw r0, 0x640(r30) -/* 80C6EFAC A8 1E 0A 3E */ lha r0, 0xa3e(r30) -/* 80C6EFB0 C8 3F 00 38 */ lfd f1, 0x38(r31) -/* 80C6EFB4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6EFB8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C6EFBC 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6EFC0 90 01 00 08 */ stw r0, 8(r1) -/* 80C6EFC4 C8 01 00 08 */ lfd f0, 8(r1) -/* 80C6EFC8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6EFCC D0 1E 0A 48 */ stfs f0, 0xa48(r30) -/* 80C6EFD0 38 00 00 01 */ li r0, 1 -/* 80C6EFD4 98 1E 0A 3C */ stb r0, 0xa3c(r30) -/* 80C6EFD8 48 00 00 9C */ b lbl_80C6F074 -lbl_80C6EFDC: -/* 80C6EFDC 54 64 FE 3E */ rlwinm r4, r3, 0x1f, 0x18, 0x1f -/* 80C6EFE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6EFE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6EFE8 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 80C6EFEC 7C 05 07 74 */ extsb r5, r0 -/* 80C6EFF0 4B 3C 63 71 */ bl isSwitch__10dSv_info_cCFii -/* 80C6EFF4 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6EFF8 40 82 00 44 */ bne lbl_80C6F03C -/* 80C6EFFC 38 00 E5 B1 */ li r0, -6735 -/* 80C6F000 B0 1E 04 DC */ sth r0, 0x4dc(r30) -/* 80C6F004 38 00 00 04 */ li r0, 4 -/* 80C6F008 90 1E 06 40 */ stw r0, 0x640(r30) -/* 80C6F00C A8 1E 0A 3E */ lha r0, 0xa3e(r30) -/* 80C6F010 C8 3F 00 38 */ lfd f1, 0x38(r31) -/* 80C6F014 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6F018 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C6F01C 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6F020 90 01 00 08 */ stw r0, 8(r1) -/* 80C6F024 C8 01 00 08 */ lfd f0, 8(r1) -/* 80C6F028 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6F02C D0 1E 0A 48 */ stfs f0, 0xa48(r30) -/* 80C6F030 38 00 00 01 */ li r0, 1 -/* 80C6F034 98 1E 0A 3C */ stb r0, 0xa3c(r30) -/* 80C6F038 48 00 00 3C */ b lbl_80C6F074 -lbl_80C6F03C: -/* 80C6F03C 38 00 1A 4F */ li r0, 0x1a4f -/* 80C6F040 B0 1E 04 DC */ sth r0, 0x4dc(r30) -/* 80C6F044 38 60 00 00 */ li r3, 0 -/* 80C6F048 90 7E 06 40 */ stw r3, 0x640(r30) -/* 80C6F04C A8 1E 0A 40 */ lha r0, 0xa40(r30) -/* 80C6F050 C8 3F 00 38 */ lfd f1, 0x38(r31) -/* 80C6F054 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6F058 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C6F05C 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6F060 90 01 00 08 */ stw r0, 8(r1) -/* 80C6F064 C8 01 00 08 */ lfd f0, 8(r1) -/* 80C6F068 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6F06C D0 1E 0A 48 */ stfs f0, 0xa48(r30) -/* 80C6F070 98 7E 0A 3C */ stb r3, 0xa3c(r30) -lbl_80C6F074: -/* 80C6F074 38 7E 0A 38 */ addi r3, r30, 0xa38 -/* 80C6F078 4B 39 E3 B1 */ bl play__14mDoExt_baseAnmFv -/* 80C6F07C 7F C3 F3 78 */ mr r3, r30 -/* 80C6F080 4B FF FC 09 */ bl setMtx__16daObjYIblltray_cFv -/* 80C6F084 38 00 00 00 */ li r0, 0 -/* 80C6F088 B0 1E 06 24 */ sth r0, 0x624(r30) -/* 80C6F08C 7F C3 F3 78 */ mr r3, r30 -/* 80C6F090 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80C6F094 38 9F 00 00 */ addi r4, r31, 0 -/* 80C6F098 C0 44 00 04 */ lfs f2, 4(r4) -/* 80C6F09C C0 64 00 08 */ lfs f3, 8(r4) -/* 80C6F0A0 C0 84 00 0C */ lfs f4, 0xc(r4) -/* 80C6F0A4 C0 A4 00 10 */ lfs f5, 0x10(r4) -/* 80C6F0A8 C0 C4 00 14 */ lfs f6, 0x14(r4) -/* 80C6F0AC 4B 3A B4 9D */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80C6F0B0 38 00 FF FF */ li r0, -1 -/* 80C6F0B4 90 1E 06 34 */ stw r0, 0x634(r30) -/* 80C6F0B8 90 1E 06 38 */ stw r0, 0x638(r30) -/* 80C6F0BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6F0C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6F0C4 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80C6F0C8 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80C6F0CC C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 80C6F0D0 4B 6D 78 19 */ bl PSMTXTrans -/* 80C6F0D4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6F0D8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6F0DC A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 80C6F0E0 4B 39 D3 55 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C6F0E4 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C6F0E8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80C6F0EC 40 82 00 18 */ bne lbl_80C6F104 -/* 80C6F0F0 C0 3F 00 18 */ lfs f1, 0x18(r31) -/* 80C6F0F4 C0 5F 00 1C */ lfs f2, 0x1c(r31) -/* 80C6F0F8 C0 7F 00 20 */ lfs f3, 0x20(r31) -/* 80C6F0FC 4B 39 DC A1 */ bl transM__14mDoMtx_stack_cFfff -/* 80C6F100 48 00 00 14 */ b lbl_80C6F114 -lbl_80C6F104: -/* 80C6F104 C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 80C6F108 C0 5F 00 1C */ lfs f2, 0x1c(r31) -/* 80C6F10C C0 7F 00 20 */ lfs f3, 0x20(r31) -/* 80C6F110 4B 39 DC 8D */ bl transM__14mDoMtx_stack_cFfff -lbl_80C6F114: -/* 80C6F114 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6F118 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6F11C 3C 80 80 C7 */ lis r4, l_back_pos@ha /* 0x80C70A54@ha */ -/* 80C6F120 38 84 0A 54 */ addi r4, r4, l_back_pos@l /* 0x80C70A54@l */ -/* 80C6F124 38 BE 05 B4 */ addi r5, r30, 0x5b4 -/* 80C6F128 4B 6D 7C 45 */ bl PSMTXMultVec -/* 80C6F12C 38 7E 09 F8 */ addi r3, r30, 0x9f8 -/* 80C6F130 38 80 00 FF */ li r4, 0xff -/* 80C6F134 38 A0 00 00 */ li r5, 0 -/* 80C6F138 7F C6 F3 78 */ mr r6, r30 -/* 80C6F13C 4B 41 47 25 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C6F140 38 7E 06 44 */ addi r3, r30, 0x644 -/* 80C6F144 3C 80 80 C7 */ lis r4, l_cc_cyl_src@ha /* 0x80C70A60@ha */ -/* 80C6F148 38 84 0A 60 */ addi r4, r4, l_cc_cyl_src@l /* 0x80C70A60@l */ -/* 80C6F14C 4B 41 57 69 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C6F150 38 1E 09 F8 */ addi r0, r30, 0x9f8 -/* 80C6F154 90 1E 06 88 */ stw r0, 0x688(r30) -/* 80C6F158 38 7E 07 80 */ addi r3, r30, 0x780 -/* 80C6F15C 3C 80 80 C7 */ lis r4, l_cc_cyl_src@ha /* 0x80C70A60@ha */ -/* 80C6F160 38 84 0A 60 */ addi r4, r4, l_cc_cyl_src@l /* 0x80C70A60@l */ -/* 80C6F164 4B 41 57 51 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C6F168 38 1E 09 F8 */ addi r0, r30, 0x9f8 -/* 80C6F16C 90 1E 07 C4 */ stw r0, 0x7c4(r30) -/* 80C6F170 38 7E 08 A4 */ addi r3, r30, 0x8a4 -/* 80C6F174 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 80C6F178 4B 60 00 89 */ bl SetR__8cM3dGCylFf -/* 80C6F17C 38 7E 08 A4 */ addi r3, r30, 0x8a4 -/* 80C6F180 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80C6F184 4B 60 00 75 */ bl SetH__8cM3dGCylFf -/* 80C6F188 38 7E 08 BC */ addi r3, r30, 0x8bc -/* 80C6F18C 3C 80 80 C7 */ lis r4, l_cc_cyl_src@ha /* 0x80C70A60@ha */ -/* 80C6F190 38 84 0A 60 */ addi r4, r4, l_cc_cyl_src@l /* 0x80C70A60@l */ -/* 80C6F194 4B 41 57 21 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C6F198 38 1E 09 F8 */ addi r0, r30, 0x9f8 -/* 80C6F19C 90 1E 09 00 */ stw r0, 0x900(r30) -/* 80C6F1A0 38 7E 09 E0 */ addi r3, r30, 0x9e0 -/* 80C6F1A4 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80C6F1A8 4B 60 00 59 */ bl SetR__8cM3dGCylFf -/* 80C6F1AC 38 7E 09 E0 */ addi r3, r30, 0x9e0 -/* 80C6F1B0 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80C6F1B4 4B 60 00 45 */ bl SetH__8cM3dGCylFf -/* 80C6F1B8 38 7E 08 E8 */ addi r3, r30, 0x8e8 -/* 80C6F1BC 38 80 00 60 */ li r4, 0x60 -/* 80C6F1C0 4B 5F 57 5D */ bl SetVsGrp__10cCcD_ObjCoFUl -/* 80C6F1C4 38 00 00 54 */ li r0, 0x54 -/* 80C6F1C8 98 1E 05 4B */ stb r0, 0x54b(r30) -/* 80C6F1CC 38 60 00 01 */ li r3, 1 -/* 80C6F1D0 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C6F1D4 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80C6F1D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C6F1DC 7C 08 03 A6 */ mtlr r0 -/* 80C6F1E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C6F1E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Delete__16daObjYIblltray_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Delete__16daObjYIblltray_cFv.s deleted file mode 100644 index 51bbb043c6..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Delete__16daObjYIblltray_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80C70408: -/* 80C70408 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C7040C 7C 08 02 A6 */ mflr r0 -/* 80C70410 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C70414 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C70418 7C 7F 1B 78 */ mr r31, r3 -/* 80C7041C 80 63 06 34 */ lwz r3, 0x634(r3) -/* 80C70420 3C 03 00 01 */ addis r0, r3, 1 -/* 80C70424 28 00 FF FF */ cmplwi r0, 0xffff -/* 80C70428 41 82 00 20 */ beq lbl_80C70448 -/* 80C7042C 90 61 00 08 */ stw r3, 8(r1) -/* 80C70430 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80C70434 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80C70438 38 81 00 08 */ addi r4, r1, 8 -/* 80C7043C 4B 3A 93 BD */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C70440 38 00 00 01 */ li r0, 1 -/* 80C70444 98 03 0D B8 */ stb r0, 0xdb8(r3) -lbl_80C70448: -/* 80C70448 7F E3 FB 78 */ mr r3, r31 -/* 80C7044C 28 1F 00 00 */ cmplwi r31, 0 -/* 80C70450 41 82 00 08 */ beq lbl_80C70458 -/* 80C70454 38 7F 05 A0 */ addi r3, r31, 0x5a0 -lbl_80C70458: -/* 80C70458 3C 80 80 C7 */ lis r4, l_arcName@ha /* 0x80C70A38@ha */ -/* 80C7045C 38 84 0A 38 */ addi r4, r4, l_arcName@l /* 0x80C70A38@l */ -/* 80C70460 80 84 00 00 */ lwz r4, 0(r4) -/* 80C70464 4B 3B CB A5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C70468 38 60 00 01 */ li r3, 1 -/* 80C7046C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C70470 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C70474 7C 08 03 A6 */ mtlr r0 -/* 80C70478 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C7047C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Draw__16daObjYIblltray_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Draw__16daObjYIblltray_cFv.s deleted file mode 100644 index 472343fcba..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Draw__16daObjYIblltray_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80C70330: -/* 80C70330 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C70334 7C 08 02 A6 */ mflr r0 -/* 80C70338 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C7033C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C70340 93 C1 00 08 */ stw r30, 8(r1) -/* 80C70344 7C 7E 1B 78 */ mr r30, r3 -/* 80C70348 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C7034C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C70350 38 80 00 10 */ li r4, 0x10 -/* 80C70354 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80C70358 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80C7035C 4B 53 34 69 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C70360 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C70364 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C70368 80 9E 06 20 */ lwz r4, 0x620(r30) -/* 80C7036C 80 84 00 04 */ lwz r4, 4(r4) -/* 80C70370 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C70374 4B 53 4A 2D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C70378 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C7037C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C70380 80 9E 0A 34 */ lwz r4, 0xa34(r30) -/* 80C70384 80 84 00 04 */ lwz r4, 4(r4) -/* 80C70388 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80C7038C 4B 53 4A 15 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C70390 80 7E 0A 34 */ lwz r3, 0xa34(r30) -/* 80C70394 80 83 00 04 */ lwz r4, 4(r3) -/* 80C70398 38 7E 0A 38 */ addi r3, r30, 0xa38 -/* 80C7039C C0 3E 0A 48 */ lfs f1, 0xa48(r30) -/* 80C703A0 4B 39 D6 2D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80C703A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C703A8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C703AC 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80C703B0 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80C703B4 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80C703B8 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C703BC 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80C703C0 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C703C4 80 7E 06 20 */ lwz r3, 0x620(r30) -/* 80C703C8 4B 39 D8 FD */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C703CC 80 7E 0A 34 */ lwz r3, 0xa34(r30) -/* 80C703D0 4B 39 D8 F5 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C703D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C703D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C703DC 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80C703E0 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80C703E4 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80C703E8 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80C703EC 38 60 00 01 */ li r3, 1 -/* 80C703F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C703F4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C703F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C703FC 7C 08 03 A6 */ mtlr r0 -/* 80C70400 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C70404 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Execute__16daObjYIblltray_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Execute__16daObjYIblltray_cFPPA3_A4_f.s deleted file mode 100644 index af5d4726a7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Execute__16daObjYIblltray_cFPPA3_A4_f.s +++ /dev/null @@ -1,999 +0,0 @@ -lbl_80C6F460: -/* 80C6F460 94 21 FF 00 */ stwu r1, -0x100(r1) -/* 80C6F464 7C 08 02 A6 */ mflr r0 -/* 80C6F468 90 01 01 04 */ stw r0, 0x104(r1) -/* 80C6F46C 39 61 01 00 */ addi r11, r1, 0x100 -/* 80C6F470 4B 6F 2D 6D */ bl _savegpr_29 -/* 80C6F474 7C 7F 1B 78 */ mr r31, r3 -/* 80C6F478 7C 9D 23 78 */ mr r29, r4 -/* 80C6F47C 3C 60 80 C7 */ lis r3, l_cull_box@ha /* 0x80C709A0@ha */ -/* 80C6F480 3B C3 09 A0 */ addi r30, r3, l_cull_box@l /* 0x80C709A0@l */ -/* 80C6F484 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C6F488 54 00 BF FF */ rlwinm. r0, r0, 0x17, 0x1f, 0x1f -/* 80C6F48C 40 82 00 3C */ bne lbl_80C6F4C8 -/* 80C6F490 80 7F 06 38 */ lwz r3, 0x638(r31) -/* 80C6F494 3C 03 00 01 */ addis r0, r3, 1 -/* 80C6F498 28 00 FF FF */ cmplwi r0, 0xffff -/* 80C6F49C 40 82 00 2C */ bne lbl_80C6F4C8 -/* 80C6F4A0 3C 60 80 C7 */ lis r3, searchObjYIblltray__FPvPv@ha /* 0x80C6F2BC@ha */ -/* 80C6F4A4 38 63 F2 BC */ addi r3, r3, searchObjYIblltray__FPvPv@l /* 0x80C6F2BC@l */ -/* 80C6F4A8 7F E4 FB 78 */ mr r4, r31 -/* 80C6F4AC 4B 3A A3 4D */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C6F4B0 28 03 00 00 */ cmplwi r3, 0 -/* 80C6F4B4 41 82 00 0C */ beq lbl_80C6F4C0 -/* 80C6F4B8 80 03 00 04 */ lwz r0, 4(r3) -/* 80C6F4BC 48 00 00 08 */ b lbl_80C6F4C4 -lbl_80C6F4C0: -/* 80C6F4C0 38 00 FF FF */ li r0, -1 -lbl_80C6F4C4: -/* 80C6F4C4 90 1F 06 38 */ stw r0, 0x638(r31) -lbl_80C6F4C8: -/* 80C6F4C8 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C6F4CC 2C 00 00 00 */ cmpwi r0, 0 -/* 80C6F4D0 40 82 00 38 */ bne lbl_80C6F508 -/* 80C6F4D4 3C 60 80 C7 */ lis r3, rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c@ha /* 0x80C6EED4@ha */ -/* 80C6F4D8 38 03 EE D4 */ addi r0, r3, rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c@l /* 0x80C6EED4@l */ -/* 80C6F4DC 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C6F4E0 90 03 00 B4 */ stw r0, 0xb4(r3) -/* 80C6F4E4 3C 60 80 C7 */ lis r3, searchNearIronball__FPvPv@ha /* 0x80C6F338@ha */ -/* 80C6F4E8 38 63 F3 38 */ addi r3, r3, searchNearIronball__FPvPv@l /* 0x80C6F338@l */ -/* 80C6F4EC 7F E4 FB 78 */ mr r4, r31 -/* 80C6F4F0 4B 3A A3 09 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C6F4F4 7C 64 1B 79 */ or. r4, r3, r3 -/* 80C6F4F8 41 82 00 1C */ beq lbl_80C6F514 -/* 80C6F4FC 7F E3 FB 78 */ mr r3, r31 -/* 80C6F500 4B FF FC E9 */ bl rideActor__16daObjYIblltray_cFP10fopAc_ac_c -/* 80C6F504 48 00 00 10 */ b lbl_80C6F514 -lbl_80C6F508: -/* 80C6F508 38 00 00 00 */ li r0, 0 -/* 80C6F50C 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C6F510 90 03 00 B4 */ stw r0, 0xb4(r3) -lbl_80C6F514: -/* 80C6F514 7F E3 FB 78 */ mr r3, r31 -/* 80C6F518 4B FF F7 71 */ bl setMtx__16daObjYIblltray_cFv -/* 80C6F51C 38 7F 05 F0 */ addi r3, r31, 0x5f0 -/* 80C6F520 80 9F 06 20 */ lwz r4, 0x620(r31) -/* 80C6F524 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C6F528 4B 6D 6F 89 */ bl PSMTXCopy -/* 80C6F52C 38 7F 0A 54 */ addi r3, r31, 0xa54 -/* 80C6F530 80 9F 0A 34 */ lwz r4, 0xa34(r31) -/* 80C6F534 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C6F538 4B 6D 6F 79 */ bl PSMTXCopy -/* 80C6F53C 38 1F 05 C0 */ addi r0, r31, 0x5c0 -/* 80C6F540 90 1D 00 00 */ stw r0, 0(r29) -/* 80C6F544 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C6F548 2C 00 00 04 */ cmpwi r0, 4 -/* 80C6F54C 40 82 00 3C */ bne lbl_80C6F588 -/* 80C6F550 C0 5F 0A 48 */ lfs f2, 0xa48(r31) -/* 80C6F554 A8 1F 0A 3E */ lha r0, 0xa3e(r31) -/* 80C6F558 C8 3E 00 38 */ lfd f1, 0x38(r30) -/* 80C6F55C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6F560 90 01 00 DC */ stw r0, 0xdc(r1) -/* 80C6F564 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6F568 90 01 00 D8 */ stw r0, 0xd8(r1) -/* 80C6F56C C8 01 00 D8 */ lfd f0, 0xd8(r1) -/* 80C6F570 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6F574 FC 02 00 00 */ fcmpu cr0, f2, f0 -/* 80C6F578 40 82 00 10 */ bne lbl_80C6F588 -/* 80C6F57C 7F E3 FB 78 */ mr r3, r31 -/* 80C6F580 4B FF FE C1 */ bl onAttention__16daObjYIblltray_cFv -/* 80C6F584 48 00 00 0C */ b lbl_80C6F590 -lbl_80C6F588: -/* 80C6F588 7F E3 FB 78 */ mr r3, r31 -/* 80C6F58C 4B FF FE C5 */ bl offAttention__16daObjYIblltray_cFv -lbl_80C6F590: -/* 80C6F590 88 1F 0A 84 */ lbz r0, 0xa84(r31) -/* 80C6F594 28 00 00 00 */ cmplwi r0, 0 -/* 80C6F598 41 82 01 04 */ beq lbl_80C6F69C -/* 80C6F59C 38 00 00 00 */ li r0, 0 -/* 80C6F5A0 98 1F 0A 84 */ stb r0, 0xa84(r31) -/* 80C6F5A4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C6F5A8 54 04 FE 3E */ rlwinm r4, r0, 0x1f, 0x18, 0x1f -/* 80C6F5AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6F5B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6F5B4 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6F5B8 7C 05 07 74 */ extsb r5, r0 -/* 80C6F5BC 4B 3C 5D A5 */ bl isSwitch__10dSv_info_cCFii -/* 80C6F5C0 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6F5C4 40 82 00 70 */ bne lbl_80C6F634 -/* 80C6F5C8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C6F5CC 54 04 FE 3E */ rlwinm r4, r0, 0x1f, 0x18, 0x1f -/* 80C6F5D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6F5D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6F5D8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6F5DC 7C 05 07 74 */ extsb r5, r0 -/* 80C6F5E0 4B 3C 5C 21 */ bl onSwitch__10dSv_info_cFii -/* 80C6F5E4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C6F5E8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80C6F5EC 41 82 00 B0 */ beq lbl_80C6F69C -/* 80C6F5F0 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801DD@ha */ -/* 80C6F5F4 38 03 01 DD */ addi r0, r3, 0x01DD /* 0x000801DD@l */ -/* 80C6F5F8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C6F5FC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6F600 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6F604 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6F608 38 81 00 34 */ addi r4, r1, 0x34 -/* 80C6F60C 38 BF 0A 88 */ addi r5, r31, 0xa88 -/* 80C6F610 38 C0 00 00 */ li r6, 0 -/* 80C6F614 38 E0 00 00 */ li r7, 0 -/* 80C6F618 C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 80C6F61C FC 40 08 90 */ fmr f2, f1 -/* 80C6F620 C0 7E 00 44 */ lfs f3, 0x44(r30) -/* 80C6F624 FC 80 18 90 */ fmr f4, f3 -/* 80C6F628 39 00 00 00 */ li r8, 0 -/* 80C6F62C 4B 63 C3 59 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C6F630 48 00 00 6C */ b lbl_80C6F69C -lbl_80C6F634: -/* 80C6F634 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C6F638 54 04 FE 3E */ rlwinm r4, r0, 0x1f, 0x18, 0x1f -/* 80C6F63C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6F640 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6F644 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6F648 7C 05 07 74 */ extsb r5, r0 -/* 80C6F64C 4B 3C 5C 65 */ bl offSwitch__10dSv_info_cFii -/* 80C6F650 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C6F654 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80C6F658 40 82 00 44 */ bne lbl_80C6F69C -/* 80C6F65C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801DD@ha */ -/* 80C6F660 38 03 01 DD */ addi r0, r3, 0x01DD /* 0x000801DD@l */ -/* 80C6F664 90 01 00 30 */ stw r0, 0x30(r1) -/* 80C6F668 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C6F66C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C6F670 80 63 00 00 */ lwz r3, 0(r3) -/* 80C6F674 38 81 00 30 */ addi r4, r1, 0x30 -/* 80C6F678 38 BF 0A 88 */ addi r5, r31, 0xa88 -/* 80C6F67C 38 C0 00 00 */ li r6, 0 -/* 80C6F680 38 E0 00 00 */ li r7, 0 -/* 80C6F684 C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 80C6F688 FC 40 08 90 */ fmr f2, f1 -/* 80C6F68C C0 7E 00 44 */ lfs f3, 0x44(r30) -/* 80C6F690 FC 80 18 90 */ fmr f4, f3 -/* 80C6F694 39 00 00 00 */ li r8, 0 -/* 80C6F698 4B 63 C2 ED */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_80C6F69C: -/* 80C6F69C 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C6F6A0 2C 00 00 04 */ cmpwi r0, 4 -/* 80C6F6A4 40 82 00 38 */ bne lbl_80C6F6DC -/* 80C6F6A8 38 7F 06 70 */ addi r3, r31, 0x670 -/* 80C6F6AC 38 80 00 70 */ li r4, 0x70 -/* 80C6F6B0 4B 5F 52 6D */ bl SetVsGrp__10cCcD_ObjCoFUl -/* 80C6F6B4 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C6F6B8 4B 5F 8B 1D */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C6F6BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C6F6C0 41 82 00 50 */ beq lbl_80C6F710 -/* 80C6F6C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6F6C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6F6CC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C6F6D0 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C6F6D4 4B 40 4B 7D */ bl Release__4cBgSFP9dBgW_Base -/* 80C6F6D8 48 00 00 38 */ b lbl_80C6F710 -lbl_80C6F6DC: -/* 80C6F6DC 38 7F 06 70 */ addi r3, r31, 0x670 -/* 80C6F6E0 38 80 00 30 */ li r4, 0x30 -/* 80C6F6E4 4B 5F 52 39 */ bl SetVsGrp__10cCcD_ObjCoFUl -/* 80C6F6E8 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80C6F6EC 4B 5F 8A E9 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80C6F6F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80C6F6F4 40 82 00 1C */ bne lbl_80C6F710 -/* 80C6F6F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6F6FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6F700 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80C6F704 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 80C6F708 7F E5 FB 78 */ mr r5, r31 -/* 80C6F70C 4B 40 52 FD */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -lbl_80C6F710: -/* 80C6F710 80 7F 00 B0 */ lwz r3, 0xb0(r31) -/* 80C6F714 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 80C6F718 40 82 01 94 */ bne lbl_80C6F8AC -/* 80C6F71C 54 64 FE 3E */ rlwinm r4, r3, 0x1f, 0x18, 0x1f -/* 80C6F720 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6F724 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6F728 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6F72C 7C 05 07 74 */ extsb r5, r0 -/* 80C6F730 4B 3C 5C 31 */ bl isSwitch__10dSv_info_cCFii -/* 80C6F734 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6F738 40 82 00 CC */ bne lbl_80C6F804 -/* 80C6F73C C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 80C6F740 D0 1F 0A 44 */ stfs f0, 0xa44(r31) -/* 80C6F744 38 00 00 00 */ li r0, 0 -/* 80C6F748 98 1F 0A 3C */ stb r0, 0xa3c(r31) -/* 80C6F74C A8 1F 04 DC */ lha r0, 0x4dc(r31) -/* 80C6F750 2C 00 19 EB */ cmpwi r0, 0x19eb -/* 80C6F754 40 80 00 14 */ bge lbl_80C6F768 -/* 80C6F758 A8 7F 06 24 */ lha r3, 0x624(r31) -/* 80C6F75C 38 03 00 64 */ addi r0, r3, 0x64 -/* 80C6F760 B0 1F 06 24 */ sth r0, 0x624(r31) -/* 80C6F764 48 00 01 34 */ b lbl_80C6F898 -lbl_80C6F768: -/* 80C6F768 C0 5E 00 48 */ lfs f2, 0x48(r30) -/* 80C6F76C A8 1F 06 24 */ lha r0, 0x624(r31) -/* 80C6F770 C8 3E 00 38 */ lfd f1, 0x38(r30) -/* 80C6F774 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6F778 90 01 00 DC */ stw r0, 0xdc(r1) -/* 80C6F77C 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6F780 90 01 00 D8 */ stw r0, 0xd8(r1) -/* 80C6F784 C8 01 00 D8 */ lfd f0, 0xd8(r1) -/* 80C6F788 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6F78C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C6F790 FC 00 00 1E */ fctiwz f0, f0 -/* 80C6F794 D8 01 00 E0 */ stfd f0, 0xe0(r1) -/* 80C6F798 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 80C6F79C B0 1F 06 24 */ sth r0, 0x624(r31) -/* 80C6F7A0 38 00 1A 4F */ li r0, 0x1a4f -/* 80C6F7A4 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 80C6F7A8 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C6F7AC 2C 00 00 00 */ cmpwi r0, 0 -/* 80C6F7B0 41 82 00 E8 */ beq lbl_80C6F898 -/* 80C6F7B4 2C 00 00 01 */ cmpwi r0, 1 -/* 80C6F7B8 41 82 00 E0 */ beq lbl_80C6F898 -/* 80C6F7BC 2C 00 00 04 */ cmpwi r0, 4 -/* 80C6F7C0 40 82 00 D8 */ bne lbl_80C6F898 -/* 80C6F7C4 3C 60 80 C7 */ lis r3, searchNearBackTrayIronball__FPvPv@ha /* 0x80C6F3BC@ha */ -/* 80C6F7C8 38 63 F3 BC */ addi r3, r3, searchNearBackTrayIronball__FPvPv@l /* 0x80C6F3BC@l */ -/* 80C6F7CC 7F E4 FB 78 */ mr r4, r31 -/* 80C6F7D0 4B 3A A0 29 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C6F7D4 7C 64 1B 79 */ or. r4, r3, r3 -/* 80C6F7D8 40 82 00 10 */ bne lbl_80C6F7E8 -/* 80C6F7DC 38 00 00 00 */ li r0, 0 -/* 80C6F7E0 90 1F 06 40 */ stw r0, 0x640(r31) -/* 80C6F7E4 48 00 00 B4 */ b lbl_80C6F898 -lbl_80C6F7E8: -/* 80C6F7E8 7F E3 FB 78 */ mr r3, r31 -/* 80C6F7EC 41 82 00 0C */ beq lbl_80C6F7F8 -/* 80C6F7F0 80 84 00 04 */ lwz r4, 4(r4) -/* 80C6F7F4 48 00 00 08 */ b lbl_80C6F7FC -lbl_80C6F7F8: -/* 80C6F7F8 38 80 FF FF */ li r4, -1 -lbl_80C6F7FC: -/* 80C6F7FC 4B FF FA 41 */ bl sendBall__16daObjYIblltray_cFUi -/* 80C6F800 48 00 00 98 */ b lbl_80C6F898 -lbl_80C6F804: -/* 80C6F804 C0 1E 00 44 */ lfs f0, 0x44(r30) -/* 80C6F808 D0 1F 0A 44 */ stfs f0, 0xa44(r31) -/* 80C6F80C 38 00 00 01 */ li r0, 1 -/* 80C6F810 98 1F 0A 3C */ stb r0, 0xa3c(r31) -/* 80C6F814 A8 1F 04 DC */ lha r0, 0x4dc(r31) -/* 80C6F818 2C 00 E6 15 */ cmpwi r0, -6635 -/* 80C6F81C 40 81 00 14 */ ble lbl_80C6F830 -/* 80C6F820 A8 7F 06 24 */ lha r3, 0x624(r31) -/* 80C6F824 38 03 FF 9C */ addi r0, r3, -100 -/* 80C6F828 B0 1F 06 24 */ sth r0, 0x624(r31) -/* 80C6F82C 48 00 00 6C */ b lbl_80C6F898 -lbl_80C6F830: -/* 80C6F830 C0 5E 00 48 */ lfs f2, 0x48(r30) -/* 80C6F834 A8 1F 06 24 */ lha r0, 0x624(r31) -/* 80C6F838 C8 3E 00 38 */ lfd f1, 0x38(r30) -/* 80C6F83C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6F840 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 80C6F844 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6F848 90 01 00 E0 */ stw r0, 0xe0(r1) -/* 80C6F84C C8 01 00 E0 */ lfd f0, 0xe0(r1) -/* 80C6F850 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6F854 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C6F858 FC 00 00 1E */ fctiwz f0, f0 -/* 80C6F85C D8 01 00 D8 */ stfd f0, 0xd8(r1) -/* 80C6F860 80 01 00 DC */ lwz r0, 0xdc(r1) -/* 80C6F864 B0 1F 06 24 */ sth r0, 0x624(r31) -/* 80C6F868 38 00 E5 B1 */ li r0, -6735 -/* 80C6F86C B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 80C6F870 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C6F874 2C 00 00 00 */ cmpwi r0, 0 -/* 80C6F878 40 82 00 10 */ bne lbl_80C6F888 -/* 80C6F87C 38 00 00 04 */ li r0, 4 -/* 80C6F880 90 1F 06 40 */ stw r0, 0x640(r31) -/* 80C6F884 48 00 00 14 */ b lbl_80C6F898 -lbl_80C6F888: -/* 80C6F888 2C 00 00 01 */ cmpwi r0, 1 -/* 80C6F88C 40 82 00 0C */ bne lbl_80C6F898 -/* 80C6F890 7F E3 FB 78 */ mr r3, r31 -/* 80C6F894 48 00 0A 4D */ bl initRotTo__16daObjYIblltray_cFv -lbl_80C6F898: -/* 80C6F898 A8 7F 04 DC */ lha r3, 0x4dc(r31) -/* 80C6F89C A8 1F 06 24 */ lha r0, 0x624(r31) -/* 80C6F8A0 7C 03 02 14 */ add r0, r3, r0 -/* 80C6F8A4 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 80C6F8A8 48 00 01 80 */ b lbl_80C6FA28 -lbl_80C6F8AC: -/* 80C6F8AC 54 64 FE 3E */ rlwinm r4, r3, 0x1f, 0x18, 0x1f -/* 80C6F8B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C6F8B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C6F8B8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6F8BC 7C 05 07 74 */ extsb r5, r0 -/* 80C6F8C0 4B 3C 5A A1 */ bl isSwitch__10dSv_info_cCFii -/* 80C6F8C4 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6F8C8 41 82 00 BC */ beq lbl_80C6F984 -/* 80C6F8CC C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 80C6F8D0 D0 1F 0A 44 */ stfs f0, 0xa44(r31) -/* 80C6F8D4 38 00 00 00 */ li r0, 0 -/* 80C6F8D8 98 1F 0A 3C */ stb r0, 0xa3c(r31) -/* 80C6F8DC A8 1F 04 DC */ lha r0, 0x4dc(r31) -/* 80C6F8E0 2C 00 19 EB */ cmpwi r0, 0x19eb -/* 80C6F8E4 40 80 00 14 */ bge lbl_80C6F8F8 -/* 80C6F8E8 A8 7F 06 24 */ lha r3, 0x624(r31) -/* 80C6F8EC 38 03 00 64 */ addi r0, r3, 0x64 -/* 80C6F8F0 B0 1F 06 24 */ sth r0, 0x624(r31) -/* 80C6F8F4 48 00 01 24 */ b lbl_80C6FA18 -lbl_80C6F8F8: -/* 80C6F8F8 C0 5E 00 48 */ lfs f2, 0x48(r30) -/* 80C6F8FC A8 1F 06 24 */ lha r0, 0x624(r31) -/* 80C6F900 C8 3E 00 38 */ lfd f1, 0x38(r30) -/* 80C6F904 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6F908 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 80C6F90C 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6F910 90 01 00 E0 */ stw r0, 0xe0(r1) -/* 80C6F914 C8 01 00 E0 */ lfd f0, 0xe0(r1) -/* 80C6F918 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6F91C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C6F920 FC 00 00 1E */ fctiwz f0, f0 -/* 80C6F924 D8 01 00 D8 */ stfd f0, 0xd8(r1) -/* 80C6F928 80 01 00 DC */ lwz r0, 0xdc(r1) -/* 80C6F92C B0 1F 06 24 */ sth r0, 0x624(r31) -/* 80C6F930 38 00 1A 4F */ li r0, 0x1a4f -/* 80C6F934 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 80C6F938 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C6F93C 2C 00 00 04 */ cmpwi r0, 4 -/* 80C6F940 40 82 00 D8 */ bne lbl_80C6FA18 -/* 80C6F944 3C 60 80 C7 */ lis r3, searchNearBackTrayIronball__FPvPv@ha /* 0x80C6F3BC@ha */ -/* 80C6F948 38 63 F3 BC */ addi r3, r3, searchNearBackTrayIronball__FPvPv@l /* 0x80C6F3BC@l */ -/* 80C6F94C 7F E4 FB 78 */ mr r4, r31 -/* 80C6F950 4B 3A 9E A9 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C6F954 7C 64 1B 79 */ or. r4, r3, r3 -/* 80C6F958 40 82 00 10 */ bne lbl_80C6F968 -/* 80C6F95C 38 00 00 00 */ li r0, 0 -/* 80C6F960 90 1F 06 40 */ stw r0, 0x640(r31) -/* 80C6F964 48 00 00 B4 */ b lbl_80C6FA18 -lbl_80C6F968: -/* 80C6F968 7F E3 FB 78 */ mr r3, r31 -/* 80C6F96C 41 82 00 0C */ beq lbl_80C6F978 -/* 80C6F970 80 84 00 04 */ lwz r4, 4(r4) -/* 80C6F974 48 00 00 08 */ b lbl_80C6F97C -lbl_80C6F978: -/* 80C6F978 38 80 FF FF */ li r4, -1 -lbl_80C6F97C: -/* 80C6F97C 4B FF F8 C1 */ bl sendBall__16daObjYIblltray_cFUi -/* 80C6F980 48 00 00 98 */ b lbl_80C6FA18 -lbl_80C6F984: -/* 80C6F984 C0 1E 00 44 */ lfs f0, 0x44(r30) -/* 80C6F988 D0 1F 0A 44 */ stfs f0, 0xa44(r31) -/* 80C6F98C 38 00 00 01 */ li r0, 1 -/* 80C6F990 98 1F 0A 3C */ stb r0, 0xa3c(r31) -/* 80C6F994 A8 1F 04 DC */ lha r0, 0x4dc(r31) -/* 80C6F998 2C 00 E6 15 */ cmpwi r0, -6635 -/* 80C6F99C 40 81 00 14 */ ble lbl_80C6F9B0 -/* 80C6F9A0 A8 7F 06 24 */ lha r3, 0x624(r31) -/* 80C6F9A4 38 03 FF 9C */ addi r0, r3, -100 -/* 80C6F9A8 B0 1F 06 24 */ sth r0, 0x624(r31) -/* 80C6F9AC 48 00 00 6C */ b lbl_80C6FA18 -lbl_80C6F9B0: -/* 80C6F9B0 C0 5E 00 48 */ lfs f2, 0x48(r30) -/* 80C6F9B4 A8 1F 06 24 */ lha r0, 0x624(r31) -/* 80C6F9B8 C8 3E 00 38 */ lfd f1, 0x38(r30) -/* 80C6F9BC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80C6F9C0 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 80C6F9C4 3C 00 43 30 */ lis r0, 0x4330 -/* 80C6F9C8 90 01 00 E0 */ stw r0, 0xe0(r1) -/* 80C6F9CC C8 01 00 E0 */ lfd f0, 0xe0(r1) -/* 80C6F9D0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80C6F9D4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80C6F9D8 FC 00 00 1E */ fctiwz f0, f0 -/* 80C6F9DC D8 01 00 D8 */ stfd f0, 0xd8(r1) -/* 80C6F9E0 80 01 00 DC */ lwz r0, 0xdc(r1) -/* 80C6F9E4 B0 1F 06 24 */ sth r0, 0x624(r31) -/* 80C6F9E8 38 00 E5 B1 */ li r0, -6735 -/* 80C6F9EC B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 80C6F9F0 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C6F9F4 2C 00 00 00 */ cmpwi r0, 0 -/* 80C6F9F8 40 82 00 10 */ bne lbl_80C6FA08 -/* 80C6F9FC 38 00 00 04 */ li r0, 4 -/* 80C6FA00 90 1F 06 40 */ stw r0, 0x640(r31) -/* 80C6FA04 48 00 00 14 */ b lbl_80C6FA18 -lbl_80C6FA08: -/* 80C6FA08 2C 00 00 01 */ cmpwi r0, 1 -/* 80C6FA0C 40 82 00 0C */ bne lbl_80C6FA18 -/* 80C6FA10 7F E3 FB 78 */ mr r3, r31 -/* 80C6FA14 48 00 08 CD */ bl initRotTo__16daObjYIblltray_cFv -lbl_80C6FA18: -/* 80C6FA18 A8 7F 04 DC */ lha r3, 0x4dc(r31) -/* 80C6FA1C A8 1F 06 24 */ lha r0, 0x624(r31) -/* 80C6FA20 7C 03 02 14 */ add r0, r3, r0 -/* 80C6FA24 B0 1F 04 DC */ sth r0, 0x4dc(r31) -lbl_80C6FA28: -/* 80C6FA28 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C6FA2C 2C 00 00 01 */ cmpwi r0, 1 -/* 80C6FA30 40 82 01 EC */ bne lbl_80C6FC1C -/* 80C6FA34 80 1F 06 34 */ lwz r0, 0x634(r31) -/* 80C6FA38 90 01 00 28 */ stw r0, 0x28(r1) -/* 80C6FA3C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80C6FA40 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80C6FA44 38 81 00 28 */ addi r4, r1, 0x28 -/* 80C6FA48 4B 3A 9D B1 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C6FA4C 7C 7D 1B 78 */ mr r29, r3 -/* 80C6FA50 80 03 04 9C */ lwz r0, 0x49c(r3) -/* 80C6FA54 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 80C6FA58 41 82 00 18 */ beq lbl_80C6FA70 -/* 80C6FA5C 38 00 FF FF */ li r0, -1 -/* 80C6FA60 90 1F 06 34 */ stw r0, 0x634(r31) -/* 80C6FA64 38 00 00 00 */ li r0, 0 -/* 80C6FA68 90 1F 06 40 */ stw r0, 0x640(r31) -/* 80C6FA6C 48 00 01 A8 */ b lbl_80C6FC14 -lbl_80C6FA70: -/* 80C6FA70 38 61 00 50 */ addi r3, r1, 0x50 -/* 80C6FA74 38 9F 05 A8 */ addi r4, r31, 0x5a8 -/* 80C6FA78 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80C6FA7C 4B 5F 70 B9 */ bl __mi__4cXyzCFRC3Vec -/* 80C6FA80 C0 01 00 50 */ lfs f0, 0x50(r1) -/* 80C6FA84 D0 01 00 98 */ stfs f0, 0x98(r1) -/* 80C6FA88 C0 01 00 54 */ lfs f0, 0x54(r1) -/* 80C6FA8C D0 01 00 9C */ stfs f0, 0x9c(r1) -/* 80C6FA90 C0 01 00 58 */ lfs f0, 0x58(r1) -/* 80C6FA94 D0 01 00 A0 */ stfs f0, 0xa0(r1) -/* 80C6FA98 38 61 00 98 */ addi r3, r1, 0x98 -/* 80C6FA9C 4B 6D 76 9D */ bl PSVECSquareMag -/* 80C6FAA0 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80C6FAA4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FAA8 40 81 00 58 */ ble lbl_80C6FB00 -/* 80C6FAAC FC 00 08 34 */ frsqrte f0, f1 -/* 80C6FAB0 C8 9E 00 50 */ lfd f4, 0x50(r30) -/* 80C6FAB4 FC 44 00 32 */ fmul f2, f4, f0 -/* 80C6FAB8 C8 7E 00 58 */ lfd f3, 0x58(r30) -/* 80C6FABC FC 00 00 32 */ fmul f0, f0, f0 -/* 80C6FAC0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80C6FAC4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80C6FAC8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80C6FACC FC 44 00 32 */ fmul f2, f4, f0 -/* 80C6FAD0 FC 00 00 32 */ fmul f0, f0, f0 -/* 80C6FAD4 FC 01 00 32 */ fmul f0, f1, f0 -/* 80C6FAD8 FC 03 00 28 */ fsub f0, f3, f0 -/* 80C6FADC FC 02 00 32 */ fmul f0, f2, f0 -/* 80C6FAE0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80C6FAE4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80C6FAE8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80C6FAEC FC 03 00 28 */ fsub f0, f3, f0 -/* 80C6FAF0 FC 02 00 32 */ fmul f0, f2, f0 -/* 80C6FAF4 FC 21 00 32 */ fmul f1, f1, f0 -/* 80C6FAF8 FC 20 08 18 */ frsp f1, f1 -/* 80C6FAFC 48 00 00 88 */ b lbl_80C6FB84 -lbl_80C6FB00: -/* 80C6FB00 C8 1E 00 60 */ lfd f0, 0x60(r30) -/* 80C6FB04 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FB08 40 80 00 10 */ bge lbl_80C6FB18 -/* 80C6FB0C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80C6FB10 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80C6FB14 48 00 00 70 */ b lbl_80C6FB84 -lbl_80C6FB18: -/* 80C6FB18 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80C6FB1C 80 81 00 10 */ lwz r4, 0x10(r1) -/* 80C6FB20 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80C6FB24 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80C6FB28 7C 03 00 00 */ cmpw r3, r0 -/* 80C6FB2C 41 82 00 14 */ beq lbl_80C6FB40 -/* 80C6FB30 40 80 00 40 */ bge lbl_80C6FB70 -/* 80C6FB34 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6FB38 41 82 00 20 */ beq lbl_80C6FB58 -/* 80C6FB3C 48 00 00 34 */ b lbl_80C6FB70 -lbl_80C6FB40: -/* 80C6FB40 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80C6FB44 41 82 00 0C */ beq lbl_80C6FB50 -/* 80C6FB48 38 00 00 01 */ li r0, 1 -/* 80C6FB4C 48 00 00 28 */ b lbl_80C6FB74 -lbl_80C6FB50: -/* 80C6FB50 38 00 00 02 */ li r0, 2 -/* 80C6FB54 48 00 00 20 */ b lbl_80C6FB74 -lbl_80C6FB58: -/* 80C6FB58 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80C6FB5C 41 82 00 0C */ beq lbl_80C6FB68 -/* 80C6FB60 38 00 00 05 */ li r0, 5 -/* 80C6FB64 48 00 00 10 */ b lbl_80C6FB74 -lbl_80C6FB68: -/* 80C6FB68 38 00 00 03 */ li r0, 3 -/* 80C6FB6C 48 00 00 08 */ b lbl_80C6FB74 -lbl_80C6FB70: -/* 80C6FB70 38 00 00 04 */ li r0, 4 -lbl_80C6FB74: -/* 80C6FB74 2C 00 00 01 */ cmpwi r0, 1 -/* 80C6FB78 40 82 00 0C */ bne lbl_80C6FB84 -/* 80C6FB7C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80C6FB80 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80C6FB84: -/* 80C6FB84 C0 1E 00 68 */ lfs f0, 0x68(r30) -/* 80C6FB88 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FB8C 4C 40 13 82 */ cror 2, 0, 2 -/* 80C6FB90 40 82 00 20 */ bne lbl_80C6FBB0 -/* 80C6FB94 C0 1F 05 A8 */ lfs f0, 0x5a8(r31) -/* 80C6FB98 D0 1D 04 D0 */ stfs f0, 0x4d0(r29) -/* 80C6FB9C C0 1F 05 AC */ lfs f0, 0x5ac(r31) -/* 80C6FBA0 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 80C6FBA4 C0 1F 05 B0 */ lfs f0, 0x5b0(r31) -/* 80C6FBA8 D0 1D 04 D8 */ stfs f0, 0x4d8(r29) -/* 80C6FBAC 48 00 00 68 */ b lbl_80C6FC14 -lbl_80C6FBB0: -/* 80C6FBB0 FC 00 0A 10 */ fabs f0, f1 -/* 80C6FBB4 FC 40 00 18 */ frsp f2, f0 -/* 80C6FBB8 3C 60 80 45 */ lis r3, G_CM3D_F_ABS_MIN@ha /* 0x80451180@ha */ -/* 80C6FBBC C0 03 11 80 */ lfs f0, G_CM3D_F_ABS_MIN@l(r3) /* 0x80451180@l */ -/* 80C6FBC0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80C6FBC4 41 80 00 50 */ blt lbl_80C6FC14 -/* 80C6FBC8 38 61 00 98 */ addi r3, r1, 0x98 -/* 80C6FBCC 7C 64 1B 78 */ mr r4, r3 -/* 80C6FBD0 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 80C6FBD4 EC 20 08 24 */ fdivs f1, f0, f1 -/* 80C6FBD8 4B 6D 75 01 */ bl PSVECScale -/* 80C6FBDC 38 61 00 98 */ addi r3, r1, 0x98 -/* 80C6FBE0 7C 64 1B 78 */ mr r4, r3 -/* 80C6FBE4 C0 3E 00 34 */ lfs f1, 0x34(r30) -/* 80C6FBE8 4B 6D 74 F1 */ bl PSVECScale -/* 80C6FBEC 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80C6FBF0 38 81 00 98 */ addi r4, r1, 0x98 -/* 80C6FBF4 7C 65 1B 78 */ mr r5, r3 -/* 80C6FBF8 4B 6D 74 99 */ bl PSVECAdd -/* 80C6FBFC C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80C6FC00 D0 1D 04 BC */ stfs f0, 0x4bc(r29) -/* 80C6FC04 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80C6FC08 D0 1D 04 C0 */ stfs f0, 0x4c0(r29) -/* 80C6FC0C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80C6FC10 D0 1D 04 C4 */ stfs f0, 0x4c4(r29) -lbl_80C6FC14: -/* 80C6FC14 38 00 00 00 */ li r0, 0 -/* 80C6FC18 98 1D 0D B8 */ stb r0, 0xdb8(r29) -lbl_80C6FC1C: -/* 80C6FC1C 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C6FC20 2C 00 00 02 */ cmpwi r0, 2 -/* 80C6FC24 40 82 02 6C */ bne lbl_80C6FE90 -/* 80C6FC28 C0 3F 06 3C */ lfs f1, 0x63c(r31) -/* 80C6FC2C C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 80C6FC30 EC 01 00 2A */ fadds f0, f1, f0 -/* 80C6FC34 D0 1F 06 3C */ stfs f0, 0x63c(r31) -/* 80C6FC38 C0 3F 06 3C */ lfs f1, 0x63c(r31) -/* 80C6FC3C C0 1E 00 34 */ lfs f0, 0x34(r30) -/* 80C6FC40 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FC44 4C 41 13 82 */ cror 2, 1, 2 -/* 80C6FC48 40 82 00 08 */ bne lbl_80C6FC50 -/* 80C6FC4C D0 1F 06 3C */ stfs f0, 0x63c(r31) -lbl_80C6FC50: -/* 80C6FC50 80 1F 06 34 */ lwz r0, 0x634(r31) -/* 80C6FC54 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C6FC58 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80C6FC5C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80C6FC60 38 81 00 24 */ addi r4, r1, 0x24 -/* 80C6FC64 4B 3A 9B 95 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C6FC68 7C 7D 1B 78 */ mr r29, r3 -/* 80C6FC6C 38 61 00 44 */ addi r3, r1, 0x44 -/* 80C6FC70 38 9F 06 28 */ addi r4, r31, 0x628 -/* 80C6FC74 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80C6FC78 4B 5F 6E BD */ bl __mi__4cXyzCFRC3Vec -/* 80C6FC7C C0 01 00 44 */ lfs f0, 0x44(r1) -/* 80C6FC80 D0 01 00 8C */ stfs f0, 0x8c(r1) -/* 80C6FC84 C0 01 00 48 */ lfs f0, 0x48(r1) -/* 80C6FC88 D0 01 00 90 */ stfs f0, 0x90(r1) -/* 80C6FC8C C0 01 00 4C */ lfs f0, 0x4c(r1) -/* 80C6FC90 D0 01 00 94 */ stfs f0, 0x94(r1) -/* 80C6FC94 38 61 00 8C */ addi r3, r1, 0x8c -/* 80C6FC98 4B 6D 74 A1 */ bl PSVECSquareMag -/* 80C6FC9C C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80C6FCA0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FCA4 40 81 00 58 */ ble lbl_80C6FCFC -/* 80C6FCA8 FC 00 08 34 */ frsqrte f0, f1 -/* 80C6FCAC C8 9E 00 50 */ lfd f4, 0x50(r30) -/* 80C6FCB0 FC 44 00 32 */ fmul f2, f4, f0 -/* 80C6FCB4 C8 7E 00 58 */ lfd f3, 0x58(r30) -/* 80C6FCB8 FC 00 00 32 */ fmul f0, f0, f0 -/* 80C6FCBC FC 01 00 32 */ fmul f0, f1, f0 -/* 80C6FCC0 FC 03 00 28 */ fsub f0, f3, f0 -/* 80C6FCC4 FC 02 00 32 */ fmul f0, f2, f0 -/* 80C6FCC8 FC 44 00 32 */ fmul f2, f4, f0 -/* 80C6FCCC FC 00 00 32 */ fmul f0, f0, f0 -/* 80C6FCD0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80C6FCD4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80C6FCD8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80C6FCDC FC 44 00 32 */ fmul f2, f4, f0 -/* 80C6FCE0 FC 00 00 32 */ fmul f0, f0, f0 -/* 80C6FCE4 FC 01 00 32 */ fmul f0, f1, f0 -/* 80C6FCE8 FC 03 00 28 */ fsub f0, f3, f0 -/* 80C6FCEC FC 02 00 32 */ fmul f0, f2, f0 -/* 80C6FCF0 FC 21 00 32 */ fmul f1, f1, f0 -/* 80C6FCF4 FC 20 08 18 */ frsp f1, f1 -/* 80C6FCF8 48 00 00 88 */ b lbl_80C6FD80 -lbl_80C6FCFC: -/* 80C6FCFC C8 1E 00 60 */ lfd f0, 0x60(r30) -/* 80C6FD00 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FD04 40 80 00 10 */ bge lbl_80C6FD14 -/* 80C6FD08 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80C6FD0C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80C6FD10 48 00 00 70 */ b lbl_80C6FD80 -lbl_80C6FD14: -/* 80C6FD14 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80C6FD18 80 81 00 0C */ lwz r4, 0xc(r1) -/* 80C6FD1C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80C6FD20 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80C6FD24 7C 03 00 00 */ cmpw r3, r0 -/* 80C6FD28 41 82 00 14 */ beq lbl_80C6FD3C -/* 80C6FD2C 40 80 00 40 */ bge lbl_80C6FD6C -/* 80C6FD30 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6FD34 41 82 00 20 */ beq lbl_80C6FD54 -/* 80C6FD38 48 00 00 34 */ b lbl_80C6FD6C -lbl_80C6FD3C: -/* 80C6FD3C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80C6FD40 41 82 00 0C */ beq lbl_80C6FD4C -/* 80C6FD44 38 00 00 01 */ li r0, 1 -/* 80C6FD48 48 00 00 28 */ b lbl_80C6FD70 -lbl_80C6FD4C: -/* 80C6FD4C 38 00 00 02 */ li r0, 2 -/* 80C6FD50 48 00 00 20 */ b lbl_80C6FD70 -lbl_80C6FD54: -/* 80C6FD54 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80C6FD58 41 82 00 0C */ beq lbl_80C6FD64 -/* 80C6FD5C 38 00 00 05 */ li r0, 5 -/* 80C6FD60 48 00 00 10 */ b lbl_80C6FD70 -lbl_80C6FD64: -/* 80C6FD64 38 00 00 03 */ li r0, 3 -/* 80C6FD68 48 00 00 08 */ b lbl_80C6FD70 -lbl_80C6FD6C: -/* 80C6FD6C 38 00 00 04 */ li r0, 4 -lbl_80C6FD70: -/* 80C6FD70 2C 00 00 01 */ cmpwi r0, 1 -/* 80C6FD74 40 82 00 0C */ bne lbl_80C6FD80 -/* 80C6FD78 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80C6FD7C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80C6FD80: -/* 80C6FD80 C0 1F 06 3C */ lfs f0, 0x63c(r31) -/* 80C6FD84 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FD88 4C 40 13 82 */ cror 2, 0, 2 -/* 80C6FD8C 40 82 00 A0 */ bne lbl_80C6FE2C -/* 80C6FD90 C0 1F 06 28 */ lfs f0, 0x628(r31) -/* 80C6FD94 D0 1D 04 D0 */ stfs f0, 0x4d0(r29) -/* 80C6FD98 C0 1F 06 2C */ lfs f0, 0x62c(r31) -/* 80C6FD9C D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 80C6FDA0 C0 1F 06 30 */ lfs f0, 0x630(r31) -/* 80C6FDA4 D0 1D 04 D8 */ stfs f0, 0x4d8(r29) -/* 80C6FDA8 80 7F 06 38 */ lwz r3, 0x638(r31) -/* 80C6FDAC 3C 03 00 01 */ addis r0, r3, 1 -/* 80C6FDB0 28 00 FF FF */ cmplwi r0, 0xffff -/* 80C6FDB4 41 82 00 34 */ beq lbl_80C6FDE8 -/* 80C6FDB8 90 61 00 20 */ stw r3, 0x20(r1) -/* 80C6FDBC 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80C6FDC0 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80C6FDC4 38 81 00 20 */ addi r4, r1, 0x20 -/* 80C6FDC8 4B 3A 9A 31 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C6FDCC 80 9F 06 34 */ lwz r4, 0x634(r31) -/* 80C6FDD0 4B FF F4 6D */ bl sendBall__16daObjYIblltray_cFUi -/* 80C6FDD4 38 00 FF FF */ li r0, -1 -/* 80C6FDD8 90 1F 06 34 */ stw r0, 0x634(r31) -/* 80C6FDDC 38 00 00 04 */ li r0, 4 -/* 80C6FDE0 90 1F 06 40 */ stw r0, 0x640(r31) -/* 80C6FDE4 48 00 00 AC */ b lbl_80C6FE90 -lbl_80C6FDE8: -/* 80C6FDE8 80 1F 06 34 */ lwz r0, 0x634(r31) -/* 80C6FDEC 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80C6FDF0 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80C6FDF4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80C6FDF8 38 81 00 1C */ addi r4, r1, 0x1c -/* 80C6FDFC 4B 3A 99 FD */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C6FE00 C0 1F 05 B4 */ lfs f0, 0x5b4(r31) -/* 80C6FE04 D0 03 04 D0 */ stfs f0, 0x4d0(r3) -/* 80C6FE08 C0 1F 05 B8 */ lfs f0, 0x5b8(r31) -/* 80C6FE0C D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 80C6FE10 C0 1F 05 BC */ lfs f0, 0x5bc(r31) -/* 80C6FE14 D0 03 04 D8 */ stfs f0, 0x4d8(r3) -/* 80C6FE18 38 00 FF FF */ li r0, -1 -/* 80C6FE1C 90 1F 06 34 */ stw r0, 0x634(r31) -/* 80C6FE20 38 00 00 04 */ li r0, 4 -/* 80C6FE24 90 1F 06 40 */ stw r0, 0x640(r31) -/* 80C6FE28 48 00 00 68 */ b lbl_80C6FE90 -lbl_80C6FE2C: -/* 80C6FE2C FC 00 0A 10 */ fabs f0, f1 -/* 80C6FE30 FC 40 00 18 */ frsp f2, f0 -/* 80C6FE34 3C 60 80 45 */ lis r3, G_CM3D_F_ABS_MIN@ha /* 0x80451180@ha */ -/* 80C6FE38 C0 03 11 80 */ lfs f0, G_CM3D_F_ABS_MIN@l(r3) /* 0x80451180@l */ -/* 80C6FE3C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80C6FE40 41 80 00 50 */ blt lbl_80C6FE90 -/* 80C6FE44 38 61 00 8C */ addi r3, r1, 0x8c -/* 80C6FE48 7C 64 1B 78 */ mr r4, r3 -/* 80C6FE4C C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 80C6FE50 EC 20 08 24 */ fdivs f1, f0, f1 -/* 80C6FE54 4B 6D 72 85 */ bl PSVECScale -/* 80C6FE58 38 61 00 8C */ addi r3, r1, 0x8c -/* 80C6FE5C 7C 64 1B 78 */ mr r4, r3 -/* 80C6FE60 C0 3F 06 3C */ lfs f1, 0x63c(r31) -/* 80C6FE64 4B 6D 72 75 */ bl PSVECScale -/* 80C6FE68 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80C6FE6C 38 81 00 8C */ addi r4, r1, 0x8c -/* 80C6FE70 7C 65 1B 78 */ mr r5, r3 -/* 80C6FE74 4B 6D 72 1D */ bl PSVECAdd -/* 80C6FE78 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80C6FE7C D0 1D 04 BC */ stfs f0, 0x4bc(r29) -/* 80C6FE80 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80C6FE84 D0 1D 04 C0 */ stfs f0, 0x4c0(r29) -/* 80C6FE88 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80C6FE8C D0 1D 04 C4 */ stfs f0, 0x4c4(r29) -lbl_80C6FE90: -/* 80C6FE90 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C6FE94 2C 00 00 03 */ cmpwi r0, 3 -/* 80C6FE98 40 82 02 64 */ bne lbl_80C700FC -/* 80C6FE9C C0 3F 06 3C */ lfs f1, 0x63c(r31) -/* 80C6FEA0 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 80C6FEA4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80C6FEA8 D0 1F 06 3C */ stfs f0, 0x63c(r31) -/* 80C6FEAC C0 3F 06 3C */ lfs f1, 0x63c(r31) -/* 80C6FEB0 C0 1E 00 34 */ lfs f0, 0x34(r30) -/* 80C6FEB4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FEB8 4C 41 13 82 */ cror 2, 1, 2 -/* 80C6FEBC 40 82 00 08 */ bne lbl_80C6FEC4 -/* 80C6FEC0 D0 1F 06 3C */ stfs f0, 0x63c(r31) -lbl_80C6FEC4: -/* 80C6FEC4 80 1F 06 34 */ lwz r0, 0x634(r31) -/* 80C6FEC8 90 01 00 18 */ stw r0, 0x18(r1) -/* 80C6FECC 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80C6FED0 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80C6FED4 38 81 00 18 */ addi r4, r1, 0x18 -/* 80C6FED8 4B 3A 99 21 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C6FEDC 7C 7D 1B 78 */ mr r29, r3 -/* 80C6FEE0 38 61 00 38 */ addi r3, r1, 0x38 -/* 80C6FEE4 38 9F 05 A8 */ addi r4, r31, 0x5a8 -/* 80C6FEE8 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80C6FEEC 4B 5F 6C 49 */ bl __mi__4cXyzCFRC3Vec -/* 80C6FEF0 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 80C6FEF4 D0 01 00 80 */ stfs f0, 0x80(r1) -/* 80C6FEF8 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 80C6FEFC D0 01 00 84 */ stfs f0, 0x84(r1) -/* 80C6FF00 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 80C6FF04 D0 01 00 88 */ stfs f0, 0x88(r1) -/* 80C6FF08 38 61 00 80 */ addi r3, r1, 0x80 -/* 80C6FF0C 4B 6D 72 2D */ bl PSVECSquareMag -/* 80C6FF10 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80C6FF14 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FF18 40 81 00 58 */ ble lbl_80C6FF70 -/* 80C6FF1C FC 00 08 34 */ frsqrte f0, f1 -/* 80C6FF20 C8 9E 00 50 */ lfd f4, 0x50(r30) -/* 80C6FF24 FC 44 00 32 */ fmul f2, f4, f0 -/* 80C6FF28 C8 7E 00 58 */ lfd f3, 0x58(r30) -/* 80C6FF2C FC 00 00 32 */ fmul f0, f0, f0 -/* 80C6FF30 FC 01 00 32 */ fmul f0, f1, f0 -/* 80C6FF34 FC 03 00 28 */ fsub f0, f3, f0 -/* 80C6FF38 FC 02 00 32 */ fmul f0, f2, f0 -/* 80C6FF3C FC 44 00 32 */ fmul f2, f4, f0 -/* 80C6FF40 FC 00 00 32 */ fmul f0, f0, f0 -/* 80C6FF44 FC 01 00 32 */ fmul f0, f1, f0 -/* 80C6FF48 FC 03 00 28 */ fsub f0, f3, f0 -/* 80C6FF4C FC 02 00 32 */ fmul f0, f2, f0 -/* 80C6FF50 FC 44 00 32 */ fmul f2, f4, f0 -/* 80C6FF54 FC 00 00 32 */ fmul f0, f0, f0 -/* 80C6FF58 FC 01 00 32 */ fmul f0, f1, f0 -/* 80C6FF5C FC 03 00 28 */ fsub f0, f3, f0 -/* 80C6FF60 FC 02 00 32 */ fmul f0, f2, f0 -/* 80C6FF64 FC 21 00 32 */ fmul f1, f1, f0 -/* 80C6FF68 FC 20 08 18 */ frsp f1, f1 -/* 80C6FF6C 48 00 00 88 */ b lbl_80C6FFF4 -lbl_80C6FF70: -/* 80C6FF70 C8 1E 00 60 */ lfd f0, 0x60(r30) -/* 80C6FF74 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FF78 40 80 00 10 */ bge lbl_80C6FF88 -/* 80C6FF7C 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80C6FF80 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80C6FF84 48 00 00 70 */ b lbl_80C6FFF4 -lbl_80C6FF88: -/* 80C6FF88 D0 21 00 08 */ stfs f1, 8(r1) -/* 80C6FF8C 80 81 00 08 */ lwz r4, 8(r1) -/* 80C6FF90 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80C6FF94 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80C6FF98 7C 03 00 00 */ cmpw r3, r0 -/* 80C6FF9C 41 82 00 14 */ beq lbl_80C6FFB0 -/* 80C6FFA0 40 80 00 40 */ bge lbl_80C6FFE0 -/* 80C6FFA4 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6FFA8 41 82 00 20 */ beq lbl_80C6FFC8 -/* 80C6FFAC 48 00 00 34 */ b lbl_80C6FFE0 -lbl_80C6FFB0: -/* 80C6FFB0 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80C6FFB4 41 82 00 0C */ beq lbl_80C6FFC0 -/* 80C6FFB8 38 00 00 01 */ li r0, 1 -/* 80C6FFBC 48 00 00 28 */ b lbl_80C6FFE4 -lbl_80C6FFC0: -/* 80C6FFC0 38 00 00 02 */ li r0, 2 -/* 80C6FFC4 48 00 00 20 */ b lbl_80C6FFE4 -lbl_80C6FFC8: -/* 80C6FFC8 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80C6FFCC 41 82 00 0C */ beq lbl_80C6FFD8 -/* 80C6FFD0 38 00 00 05 */ li r0, 5 -/* 80C6FFD4 48 00 00 10 */ b lbl_80C6FFE4 -lbl_80C6FFD8: -/* 80C6FFD8 38 00 00 03 */ li r0, 3 -/* 80C6FFDC 48 00 00 08 */ b lbl_80C6FFE4 -lbl_80C6FFE0: -/* 80C6FFE0 38 00 00 04 */ li r0, 4 -lbl_80C6FFE4: -/* 80C6FFE4 2C 00 00 01 */ cmpwi r0, 1 -/* 80C6FFE8 40 82 00 0C */ bne lbl_80C6FFF4 -/* 80C6FFEC 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80C6FFF0 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80C6FFF4: -/* 80C6FFF4 C0 1F 06 3C */ lfs f0, 0x63c(r31) -/* 80C6FFF8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6FFFC 4C 40 13 82 */ cror 2, 0, 2 -/* 80C70000 40 82 00 98 */ bne lbl_80C70098 -/* 80C70004 C0 1F 05 A8 */ lfs f0, 0x5a8(r31) -/* 80C70008 D0 1D 04 D0 */ stfs f0, 0x4d0(r29) -/* 80C7000C C0 1F 05 AC */ lfs f0, 0x5ac(r31) -/* 80C70010 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 80C70014 C0 1F 05 B0 */ lfs f0, 0x5b0(r31) -/* 80C70018 D0 1D 04 D8 */ stfs f0, 0x4d8(r29) -/* 80C7001C 3C 60 00 08 */ lis r3, 0x0008 /* 0x000801DE@ha */ -/* 80C70020 38 03 01 DE */ addi r0, r3, 0x01DE /* 0x000801DE@l */ -/* 80C70024 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80C70028 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C7002C 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C70030 80 63 00 00 */ lwz r3, 0(r3) -/* 80C70034 38 81 00 2C */ addi r4, r1, 0x2c -/* 80C70038 38 BF 06 28 */ addi r5, r31, 0x628 -/* 80C7003C 38 C0 00 00 */ li r6, 0 -/* 80C70040 38 E0 00 00 */ li r7, 0 -/* 80C70044 C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 80C70048 FC 40 08 90 */ fmr f2, f1 -/* 80C7004C C0 7E 00 44 */ lfs f3, 0x44(r30) -/* 80C70050 FC 80 18 90 */ fmr f4, f3 -/* 80C70054 39 00 00 00 */ li r8, 0 -/* 80C70058 4B 63 B9 2D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C7005C 38 00 00 01 */ li r0, 1 -/* 80C70060 90 1F 06 40 */ stw r0, 0x640(r31) -/* 80C70064 80 1F 06 34 */ lwz r0, 0x634(r31) -/* 80C70068 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C7006C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80C70070 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80C70074 38 81 00 14 */ addi r4, r1, 0x14 -/* 80C70078 4B 3A 97 81 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C7007C C0 1F 05 A8 */ lfs f0, 0x5a8(r31) -/* 80C70080 D0 03 04 D0 */ stfs f0, 0x4d0(r3) -/* 80C70084 C0 1F 05 AC */ lfs f0, 0x5ac(r31) -/* 80C70088 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 80C7008C C0 1F 05 B0 */ lfs f0, 0x5b0(r31) -/* 80C70090 D0 03 04 D8 */ stfs f0, 0x4d8(r3) -/* 80C70094 48 00 00 68 */ b lbl_80C700FC -lbl_80C70098: -/* 80C70098 FC 00 0A 10 */ fabs f0, f1 -/* 80C7009C FC 40 00 18 */ frsp f2, f0 -/* 80C700A0 3C 60 80 45 */ lis r3, G_CM3D_F_ABS_MIN@ha /* 0x80451180@ha */ -/* 80C700A4 C0 03 11 80 */ lfs f0, G_CM3D_F_ABS_MIN@l(r3) /* 0x80451180@l */ -/* 80C700A8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80C700AC 41 80 00 50 */ blt lbl_80C700FC -/* 80C700B0 38 61 00 80 */ addi r3, r1, 0x80 -/* 80C700B4 7C 64 1B 78 */ mr r4, r3 -/* 80C700B8 C0 1E 00 28 */ lfs f0, 0x28(r30) -/* 80C700BC EC 20 08 24 */ fdivs f1, f0, f1 -/* 80C700C0 4B 6D 70 19 */ bl PSVECScale -/* 80C700C4 38 61 00 80 */ addi r3, r1, 0x80 -/* 80C700C8 7C 64 1B 78 */ mr r4, r3 -/* 80C700CC C0 3F 06 3C */ lfs f1, 0x63c(r31) -/* 80C700D0 4B 6D 70 09 */ bl PSVECScale -/* 80C700D4 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80C700D8 38 81 00 80 */ addi r4, r1, 0x80 -/* 80C700DC 7C 65 1B 78 */ mr r5, r3 -/* 80C700E0 4B 6D 6F B1 */ bl PSVECAdd -/* 80C700E4 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80C700E8 D0 1D 04 BC */ stfs f0, 0x4bc(r29) -/* 80C700EC C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80C700F0 D0 1D 04 C0 */ stfs f0, 0x4c0(r29) -/* 80C700F4 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80C700F8 D0 1D 04 C4 */ stfs f0, 0x4c4(r29) -lbl_80C700FC: -/* 80C700FC C0 1F 05 FC */ lfs f0, 0x5fc(r31) -/* 80C70100 D0 01 00 74 */ stfs f0, 0x74(r1) -/* 80C70104 C0 3F 06 0C */ lfs f1, 0x60c(r31) -/* 80C70108 D0 21 00 78 */ stfs f1, 0x78(r1) -/* 80C7010C C0 1F 06 1C */ lfs f0, 0x61c(r31) -/* 80C70110 D0 01 00 7C */ stfs f0, 0x7c(r1) -/* 80C70114 C0 1E 00 1C */ lfs f0, 0x1c(r30) -/* 80C70118 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80C7011C D0 01 00 78 */ stfs f0, 0x78(r1) -/* 80C70120 38 7F 07 68 */ addi r3, r31, 0x768 -/* 80C70124 38 81 00 74 */ addi r4, r1, 0x74 -/* 80C70128 4B 5F F0 B5 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C7012C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C70130 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C70134 3B A3 23 3C */ addi r29, r3, 0x233c -/* 80C70138 7F A3 EB 78 */ mr r3, r29 -/* 80C7013C 38 9F 06 44 */ addi r4, r31, 0x644 -/* 80C70140 4B 5F 4A 69 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C70144 38 7F 08 A4 */ addi r3, r31, 0x8a4 -/* 80C70148 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80C7014C 4B 5F F0 91 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C70150 7F A3 EB 78 */ mr r3, r29 -/* 80C70154 38 9F 07 80 */ addi r4, r31, 0x780 -/* 80C70158 4B 5F 4A 51 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C7015C C0 1F 04 AC */ lfs f0, 0x4ac(r31) -/* 80C70160 D0 01 00 78 */ stfs f0, 0x78(r1) -/* 80C70164 38 7F 09 E0 */ addi r3, r31, 0x9e0 -/* 80C70168 38 81 00 74 */ addi r4, r1, 0x74 -/* 80C7016C 4B 5F F0 71 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C70170 7F A3 EB 78 */ mr r3, r29 -/* 80C70174 38 9F 08 BC */ addi r4, r31, 0x8bc -/* 80C70178 4B 5F 4A 31 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C7017C 38 7F 0A 14 */ addi r3, r31, 0xa14 -/* 80C70180 4B 41 36 B1 */ bl Move__10dCcD_GSttsFv -/* 80C70184 38 7F 0A 38 */ addi r3, r31, 0xa38 -/* 80C70188 4B 39 D2 A1 */ bl play__14mDoExt_baseAnmFv -/* 80C7018C C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80C70190 D0 01 00 68 */ stfs f0, 0x68(r1) -/* 80C70194 D0 01 00 6C */ stfs f0, 0x6c(r1) -/* 80C70198 C0 1E 00 1C */ lfs f0, 0x1c(r30) -/* 80C7019C D0 01 00 70 */ stfs f0, 0x70(r1) -/* 80C701A0 80 7F 0A 34 */ lwz r3, 0xa34(r31) -/* 80C701A4 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80C701A8 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80C701AC 38 81 00 68 */ addi r4, r1, 0x68 -/* 80C701B0 38 BF 0A 88 */ addi r5, r31, 0xa88 -/* 80C701B4 4B 6D 6B B9 */ bl PSMTXMultVec -/* 80C701B8 C0 1F 0A 88 */ lfs f0, 0xa88(r31) -/* 80C701BC D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 80C701C0 C0 1F 0A 8C */ lfs f0, 0xa8c(r31) -/* 80C701C4 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80C701C8 C0 1F 0A 90 */ lfs f0, 0xa90(r31) -/* 80C701CC D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 80C701D0 80 1F 06 40 */ lwz r0, 0x640(r31) -/* 80C701D4 2C 00 00 00 */ cmpwi r0, 0 -/* 80C701D8 40 82 00 EC */ bne lbl_80C702C4 -/* 80C701DC 38 7F 0A 54 */ addi r3, r31, 0xa54 -/* 80C701E0 38 81 00 A4 */ addi r4, r1, 0xa4 -/* 80C701E4 4B 6D 63 CD */ bl PSMTXInverse -/* 80C701E8 28 03 00 00 */ cmplwi r3, 0 -/* 80C701EC 41 82 00 D8 */ beq lbl_80C702C4 -/* 80C701F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C701F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C701F8 83 A3 5D AC */ lwz r29, 0x5dac(r3) -/* 80C701FC 38 61 00 A4 */ addi r3, r1, 0xa4 -/* 80C70200 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80C70204 38 A1 00 5C */ addi r5, r1, 0x5c -/* 80C70208 4B 6D 6B 65 */ bl PSMTXMultVec -/* 80C7020C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80C70210 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80C70214 A8 7F 04 DE */ lha r3, 0x4de(r31) -/* 80C70218 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 80C7021C 7C 03 00 50 */ subf r0, r3, r0 -/* 80C70220 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80C70224 7C 64 02 14 */ add r3, r4, r0 -/* 80C70228 C0 23 00 04 */ lfs f1, 4(r3) -/* 80C7022C C0 1E 00 6C */ lfs f0, 0x6c(r30) -/* 80C70230 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C70234 40 80 00 90 */ bge lbl_80C702C4 -/* 80C70238 C0 21 00 60 */ lfs f1, 0x60(r1) -/* 80C7023C C0 1E 00 70 */ lfs f0, 0x70(r30) -/* 80C70240 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C70244 40 81 00 80 */ ble lbl_80C702C4 -/* 80C70248 C0 1E 00 74 */ lfs f0, 0x74(r30) -/* 80C7024C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C70250 40 80 00 74 */ bge lbl_80C702C4 -/* 80C70254 C0 21 00 64 */ lfs f1, 0x64(r1) -/* 80C70258 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C7025C 40 81 00 68 */ ble lbl_80C702C4 -/* 80C70260 C0 1E 00 78 */ lfs f0, 0x78(r30) -/* 80C70264 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C70268 40 80 00 5C */ bge lbl_80C702C4 -/* 80C7026C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C70270 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80C70274 40 82 00 20 */ bne lbl_80C70294 -/* 80C70278 C0 21 00 5C */ lfs f1, 0x5c(r1) -/* 80C7027C C0 1E 00 7C */ lfs f0, 0x7c(r30) -/* 80C70280 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C70284 40 80 00 10 */ bge lbl_80C70294 -/* 80C70288 C0 1E 00 80 */ lfs f0, 0x80(r30) -/* 80C7028C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C70290 41 81 00 28 */ bgt lbl_80C702B8 -lbl_80C70294: -/* 80C70294 2C 00 00 00 */ cmpwi r0, 0 -/* 80C70298 41 82 00 2C */ beq lbl_80C702C4 -/* 80C7029C C0 21 00 5C */ lfs f1, 0x5c(r1) -/* 80C702A0 C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 80C702A4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C702A8 40 80 00 1C */ bge lbl_80C702C4 -/* 80C702AC C0 1E 00 88 */ lfs f0, 0x88(r30) -/* 80C702B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C702B4 40 81 00 10 */ ble lbl_80C702C4 -lbl_80C702B8: -/* 80C702B8 80 1D 05 8C */ lwz r0, 0x58c(r29) -/* 80C702BC 64 00 10 00 */ oris r0, r0, 0x1000 -/* 80C702C0 90 1D 05 8C */ stw r0, 0x58c(r29) -lbl_80C702C4: -/* 80C702C4 38 60 00 01 */ li r3, 1 -/* 80C702C8 39 61 01 00 */ addi r11, r1, 0x100 -/* 80C702CC 4B 6F 1F 5D */ bl _restgpr_29 -/* 80C702D0 80 01 01 04 */ lwz r0, 0x104(r1) -/* 80C702D4 7C 08 03 A6 */ mtlr r0 -/* 80C702D8 38 21 01 00 */ addi r1, r1, 0x100 -/* 80C702DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__ct__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__ct__8dCcD_CylFv.s deleted file mode 100644 index 45c74efe94..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__ct__8dCcD_CylFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80C706C4: -/* 80C706C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C706C8 7C 08 02 A6 */ mflr r0 -/* 80C706CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C706D0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C706D4 7C 7F 1B 78 */ mr r31, r3 -/* 80C706D8 4B 41 33 51 */ bl __ct__12dCcD_GObjInfFv -/* 80C706DC 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C706E0 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C706E4 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80C706E8 3C 60 80 C7 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C70AF4@ha */ -/* 80C706EC 38 03 0A F4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C70AF4@l */ -/* 80C706F0 90 1F 01 1C */ stw r0, 0x11c(r31) -/* 80C706F4 3C 60 80 C7 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C70B00@ha */ -/* 80C706F8 38 03 0B 00 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C70B00@l */ -/* 80C706FC 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80C70700 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C70704 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C70708 90 7F 01 20 */ stw r3, 0x120(r31) -/* 80C7070C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C70710 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80C70714 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C70718 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C7071C 90 7F 00 3C */ stw r3, 0x3c(r31) -/* 80C70720 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C70724 90 1F 01 20 */ stw r0, 0x120(r31) -/* 80C70728 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C7072C 90 1F 01 38 */ stw r0, 0x138(r31) -/* 80C70730 7F E3 FB 78 */ mr r3, r31 -/* 80C70734 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C70738 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C7073C 7C 08 03 A6 */ mtlr r0 -/* 80C70740 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C70744 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index 782b455242..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C70844: -/* 80C70844 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C70848 7C 08 02 A6 */ mflr r0 -/* 80C7084C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C70850 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C70854 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C70858 41 82 00 1C */ beq lbl_80C70874 -/* 80C7085C 3C A0 80 C7 */ lis r5, __vt__10cCcD_GStts@ha /* 0x80C70B0C@ha */ -/* 80C70860 38 05 0B 0C */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80C70B0C@l */ -/* 80C70864 90 1F 00 00 */ stw r0, 0(r31) -/* 80C70868 7C 80 07 35 */ extsh. r0, r4 -/* 80C7086C 40 81 00 08 */ ble lbl_80C70874 -/* 80C70870 4B 65 E4 CD */ bl __dl__FPv -lbl_80C70874: -/* 80C70874 7F E3 FB 78 */ mr r3, r31 -/* 80C70878 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C7087C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C70880 7C 08 03 A6 */ mtlr r0 -/* 80C70884 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C70888 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index cb79841839..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C7059C: -/* 80C7059C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C705A0 7C 08 02 A6 */ mflr r0 -/* 80C705A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C705A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C705AC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C705B0 41 82 00 30 */ beq lbl_80C705E0 -/* 80C705B4 3C 60 80 C7 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80C70B18@ha */ -/* 80C705B8 38 03 0B 18 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80C70B18@l */ -/* 80C705BC 90 1F 00 00 */ stw r0, 0(r31) -/* 80C705C0 41 82 00 10 */ beq lbl_80C705D0 -/* 80C705C4 3C 60 80 C7 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80C70B0C@ha */ -/* 80C705C8 38 03 0B 0C */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80C70B0C@l */ -/* 80C705CC 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C705D0: -/* 80C705D0 7C 80 07 35 */ extsh. r0, r4 -/* 80C705D4 40 81 00 0C */ ble lbl_80C705E0 -/* 80C705D8 7F E3 FB 78 */ mr r3, r31 -/* 80C705DC 4B 65 E7 61 */ bl __dl__FPv -lbl_80C705E0: -/* 80C705E0 7F E3 FB 78 */ mr r3, r31 -/* 80C705E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C705E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C705EC 7C 08 03 A6 */ mtlr r0 -/* 80C705F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C705F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 00cc7244c3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C70554: -/* 80C70554 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C70558 7C 08 02 A6 */ mflr r0 -/* 80C7055C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C70560 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C70564 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C70568 41 82 00 1C */ beq lbl_80C70584 -/* 80C7056C 3C A0 80 C7 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80C70B24@ha */ -/* 80C70570 38 05 0B 24 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80C70B24@l */ -/* 80C70574 90 1F 00 00 */ stw r0, 0(r31) -/* 80C70578 7C 80 07 35 */ extsh. r0, r4 -/* 80C7057C 40 81 00 08 */ ble lbl_80C70584 -/* 80C70580 4B 65 E7 BD */ bl __dl__FPv -lbl_80C70584: -/* 80C70584 7F E3 FB 78 */ mr r3, r31 -/* 80C70588 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C7058C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C70590 7C 08 03 A6 */ mtlr r0 -/* 80C70594 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C70598 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__16daObjYIblltray_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__16daObjYIblltray_cFv.s deleted file mode 100644 index d65a49372f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__16daObjYIblltray_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_80C7088C: -/* 80C7088C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C70890 7C 08 02 A6 */ mflr r0 -/* 80C70894 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C70898 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C7089C 93 C1 00 08 */ stw r30, 8(r1) -/* 80C708A0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C708A4 7C 9F 23 78 */ mr r31, r4 -/* 80C708A8 41 82 00 D4 */ beq lbl_80C7097C -/* 80C708AC 3C 60 80 C7 */ lis r3, __vt__16daObjYIblltray_c@ha /* 0x80C70B30@ha */ -/* 80C708B0 38 03 0B 30 */ addi r0, r3, __vt__16daObjYIblltray_c@l /* 0x80C70B30@l */ -/* 80C708B4 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C708B8 34 1E 0A 38 */ addic. r0, r30, 0xa38 -/* 80C708BC 41 82 00 20 */ beq lbl_80C708DC -/* 80C708C0 34 1E 0A 38 */ addic. r0, r30, 0xa38 -/* 80C708C4 41 82 00 18 */ beq lbl_80C708DC -/* 80C708C8 34 1E 0A 38 */ addic. r0, r30, 0xa38 -/* 80C708CC 41 82 00 10 */ beq lbl_80C708DC -/* 80C708D0 3C 60 80 C7 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80C70B24@ha */ -/* 80C708D4 38 03 0B 24 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80C70B24@l */ -/* 80C708D8 90 1E 0A 38 */ stw r0, 0xa38(r30) -lbl_80C708DC: -/* 80C708DC 34 1E 09 F8 */ addic. r0, r30, 0x9f8 -/* 80C708E0 41 82 00 54 */ beq lbl_80C70934 -/* 80C708E4 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C708E8 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C708EC 90 7E 0A 10 */ stw r3, 0xa10(r30) -/* 80C708F0 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C708F4 90 1E 0A 14 */ stw r0, 0xa14(r30) -/* 80C708F8 34 1E 0A 14 */ addic. r0, r30, 0xa14 -/* 80C708FC 41 82 00 24 */ beq lbl_80C70920 -/* 80C70900 3C 60 80 C7 */ lis r3, __vt__10dCcD_GStts@ha /* 0x80C70B18@ha */ -/* 80C70904 38 03 0B 18 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80C70B18@l */ -/* 80C70908 90 1E 0A 14 */ stw r0, 0xa14(r30) -/* 80C7090C 34 1E 0A 14 */ addic. r0, r30, 0xa14 -/* 80C70910 41 82 00 10 */ beq lbl_80C70920 -/* 80C70914 3C 60 80 C7 */ lis r3, __vt__10cCcD_GStts@ha /* 0x80C70B0C@ha */ -/* 80C70918 38 03 0B 0C */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80C70B0C@l */ -/* 80C7091C 90 1E 0A 14 */ stw r0, 0xa14(r30) -lbl_80C70920: -/* 80C70920 34 1E 09 F8 */ addic. r0, r30, 0x9f8 -/* 80C70924 41 82 00 10 */ beq lbl_80C70934 -/* 80C70928 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C7092C 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C70930 90 1E 0A 10 */ stw r0, 0xa10(r30) -lbl_80C70934: -/* 80C70934 38 7E 06 44 */ addi r3, r30, 0x644 -/* 80C70938 3C 80 80 C7 */ lis r4, __dt__8dCcD_CylFv@ha /* 0x80C705F8@ha */ -/* 80C7093C 38 84 05 F8 */ addi r4, r4, __dt__8dCcD_CylFv@l /* 0x80C705F8@l */ -/* 80C70940 38 A0 01 3C */ li r5, 0x13c -/* 80C70944 38 C0 00 03 */ li r6, 3 -/* 80C70948 4B 6F 13 A1 */ bl __destroy_arr -/* 80C7094C 28 1E 00 00 */ cmplwi r30, 0 -/* 80C70950 41 82 00 1C */ beq lbl_80C7096C -/* 80C70954 3C 60 80 3B */ lis r3, __vt__16dBgS_MoveBgActor@ha /* 0x803AB9A0@ha */ -/* 80C70958 38 03 B9 A0 */ addi r0, r3, __vt__16dBgS_MoveBgActor@l /* 0x803AB9A0@l */ -/* 80C7095C 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C70960 7F C3 F3 78 */ mr r3, r30 -/* 80C70964 38 80 00 00 */ li r4, 0 -/* 80C70968 4B 3A 83 25 */ bl __dt__10fopAc_ac_cFv -lbl_80C7096C: -/* 80C7096C 7F E0 07 35 */ extsh. r0, r31 -/* 80C70970 40 81 00 0C */ ble lbl_80C7097C -/* 80C70974 7F C3 F3 78 */ mr r3, r30 -/* 80C70978 4B 65 E3 C5 */ bl __dl__FPv -lbl_80C7097C: -/* 80C7097C 7F C3 F3 78 */ mr r3, r30 -/* 80C70980 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C70984 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C70988 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C7098C 7C 08 03 A6 */ mtlr r0 -/* 80C70990 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C70994 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8cM3dGAabFv.s deleted file mode 100644 index 88ea34d6da..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C70790: -/* 80C70790 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C70794 7C 08 02 A6 */ mflr r0 -/* 80C70798 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C7079C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C707A0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C707A4 41 82 00 1C */ beq lbl_80C707C0 -/* 80C707A8 3C A0 80 C7 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C70AF4@ha */ -/* 80C707AC 38 05 0A F4 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C70AF4@l */ -/* 80C707B0 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C707B4 7C 80 07 35 */ extsh. r0, r4 -/* 80C707B8 40 81 00 08 */ ble lbl_80C707C0 -/* 80C707BC 4B 65 E5 81 */ bl __dl__FPv -lbl_80C707C0: -/* 80C707C0 7F E3 FB 78 */ mr r3, r31 -/* 80C707C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C707C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C707CC 7C 08 03 A6 */ mtlr r0 -/* 80C707D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C707D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8cM3dGCylFv.s deleted file mode 100644 index ff2af11635..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C70748: -/* 80C70748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C7074C 7C 08 02 A6 */ mflr r0 -/* 80C70750 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C70754 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C70758 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C7075C 41 82 00 1C */ beq lbl_80C70778 -/* 80C70760 3C A0 80 C7 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80C70B00@ha */ -/* 80C70764 38 05 0B 00 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80C70B00@l */ -/* 80C70768 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C7076C 7C 80 07 35 */ extsh. r0, r4 -/* 80C70770 40 81 00 08 */ ble lbl_80C70778 -/* 80C70774 4B 65 E5 C9 */ bl __dl__FPv -lbl_80C70778: -/* 80C70778 7F E3 FB 78 */ mr r3, r31 -/* 80C7077C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C70780 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C70784 7C 08 03 A6 */ mtlr r0 -/* 80C70788 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C7078C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8dCcD_CylFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8dCcD_CylFv.s deleted file mode 100644 index c2e6c204b9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8dCcD_CylFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80C705F8: -/* 80C705F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C705FC 7C 08 02 A6 */ mflr r0 -/* 80C70600 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C70604 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C70608 93 C1 00 08 */ stw r30, 8(r1) -/* 80C7060C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C70610 7C 9F 23 78 */ mr r31, r4 -/* 80C70614 41 82 00 94 */ beq lbl_80C706A8 -/* 80C70618 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C7061C 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C70620 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80C70624 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C70628 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C7062C 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C70630 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C70634 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80C70638 41 82 00 54 */ beq lbl_80C7068C -/* 80C7063C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C70640 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C70644 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80C70648 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C7064C 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C70650 34 1E 01 24 */ addic. r0, r30, 0x124 -/* 80C70654 41 82 00 10 */ beq lbl_80C70664 -/* 80C70658 3C 60 80 C7 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C70B00@ha */ -/* 80C7065C 38 03 0B 00 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C70B00@l */ -/* 80C70660 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_80C70664: -/* 80C70664 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80C70668 41 82 00 24 */ beq lbl_80C7068C -/* 80C7066C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C70670 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C70674 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C70678 34 1E 01 04 */ addic. r0, r30, 0x104 -/* 80C7067C 41 82 00 10 */ beq lbl_80C7068C -/* 80C70680 3C 60 80 C7 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C70AF4@ha */ -/* 80C70684 38 03 0A F4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C70AF4@l */ -/* 80C70688 90 1E 01 1C */ stw r0, 0x11c(r30) -lbl_80C7068C: -/* 80C7068C 7F C3 F3 78 */ mr r3, r30 -/* 80C70690 38 80 00 00 */ li r4, 0 -/* 80C70694 4B 41 3A 51 */ bl __dt__12dCcD_GObjInfFv -/* 80C70698 7F E0 07 35 */ extsh. r0, r31 -/* 80C7069C 40 81 00 0C */ ble lbl_80C706A8 -/* 80C706A0 7F C3 F3 78 */ mr r3, r30 -/* 80C706A4 4B 65 E6 99 */ bl __dl__FPv -lbl_80C706A8: -/* 80C706A8 7F C3 F3 78 */ mr r3, r30 -/* 80C706AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C706B0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C706B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C706B8 7C 08 03 A6 */ mtlr r0 -/* 80C706BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C706C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/create1st__16daObjYIblltray_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/create1st__16daObjYIblltray_cFv.s deleted file mode 100644 index 88d805148d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/create1st__16daObjYIblltray_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80C6EBF8: -/* 80C6EBF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6EBFC 7C 08 02 A6 */ mflr r0 -/* 80C6EC00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6EC04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6EC08 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C6EC0C 41 82 00 08 */ beq lbl_80C6EC14 -/* 80C6EC10 38 63 05 A0 */ addi r3, r3, 0x5a0 -lbl_80C6EC14: -/* 80C6EC14 3C 80 80 C7 */ lis r4, l_arcName@ha /* 0x80C70A38@ha */ -/* 80C6EC18 38 84 0A 38 */ addi r4, r4, l_arcName@l /* 0x80C70A38@l */ -/* 80C6EC1C 80 84 00 00 */ lwz r4, 0(r4) -/* 80C6EC20 4B 3B E2 9D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C6EC24 7C 60 1B 78 */ mr r0, r3 -/* 80C6EC28 2C 00 00 04 */ cmpwi r0, 4 -/* 80C6EC2C 40 82 00 44 */ bne lbl_80C6EC70 -/* 80C6EC30 7F E3 FB 78 */ mr r3, r31 -/* 80C6EC34 48 00 00 55 */ bl setMtx__16daObjYIblltray_cFv -/* 80C6EC38 7F E3 FB 78 */ mr r3, r31 -/* 80C6EC3C 3C 80 80 C7 */ lis r4, l_arcName@ha /* 0x80C70A38@ha */ -/* 80C6EC40 38 84 0A 38 */ addi r4, r4, l_arcName@l /* 0x80C70A38@l */ -/* 80C6EC44 80 84 00 00 */ lwz r4, 0(r4) -/* 80C6EC48 38 A0 00 0C */ li r5, 0xc -/* 80C6EC4C 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C6EC50 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C6EC54 38 E0 12 10 */ li r7, 0x1210 -/* 80C6EC58 39 1F 05 C0 */ addi r8, r31, 0x5c0 -/* 80C6EC5C 4B 40 9B 61 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C6EC60 7C 60 1B 78 */ mr r0, r3 -/* 80C6EC64 2C 00 00 05 */ cmpwi r0, 5 -/* 80C6EC68 40 82 00 08 */ bne lbl_80C6EC70 -/* 80C6EC6C 48 00 00 08 */ b lbl_80C6EC74 -lbl_80C6EC70: -/* 80C6EC70 7C 03 03 78 */ mr r3, r0 -lbl_80C6EC74: -/* 80C6EC74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6EC78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6EC7C 7C 08 03 A6 */ mtlr r0 -/* 80C6EC80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6EC84 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGDelete__FP16daObjYIblltray_c.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGDelete__FP16daObjYIblltray_c.s deleted file mode 100644 index b8e7cacfed..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGDelete__FP16daObjYIblltray_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C707D8: -/* 80C707D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C707DC 7C 08 02 A6 */ mflr r0 -/* 80C707E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C707E4 4B 40 80 F9 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C707E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C707EC 7C 08 03 A6 */ mtlr r0 -/* 80C707F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C707F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGDraw__FP16daObjYIblltray_c.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGDraw__FP16daObjYIblltray_c.s deleted file mode 100644 index 7de2d37d9f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGDraw__FP16daObjYIblltray_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C70818: -/* 80C70818 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C7081C 7C 08 02 A6 */ mflr r0 -/* 80C70820 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C70824 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C70828 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C7082C 7D 89 03 A6 */ mtctr r12 -/* 80C70830 4E 80 04 21 */ bctrl -/* 80C70834 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C70838 7C 08 03 A6 */ mtlr r0 -/* 80C7083C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C70840 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGExecute__FP16daObjYIblltray_c.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGExecute__FP16daObjYIblltray_c.s deleted file mode 100644 index cb193add9c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGExecute__FP16daObjYIblltray_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C707F8: -/* 80C707F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C707FC 7C 08 02 A6 */ mflr r0 -/* 80C70800 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C70804 4B 40 81 4D */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C70808 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C7080C 7C 08 03 A6 */ mtlr r0 -/* 80C70810 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C70814 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_create1st__FP16daObjYIblltray_c.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_create1st__FP16daObjYIblltray_c.s deleted file mode 100644 index 16e79c7da3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_create1st__FP16daObjYIblltray_c.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_80C70480: -/* 80C70480 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C70484 7C 08 02 A6 */ mflr r0 -/* 80C70488 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C7048C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C70490 93 C1 00 08 */ stw r30, 8(r1) -/* 80C70494 7C 7F 1B 78 */ mr r31, r3 -/* 80C70498 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C7049C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C704A0 40 82 00 94 */ bne lbl_80C70534 -/* 80C704A4 7F E0 FB 79 */ or. r0, r31, r31 -/* 80C704A8 41 82 00 80 */ beq lbl_80C70528 -/* 80C704AC 7C 1E 03 78 */ mr r30, r0 -/* 80C704B0 4B 40 81 75 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C704B4 3C 60 80 C7 */ lis r3, __vt__16daObjYIblltray_c@ha /* 0x80C70B30@ha */ -/* 80C704B8 38 03 0B 30 */ addi r0, r3, __vt__16daObjYIblltray_c@l /* 0x80C70B30@l */ -/* 80C704BC 90 1E 05 9C */ stw r0, 0x59c(r30) -/* 80C704C0 38 7E 06 44 */ addi r3, r30, 0x644 -/* 80C704C4 3C 80 80 C7 */ lis r4, __ct__8dCcD_CylFv@ha /* 0x80C706C4@ha */ -/* 80C704C8 38 84 06 C4 */ addi r4, r4, __ct__8dCcD_CylFv@l /* 0x80C706C4@l */ -/* 80C704CC 3C A0 80 C7 */ lis r5, __dt__8dCcD_CylFv@ha /* 0x80C705F8@ha */ -/* 80C704D0 38 A5 05 F8 */ addi r5, r5, __dt__8dCcD_CylFv@l /* 0x80C705F8@l */ -/* 80C704D4 38 C0 01 3C */ li r6, 0x13c -/* 80C704D8 38 E0 00 03 */ li r7, 3 -/* 80C704DC 4B 6F 18 85 */ bl __construct_array -/* 80C704E0 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C704E4 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C704E8 90 1E 0A 10 */ stw r0, 0xa10(r30) -/* 80C704EC 38 7E 0A 14 */ addi r3, r30, 0xa14 -/* 80C704F0 4B 41 32 71 */ bl __ct__10dCcD_GSttsFv -/* 80C704F4 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C704F8 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C704FC 90 7E 0A 10 */ stw r3, 0xa10(r30) -/* 80C70500 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C70504 90 1E 0A 14 */ stw r0, 0xa14(r30) -/* 80C70508 3C 60 80 C7 */ lis r3, __vt__12J3DFrameCtrl@ha /* 0x80C70B24@ha */ -/* 80C7050C 38 03 0B 24 */ addi r0, r3, __vt__12J3DFrameCtrl@l /* 0x80C70B24@l */ -/* 80C70510 94 1E 0A 38 */ stwu r0, 0xa38(r30) -/* 80C70514 7F C3 F3 78 */ mr r3, r30 -/* 80C70518 38 80 00 00 */ li r4, 0 -/* 80C7051C 4B 6B 7E E1 */ bl init__12J3DFrameCtrlFs -/* 80C70520 38 00 00 00 */ li r0, 0 -/* 80C70524 90 1E 00 18 */ stw r0, 0x18(r30) -lbl_80C70528: -/* 80C70528 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C7052C 60 00 00 08 */ ori r0, r0, 8 -/* 80C70530 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C70534: -/* 80C70534 7F E3 FB 78 */ mr r3, r31 -/* 80C70538 4B FF E6 C1 */ bl create1st__16daObjYIblltray_cFv -/* 80C7053C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C70540 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C70544 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C70548 7C 08 03 A6 */ mtlr r0 -/* 80C7054C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C70550 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/initRotTo__16daObjYIblltray_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/initRotTo__16daObjYIblltray_cFv.s deleted file mode 100644 index 508d5736ea..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/initRotTo__16daObjYIblltray_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80C702E0: -/* 80C702E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C702E4 7C 08 02 A6 */ mflr r0 -/* 80C702E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C702EC 38 00 00 02 */ li r0, 2 -/* 80C702F0 90 03 06 40 */ stw r0, 0x640(r3) -/* 80C702F4 3C 80 80 C7 */ lis r4, lit_3694@ha /* 0x80C709C0@ha */ -/* 80C702F8 C0 04 09 C0 */ lfs f0, lit_3694@l(r4) /* 0x80C709C0@l */ -/* 80C702FC D0 03 06 3C */ stfs f0, 0x63c(r3) -/* 80C70300 80 03 06 34 */ lwz r0, 0x634(r3) -/* 80C70304 90 01 00 08 */ stw r0, 8(r1) -/* 80C70308 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80C7030C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80C70310 38 81 00 08 */ addi r4, r1, 8 -/* 80C70314 4B 3A 94 E5 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C70318 38 00 00 01 */ li r0, 1 -/* 80C7031C 98 03 0D B8 */ stb r0, 0xdb8(r3) -/* 80C70320 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C70324 7C 08 03 A6 */ mtlr r0 -/* 80C70328 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C7032C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/offAttention__16daObjYIblltray_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/offAttention__16daObjYIblltray_cFv.s deleted file mode 100644 index f638c2e2f5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/offAttention__16daObjYIblltray_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80C6F450: -/* 80C6F450 80 03 05 5C */ lwz r0, 0x55c(r3) -/* 80C6F454 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 -/* 80C6F458 90 03 05 5C */ stw r0, 0x55c(r3) -/* 80C6F45C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/onAttention__16daObjYIblltray_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/onAttention__16daObjYIblltray_cFv.s deleted file mode 100644 index 11a5bf76fd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/onAttention__16daObjYIblltray_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80C6F440: -/* 80C6F440 80 03 05 5C */ lwz r0, 0x55c(r3) -/* 80C6F444 60 00 00 80 */ ori r0, r0, 0x80 -/* 80C6F448 90 03 05 5C */ stw r0, 0x55c(r3) -/* 80C6F44C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/rideActor__16daObjYIblltray_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/rideActor__16daObjYIblltray_cFP10fopAc_ac_c.s deleted file mode 100644 index 7fc55b45cf..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/rideActor__16daObjYIblltray_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80C6F1E8: -/* 80C6F1E8 80 A3 06 34 */ lwz r5, 0x634(r3) -/* 80C6F1EC 3C 05 00 01 */ addis r0, r5, 1 -/* 80C6F1F0 28 00 FF FF */ cmplwi r0, 0xffff -/* 80C6F1F4 4C 82 00 20 */ bnelr -/* 80C6F1F8 A8 04 00 0E */ lha r0, 0xe(r4) -/* 80C6F1FC 2C 00 02 FC */ cmpwi r0, 0x2fc -/* 80C6F200 4C 82 00 20 */ bnelr -/* 80C6F204 88 04 0C F0 */ lbz r0, 0xcf0(r4) -/* 80C6F208 2C 00 00 03 */ cmpwi r0, 3 -/* 80C6F20C 4C 82 00 20 */ bnelr -/* 80C6F210 28 04 00 00 */ cmplwi r4, 0 -/* 80C6F214 41 82 00 0C */ beq lbl_80C6F220 -/* 80C6F218 80 04 00 04 */ lwz r0, 4(r4) -/* 80C6F21C 48 00 00 08 */ b lbl_80C6F224 -lbl_80C6F220: -/* 80C6F220 38 00 FF FF */ li r0, -1 -lbl_80C6F224: -/* 80C6F224 90 03 06 34 */ stw r0, 0x634(r3) -/* 80C6F228 38 00 00 01 */ li r0, 1 -/* 80C6F22C 90 03 06 40 */ stw r0, 0x640(r3) -/* 80C6F230 88 03 04 BA */ lbz r0, 0x4ba(r3) -/* 80C6F234 98 04 04 E2 */ stb r0, 0x4e2(r4) -/* 80C6F238 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s deleted file mode 100644 index 530661ede8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80C6EED4: -/* 80C6EED4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6EED8 7C 08 02 A6 */ mflr r0 -/* 80C6EEDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6EEE0 7C 83 23 78 */ mr r3, r4 -/* 80C6EEE4 7C A4 2B 78 */ mr r4, r5 -/* 80C6EEE8 48 00 03 01 */ bl rideActor__16daObjYIblltray_cFP10fopAc_ac_c -/* 80C6EEEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6EEF0 7C 08 03 A6 */ mtlr r0 -/* 80C6EEF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6EEF8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchNearBackTrayIronball__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchNearBackTrayIronball__FPvPv.s deleted file mode 100644 index 8956b326e7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchNearBackTrayIronball__FPvPv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80C6F3BC: -/* 80C6F3BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6F3C0 7C 08 02 A6 */ mflr r0 -/* 80C6F3C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6F3C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6F3CC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6F3D0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C6F3D4 7C 9F 23 78 */ mr r31, r4 -/* 80C6F3D8 41 82 00 4C */ beq lbl_80C6F424 -/* 80C6F3DC 4B 3A 99 05 */ bl fopAc_IsActor__FPv -/* 80C6F3E0 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6F3E4 41 82 00 40 */ beq lbl_80C6F424 -/* 80C6F3E8 A8 1E 00 0E */ lha r0, 0xe(r30) -/* 80C6F3EC 2C 00 02 FC */ cmpwi r0, 0x2fc -/* 80C6F3F0 40 82 00 34 */ bne lbl_80C6F424 -/* 80C6F3F4 88 1E 0C F0 */ lbz r0, 0xcf0(r30) -/* 80C6F3F8 2C 00 00 03 */ cmpwi r0, 3 -/* 80C6F3FC 40 82 00 28 */ bne lbl_80C6F424 -/* 80C6F400 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80C6F404 38 9F 05 B4 */ addi r4, r31, 0x5b4 -/* 80C6F408 4B 6D 7F 95 */ bl PSVECSquareDistance -/* 80C6F40C 3C 60 80 C7 */ lis r3, lit_3868@ha /* 0x80C709E0@ha */ -/* 80C6F410 C0 03 09 E0 */ lfs f0, lit_3868@l(r3) /* 0x80C709E0@l */ -/* 80C6F414 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6F418 40 80 00 0C */ bge lbl_80C6F424 -/* 80C6F41C 7F C3 F3 78 */ mr r3, r30 -/* 80C6F420 48 00 00 08 */ b lbl_80C6F428 -lbl_80C6F424: -/* 80C6F424 38 60 00 00 */ li r3, 0 -lbl_80C6F428: -/* 80C6F428 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6F42C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6F430 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6F434 7C 08 03 A6 */ mtlr r0 -/* 80C6F438 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6F43C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchNearIronball__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchNearIronball__FPvPv.s deleted file mode 100644 index ea68b4f7d5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchNearIronball__FPvPv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80C6F338: -/* 80C6F338 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6F33C 7C 08 02 A6 */ mflr r0 -/* 80C6F340 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6F344 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6F348 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6F34C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C6F350 7C 9F 23 78 */ mr r31, r4 -/* 80C6F354 41 82 00 4C */ beq lbl_80C6F3A0 -/* 80C6F358 4B 3A 99 89 */ bl fopAc_IsActor__FPv -/* 80C6F35C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6F360 41 82 00 40 */ beq lbl_80C6F3A0 -/* 80C6F364 A8 1E 00 0E */ lha r0, 0xe(r30) -/* 80C6F368 2C 00 02 FC */ cmpwi r0, 0x2fc -/* 80C6F36C 40 82 00 34 */ bne lbl_80C6F3A0 -/* 80C6F370 88 1E 0C F0 */ lbz r0, 0xcf0(r30) -/* 80C6F374 2C 00 00 03 */ cmpwi r0, 3 -/* 80C6F378 40 82 00 28 */ bne lbl_80C6F3A0 -/* 80C6F37C 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80C6F380 38 9F 05 A8 */ addi r4, r31, 0x5a8 -/* 80C6F384 4B 6D 80 19 */ bl PSVECSquareDistance -/* 80C6F388 3C 60 80 C7 */ lis r3, lit_3868@ha /* 0x80C709E0@ha */ -/* 80C6F38C C0 03 09 E0 */ lfs f0, lit_3868@l(r3) /* 0x80C709E0@l */ -/* 80C6F390 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80C6F394 40 80 00 0C */ bge lbl_80C6F3A0 -/* 80C6F398 7F C3 F3 78 */ mr r3, r30 -/* 80C6F39C 48 00 00 08 */ b lbl_80C6F3A4 -lbl_80C6F3A0: -/* 80C6F3A0 38 60 00 00 */ li r3, 0 -lbl_80C6F3A4: -/* 80C6F3A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6F3A8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6F3AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6F3B0 7C 08 03 A6 */ mtlr r0 -/* 80C6F3B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6F3B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchObjYIblltray__FPvPv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchObjYIblltray__FPvPv.s deleted file mode 100644 index 6de1029b76..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchObjYIblltray__FPvPv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80C6F2BC: -/* 80C6F2BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6F2C0 7C 08 02 A6 */ mflr r0 -/* 80C6F2C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6F2C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6F2CC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6F2D0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80C6F2D4 7C 9F 23 78 */ mr r31, r4 -/* 80C6F2D8 41 82 00 44 */ beq lbl_80C6F31C -/* 80C6F2DC 4B 3A 9A 05 */ bl fopAc_IsActor__FPv -/* 80C6F2E0 2C 03 00 00 */ cmpwi r3, 0 -/* 80C6F2E4 41 82 00 38 */ beq lbl_80C6F31C -/* 80C6F2E8 A8 1E 00 0E */ lha r0, 0xe(r30) -/* 80C6F2EC 2C 00 00 CC */ cmpwi r0, 0xcc -/* 80C6F2F0 40 82 00 2C */ bne lbl_80C6F31C -/* 80C6F2F4 7C 1E F8 40 */ cmplw r30, r31 -/* 80C6F2F8 41 82 00 24 */ beq lbl_80C6F31C -/* 80C6F2FC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C6F300 54 03 FE 3E */ rlwinm r3, r0, 0x1f, 0x18, 0x1f -/* 80C6F304 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80C6F308 54 00 FE 3E */ rlwinm r0, r0, 0x1f, 0x18, 0x1f -/* 80C6F30C 7C 03 00 00 */ cmpw r3, r0 -/* 80C6F310 40 82 00 0C */ bne lbl_80C6F31C -/* 80C6F314 7F C3 F3 78 */ mr r3, r30 -/* 80C6F318 48 00 00 08 */ b lbl_80C6F320 -lbl_80C6F31C: -/* 80C6F31C 38 60 00 00 */ li r3, 0 -lbl_80C6F320: -/* 80C6F320 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6F324 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6F328 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6F32C 7C 08 03 A6 */ mtlr r0 -/* 80C6F330 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6F334 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/sendBall__16daObjYIblltray_cFUi.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/sendBall__16daObjYIblltray_cFUi.s deleted file mode 100644 index e3b53ff8c3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/sendBall__16daObjYIblltray_cFUi.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_80C6F23C: -/* 80C6F23C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80C6F240 7C 08 02 A6 */ mflr r0 -/* 80C6F244 90 01 00 24 */ stw r0, 0x24(r1) -/* 80C6F248 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80C6F24C 7C 7F 1B 78 */ mr r31, r3 -/* 80C6F250 90 83 06 34 */ stw r4, 0x634(r3) -/* 80C6F254 38 00 00 03 */ li r0, 3 -/* 80C6F258 90 03 06 40 */ stw r0, 0x640(r3) -/* 80C6F25C 3C 60 80 C7 */ lis r3, lit_3694@ha /* 0x80C709C0@ha */ -/* 80C6F260 C0 03 09 C0 */ lfs f0, lit_3694@l(r3) /* 0x80C709C0@l */ -/* 80C6F264 D0 1F 06 3C */ stfs f0, 0x63c(r31) -/* 80C6F268 80 1F 06 34 */ lwz r0, 0x634(r31) -/* 80C6F26C 90 01 00 08 */ stw r0, 8(r1) -/* 80C6F270 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80C6F274 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80C6F278 38 81 00 08 */ addi r4, r1, 8 -/* 80C6F27C 4B 3A A5 7D */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 80C6F280 C0 1F 06 28 */ lfs f0, 0x628(r31) -/* 80C6F284 D0 03 04 D0 */ stfs f0, 0x4d0(r3) -/* 80C6F288 C0 1F 06 2C */ lfs f0, 0x62c(r31) -/* 80C6F28C D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 80C6F290 C0 1F 06 30 */ lfs f0, 0x630(r31) -/* 80C6F294 D0 03 04 D8 */ stfs f0, 0x4d8(r3) -/* 80C6F298 38 00 00 01 */ li r0, 1 -/* 80C6F29C 98 03 0D B8 */ stb r0, 0xdb8(r3) -/* 80C6F2A0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80C6F2A4 98 03 04 E2 */ stb r0, 0x4e2(r3) -/* 80C6F2A8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80C6F2AC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80C6F2B0 7C 08 03 A6 */ mtlr r0 -/* 80C6F2B4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80C6F2B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/setMtx__16daObjYIblltray_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/setMtx__16daObjYIblltray_cFv.s deleted file mode 100644 index 57854f7463..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/setMtx__16daObjYIblltray_cFv.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_80C6EC88: -/* 80C6EC88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C6EC8C 7C 08 02 A6 */ mflr r0 -/* 80C6EC90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C6EC94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C6EC98 93 C1 00 08 */ stw r30, 8(r1) -/* 80C6EC9C 7C 7F 1B 78 */ mr r31, r3 -/* 80C6ECA0 3C 60 80 C7 */ lis r3, l_cull_box@ha /* 0x80C709A0@ha */ -/* 80C6ECA4 3B C3 09 A0 */ addi r30, r3, l_cull_box@l /* 0x80C709A0@l */ -/* 80C6ECA8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6ECAC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6ECB0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C6ECB4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C6ECB8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C6ECBC 4B 6D 7C 2D */ bl PSMTXTrans -/* 80C6ECC0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6ECC4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6ECC8 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80C6ECCC 4B 39 D7 69 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C6ECD0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C6ECD4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80C6ECD8 40 82 00 18 */ bne lbl_80C6ECF0 -/* 80C6ECDC C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 80C6ECE0 C0 5E 00 1C */ lfs f2, 0x1c(r30) -/* 80C6ECE4 C0 7E 00 20 */ lfs f3, 0x20(r30) -/* 80C6ECE8 4B 39 E0 B5 */ bl transM__14mDoMtx_stack_cFfff -/* 80C6ECEC 48 00 00 14 */ b lbl_80C6ED00 -lbl_80C6ECF0: -/* 80C6ECF0 C0 3E 00 24 */ lfs f1, 0x24(r30) -/* 80C6ECF4 C0 5E 00 1C */ lfs f2, 0x1c(r30) -/* 80C6ECF8 C0 7E 00 20 */ lfs f3, 0x20(r30) -/* 80C6ECFC 4B 39 E0 A1 */ bl transM__14mDoMtx_stack_cFfff -lbl_80C6ED00: -/* 80C6ED00 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6ED04 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6ED08 A8 9F 04 DC */ lha r4, 0x4dc(r31) -/* 80C6ED0C 4B 39 D6 91 */ bl mDoMtx_XrotM__FPA4_fs -/* 80C6ED10 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6ED14 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6ED18 38 9F 05 F0 */ addi r4, r31, 0x5f0 -/* 80C6ED1C 4B 6D 77 95 */ bl PSMTXCopy -/* 80C6ED20 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6ED24 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6ED28 38 9F 05 C0 */ addi r4, r31, 0x5c0 -/* 80C6ED2C 4B 6D 77 85 */ bl PSMTXCopy -/* 80C6ED30 38 7F 05 C0 */ addi r3, r31, 0x5c0 -/* 80C6ED34 3C 80 80 C7 */ lis r4, l_in_ball@ha /* 0x80C70A3C@ha */ -/* 80C6ED38 38 84 0A 3C */ addi r4, r4, l_in_ball@l /* 0x80C70A3C@l */ -/* 80C6ED3C 38 BF 05 A8 */ addi r5, r31, 0x5a8 -/* 80C6ED40 4B 6D 80 2D */ bl PSMTXMultVec -/* 80C6ED44 38 7F 05 C0 */ addi r3, r31, 0x5c0 -/* 80C6ED48 3C 80 80 C7 */ lis r4, l_base@ha /* 0x80C70A48@ha */ -/* 80C6ED4C 38 84 0A 48 */ addi r4, r4, l_base@l /* 0x80C70A48@l */ -/* 80C6ED50 38 BF 06 28 */ addi r5, r31, 0x628 -/* 80C6ED54 4B 6D 80 19 */ bl PSMTXMultVec -/* 80C6ED58 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6ED5C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6ED60 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C6ED64 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C6ED68 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C6ED6C 4B 6D 7B 7D */ bl PSMTXTrans -/* 80C6ED70 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6ED74 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6ED78 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 80C6ED7C 4B 39 D6 B9 */ bl mDoMtx_YrotM__FPA4_fs -/* 80C6ED80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C6ED84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C6ED88 38 9F 0A 54 */ addi r4, r31, 0xa54 -/* 80C6ED8C 4B 6D 77 25 */ bl PSMTXCopy -/* 80C6ED90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C6ED94 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C6ED98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C6ED9C 7C 08 03 A6 */ mtlr r0 -/* 80C6EDA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C6EDA4 4E 80 00 20 */ blr diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 64381d1c21..0c7b3b7303 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -503,6 +503,7 @@ public: void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(0xC); } void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(0xC); } void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); } + void SetCoVsGrp(u32 grp) { mObjCo.SetVsGrp(grp); } void SetAtSPrm(u32 prm) { mObjAt.SetSPrm(prm); } void SetTgSPrm(u32 prm) { mObjTg.SetSPrm(prm); } void SetCoSPrm(u32 prm) { mObjCo.SetSPrm(prm); } diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 98b1ef8eb9..a0515a0524 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -100,13 +100,13 @@ public: void setData(fopAc_ac_c*); void clearData(); - u32 getID() const { return mID; } - void setID(u32 id) { mID = id; } + fpc_ProcID getID() const { return mID; } + void setID(fpc_ProcID id) { mID = id; } fopAc_ac_c* getActor() const { return mActor; } fopAc_ac_c* getActorConst() const { return mActor; } private: - /* 0x0 */ u32 mID; + /* 0x0 */ fpc_ProcID mID; /* 0x4 */ fopAc_ac_c* mActor; }; // Size: 0x8 @@ -848,6 +848,7 @@ public: void onLightSwordGetEffect() { onEndResetFlg2(ERFLG2_UNK_10); } void onForceGameOver() { onNoResetFlg2(FLG2_FORCE_GAMEOVER); } void onForceWolfChange() { onEndResetFlg0(ERFLG0_UNK_2); } + void onDoPutEmphasys() { onEndResetFlg1(ERFLG1_UNK_10000000); } u32 checkBoarSingleBattle() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } u32 checkWolfDashAutoJump() const { return checkNoResetFlg2(FLG2_WOLF_DASH_AUTO_JUMP); } diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index e768f17016..3f449816e3 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -209,7 +209,7 @@ public: /* 0x49A */ u8 carryType; /* 0x49C */ u32 actor_status; /* 0x4A0 */ u32 actor_condition; - /* 0x4A4 */ u32 parentActorID; + /* 0x4A4 */ fpc_ProcID parentActorID; /* 0x4A8 */ actor_place home; /* 0x4BC */ actor_place old; /* 0x4D0 */ actor_place current; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index cf4421bd07..6581781176 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -35,7 +35,7 @@ struct fopAcM_prm_class { /* 0x16 */ u16 mEnemyNo; /* 0x18 */ u8 mScale[3]; /* 0x1B */ u8 mGbaName; // from WW, maybe a different parameter here - /* 0x1C */ s32 mParentPId; // parent process ID + /* 0x1C */ fpc_ProcID mParentPId; // parent process ID /* 0x20 */ s8 mSubtype; /* 0x21 */ s8 mRoomNo; }; @@ -167,7 +167,7 @@ inline s32 fopAcM_GetRoomNo(const fopAc_ac_c* pActor) { return (s8)pActor->current.roomNo; } -inline u32 fopAcM_GetID(const void* pActor) { +inline fpc_ProcID fopAcM_GetID(const void* pActor) { return fpcM_GetID(pActor); } @@ -242,11 +242,11 @@ inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc func, void* param) { return (fopAc_ac_c*)fopAcIt_Judge(func, param); } -inline fopAc_ac_c* fopAcM_SearchByID(unsigned int id) { +inline fopAc_ac_c* fopAcM_SearchByID(fpc_ProcID id) { return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id); } -inline u32 fopAcM_GetLinkId(const fopAc_ac_c* pActor) { +inline fpc_ProcID fopAcM_GetLinkId(const fopAc_ac_c* pActor) { return pActor->parentActorID; } @@ -342,7 +342,7 @@ inline fopAcM_prm_class* fopAcM_GetAppend(void* actor) { return (fopAcM_prm_class*)fpcM_GetAppend(actor); } -inline BOOL fopAcM_IsExecuting(unsigned int id) { +inline BOOL fopAcM_IsExecuting(fpc_ProcID id) { return fpcM_IsExecuting(id); } @@ -456,7 +456,7 @@ void fopAcM_setStageLayer(void* p_proc); void fopAcM_setRoomLayer(void* p_proc, int roomNo); -s32 fopAcM_SearchByID(unsigned int id, fopAc_ac_c** p_actor); +s32 fopAcM_SearchByID(fpc_ProcID id, fopAc_ac_c** p_actor); s32 fopAcM_SearchByName(s16 procName, fopAc_ac_c** p_actor); @@ -464,13 +464,13 @@ fopAcM_prm_class* fopAcM_CreateAppend(); fopAcM_prm_class* createAppend(u16 enemyNo, u32 parameters, const cXyz* p_pos, int roomNo, const csXyz* p_angle, const cXyz* p_scale, s8 subType, - unsigned int parentPId); + fpc_ProcID parentPId); void fopAcM_Log(fopAc_ac_c const* p_actor, char const* str); void fopAcM_delete(fopAc_ac_c* p_actor); -s32 fopAcM_delete(unsigned int actorID); +s32 fopAcM_delete(fpc_ProcID actorID); s32 fopAcM_create(s16 procName, u16 enemyNo, u32 parameter, const cXyz* p_pos, int roomNo, const csXyz* p_angle, const cXyz* p_scale, s8 subType, createFunc p_createFunc); diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index 1e67869182..d75a61dec7 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -7,6 +7,8 @@ #include "f_pc/f_pc_line_tag.h" #include "f_pc/f_pc_priority.h" +typedef unsigned int fpc_ProcID; + typedef struct create_request create_request; typedef struct process_method_class process_method_class; typedef struct process_profile_definition process_profile_definition; @@ -14,7 +16,7 @@ typedef struct profile_method_class profile_method_class; typedef struct base_process_class { /* 0x00 */ u32 mBsType; - /* 0x04 */ u32 mBsPcId; + /* 0x04 */ fpc_ProcID mBsPcId; /* 0x08 */ s16 mProcName; /* 0x0A */ s8 mUnk0; /* 0x0B */ u8 mPauseFlag; @@ -40,7 +42,7 @@ s32 fpcBs_Execute(base_process_class* pProc); void fpcBs_DeleteAppend(base_process_class* pProc); s32 fpcBs_IsDelete(base_process_class* pProc); s32 fpcBs_Delete(base_process_class* pProc); -base_process_class* fpcBs_Create(s16 pProcTypeID, unsigned int pProcID, void* pData); +base_process_class* fpcBs_Create(s16 pProcTypeID, fpc_ProcID pProcID, void* pData); s32 fpcBs_SubCreate(base_process_class* pProc); #endif diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 5081b75a0b..e808099465 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -9,15 +9,15 @@ #include "f_pc/f_pc_searcher.h" enum { - fpcM_ERROR_PROCESS_ID_e = -1, + fpcM_ERROR_PROCESS_ID_e = 0xFFFFFFFF }; typedef int (*FastCreateReqFunc)(void*); typedef void (*fpcM_ManagementFunc)(void); typedef int (*fpcM_DrawIteraterFunc)(void*, void*); -inline u32 fpcM_GetID(const void* pProc) { - return pProc != NULL ? ((base_process_class*)pProc)->mBsPcId : 0xFFFFFFFF; +inline fpc_ProcID fpcM_GetID(const void* pProc) { + return pProc != NULL ? ((base_process_class*)pProc)->mBsPcId : fpcM_ERROR_PROCESS_ID_e; } inline s16 fpcM_GetName(const void* pActor) { return ((base_process_class*)pActor)->mProcName; diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 55b5dc3a93..ce05132394 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -27,6 +27,7 @@ public: void setPlaySpeed(f32 speed) { mFrameCtrl.setRate(speed); } f32 getFrame() { return mFrameCtrl.getFrame(); } f32 getEndFrame() { return mFrameCtrl.getEnd(); } + f32 getStartFrame() { return mFrameCtrl.getStart(); } void setEndFrame(f32 frame) { mFrameCtrl.setEnd(frame); } void setFrame(f32 frame) { mFrameCtrl.setFrame(frame); } void setPlayMode(int i_mode) { mFrameCtrl.setAttribute(i_mode); } diff --git a/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h b/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h index 42f62da70a..d3da1198ea 100644 --- a/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h +++ b/include/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h @@ -15,14 +15,21 @@ */ class daObjYIblltray_c : public dBgS_MoveBgActor, public request_of_phase_process_class { public: - /* 80C6EBF8 */ void create1st(); + enum daObjYIblltray_MODE { + MODE_FRONT_WAIT, + MODE_FRONT_RIDE, + MODE_INIT_ROT, + MODE_SEND_BALL, + MODE_BACK_RIDE, + }; + + /* 80C6EBF8 */ int create1st(); /* 80C6EC88 */ void setMtx(); /* 80C6F1E8 */ void rideActor(fopAc_ac_c*); - /* 80C6F23C */ void sendBall(unsigned int); + /* 80C6F23C */ void sendBall(fpc_ProcID); /* 80C6F440 */ void onAttention(); /* 80C6F450 */ void offAttention(); /* 80C702E0 */ void initRotTo(); - /* 80C7088C */ ~daObjYIblltray_c(); /* 80C6EDA8 */ virtual int CreateHeap(); /* 80C6EEFC */ virtual int Create(); @@ -30,26 +37,31 @@ public: /* 80C70330 */ virtual int Draw(); /* 80C70408 */ virtual int Delete(); + /* 80C7088C */ virtual ~daObjYIblltray_c() {} + + int getType() { return fopAcM_GetParamBit(this, 0, 1); } + int getSwNo() { return fopAcM_GetParamBit(this, 1, 8); } + int getNoSameRoom() { return fopAcM_GetParamBit(this, 9, 1); } + cXyz& getHandlePos() { return mHandlePos; } void onHang() { mIsHang = true; } -private: - /* 0x5A8 */ cXyz field_0x5a8; - /* 0x5B4 */ cXyz field_0x5b4; + /* 0x5A8 */ cXyz mInBallPos; + /* 0x5B4 */ cXyz mBackPos; /* 0x5C0 */ Mtx field_0x5c0; - /* 0x5F0 */ Mtx field_0x5f0; - /* 0x620 */ J3DModel* field_0x620; - /* 0x624 */ s16 field_0x624; - /* 0x628 */ cXyz field_0x628; - /* 0x634 */ u32 field_0x634; - /* 0x638 */ int field_0x638; + /* 0x5F0 */ Mtx mTrayMtx; + /* 0x620 */ J3DModel* mpTrayModel; + /* 0x624 */ s16 mRotAmount; + /* 0x628 */ cXyz mBasePos; + /* 0x634 */ fpc_ProcID mBallID; + /* 0x638 */ fpc_ProcID mTrayID; /* 0x63C */ f32 field_0x63c; - /* 0x640 */ int field_0x640; + /* 0x640 */ int mMode; /* 0x644 */ dCcD_Cyl mCcCyl[3]; /* 0x9F8 */ dCcD_Stts mCcStts; - /* 0xA34 */ J3DModel* field_0xa34; + /* 0xA34 */ J3DModel* mpHandleModel; /* 0xA38 */ mDoExt_bckAnm mBck; - /* 0xA54 */ Mtx field_0xa54; + /* 0xA54 */ Mtx mHandleMtx; /* 0xA84 */ u8 mIsHang; /* 0xA88 */ cXyz mHandlePos; }; diff --git a/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp b/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp index 6b9cd45f4d..068cdd01b0 100644 --- a/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp +++ b/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp @@ -1,718 +1,631 @@ /** * @file d_a_obj_lv5yiblltray.cpp - * -*/ + * Snowpeak Ruins Cannon Ball Tray + */ #include "rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.h" -#include "dol2asm.h" - - -// -// Forward References: -// - -extern "C" void create1st__16daObjYIblltray_cFv(); -extern "C" void setMtx__16daObjYIblltray_cFv(); -extern "C" void CreateHeap__16daObjYIblltray_cFv(); -extern "C" static void rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); -extern "C" void Create__16daObjYIblltray_cFv(); -extern "C" void rideActor__16daObjYIblltray_cFP10fopAc_ac_c(); -extern "C" void sendBall__16daObjYIblltray_cFUi(); -extern "C" static void searchObjYIblltray__FPvPv(); -extern "C" static void searchNearIronball__FPvPv(); -extern "C" static void searchNearBackTrayIronball__FPvPv(); -extern "C" void onAttention__16daObjYIblltray_cFv(); -extern "C" void offAttention__16daObjYIblltray_cFv(); -extern "C" void Execute__16daObjYIblltray_cFPPA3_A4_f(); -extern "C" void initRotTo__16daObjYIblltray_cFv(); -extern "C" void Draw__16daObjYIblltray_cFv(); -extern "C" void Delete__16daObjYIblltray_cFv(); -extern "C" static void daObjYIblltray_create1st__FP16daObjYIblltray_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__8dCcD_CylFv(); -extern "C" void __ct__8dCcD_CylFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" static void daObjYIblltray_MoveBGDelete__FP16daObjYIblltray_c(); -extern "C" static void daObjYIblltray_MoveBGExecute__FP16daObjYIblltray_c(); -extern "C" static void daObjYIblltray_MoveBGDraw__FP16daObjYIblltray_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__16daObjYIblltray_cFv(); -extern "C" extern char const* const d_a_obj_lv5yiblltray__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void offSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Move__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void SetVsGrp__10cCcD_ObjCoFUl(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void __destroy_arr(); -extern "C" void __construct_array(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C70A2C-80C70A2C 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C70A2C = "YIblltray"; -#pragma pop +#include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" /* 80C70A38-80C70A3C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv5yiblltray__stringBase0; +static char* l_arcName = "YIblltray"; /* 80C6EBF8-80C6EC88 000078 0090+00 1/1 0/0 0/0 .text create1st__16daObjYIblltray_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYIblltray_c::create1st() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/create1st__16daObjYIblltray_cFv.s" +int daObjYIblltray_c::create1st() { + int phase = dComIfG_resLoad(this, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + setMtx(); + + phase = MoveBGCreate(l_arcName, 12, dBgS_MoveBGProc_TypicalRotY, 0x1210, &field_0x5c0); + if (phase == cPhs_ERROR_e) { + return phase; + } + } + + return phase; } -#pragma pop -/* ############################################################################################## */ /* 80C709A0-80C709B8 000000 0018+00 3/3 0/0 0/0 .rodata l_cull_box */ -SECTION_RODATA static u8 const l_cull_box[24] = { - 0xC3, 0x6E, 0xF5, 0xC2, 0xC3, 0x48, 0x00, 0x00, 0xC3, 0x06, 0x38, 0x52, - 0x43, 0x6E, 0xF5, 0xC2, 0x43, 0x48, 0x00, 0x00, 0x43, 0x5A, 0xAB, 0x85, -}; -COMPILER_STRIP_GATE(0x80C709A0, &l_cull_box); - -/* 80C709B8-80C709BC 000018 0004+00 0/2 0/0 0/0 .rodata @3692 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3692 = 125.0f; -COMPILER_STRIP_GATE(0x80C709B8, &lit_3692); -#pragma pop - -/* 80C709BC-80C709C0 00001C 0004+00 0/3 0/0 0/0 .rodata @3693 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3693 = 100.0f; -COMPILER_STRIP_GATE(0x80C709BC, &lit_3693); -#pragma pop - -/* 80C709C0-80C709C4 000020 0004+00 3/6 0/0 0/0 .rodata @3694 */ -SECTION_RODATA static u8 const lit_3694[4] = { - 0x00, - 0x00, - 0x00, - 0x00, +static const cull_box l_cull_box = { + {-238.95999f, -200.0f, -134.22f}, + {238.95999f, 200.0f, 218.67f}, }; -COMPILER_STRIP_GATE(0x80C709C0, &lit_3694); - -/* 80C709C4-80C709C8 000024 0004+00 0/2 0/0 0/0 .rodata @3695 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3695 = -125.0f; -COMPILER_STRIP_GATE(0x80C709C4, &lit_3695); -#pragma pop /* 80C70A3C-80C70A48 000004 000C+00 1/1 0/0 0/0 .data l_in_ball */ -SECTION_DATA static u8 l_in_ball[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xAE, 0x00, 0x00, -}; +static Vec l_in_ball = {0.0f, 0.0f, 87.0f}; /* 80C70A48-80C70A54 000010 000C+00 1/1 0/0 0/0 .data l_base */ -SECTION_DATA static u8 l_base[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x70, 0x00, 0x00, -}; +static Vec l_base = {0.0f, 0.0f, -60.0f}; /* 80C6EC88-80C6EDA8 000108 0120+00 3/3 0/0 0/0 .text setMtx__16daObjYIblltray_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYIblltray_c::setMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/setMtx__16daObjYIblltray_cFv.s" +void daObjYIblltray_c::setMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(current.angle.y); + + if (getType() == 0) { + mDoMtx_stack_c::transM(125.0f, 100.0f, 0.0f); + } else { + mDoMtx_stack_c::transM(-125.0f, 100.0f, 0.0f); + } + + mDoMtx_stack_c::XrotM(current.angle.x); + MTXCopy(mDoMtx_stack_c::get(), mTrayMtx); + MTXCopy(mDoMtx_stack_c::get(), field_0x5c0); + + MTXMultVec(field_0x5c0, &l_in_ball, &mInBallPos); + MTXMultVec(field_0x5c0, &l_base, &mBasePos); + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(current.angle.y); + MTXCopy(mDoMtx_stack_c::get(), mHandleMtx); } -#pragma pop - -/* ############################################################################################## */ -/* 80C709C8-80C709CC 000028 0004+00 1/2 0/0 0/0 .rodata @3719 */ -SECTION_RODATA static f32 const lit_3719 = 1.0f; -COMPILER_STRIP_GATE(0x80C709C8, &lit_3719); /* 80C6EDA8-80C6EED4 000228 012C+00 1/0 0/0 0/0 .text CreateHeap__16daObjYIblltray_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm int daObjYIblltray_c::CreateHeap() { -extern "C" asm void CreateHeap__16daObjYIblltray_cFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/CreateHeap__16daObjYIblltray_cFv.s" +int daObjYIblltray_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9); + JUT_ASSERT(model_data != 0); + + mpTrayModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpTrayModel == NULL) { + return 0; + } + + model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8); + JUT_ASSERT(model_data != 0); + + mpHandleModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + if (mpHandleModel == NULL) { + return 0; + } + + J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 5); + if (!mBck.init(bck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) { + return 0; + } + + mBck.setPlaySpeed(0.0f); + return 1; } -#pragma pop /* 80C6EED4-80C6EEFC 000354 0028+00 1/1 0/0 0/0 .text * rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void rideCallback(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c.s" +static void rideCallback(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { + ((daObjYIblltray_c*)i_this)->rideActor(i_rideActor); } -#pragma pop - -/* ############################################################################################## */ -/* 80C709CC-80C709D0 00002C 0004+00 0/1 0/0 0/0 .rodata @3797 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3797 = 40.0f; -COMPILER_STRIP_GATE(0x80C709CC, &lit_3797); -#pragma pop - -/* 80C709D0-80C709D4 000030 0004+00 0/1 0/0 0/0 .rodata @3798 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3798 = 300.0f; -COMPILER_STRIP_GATE(0x80C709D0, &lit_3798); -#pragma pop - -/* 80C709D4-80C709D8 000034 0004+00 0/2 0/0 0/0 .rodata @3799 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3799 = 10.0f; -COMPILER_STRIP_GATE(0x80C709D4, &lit_3799); -#pragma pop - -/* 80C709D8-80C709E0 000038 0008+00 0/2 0/0 0/0 .rodata @3801 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3801[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C709D8, &lit_3801); -#pragma pop /* 80C70A54-80C70A60 00001C 000C+00 1/1 0/0 0/0 .data l_back_pos */ -SECTION_DATA static u8 l_back_pos[12] = { - 0x00, 0x00, 0x00, 0x00, 0xC2, 0x50, 0x00, 0x00, 0xC3, 0xB8, 0x80, 0x00, -}; +static Vec l_back_pos = {0.0f, -52.0f, -369.0f}; /* 80C70A60-80C70AA4 000028 0044+00 1/1 0/0 0/0 .data l_cc_cyl_src */ static dCcD_SrcCyl l_cc_cyl_src = { { - {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x39}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf + {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x39}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 90.0f, // mRadius - 200.0f // mHeight - } // mCyl + {0.0f, 0.0f, 0.0f}, // mCenter + 90.0f, // mRadius + 200.0f // mHeight + } // mCyl }; /* 80C6EEFC-80C6F1E8 00037C 02EC+00 1/0 0/0 0/0 .text Create__16daObjYIblltray_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjYIblltray_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Create__16daObjYIblltray_cFv.s" +int daObjYIblltray_c::Create() { + mpTrayModel->setBaseTRMtx(mTrayMtx); + fopAcM_SetMtx(this, mTrayMtx); + + if (getType() == 0) { + if (!fopAcM_isSwitch(this, getSwNo())) { + current.angle.x = 0x1A4F; + mMode = MODE_FRONT_WAIT; + mBck.setFrame(mBck.getEndFrame()); + mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_e); + } else { + current.angle.x = -0x1A4F; + mMode = MODE_BACK_RIDE; + mBck.setFrame(mBck.getStartFrame()); + mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_RESET_e); + } + } else { + if (!fopAcM_isSwitch(this, getSwNo())) { + current.angle.x = -0x1A4F; + mMode = MODE_BACK_RIDE; + mBck.setFrame(mBck.getStartFrame()); + mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_RESET_e); + } else { + current.angle.x = 0x1A4F; + mMode = MODE_FRONT_WAIT; + mBck.setFrame(mBck.getEndFrame()); + mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_e); + } + } + + mBck.play(); + setMtx(); + + mRotAmount = 0; + + fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, + l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z); + + mBallID = fpcM_ERROR_PROCESS_ID_e; + mTrayID = fpcM_ERROR_PROCESS_ID_e; + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(current.angle.y); + + if (getType() == 0) { + mDoMtx_stack_c::transM(125.0f, 100.0f, 0.0f); + } else { + mDoMtx_stack_c::transM(-125.0f, 100.0f, 0.0f); + } + + MTXMultVec(mDoMtx_stack_c::get(), &l_back_pos, &mBackPos); + + mCcStts.Init(0xFF, 0, this); + mCcCyl[0].Set(l_cc_cyl_src); + mCcCyl[0].SetStts(&mCcStts); + + mCcCyl[1].Set(l_cc_cyl_src); + mCcCyl[1].SetStts(&mCcStts); + mCcCyl[1].SetR(40.0f); + mCcCyl[1].SetH(300.0f); + + mCcCyl[2].Set(l_cc_cyl_src); + mCcCyl[2].SetStts(&mCcStts); + mCcCyl[2].SetR(100.0f); + mCcCyl[2].SetH(10.0f); + mCcCyl[2].SetCoVsGrp(0x60); + + attention_info.distances[fopAc_attn_ETC_e] = 84; + return 1; } -#pragma pop /* 80C6F1E8-80C6F23C 000668 0054+00 2/2 0/0 0/0 .text rideActor__16daObjYIblltray_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYIblltray_c::rideActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/rideActor__16daObjYIblltray_cFP10fopAc_ac_c.s" +void daObjYIblltray_c::rideActor(fopAc_ac_c* i_actor) { + if (mBallID == fpcM_ERROR_PROCESS_ID_e && fopAcM_GetProfName(i_actor) == PROC_Obj_Carry && + ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_IRON_BALL) + { + mBallID = fopAcM_GetID(i_actor); + mMode = MODE_FRONT_RIDE; + fopAcM_SetRoomNo(i_actor, fopAcM_GetHomeRoomNo(this)); + } } -#pragma pop /* 80C6F23C-80C6F2BC 0006BC 0080+00 1/1 0/0 0/0 .text sendBall__16daObjYIblltray_cFUi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYIblltray_c::sendBall(unsigned int param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/sendBall__16daObjYIblltray_cFUi.s" +void daObjYIblltray_c::sendBall(fpc_ProcID i_ID) { + mBallID = i_ID; + mMode = MODE_SEND_BALL; + field_0x63c = 0.0f; + + daObjCarry_c* ball = (daObjCarry_c*)fopAcM_SearchByID(mBallID); + ball->current.pos = mBasePos; + ball->startCtrl(); + fopAcM_SetRoomNo(ball, fopAcM_GetHomeRoomNo(this)); } -#pragma pop /* 80C6F2BC-80C6F338 00073C 007C+00 1/1 0/0 0/0 .text searchObjYIblltray__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void searchObjYIblltray(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchObjYIblltray__FPvPv.s" -} -#pragma pop +static fopAc_ac_c* searchObjYIblltray(void* i_trayB, void* i_trayA) { + if (i_trayB != NULL && fopAcM_IsActor(i_trayB) && + fopAcM_GetProfName(i_trayB) == PROC_Obj_YIblltray && i_trayB != i_trayA) + { + if (((daObjYIblltray_c*)i_trayA)->getSwNo() == ((daObjYIblltray_c*)i_trayB)->getSwNo()) { + return (fopAc_ac_c*)i_trayB; + } + } -/* ############################################################################################## */ -/* 80C709E0-80C709E4 000040 0004+00 2/2 0/0 0/0 .rodata @3868 */ -SECTION_RODATA static f32 const lit_3868 = 900.0f; -COMPILER_STRIP_GATE(0x80C709E0, &lit_3868); + return NULL; +} /* 80C6F338-80C6F3BC 0007B8 0084+00 1/1 0/0 0/0 .text searchNearIronball__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void searchNearIronball(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchNearIronball__FPvPv.s" +static fopAc_ac_c* searchNearIronball(void* i_ball, void* i_tray) { + if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == PROC_Obj_Carry && + ((daObjCarry_c*)i_ball)->getType() == daObjCarry_c::TYPE_IRON_BALL && + VECSquareDistance(&((daObjCarry_c*)i_ball)->current.pos, + &((daObjYIblltray_c*)i_tray)->mInBallPos) < 900.0f) + { + return (fopAc_ac_c*)i_ball; + } + + return NULL; } -#pragma pop /* 80C6F3BC-80C6F440 00083C 0084+00 1/1 0/0 0/0 .text searchNearBackTrayIronball__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void searchNearBackTrayIronball(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/searchNearBackTrayIronball__FPvPv.s" +static fopAc_ac_c* searchNearBackTrayIronball(void* i_ball, void* i_tray) { + if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == PROC_Obj_Carry && + ((daObjCarry_c*)i_ball)->getType() == daObjCarry_c::TYPE_IRON_BALL && + VECSquareDistance(&((daObjCarry_c*)i_ball)->current.pos, + &((daObjYIblltray_c*)i_tray)->mBackPos) < 900.0f) + { + return (fopAc_ac_c*)i_ball; + } + + return NULL; } -#pragma pop /* 80C6F440-80C6F450 0008C0 0010+00 1/1 0/0 0/0 .text onAttention__16daObjYIblltray_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYIblltray_c::onAttention() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/onAttention__16daObjYIblltray_cFv.s" +void daObjYIblltray_c::onAttention() { + attention_info.flags |= 0x80; } -#pragma pop /* 80C6F450-80C6F460 0008D0 0010+00 1/1 0/0 0/0 .text offAttention__16daObjYIblltray_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYIblltray_c::offAttention() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/offAttention__16daObjYIblltray_cFv.s" +void daObjYIblltray_c::offAttention() { + attention_info.flags &= ~0x80; } -#pragma pop - -/* ############################################################################################## */ -/* 80C709E4-80C709E8 000044 0004+00 0/1 0/0 0/0 .rodata @4438 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4438 = -1.0f; -COMPILER_STRIP_GATE(0x80C709E4, &lit_4438); -#pragma pop - -/* 80C709E8-80C709F0 000048 0004+04 0/1 0/0 0/0 .rodata @4439 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4439[1 + 1 /* padding */] = { - -1.0f / 10.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80C709E8, &lit_4439); -#pragma pop - -/* 80C709F0-80C709F8 000050 0008+00 0/1 0/0 0/0 .rodata @4440 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4440[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C709F0, &lit_4440); -#pragma pop - -/* 80C709F8-80C70A00 000058 0008+00 0/1 0/0 0/0 .rodata @4441 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4441[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C709F8, &lit_4441); -#pragma pop - -/* 80C70A00-80C70A08 000060 0008+00 0/1 0/0 0/0 .rodata @4442 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4442[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C70A00, &lit_4442); -#pragma pop - -/* 80C70A08-80C70A0C 000068 0004+00 0/1 0/0 0/0 .rodata @4443 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4443 = 30.0f; -COMPILER_STRIP_GATE(0x80C70A08, &lit_4443); -#pragma pop - -/* 80C70A0C-80C70A10 00006C 0004+00 0/1 0/0 0/0 .rodata @4444 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4444 = -7.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C70A0C, &lit_4444); -#pragma pop - -/* 80C70A10-80C70A14 000070 0004+00 0/1 0/0 0/0 .rodata @4445 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4445 = -50.0f; -COMPILER_STRIP_GATE(0x80C70A10, &lit_4445); -#pragma pop - -/* 80C70A14-80C70A18 000074 0004+00 0/1 0/0 0/0 .rodata @4446 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4446 = 50.0f; -COMPILER_STRIP_GATE(0x80C70A14, &lit_4446); -#pragma pop - -/* 80C70A18-80C70A1C 000078 0004+00 0/1 0/0 0/0 .rodata @4447 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4447 = 160.0f; -COMPILER_STRIP_GATE(0x80C70A18, &lit_4447); -#pragma pop - -/* 80C70A1C-80C70A20 00007C 0004+00 0/1 0/0 0/0 .rodata @4448 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4448 = 175.0f; -COMPILER_STRIP_GATE(0x80C70A1C, &lit_4448); -#pragma pop - -/* 80C70A20-80C70A24 000080 0004+00 0/1 0/0 0/0 .rodata @4449 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4449 = 75.0f; -COMPILER_STRIP_GATE(0x80C70A20, &lit_4449); -#pragma pop - -/* 80C70A24-80C70A28 000084 0004+00 0/1 0/0 0/0 .rodata @4450 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4450 = -55.0f; -COMPILER_STRIP_GATE(0x80C70A24, &lit_4450); -#pragma pop - -/* 80C70A28-80C70A2C 000088 0004+00 0/1 0/0 0/0 .rodata @4451 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4451 = -195.0f; -COMPILER_STRIP_GATE(0x80C70A28, &lit_4451); -#pragma pop /* 80C6F460-80C702E0 0008E0 0E80+00 1/0 0/0 0/0 .text Execute__16daObjYIblltray_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjYIblltray_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Execute__16daObjYIblltray_cFPPA3_A4_f.s" +int daObjYIblltray_c::Execute(Mtx** param_0) { + if (!getNoSameRoom() && mTrayID == fpcM_ERROR_PROCESS_ID_e) { + daObjYIblltray_c* ptray = + (daObjYIblltray_c*)fopAcM_Search((fopAcIt_JudgeFunc)searchObjYIblltray, this); + JUT_ASSERT(ptray != 0); + + mTrayID = fopAcM_GetID(ptray); + } + + if (mMode == MODE_FRONT_WAIT) { + mpBgW->SetRideCallback(rideCallback); + + fopAc_ac_c* ball = fopAcM_Search((fopAcIt_JudgeFunc)searchNearIronball, this); + if (ball != NULL) { + rideActor(ball); + } + } else { + mpBgW->SetRideCallback(NULL); + } + + setMtx(); + mpTrayModel->setBaseTRMtx(mTrayMtx); + mpHandleModel->setBaseTRMtx(mHandleMtx); + *param_0 = &field_0x5c0; + + if (mMode == MODE_BACK_RIDE && mBck.getFrame() == mBck.getStartFrame()) { + onAttention(); + } else { + offAttention(); + } + + if (mIsHang) { + mIsHang = false; + + if (!fopAcM_isSwitch(this, getSwNo())) { + fopAcM_onSwitch(this, getSwNo()); + + if (getType() != 0) { + Z2GetAudioMgr()->seStart(Z2SE_OBJ_IRONTRAY_SWITCH, &mHandlePos, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + } else { + fopAcM_offSwitch(this, getSwNo()); + + if (getType() == 0) { + Z2GetAudioMgr()->seStart(Z2SE_OBJ_IRONTRAY_SWITCH, &mHandlePos, 0, 0, 1.0f, 1.0f, + -1.0f, -1.0f, 0); + } + } + } + + if (mMode == MODE_BACK_RIDE) { + mCcCyl[0].SetCoVsGrp(0x70); + + if (mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } + } else { + mCcCyl[0].SetCoVsGrp(0x30); + + if (!mpBgW->ChkUsed()) { + dComIfG_Bgsp().Regist(mpBgW, this); + } + } + + if (getType() == 0) { + if (!fopAcM_isSwitch(this, getSwNo())) { + mBck.setPlaySpeed(1.0f); + mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_e); + + if (current.angle.x < 0x19EB) { + mRotAmount += 100; + } else { + mRotAmount = (f32)mRotAmount * -0.1f; + current.angle.x = 0x1A4F; + + if (mMode != MODE_FRONT_WAIT && mMode != MODE_FRONT_RIDE && mMode == MODE_BACK_RIDE) + { + fopAc_ac_c* ball = + fopAcM_Search((fopAcIt_JudgeFunc)searchNearBackTrayIronball, this); + if (ball == NULL) { + mMode = MODE_FRONT_WAIT; + } else { + sendBall(fopAcM_GetID(ball)); + } + } + } + } else { + mBck.setPlaySpeed(-1.0f); + mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_RESET_e); + + if (current.angle.x > -0x19EB) { + mRotAmount -= 100; + } else { + mRotAmount = (f32)mRotAmount * -0.1f; + current.angle.x = -0x1A4F; + + if (mMode == MODE_FRONT_WAIT) { + mMode = MODE_BACK_RIDE; + } else if (mMode == MODE_FRONT_RIDE) { + initRotTo(); + } + } + } + + current.angle.x += mRotAmount; + } else { + if (fopAcM_isSwitch(this, getSwNo())) { + mBck.setPlaySpeed(1.0f); + mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_e); + + if (current.angle.x < 0x19EB) { + mRotAmount += 100; + } else { + mRotAmount = (f32)mRotAmount * -0.1f; + current.angle.x = 0x1A4F; + + if (mMode == MODE_BACK_RIDE) { + fopAc_ac_c* ball = + fopAcM_Search((fopAcIt_JudgeFunc)searchNearBackTrayIronball, this); + if (ball == NULL) { + mMode = MODE_FRONT_WAIT; + } else { + sendBall(fopAcM_GetID(ball)); + } + } + } + } else { + mBck.setPlaySpeed(-1.0f); + mBck.setPlayMode(J3DFrameCtrl::LOOP_ONCE_RESET_e); + + if (current.angle.x > -0x19EB) { + mRotAmount -= 100; + } else { + mRotAmount = (f32)mRotAmount * -0.1f; + current.angle.x = -0x1A4F; + + if (mMode == MODE_FRONT_WAIT) { + mMode = MODE_BACK_RIDE; + } else if (mMode == MODE_FRONT_RIDE) { + initRotTo(); + } + } + } + + current.angle.x += mRotAmount; + } + + if (mMode == MODE_FRONT_RIDE) { + daObjCarry_c* ball = (daObjCarry_c*)fopAcM_SearchByID(mBallID); + + if (fopAcM_checkCarryNow(ball)) { + mBallID = fpcM_ERROR_PROCESS_ID_e; + mMode = MODE_FRONT_WAIT; + } else { + cXyz spAC; + spAC = mInBallPos - ball->current.pos; + + f32 var_f31 = spAC.abs(); + if (var_f31 <= 30.0f) { + ball->current.pos = mInBallPos; + } else if (!cM3d_IsZero(var_f31)) { + spAC /= var_f31; + spAC *= 10.0f; + ball->current.pos += spAC; + ball->old.pos = ball->current.pos; + } + } + + ball->endCtrl(); + } + + if (mMode == MODE_INIT_ROT) { + cM3d_IsZero(field_0x63c); + field_0x63c += 1.0f; + if (field_0x63c >= 10.0f) { + field_0x63c = 10.0f; + } + + daObjCarry_c* ball = (daObjCarry_c*)fopAcM_SearchByID(mBallID); + + cXyz spB8; + spB8 = mBasePos - ball->current.pos; + + f32 var_f30 = spB8.abs(); + if (var_f30 <= field_0x63c) { + ball->current.pos = mBasePos; + + if (mTrayID != fpcM_ERROR_PROCESS_ID_e) { + daObjYIblltray_c* ptray = (daObjYIblltray_c*)fopAcM_SearchByID(mTrayID); + ptray->sendBall(mBallID); + mBallID = fpcM_ERROR_PROCESS_ID_e; + mMode = MODE_BACK_RIDE; + } else { + fopAc_ac_c* ac = fopAcM_SearchByID(mBallID); + ac->current.pos = mBackPos; + mBallID = fpcM_ERROR_PROCESS_ID_e; + mMode = MODE_BACK_RIDE; + } + } else if (!cM3d_IsZero(var_f30)) { + spB8 /= var_f30; + spB8 *= field_0x63c; + ball->current.pos += spB8; + ball->old.pos = ball->current.pos; + } + } + + if (mMode == MODE_SEND_BALL) { + field_0x63c += 1.0f; + if (field_0x63c >= 10.0f) { + field_0x63c = 10.0f; + } + + daObjCarry_c* ball = (daObjCarry_c*)fopAcM_SearchByID(mBallID); + + cXyz spC4; + spC4 = mInBallPos - ball->current.pos; + + f32 var_f29 = spC4.abs(); + if (var_f29 <= field_0x63c) { + ball->current.pos = mInBallPos; + + Z2GetAudioMgr()->seStart(Z2SE_OBJ_IRONTRAY_BALL, &mBasePos, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + mMode = MODE_FRONT_RIDE; + fopAcM_SearchByID(mBallID)->current.pos = mInBallPos; + } else if (!cM3d_IsZero(var_f29)) { + spC4 /= var_f29; + spC4 *= field_0x63c; + ball->current.pos += spC4; + ball->old.pos = ball->current.pos; + } + } + + cXyz spD0; + spD0.x = mTrayMtx[0][3]; + spD0.y = mTrayMtx[1][3]; + spD0.z = mTrayMtx[2][3]; + spD0.y -= 100.0f; + + mCcCyl[0].SetC(spD0); + dComIfG_Ccsp()->Set(&mCcCyl[0]); + + mCcCyl[1].SetC(current.pos); + dComIfG_Ccsp()->Set(&mCcCyl[1]); + + spD0.y = home.pos.y; + mCcCyl[2].SetC(spD0); + dComIfG_Ccsp()->Set(&mCcCyl[2]); + + mCcStts.Move(); + + mBck.play(); + + cXyz spDC; + spDC.x = 0.0f; + spDC.y = 0.0f; + spDC.z = 100.0f; + + MTXMultVec(mpHandleModel->getAnmMtx(0), &spDC, &mHandlePos); + eyePos = mHandlePos; + + Mtx spA0; + if (mMode == MODE_FRONT_WAIT && MTXInverse(mHandleMtx, spA0)) { + Vec spE8; + daPy_py_c* player = daPy_getPlayerActorClass(); + MTXMultVec(spA0, &player->current.pos, &spE8); + + if (cM_scos(player->current.angle.y - current.angle.y) < -0.7f && spE8.y > -50.0f && + spE8.y < 50.0f && spE8.z > 50.0f && spE8.z < 160.0f && + ((getType() == 0 && spE8.x < 175.0f && spE8.x > 75.0f) || + (getType() != 0 && spE8.x < -55.0f && spE8.x > -195.0f))) + { + player->onDoPutEmphasys(); + } + } + + return 1; } -#pragma pop /* 80C702E0-80C70330 001760 0050+00 1/1 0/0 0/0 .text initRotTo__16daObjYIblltray_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjYIblltray_c::initRotTo() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/initRotTo__16daObjYIblltray_cFv.s" +void daObjYIblltray_c::initRotTo() { + mMode = MODE_INIT_ROT; + field_0x63c = 0.0f; + + daObjCarry_c* ball = (daObjCarry_c*)fopAcM_SearchByID(mBallID); + ball->startCtrl(); } -#pragma pop /* 80C70330-80C70408 0017B0 00D8+00 1/0 0/0 0/0 .text Draw__16daObjYIblltray_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjYIblltray_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Draw__16daObjYIblltray_cFv.s" +int daObjYIblltray_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpTrayModel, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpHandleModel, &tevStr); + + mBck.entry(mpHandleModel->getModelData()); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpTrayModel); + mDoExt_modelUpdateDL(mpHandleModel); + dComIfGd_setList(); + return 1; } -#pragma pop /* 80C70408-80C70480 001888 0078+00 1/0 0/0 0/0 .text Delete__16daObjYIblltray_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjYIblltray_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/Delete__16daObjYIblltray_cFv.s" +int daObjYIblltray_c::Delete() { + if (mBallID != fpcM_ERROR_PROCESS_ID_e) { + daObjCarry_c* ball = (daObjCarry_c*)fopAcM_SearchByID(mBallID); + ball->startCtrl(); + } + + dComIfG_resDelete(this, l_arcName); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80C70AA4-80C70AC4 -00001 0020+00 1/0 0/0 0/0 .data daObjYIblltray_METHODS */ -static actor_method_class daObjYIblltray_METHODS = { - (process_method_func)daObjYIblltray_create1st__FP16daObjYIblltray_c, - (process_method_func)daObjYIblltray_MoveBGDelete__FP16daObjYIblltray_c, - (process_method_func)daObjYIblltray_MoveBGExecute__FP16daObjYIblltray_c, - 0, - (process_method_func)daObjYIblltray_MoveBGDraw__FP16daObjYIblltray_c, -}; - -/* 80C70AC4-80C70AF4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_YIblltray */ -extern actor_process_profile_definition g_profile_Obj_YIblltray = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_YIblltray, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(daObjYIblltray_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 667, // mPriority - &daObjYIblltray_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80C70AF4-80C70B00 0000BC 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80C70B00-80C70B0C 0000C8 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80C70B0C-80C70B18 0000D4 000C+00 3/3 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80C70B18-80C70B24 0000E0 000C+00 2/2 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80C70B24-80C70B30 0000EC 000C+00 3/3 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80C70B30-80C70B5C 0000F8 002C+00 2/2 0/0 0/0 .data __vt__16daObjYIblltray_c */ -SECTION_DATA extern void* __vt__16daObjYIblltray_c[11] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__16daObjYIblltray_cFv, - (void*)Create__16daObjYIblltray_cFv, - (void*)Execute__16daObjYIblltray_cFPPA3_A4_f, - (void*)Draw__16daObjYIblltray_cFv, - (void*)Delete__16daObjYIblltray_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, - (void*)__dt__16daObjYIblltray_cFv, -}; /* 80C70480-80C70554 001900 00D4+00 1/0 0/0 0/0 .text * daObjYIblltray_create1st__FP16daObjYIblltray_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYIblltray_create1st(daObjYIblltray_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_create1st__FP16daObjYIblltray_c.s" -} -#pragma pop - -/* 80C70554-80C7059C 0019D4 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" asm void __dt__12J3DFrameCtrlFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__12J3DFrameCtrlFv.s" +static int daObjYIblltray_create1st(daObjYIblltray_c* i_this) { + fopAcM_SetupActor(i_this, daObjYIblltray_c); + return i_this->create1st(); } -#pragma pop - -/* 80C7059C-80C705F8 001A1C 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80C705F8-80C706C4 001A78 00CC+00 2/2 0/0 0/0 .text __dt__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Cyl::~dCcD_Cyl() { -extern "C" asm void __dt__8dCcD_CylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8dCcD_CylFv.s" -} -#pragma pop - -/* 80C706C4-80C70748 001B44 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_CylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_Cyl::dCcD_Cyl() { -extern "C" asm void __ct__8dCcD_CylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__ct__8dCcD_CylFv.s" -} -#pragma pop - -/* 80C70748-80C70790 001BC8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 80C70790-80C707D8 001C10 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__8cM3dGAabFv.s" -} -#pragma pop /* 80C707D8-80C707F8 001C58 0020+00 1/0 0/0 0/0 .text * daObjYIblltray_MoveBGDelete__FP16daObjYIblltray_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYIblltray_MoveBGDelete(daObjYIblltray_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGDelete__FP16daObjYIblltray_c.s" +static int daObjYIblltray_MoveBGDelete(daObjYIblltray_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80C707F8-80C70818 001C78 0020+00 1/0 0/0 0/0 .text * daObjYIblltray_MoveBGExecute__FP16daObjYIblltray_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYIblltray_MoveBGExecute(daObjYIblltray_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGExecute__FP16daObjYIblltray_c.s" +static int daObjYIblltray_MoveBGExecute(daObjYIblltray_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80C70818-80C70844 001C98 002C+00 1/0 0/0 0/0 .text * daObjYIblltray_MoveBGDraw__FP16daObjYIblltray_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjYIblltray_MoveBGDraw(daObjYIblltray_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/daObjYIblltray_MoveBGDraw__FP16daObjYIblltray_c.s" -} -#pragma pop - -/* 80C70844-80C7088C 001CC4 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80C7088C-80C70998 001D0C 010C+00 1/0 0/0 0/0 .text __dt__16daObjYIblltray_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjYIblltray_c::~daObjYIblltray_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray/__dt__16daObjYIblltray_cFv.s" +static int daObjYIblltray_MoveBGDraw(daObjYIblltray_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop -/* 80C70A2C-80C70A2C 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C70AA4-80C70AC4 -00001 0020+00 1/0 0/0 0/0 .data daObjYIblltray_METHODS */ +static actor_method_class daObjYIblltray_METHODS = { + (process_method_func)daObjYIblltray_create1st, + (process_method_func)daObjYIblltray_MoveBGDelete, + (process_method_func)daObjYIblltray_MoveBGExecute, + (process_method_func)NULL, + (process_method_func)daObjYIblltray_MoveBGDraw, +}; + +/* 80C70AC4-80C70AF4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_YIblltray */ +extern actor_process_profile_definition g_profile_Obj_YIblltray = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_YIblltray, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjYIblltray_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 667, // mPriority + &daObjYIblltray_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; diff --git a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp index 9e7a7c4fdf..7bb3627f72 100644 --- a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp +++ b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp @@ -208,7 +208,7 @@ void daObjSwBallA_c::search_ball() { fpcM_Search(s_ball_sub, this); for (int i = 0; i < l_target_info_count; i++) { if (l_target_info[i] != 0) { - u32 id = fopAcM_GetID(l_target_info[i]); + fpc_ProcID id = fopAcM_GetID(l_target_info[i]); if (id != -1) { int idIndex = -1; for (int j = 0; j < 8; j++) { diff --git a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp index d83914c1ee..b4b000b71b 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp +++ b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp @@ -227,7 +227,7 @@ void daObjSwBallB_c::search_ball() { fpcM_Search(s_ball_sub, this); for (int i = 0; i < l_target_info_count; i++) { if (l_target_info[i] != 0) { - u32 id = fopAcM_GetID(l_target_info[i]); + fpc_ProcID id = fopAcM_GetID(l_target_info[i]); if (id != -1) { int idIndex = -1; for (int j = 0; j < 2; j++) { diff --git a/src/d/a/d_a_alink_wolf.inc b/src/d/a/d_a_alink_wolf.inc index 07ed3df93a..eaf2a4f65d 100644 --- a/src/d/a/d_a_alink_wolf.inc +++ b/src/d/a/d_a_alink_wolf.inc @@ -5596,7 +5596,7 @@ asm void daAlink_c::checkWolfLockData() { /* 8013911C-8013916C 133A5C 0050+00 1/0 0/0 0/0 .text checkWolfLock__9daAlink_cCFP10fopAc_ac_c */ BOOL daAlink_c::checkWolfLock(fopAc_ac_c* i_actor) const { - u32 actor_id = fopAcM_GetID(i_actor); + fpc_ProcID actor_id = fopAcM_GetID(i_actor); for (int i = 0; i < mWolfLockNum; i++) { if (actor_id == mWolfLockAcKeep[i].getID()) { @@ -5608,7 +5608,7 @@ BOOL daAlink_c::checkWolfLock(fopAc_ac_c* i_actor) const { /* 8013916C-801391DC 133AAC 0070+00 1/0 0/0 0/0 .text cancelWolfLock__9daAlink_cFP10fopAc_ac_c */ bool daAlink_c::cancelWolfLock(fopAc_ac_c* i_actor) { - u32 actor_id = fopAcM_GetID(i_actor); + fpc_ProcID actor_id = fopAcM_GetID(i_actor); for (int i = 0; i < mWolfLockNum; i++) { if (actor_id == mWolfLockAcKeep[i].getID()) { |