diff --git a/Progress.md b/Progress.md index 14aa9c26777..2ab35ec2890 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 41.864842% | 1683248 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 41.864842% | 1683248 | 4020672 -RELs | 34.759751% | 3997484 | 11500324 -Total | 36.600306% | 5680732 | 15520996 +RELs | 34.800967% | 4002224 | 11500324 +Total | 36.630845% | 5685472 | 15520996 ## RELs @@ -606,7 +606,7 @@ d_a_obj_snow_soup | 37.025948% | 1484 | 4008 d_a_obj_so | 31.698636% | 6412 | 20228 d_a_obj_spinLift | 41.107692% | 2672 | 6500 d_a_obj_ss_drink | 36.026542% | 3692 | 10248 -d_a_obj_ss_item | 38.313378% | 2944 | 7684 +d_a_obj_ss_item | 100.000000% | 7684 | 7684 d_a_obj_stairBlock | 45.129643% | 2576 | 5708 d_a_obj_stick | 43.708609% | 2376 | 5436 d_a_obj_stone | 35.435257% | 7148 | 20172 @@ -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 | 34.759751% | 3997484 | 11500324 +Total | 34.800967% | 4002224 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/CreateHeap__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/CreateHeap__14daObj_SSItem_cFv.s deleted file mode 100644 index 0b0595d049a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/CreateHeap__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80CE7298: -/* 80CE7298 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE729C 7C 08 02 A6 */ mflr r0 -/* 80CE72A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE72A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE72A8 93 C1 00 08 */ stw r30, 8(r1) -/* 80CE72AC 7C 7F 1B 78 */ mr r31, r3 -/* 80CE72B0 88 03 0B 0E */ lbz r0, 0xb0e(r3) -/* 80CE72B4 54 00 10 3A */ slwi r0, r0, 2 -/* 80CE72B8 3C 80 80 CE */ lis r4, l_bmdIdxName@ha /* 0x80CE7F40@ha */ -/* 80CE72BC 38 84 7F 40 */ addi r4, r4, l_bmdIdxName@l /* 0x80CE7F40@l */ -/* 80CE72C0 7F C4 00 2E */ lwzx r30, r4, r0 -/* 80CE72C4 2C 1E 00 00 */ cmpwi r30, 0 -/* 80CE72C8 41 82 00 28 */ beq lbl_80CE72F0 -/* 80CE72CC 48 00 05 6D */ bl getResName__14daObj_SSItem_cFv -/* 80CE72D0 7F C4 F3 78 */ mr r4, r30 -/* 80CE72D4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CE72D8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CE72DC 3C A5 00 02 */ addis r5, r5, 2 -/* 80CE72E0 38 C0 00 80 */ li r6, 0x80 -/* 80CE72E4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80CE72E8 4B 35 50 05 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CE72EC 48 00 00 30 */ b lbl_80CE731C -lbl_80CE72F0: -/* 80CE72F0 3C 80 80 CE */ lis r4, l_bmdFileName@ha /* 0x80CE7F4C@ha */ -/* 80CE72F4 38 84 7F 4C */ addi r4, r4, l_bmdFileName@l /* 0x80CE7F4C@l */ -/* 80CE72F8 7F C4 00 2E */ lwzx r30, r4, r0 -/* 80CE72FC 48 00 05 3D */ bl getResName__14daObj_SSItem_cFv -/* 80CE7300 7F C4 F3 78 */ mr r4, r30 -/* 80CE7304 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CE7308 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CE730C 3C A5 00 02 */ addis r5, r5, 2 -/* 80CE7310 38 C0 00 80 */ li r6, 0x80 -/* 80CE7314 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80CE7318 4B 35 50 65 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -lbl_80CE731C: -/* 80CE731C 3C 80 00 08 */ lis r4, 8 -/* 80CE7320 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CE7324 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CE7328 4B 32 D9 2D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CE732C 90 7F 05 80 */ stw r3, 0x580(r31) -/* 80CE7330 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 80CE7334 30 03 FF FF */ addic r0, r3, -1 -/* 80CE7338 7C 00 19 10 */ subfe r0, r0, r3 -/* 80CE733C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80CE7340 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7344 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CE7348 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE734C 7C 08 03 A6 */ mtlr r0 -/* 80CE7350 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7354 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Delete__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Delete__14daObj_SSItem_cFv.s deleted file mode 100644 index 6f7e8ce8462..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Delete__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80CE7358: -/* 80CE7358 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE735C 7C 08 02 A6 */ mflr r0 -/* 80CE7360 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7364 38 80 FF FF */ li r4, -1 -/* 80CE7368 81 83 05 68 */ lwz r12, 0x568(r3) -/* 80CE736C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80CE7370 7D 89 03 A6 */ mtctr r12 -/* 80CE7374 4E 80 04 21 */ bctrl -/* 80CE7378 38 60 00 01 */ li r3, 1 -/* 80CE737C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7380 7C 08 03 A6 */ mtlr r0 -/* 80CE7384 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7388 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Draw__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Draw__14daObj_SSItem_cFv.s deleted file mode 100644 index 4b61dd27e1e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Draw__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_80CE7610: -/* 80CE7610 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80CE7614 7C 08 02 A6 */ mflr r0 -/* 80CE7618 90 01 00 34 */ stw r0, 0x34(r1) -/* 80CE761C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80CE7620 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80CE7624 7C 7E 1B 78 */ mr r30, r3 -/* 80CE7628 3C 60 80 CE */ lis r3, mCcDObjInfo__14daObj_SSItem_c@ha /* 0x80CE7EB0@ha */ -/* 80CE762C 3B E3 7E B0 */ addi r31, r3, mCcDObjInfo__14daObj_SSItem_c@l /* 0x80CE7EB0@l */ -/* 80CE7630 88 1E 0B 0E */ lbz r0, 0xb0e(r30) -/* 80CE7634 28 00 00 02 */ cmplwi r0, 2 -/* 80CE7638 40 82 00 0C */ bne lbl_80CE7644 -/* 80CE763C 38 60 00 01 */ li r3, 1 -/* 80CE7640 48 00 00 B8 */ b lbl_80CE76F8 -lbl_80CE7644: -/* 80CE7644 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CE7648 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CE764C 38 80 00 00 */ li r4, 0 -/* 80CE7650 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CE7654 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80CE7658 4B 4B C1 6D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CE765C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CE7660 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CE7664 80 9E 05 80 */ lwz r4, 0x580(r30) -/* 80CE7668 80 84 00 04 */ lwz r4, 4(r4) -/* 80CE766C 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CE7670 4B 4B D7 31 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CE7674 80 7E 05 80 */ lwz r3, 0x580(r30) -/* 80CE7678 4B 32 66 4D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CE767C C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80CE7680 C0 1E 0B 00 */ lfs f0, 0xb00(r30) -/* 80CE7684 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80CE7688 41 82 00 6C */ beq lbl_80CE76F4 -/* 80CE768C 3C 60 80 CE */ lis r3, __vt__8cM3dGPla@ha /* 0x80CE7FF8@ha */ -/* 80CE7690 38 03 7F F8 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x80CE7FF8@l */ -/* 80CE7694 90 01 00 18 */ stw r0, 0x18(r1) -/* 80CE7698 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CE769C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CE76A0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80CE76A4 38 9E 0A 64 */ addi r4, r30, 0xa64 -/* 80CE76A8 38 A1 00 08 */ addi r5, r1, 8 -/* 80CE76AC 4B 38 D0 99 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 80CE76B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CE76B4 41 82 00 34 */ beq lbl_80CE76E8 -/* 80CE76B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CE76BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CE76C0 38 63 61 C0 */ addi r3, r3, 0x61c0 -/* 80CE76C4 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80CE76C8 C0 3E 0B 00 */ lfs f1, 0xb00(r30) -/* 80CE76CC C0 5F 00 40 */ lfs f2, 0x40(r31) -/* 80CE76D0 38 A1 00 08 */ addi r5, r1, 8 -/* 80CE76D4 38 C0 00 00 */ li r6, 0 -/* 80CE76D8 C0 7F 00 44 */ lfs f3, 0x44(r31) -/* 80CE76DC 3C E0 80 42 */ lis r7, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80CE76E0 38 E7 48 D0 */ addi r7, r7, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80CE76E4 4B 36 E8 A1 */ bl setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj -lbl_80CE76E8: -/* 80CE76E8 3C 60 80 CE */ lis r3, __vt__8cM3dGPla@ha /* 0x80CE7FF8@ha */ -/* 80CE76EC 38 03 7F F8 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x80CE7FF8@l */ -/* 80CE76F0 90 01 00 18 */ stw r0, 0x18(r1) -lbl_80CE76F4: -/* 80CE76F4 38 60 00 01 */ li r3, 1 -lbl_80CE76F8: -/* 80CE76F8 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80CE76FC 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80CE7700 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80CE7704 7C 08 03 A6 */ mtlr r0 -/* 80CE7708 38 21 00 30 */ addi r1, r1, 0x30 -/* 80CE770C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Execute__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Execute__14daObj_SSItem_cFv.s deleted file mode 100644 index e7c5edd5823..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Execute__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,170 +0,0 @@ -lbl_80CE738C: -/* 80CE738C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80CE7390 7C 08 02 A6 */ mflr r0 -/* 80CE7394 90 01 00 34 */ stw r0, 0x34(r1) -/* 80CE7398 39 61 00 30 */ addi r11, r1, 0x30 -/* 80CE739C 4B 67 AE 41 */ bl _savegpr_29 -/* 80CE73A0 7C 7E 1B 78 */ mr r30, r3 -/* 80CE73A4 3C 80 80 CE */ lis r4, mCcDObjInfo__14daObj_SSItem_c@ha /* 0x80CE7EB0@ha */ -/* 80CE73A8 3B E4 7E B0 */ addi r31, r4, mCcDObjInfo__14daObj_SSItem_c@l /* 0x80CE7EB0@l */ -/* 80CE73AC 88 03 0B 0E */ lbz r0, 0xb0e(r3) -/* 80CE73B0 28 00 00 02 */ cmplwi r0, 2 -/* 80CE73B4 40 82 00 0C */ bne lbl_80CE73C0 -/* 80CE73B8 38 60 00 01 */ li r3, 1 -/* 80CE73BC 48 00 02 3C */ b lbl_80CE75F8 -lbl_80CE73C0: -/* 80CE73C0 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 80CE73C4 54 00 04 A4 */ rlwinm r0, r0, 0, 0x12, 0x12 -/* 80CE73C8 90 1E 0A FC */ stw r0, 0xafc(r30) -/* 80CE73CC 48 00 07 E9 */ bl setParam__14daObj_SSItem_cFv -/* 80CE73D0 80 1E 0A FC */ lwz r0, 0xafc(r30) -/* 80CE73D4 2C 00 00 00 */ cmpwi r0, 0 -/* 80CE73D8 41 82 00 34 */ beq lbl_80CE740C -/* 80CE73DC 80 1E 05 B0 */ lwz r0, 0x5b0(r30) -/* 80CE73E0 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80CE73E4 90 1E 05 B0 */ stw r0, 0x5b0(r30) -/* 80CE73E8 80 1E 05 B0 */ lwz r0, 0x5b0(r30) -/* 80CE73EC 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 -/* 80CE73F0 90 1E 05 B0 */ stw r0, 0x5b0(r30) -/* 80CE73F4 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80CE73F8 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 80CE73FC D0 1E 04 F8 */ stfs f0, 0x4f8(r30) -/* 80CE7400 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80CE7404 D0 1E 05 00 */ stfs f0, 0x500(r30) -/* 80CE7408 48 00 01 00 */ b lbl_80CE7508 -lbl_80CE740C: -/* 80CE740C 38 7E 07 78 */ addi r3, r30, 0x778 -/* 80CE7410 4B 39 C4 21 */ bl Move__10dCcD_GSttsFv -/* 80CE7414 38 7E 07 D8 */ addi r3, r30, 0x7d8 -/* 80CE7418 4B 39 D2 41 */ bl ChkCoHit__12dCcD_GObjInfFv -/* 80CE741C 28 03 00 00 */ cmplwi r3, 0 -/* 80CE7420 41 82 00 20 */ beq lbl_80CE7440 -/* 80CE7424 C0 1E 07 5C */ lfs f0, 0x75c(r30) -/* 80CE7428 D0 1E 0A 8C */ stfs f0, 0xa8c(r30) -/* 80CE742C C0 1E 07 60 */ lfs f0, 0x760(r30) -/* 80CE7430 D0 1E 0A 90 */ stfs f0, 0xa90(r30) -/* 80CE7434 C0 1E 07 64 */ lfs f0, 0x764(r30) -/* 80CE7438 D0 1E 0A 94 */ stfs f0, 0xa94(r30) -/* 80CE743C 48 00 00 14 */ b lbl_80CE7450 -lbl_80CE7440: -/* 80CE7440 C0 1F 00 30 */ lfs f0, 0x30(r31) -/* 80CE7444 D0 1E 0A 8C */ stfs f0, 0xa8c(r30) -/* 80CE7448 D0 1E 0A 90 */ stfs f0, 0xa90(r30) -/* 80CE744C D0 1E 0A 94 */ stfs f0, 0xa94(r30) -lbl_80CE7450: -/* 80CE7450 7F C3 F3 78 */ mr r3, r30 -/* 80CE7454 38 9E 0A 8C */ addi r4, r30, 0xa8c -/* 80CE7458 4B 33 32 75 */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 80CE745C 38 7E 05 84 */ addi r3, r30, 0x584 -/* 80CE7460 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CE7464 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CE7468 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80CE746C 4B 38 F6 41 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80CE7470 80 1E 06 60 */ lwz r0, 0x660(r30) -/* 80CE7474 90 1E 0A 50 */ stw r0, 0xa50(r30) -/* 80CE7478 80 1E 06 64 */ lwz r0, 0x664(r30) -/* 80CE747C 90 1E 0A 54 */ stw r0, 0xa54(r30) -/* 80CE7480 80 1E 06 68 */ lwz r0, 0x668(r30) -/* 80CE7484 90 1E 0A 58 */ stw r0, 0xa58(r30) -/* 80CE7488 88 1E 06 6C */ lbz r0, 0x66c(r30) -/* 80CE748C 98 1E 0A 5C */ stb r0, 0xa5c(r30) -/* 80CE7490 A0 1E 06 74 */ lhz r0, 0x674(r30) -/* 80CE7494 B0 1E 0A 64 */ sth r0, 0xa64(r30) -/* 80CE7498 A0 1E 06 76 */ lhz r0, 0x676(r30) -/* 80CE749C B0 1E 0A 66 */ sth r0, 0xa66(r30) -/* 80CE74A0 80 1E 06 78 */ lwz r0, 0x678(r30) -/* 80CE74A4 90 1E 0A 68 */ stw r0, 0xa68(r30) -/* 80CE74A8 80 1E 06 7C */ lwz r0, 0x67c(r30) -/* 80CE74AC 90 1E 0A 6C */ stw r0, 0xa6c(r30) -/* 80CE74B0 C0 1E 06 84 */ lfs f0, 0x684(r30) -/* 80CE74B4 D0 1E 0A 74 */ stfs f0, 0xa74(r30) -/* 80CE74B8 C0 1E 06 88 */ lfs f0, 0x688(r30) -/* 80CE74BC D0 1E 0A 78 */ stfs f0, 0xa78(r30) -/* 80CE74C0 C0 1E 06 8C */ lfs f0, 0x68c(r30) -/* 80CE74C4 D0 1E 0A 7C */ stfs f0, 0xa7c(r30) -/* 80CE74C8 80 1E 06 90 */ lwz r0, 0x690(r30) -/* 80CE74CC 90 1E 0A 80 */ stw r0, 0xa80(r30) -/* 80CE74D0 C0 1E 06 94 */ lfs f0, 0x694(r30) -/* 80CE74D4 D0 1E 0A 84 */ stfs f0, 0xa84(r30) -/* 80CE74D8 80 1E 06 98 */ lwz r0, 0x698(r30) -/* 80CE74DC 90 1E 0A 88 */ stw r0, 0xa88(r30) -/* 80CE74E0 C0 1E 06 1C */ lfs f0, 0x61c(r30) -/* 80CE74E4 D0 1E 0B 00 */ stfs f0, 0xb00(r30) -/* 80CE74E8 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80CE74EC C0 1E 0B 00 */ lfs f0, 0xb00(r30) -/* 80CE74F0 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80CE74F4 41 82 00 14 */ beq lbl_80CE7508 -/* 80CE74F8 7F C3 F3 78 */ mr r3, r30 -/* 80CE74FC 48 00 07 29 */ bl setEnvTevColor__14daObj_SSItem_cFv -/* 80CE7500 7F C3 F3 78 */ mr r3, r30 -/* 80CE7504 48 00 07 7D */ bl setRoomNo__14daObj_SSItem_cFv -lbl_80CE7508: -/* 80CE7508 38 7E 0A E4 */ addi r3, r30, 0xae4 -/* 80CE750C 4B 67 AB 0D */ bl __ptmf_test -/* 80CE7510 2C 03 00 00 */ cmpwi r3, 0 -/* 80CE7514 41 82 00 18 */ beq lbl_80CE752C -/* 80CE7518 7F C3 F3 78 */ mr r3, r30 -/* 80CE751C 38 80 00 00 */ li r4, 0 -/* 80CE7520 39 9E 0A E4 */ addi r12, r30, 0xae4 -/* 80CE7524 4B 67 AB 61 */ bl __ptmf_scall -/* 80CE7528 60 00 00 00 */ nop -lbl_80CE752C: -/* 80CE752C 7F C3 F3 78 */ mr r3, r30 -/* 80CE7530 48 00 07 95 */ bl setMtx__14daObj_SSItem_cFv -/* 80CE7534 80 1E 0A FC */ lwz r0, 0xafc(r30) -/* 80CE7538 2C 00 00 00 */ cmpwi r0, 0 -/* 80CE753C 40 82 00 B0 */ bne lbl_80CE75EC -/* 80CE7540 38 00 00 00 */ li r0, 0 -/* 80CE7544 90 1E 09 40 */ stw r0, 0x940(r30) -/* 80CE7548 3C 60 D8 FC */ lis r3, 0xD8FC /* 0xD8FBFDFF@ha */ -/* 80CE754C 38 03 FD FF */ addi r0, r3, 0xFDFF /* 0xD8FBFDFF@l */ -/* 80CE7550 90 1E 09 3C */ stw r0, 0x93c(r30) -/* 80CE7554 38 00 00 1F */ li r0, 0x1f -/* 80CE7558 90 1E 09 2C */ stw r0, 0x92c(r30) -/* 80CE755C 38 7E 0A 38 */ addi r3, r30, 0xa38 -/* 80CE7560 C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 80CE7564 4B 58 7C 9D */ bl SetR__8cM3dGCylFf -/* 80CE7568 38 7E 0A 38 */ addi r3, r30, 0xa38 -/* 80CE756C C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80CE7570 4B 58 7C 89 */ bl SetH__8cM3dGCylFf -/* 80CE7574 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80CE7578 D0 01 00 08 */ stfs f0, 8(r1) -/* 80CE757C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80CE7580 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80CE7584 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80CE7588 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CE758C 38 7E 0A 38 */ addi r3, r30, 0xa38 -/* 80CE7590 38 81 00 08 */ addi r4, r1, 8 -/* 80CE7594 4B 58 7C 49 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80CE7598 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CE759C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CE75A0 3B A3 23 3C */ addi r29, r3, 0x233c -/* 80CE75A4 7F A3 EB 78 */ mr r3, r29 -/* 80CE75A8 38 9E 09 14 */ addi r4, r30, 0x914 -/* 80CE75AC 4B 57 D5 FD */ bl Set__4cCcSFP8cCcD_Obj -/* 80CE75B0 38 00 00 00 */ li r0, 0 -/* 80CE75B4 90 1E 07 E8 */ stw r0, 0x7e8(r30) -/* 80CE75B8 90 1E 07 D8 */ stw r0, 0x7d8(r30) -/* 80CE75BC 38 7E 08 FC */ addi r3, r30, 0x8fc -/* 80CE75C0 C0 3F 00 38 */ lfs f1, 0x38(r31) -/* 80CE75C4 4B 58 7C 3D */ bl SetR__8cM3dGCylFf -/* 80CE75C8 38 7E 08 FC */ addi r3, r30, 0x8fc -/* 80CE75CC C0 3F 00 3C */ lfs f1, 0x3c(r31) -/* 80CE75D0 4B 58 7C 29 */ bl SetH__8cM3dGCylFf -/* 80CE75D4 38 7E 08 FC */ addi r3, r30, 0x8fc -/* 80CE75D8 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80CE75DC 4B 58 7C 01 */ bl SetC__8cM3dGCylFRC4cXyz -/* 80CE75E0 7F A3 EB 78 */ mr r3, r29 -/* 80CE75E4 38 9E 07 D8 */ addi r4, r30, 0x7d8 -/* 80CE75E8 4B 57 D5 C1 */ bl Set__4cCcSFP8cCcD_Obj -lbl_80CE75EC: -/* 80CE75EC 7F C3 F3 78 */ mr r3, r30 -/* 80CE75F0 48 00 07 39 */ bl setAttnPos__14daObj_SSItem_cFv -/* 80CE75F4 38 60 00 01 */ li r3, 1 -lbl_80CE75F8: -/* 80CE75F8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80CE75FC 4B 67 AC 2D */ bl _restgpr_29 -/* 80CE7600 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80CE7604 7C 08 03 A6 */ mtlr r0 -/* 80CE7608 38 21 00 30 */ addi r1, r1, 0x30 -/* 80CE760C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index a49c4096e5d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CE7E14: -/* 80CE7E14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7E18 7C 08 02 A6 */ mflr r0 -/* 80CE7E1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7E20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE7E24 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CE7E28 41 82 00 1C */ beq lbl_80CE7E44 -/* 80CE7E2C 3C A0 80 CF */ lis r5, __vt__10cCcD_GStts@ha /* 0x80CE8028@ha */ -/* 80CE7E30 38 05 80 28 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x80CE8028@l */ -/* 80CE7E34 90 1F 00 00 */ stw r0, 0(r31) -/* 80CE7E38 7C 80 07 35 */ extsh. r0, r4 -/* 80CE7E3C 40 81 00 08 */ ble lbl_80CE7E44 -/* 80CE7E40 4B 5E 6E FD */ bl __dl__FPv -lbl_80CE7E44: -/* 80CE7E44 7F E3 FB 78 */ mr r3, r31 -/* 80CE7E48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7E4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7E50 7C 08 03 A6 */ mtlr r0 -/* 80CE7E54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7E58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 002e2706b62..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CE71CC: -/* 80CE71CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE71D0 7C 08 02 A6 */ mflr r0 -/* 80CE71D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE71D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE71DC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CE71E0 41 82 00 30 */ beq lbl_80CE7210 -/* 80CE71E4 3C 60 80 CF */ lis r3, __vt__10dCcD_GStts@ha /* 0x80CE8034@ha */ -/* 80CE71E8 38 03 80 34 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80CE8034@l */ -/* 80CE71EC 90 1F 00 00 */ stw r0, 0(r31) -/* 80CE71F0 41 82 00 10 */ beq lbl_80CE7200 -/* 80CE71F4 3C 60 80 CF */ lis r3, __vt__10cCcD_GStts@ha /* 0x80CE8028@ha */ -/* 80CE71F8 38 03 80 28 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80CE8028@l */ -/* 80CE71FC 90 1F 00 00 */ stw r0, 0(r31) -lbl_80CE7200: -/* 80CE7200 7C 80 07 35 */ extsh. r0, r4 -/* 80CE7204 40 81 00 0C */ ble lbl_80CE7210 -/* 80CE7208 7F E3 FB 78 */ mr r3, r31 -/* 80CE720C 4B 5E 7B 31 */ bl __dl__FPv -lbl_80CE7210: -/* 80CE7210 7F E3 FB 78 */ mr r3, r31 -/* 80CE7214 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7218 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE721C 7C 08 03 A6 */ mtlr r0 -/* 80CE7220 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7224 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index b59bc402df4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CE715C: -/* 80CE715C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7160 7C 08 02 A6 */ mflr r0 -/* 80CE7164 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7168 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE716C 93 C1 00 08 */ stw r30, 8(r1) -/* 80CE7170 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CE7174 7C 9F 23 78 */ mr r31, r4 -/* 80CE7178 41 82 00 38 */ beq lbl_80CE71B0 -/* 80CE717C 3C 60 80 CF */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80CE8040@ha */ -/* 80CE7180 38 03 80 40 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80CE8040@l */ -/* 80CE7184 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80CE7188 38 7E 00 14 */ addi r3, r30, 0x14 -/* 80CE718C 38 80 FF FF */ li r4, -1 -/* 80CE7190 4B 58 7D 89 */ bl __dt__8cM3dGCirFv -/* 80CE7194 7F C3 F3 78 */ mr r3, r30 -/* 80CE7198 38 80 00 00 */ li r4, 0 -/* 80CE719C 4B 58 0F 15 */ bl __dt__13cBgS_PolyInfoFv -/* 80CE71A0 7F E0 07 35 */ extsh. r0, r31 -/* 80CE71A4 40 81 00 0C */ ble lbl_80CE71B0 -/* 80CE71A8 7F C3 F3 78 */ mr r3, r30 -/* 80CE71AC 4B 5E 7B 91 */ bl __dl__FPv -lbl_80CE71B0: -/* 80CE71B0 7F C3 F3 78 */ mr r3, r30 -/* 80CE71B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE71B8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CE71BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE71C0 7C 08 03 A6 */ mtlr r0 -/* 80CE71C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE71C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index f23c8a8924e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80CE7228: -/* 80CE7228 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE722C 7C 08 02 A6 */ mflr r0 -/* 80CE7230 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7234 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE7238 93 C1 00 08 */ stw r30, 8(r1) -/* 80CE723C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CE7240 7C 9F 23 78 */ mr r31, r4 -/* 80CE7244 41 82 00 38 */ beq lbl_80CE727C -/* 80CE7248 3C 80 80 CF */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80CE8004@ha */ -/* 80CE724C 38 84 80 04 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80CE8004@l */ -/* 80CE7250 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80CE7254 38 04 00 0C */ addi r0, r4, 0xc -/* 80CE7258 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80CE725C 38 04 00 18 */ addi r0, r4, 0x18 -/* 80CE7260 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80CE7264 38 80 00 00 */ li r4, 0 -/* 80CE7268 4B 38 ED 2D */ bl __dt__9dBgS_AcchFv -/* 80CE726C 7F E0 07 35 */ extsh. r0, r31 -/* 80CE7270 40 81 00 0C */ ble lbl_80CE727C -/* 80CE7274 7F C3 F3 78 */ mr r3, r30 -/* 80CE7278 4B 5E 7A C5 */ bl __dl__FPv -lbl_80CE727C: -/* 80CE727C 7F C3 F3 78 */ mr r3, r30 -/* 80CE7280 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7284 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CE7288 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE728C 7C 08 03 A6 */ mtlr r0 -/* 80CE7290 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7294 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__14daObj_SSItem_cFv.s deleted file mode 100644 index 88e86017690..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,160 +0,0 @@ -lbl_80CE6C18: -/* 80CE6C18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE6C1C 7C 08 02 A6 */ mflr r0 -/* 80CE6C20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE6C24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE6C28 93 C1 00 08 */ stw r30, 8(r1) -/* 80CE6C2C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80CE6C30 7C 9F 23 78 */ mr r31, r4 -/* 80CE6C34 41 82 02 18 */ beq lbl_80CE6E4C -/* 80CE6C38 3C 80 80 CF */ lis r4, __vt__14daObj_SSItem_c@ha /* 0x80CE8064@ha */ -/* 80CE6C3C 38 04 80 64 */ addi r0, r4, __vt__14daObj_SSItem_c@l /* 0x80CE8064@l */ -/* 80CE6C40 90 1E 05 68 */ stw r0, 0x568(r30) -/* 80CE6C44 48 00 0B F5 */ bl getResName__14daObj_SSItem_cFv -/* 80CE6C48 7C 64 1B 78 */ mr r4, r3 -/* 80CE6C4C 38 7E 05 78 */ addi r3, r30, 0x578 -/* 80CE6C50 4B 34 63 B9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CE6C54 38 7E 0A 98 */ addi r3, r30, 0xa98 -/* 80CE6C58 38 80 FF FF */ li r4, -1 -/* 80CE6C5C 4B 56 32 ED */ bl __dt__10dMsgFlow_cFv -/* 80CE6C60 38 7E 0A 50 */ addi r3, r30, 0xa50 -/* 80CE6C64 38 80 FF FF */ li r4, -1 -/* 80CE6C68 4B 58 10 2D */ bl __dt__11cBgS_GndChkFv -/* 80CE6C6C 34 1E 09 14 */ addic. r0, r30, 0x914 -/* 80CE6C70 41 82 00 84 */ beq lbl_80CE6CF4 -/* 80CE6C74 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CE6C78 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CE6C7C 90 7E 09 50 */ stw r3, 0x950(r30) -/* 80CE6C80 38 03 00 2C */ addi r0, r3, 0x2c -/* 80CE6C84 90 1E 0A 34 */ stw r0, 0xa34(r30) -/* 80CE6C88 38 03 00 84 */ addi r0, r3, 0x84 -/* 80CE6C8C 90 1E 0A 4C */ stw r0, 0xa4c(r30) -/* 80CE6C90 34 1E 0A 18 */ addic. r0, r30, 0xa18 -/* 80CE6C94 41 82 00 54 */ beq lbl_80CE6CE8 -/* 80CE6C98 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CE6C9C 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CE6CA0 90 7E 0A 34 */ stw r3, 0xa34(r30) -/* 80CE6CA4 38 03 00 58 */ addi r0, r3, 0x58 -/* 80CE6CA8 90 1E 0A 4C */ stw r0, 0xa4c(r30) -/* 80CE6CAC 34 1E 0A 38 */ addic. r0, r30, 0xa38 -/* 80CE6CB0 41 82 00 10 */ beq lbl_80CE6CC0 -/* 80CE6CB4 3C 60 80 CF */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CE8058@ha */ -/* 80CE6CB8 38 03 80 58 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CE8058@l */ -/* 80CE6CBC 90 1E 0A 4C */ stw r0, 0xa4c(r30) -lbl_80CE6CC0: -/* 80CE6CC0 34 1E 0A 18 */ addic. r0, r30, 0xa18 -/* 80CE6CC4 41 82 00 24 */ beq lbl_80CE6CE8 -/* 80CE6CC8 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CE6CCC 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CE6CD0 90 1E 0A 34 */ stw r0, 0xa34(r30) -/* 80CE6CD4 34 1E 0A 18 */ addic. r0, r30, 0xa18 -/* 80CE6CD8 41 82 00 10 */ beq lbl_80CE6CE8 -/* 80CE6CDC 3C 60 80 CF */ lis r3, __vt__8cM3dGAab@ha /* 0x80CE804C@ha */ -/* 80CE6CE0 38 03 80 4C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CE804C@l */ -/* 80CE6CE4 90 1E 0A 30 */ stw r0, 0xa30(r30) -lbl_80CE6CE8: -/* 80CE6CE8 38 7E 09 14 */ addi r3, r30, 0x914 -/* 80CE6CEC 38 80 00 00 */ li r4, 0 -/* 80CE6CF0 4B 39 D3 F5 */ bl __dt__12dCcD_GObjInfFv -lbl_80CE6CF4: -/* 80CE6CF4 34 1E 07 D8 */ addic. r0, r30, 0x7d8 -/* 80CE6CF8 41 82 00 84 */ beq lbl_80CE6D7C -/* 80CE6CFC 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CE6D00 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CE6D04 90 7E 08 14 */ stw r3, 0x814(r30) -/* 80CE6D08 38 03 00 2C */ addi r0, r3, 0x2c -/* 80CE6D0C 90 1E 08 F8 */ stw r0, 0x8f8(r30) -/* 80CE6D10 38 03 00 84 */ addi r0, r3, 0x84 -/* 80CE6D14 90 1E 09 10 */ stw r0, 0x910(r30) -/* 80CE6D18 34 1E 08 DC */ addic. r0, r30, 0x8dc -/* 80CE6D1C 41 82 00 54 */ beq lbl_80CE6D70 -/* 80CE6D20 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CE6D24 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CE6D28 90 7E 08 F8 */ stw r3, 0x8f8(r30) -/* 80CE6D2C 38 03 00 58 */ addi r0, r3, 0x58 -/* 80CE6D30 90 1E 09 10 */ stw r0, 0x910(r30) -/* 80CE6D34 34 1E 08 FC */ addic. r0, r30, 0x8fc -/* 80CE6D38 41 82 00 10 */ beq lbl_80CE6D48 -/* 80CE6D3C 3C 60 80 CF */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CE8058@ha */ -/* 80CE6D40 38 03 80 58 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CE8058@l */ -/* 80CE6D44 90 1E 09 10 */ stw r0, 0x910(r30) -lbl_80CE6D48: -/* 80CE6D48 34 1E 08 DC */ addic. r0, r30, 0x8dc -/* 80CE6D4C 41 82 00 24 */ beq lbl_80CE6D70 -/* 80CE6D50 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CE6D54 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CE6D58 90 1E 08 F8 */ stw r0, 0x8f8(r30) -/* 80CE6D5C 34 1E 08 DC */ addic. r0, r30, 0x8dc -/* 80CE6D60 41 82 00 10 */ beq lbl_80CE6D70 -/* 80CE6D64 3C 60 80 CF */ lis r3, __vt__8cM3dGAab@ha /* 0x80CE804C@ha */ -/* 80CE6D68 38 03 80 4C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CE804C@l */ -/* 80CE6D6C 90 1E 08 F4 */ stw r0, 0x8f4(r30) -lbl_80CE6D70: -/* 80CE6D70 38 7E 07 D8 */ addi r3, r30, 0x7d8 -/* 80CE6D74 38 80 00 00 */ li r4, 0 -/* 80CE6D78 4B 39 D3 6D */ bl __dt__12dCcD_GObjInfFv -lbl_80CE6D7C: -/* 80CE6D7C 34 1E 07 98 */ addic. r0, r30, 0x798 -/* 80CE6D80 41 82 00 28 */ beq lbl_80CE6DA8 -/* 80CE6D84 3C 60 80 CF */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x80CE8040@ha */ -/* 80CE6D88 38 03 80 40 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x80CE8040@l */ -/* 80CE6D8C 90 1E 07 A4 */ stw r0, 0x7a4(r30) -/* 80CE6D90 38 7E 07 AC */ addi r3, r30, 0x7ac -/* 80CE6D94 38 80 FF FF */ li r4, -1 -/* 80CE6D98 4B 58 81 81 */ bl __dt__8cM3dGCirFv -/* 80CE6D9C 38 7E 07 98 */ addi r3, r30, 0x798 -/* 80CE6DA0 38 80 00 00 */ li r4, 0 -/* 80CE6DA4 4B 58 13 0D */ bl __dt__13cBgS_PolyInfoFv -lbl_80CE6DA8: -/* 80CE6DA8 34 1E 07 5C */ addic. r0, r30, 0x75c -/* 80CE6DAC 41 82 00 54 */ beq lbl_80CE6E00 -/* 80CE6DB0 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80CE6DB4 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80CE6DB8 90 7E 07 74 */ stw r3, 0x774(r30) -/* 80CE6DBC 38 03 00 20 */ addi r0, r3, 0x20 -/* 80CE6DC0 90 1E 07 78 */ stw r0, 0x778(r30) -/* 80CE6DC4 34 1E 07 78 */ addic. r0, r30, 0x778 -/* 80CE6DC8 41 82 00 24 */ beq lbl_80CE6DEC -/* 80CE6DCC 3C 60 80 CF */ lis r3, __vt__10dCcD_GStts@ha /* 0x80CE8034@ha */ -/* 80CE6DD0 38 03 80 34 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x80CE8034@l */ -/* 80CE6DD4 90 1E 07 78 */ stw r0, 0x778(r30) -/* 80CE6DD8 34 1E 07 78 */ addic. r0, r30, 0x778 -/* 80CE6DDC 41 82 00 10 */ beq lbl_80CE6DEC -/* 80CE6DE0 3C 60 80 CF */ lis r3, __vt__10cCcD_GStts@ha /* 0x80CE8028@ha */ -/* 80CE6DE4 38 03 80 28 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x80CE8028@l */ -/* 80CE6DE8 90 1E 07 78 */ stw r0, 0x778(r30) -lbl_80CE6DEC: -/* 80CE6DEC 34 1E 07 5C */ addic. r0, r30, 0x75c -/* 80CE6DF0 41 82 00 10 */ beq lbl_80CE6E00 -/* 80CE6DF4 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80CE6DF8 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80CE6DFC 90 1E 07 74 */ stw r0, 0x774(r30) -lbl_80CE6E00: -/* 80CE6E00 34 1E 05 84 */ addic. r0, r30, 0x584 -/* 80CE6E04 41 82 00 2C */ beq lbl_80CE6E30 -/* 80CE6E08 3C 60 80 CF */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80CE8004@ha */ -/* 80CE6E0C 38 63 80 04 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80CE8004@l */ -/* 80CE6E10 90 7E 05 94 */ stw r3, 0x594(r30) -/* 80CE6E14 38 03 00 0C */ addi r0, r3, 0xc -/* 80CE6E18 90 1E 05 98 */ stw r0, 0x598(r30) -/* 80CE6E1C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80CE6E20 90 1E 05 A8 */ stw r0, 0x5a8(r30) -/* 80CE6E24 38 7E 05 84 */ addi r3, r30, 0x584 -/* 80CE6E28 38 80 00 00 */ li r4, 0 -/* 80CE6E2C 4B 38 F1 69 */ bl __dt__9dBgS_AcchFv -lbl_80CE6E30: -/* 80CE6E30 7F C3 F3 78 */ mr r3, r30 -/* 80CE6E34 38 80 00 00 */ li r4, 0 -/* 80CE6E38 4B 47 76 19 */ bl __dt__14daObj_SSBase_cFv -/* 80CE6E3C 7F E0 07 35 */ extsh. r0, r31 -/* 80CE6E40 40 81 00 0C */ ble lbl_80CE6E4C -/* 80CE6E44 7F C3 F3 78 */ mr r3, r30 -/* 80CE6E48 4B 5E 7E F5 */ bl __dl__FPv -lbl_80CE6E4C: -/* 80CE6E4C 7F C3 F3 78 */ mr r3, r30 -/* 80CE6E50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE6E54 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CE6E58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE6E5C 7C 08 03 A6 */ mtlr r0 -/* 80CE6E60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE6E64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGAabFv.s deleted file mode 100644 index 8cab3838699..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CE7114: -/* 80CE7114 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7118 7C 08 02 A6 */ mflr r0 -/* 80CE711C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7120 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE7124 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CE7128 41 82 00 1C */ beq lbl_80CE7144 -/* 80CE712C 3C A0 80 CF */ lis r5, __vt__8cM3dGAab@ha /* 0x80CE804C@ha */ -/* 80CE7130 38 05 80 4C */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80CE804C@l */ -/* 80CE7134 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80CE7138 7C 80 07 35 */ extsh. r0, r4 -/* 80CE713C 40 81 00 08 */ ble lbl_80CE7144 -/* 80CE7140 4B 5E 7B FD */ bl __dl__FPv -lbl_80CE7144: -/* 80CE7144 7F E3 FB 78 */ mr r3, r31 -/* 80CE7148 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE714C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7150 7C 08 03 A6 */ mtlr r0 -/* 80CE7154 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7158 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGCylFv.s deleted file mode 100644 index fa40c1cd72e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CE70CC: -/* 80CE70CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE70D0 7C 08 02 A6 */ mflr r0 -/* 80CE70D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE70D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE70DC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CE70E0 41 82 00 1C */ beq lbl_80CE70FC -/* 80CE70E4 3C A0 80 CF */ lis r5, __vt__8cM3dGCyl@ha /* 0x80CE8058@ha */ -/* 80CE70E8 38 05 80 58 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80CE8058@l */ -/* 80CE70EC 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80CE70F0 7C 80 07 35 */ extsh. r0, r4 -/* 80CE70F4 40 81 00 08 */ ble lbl_80CE70FC -/* 80CE70F8 4B 5E 7C 45 */ bl __dl__FPv -lbl_80CE70FC: -/* 80CE70FC 7F E3 FB 78 */ mr r3, r31 -/* 80CE7100 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7104 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7108 7C 08 03 A6 */ mtlr r0 -/* 80CE710C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7110 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGPlaFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGPlaFv.s deleted file mode 100644 index 5cd9c1fab62..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGPlaFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CE7710: -/* 80CE7710 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7714 7C 08 02 A6 */ mflr r0 -/* 80CE7718 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE771C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE7720 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CE7724 41 82 00 1C */ beq lbl_80CE7740 -/* 80CE7728 3C A0 80 CE */ lis r5, __vt__8cM3dGPla@ha /* 0x80CE7FF8@ha */ -/* 80CE772C 38 05 7F F8 */ addi r0, r5, __vt__8cM3dGPla@l /* 0x80CE7FF8@l */ -/* 80CE7730 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80CE7734 7C 80 07 35 */ extsh. r0, r4 -/* 80CE7738 40 81 00 08 */ ble lbl_80CE7740 -/* 80CE773C 4B 5E 76 01 */ bl __dl__FPv -lbl_80CE7740: -/* 80CE7740 7F E3 FB 78 */ mr r3, r31 -/* 80CE7744 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7748 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE774C 7C 08 03 A6 */ mtlr r0 -/* 80CE7750 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7754 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__sinit_d_a_obj_ss_item_cpp.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__sinit_d_a_obj_ss_item_cpp.s deleted file mode 100644 index a50bedc43a2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__sinit_d_a_obj_ss_item_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80CE7E5C: -/* 80CE7E5C 3C 60 80 CE */ lis r3, mCcDCyl__14daObj_SSItem_c@ha /* 0x80CE7F58@ha */ -/* 80CE7E60 38 63 7F 58 */ addi r3, r3, mCcDCyl__14daObj_SSItem_c@l /* 0x80CE7F58@l */ -/* 80CE7E64 38 A3 FF FC */ addi r5, r3, -4 -/* 80CE7E68 3C 60 80 CE */ lis r3, mCcDObjInfo__14daObj_SSItem_c@ha /* 0x80CE7EB0@ha */ -/* 80CE7E6C 38 63 7E B0 */ addi r3, r3, mCcDObjInfo__14daObj_SSItem_c@l /* 0x80CE7EB0@l */ -/* 80CE7E70 38 83 FF FC */ addi r4, r3, -4 -/* 80CE7E74 38 00 00 06 */ li r0, 6 -/* 80CE7E78 7C 09 03 A6 */ mtctr r0 -lbl_80CE7E7C: -/* 80CE7E7C 80 64 00 04 */ lwz r3, 4(r4) -/* 80CE7E80 84 04 00 08 */ lwzu r0, 8(r4) -/* 80CE7E84 90 65 00 04 */ stw r3, 4(r5) -/* 80CE7E88 94 05 00 08 */ stwu r0, 8(r5) -/* 80CE7E8C 42 00 FF F0 */ bdnz lbl_80CE7E7C -/* 80CE7E90 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/createHeapCallBack__14daObj_SSItem_cFP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/createHeapCallBack__14daObj_SSItem_cFP10fopAc_ac_c.s deleted file mode 100644 index 3b29d0bc48b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/createHeapCallBack__14daObj_SSItem_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CE7758: -/* 80CE7758 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE775C 7C 08 02 A6 */ mflr r0 -/* 80CE7760 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7764 4B FF FB 35 */ bl CreateHeap__14daObj_SSItem_cFv -/* 80CE7768 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE776C 7C 08 03 A6 */ mtlr r0 -/* 80CE7770 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7774 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/create__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/create__14daObj_SSItem_cFv.s deleted file mode 100644 index c587f286f2b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/create__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,160 +0,0 @@ -lbl_80CE6E68: -/* 80CE6E68 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CE6E6C 7C 08 02 A6 */ mflr r0 -/* 80CE6E70 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CE6E74 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CE6E78 4B 67 B3 59 */ bl _savegpr_26 -/* 80CE6E7C 7C 7F 1B 78 */ mr r31, r3 -/* 80CE6E80 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CE6E84 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CE6E88 40 82 01 50 */ bne lbl_80CE6FD8 -/* 80CE6E8C 7F E0 FB 79 */ or. r0, r31, r31 -/* 80CE6E90 41 82 01 3C */ beq lbl_80CE6FCC -/* 80CE6E94 7C 1E 03 78 */ mr r30, r0 -/* 80CE6E98 4B 47 75 61 */ bl __ct__14daObj_SSBase_cFv -/* 80CE6E9C 3C 60 80 CF */ lis r3, __vt__14daObj_SSItem_c@ha /* 0x80CE8064@ha */ -/* 80CE6EA0 38 03 80 64 */ addi r0, r3, __vt__14daObj_SSItem_c@l /* 0x80CE8064@l */ -/* 80CE6EA4 90 1E 05 68 */ stw r0, 0x568(r30) -/* 80CE6EA8 3B 7E 05 84 */ addi r27, r30, 0x584 -/* 80CE6EAC 7F 63 DB 78 */ mr r3, r27 -/* 80CE6EB0 4B 38 F1 F1 */ bl __ct__9dBgS_AcchFv -/* 80CE6EB4 3C 60 80 CF */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80CE8004@ha */ -/* 80CE6EB8 38 63 80 04 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80CE8004@l */ -/* 80CE6EBC 90 7B 00 10 */ stw r3, 0x10(r27) -/* 80CE6EC0 38 03 00 0C */ addi r0, r3, 0xc -/* 80CE6EC4 90 1B 00 14 */ stw r0, 0x14(r27) -/* 80CE6EC8 38 03 00 18 */ addi r0, r3, 0x18 -/* 80CE6ECC 90 1B 00 24 */ stw r0, 0x24(r27) -/* 80CE6ED0 38 7B 00 14 */ addi r3, r27, 0x14 -/* 80CE6ED4 4B 39 1F 95 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80CE6ED8 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80CE6EDC 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80CE6EE0 90 1E 07 74 */ stw r0, 0x774(r30) -/* 80CE6EE4 38 7E 07 78 */ addi r3, r30, 0x778 -/* 80CE6EE8 4B 39 C8 79 */ bl __ct__10dCcD_GSttsFv -/* 80CE6EEC 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80CE6EF0 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80CE6EF4 90 7E 07 74 */ stw r3, 0x774(r30) -/* 80CE6EF8 38 03 00 20 */ addi r0, r3, 0x20 -/* 80CE6EFC 90 1E 07 78 */ stw r0, 0x778(r30) -/* 80CE6F00 38 7E 07 98 */ addi r3, r30, 0x798 -/* 80CE6F04 4B 38 EF A9 */ bl __ct__12dBgS_AcchCirFv -/* 80CE6F08 3B 5E 07 D8 */ addi r26, r30, 0x7d8 -/* 80CE6F0C 7F 43 D3 78 */ mr r3, r26 -/* 80CE6F10 4B 39 CB 19 */ bl __ct__12dCcD_GObjInfFv -/* 80CE6F14 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CE6F18 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CE6F1C 90 1A 01 20 */ stw r0, 0x120(r26) -/* 80CE6F20 3C 60 80 CF */ lis r3, __vt__8cM3dGAab@ha /* 0x80CE804C@ha */ -/* 80CE6F24 38 03 80 4C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CE804C@l */ -/* 80CE6F28 90 1A 01 1C */ stw r0, 0x11c(r26) -/* 80CE6F2C 3C 60 80 CF */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CE8058@ha */ -/* 80CE6F30 38 03 80 58 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CE8058@l */ -/* 80CE6F34 90 1A 01 38 */ stw r0, 0x138(r26) -/* 80CE6F38 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CE6F3C 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CE6F40 90 7A 01 20 */ stw r3, 0x120(r26) -/* 80CE6F44 3B A3 00 58 */ addi r29, r3, 0x58 -/* 80CE6F48 93 BA 01 38 */ stw r29, 0x138(r26) -/* 80CE6F4C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CE6F50 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CE6F54 90 7A 00 3C */ stw r3, 0x3c(r26) -/* 80CE6F58 3B 83 00 2C */ addi r28, r3, 0x2c -/* 80CE6F5C 93 9A 01 20 */ stw r28, 0x120(r26) -/* 80CE6F60 3B 63 00 84 */ addi r27, r3, 0x84 -/* 80CE6F64 93 7A 01 38 */ stw r27, 0x138(r26) -/* 80CE6F68 3B 5E 09 14 */ addi r26, r30, 0x914 -/* 80CE6F6C 7F 43 D3 78 */ mr r3, r26 -/* 80CE6F70 4B 39 CA B9 */ bl __ct__12dCcD_GObjInfFv -/* 80CE6F74 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80CE6F78 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80CE6F7C 90 1A 01 20 */ stw r0, 0x120(r26) -/* 80CE6F80 3C 60 80 CF */ lis r3, __vt__8cM3dGAab@ha /* 0x80CE804C@ha */ -/* 80CE6F84 38 03 80 4C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80CE804C@l */ -/* 80CE6F88 90 1A 01 1C */ stw r0, 0x11c(r26) -/* 80CE6F8C 3C 60 80 CF */ lis r3, __vt__8cM3dGCyl@ha /* 0x80CE8058@ha */ -/* 80CE6F90 38 03 80 58 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80CE8058@l */ -/* 80CE6F94 90 1A 01 38 */ stw r0, 0x138(r26) -/* 80CE6F98 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80CE6F9C 38 03 35 A4 */ addi r0, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80CE6FA0 90 1A 01 20 */ stw r0, 0x120(r26) -/* 80CE6FA4 93 BA 01 38 */ stw r29, 0x138(r26) -/* 80CE6FA8 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80CE6FAC 38 03 C0 50 */ addi r0, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80CE6FB0 90 1A 00 3C */ stw r0, 0x3c(r26) -/* 80CE6FB4 93 9A 01 20 */ stw r28, 0x120(r26) -/* 80CE6FB8 93 7A 01 38 */ stw r27, 0x138(r26) -/* 80CE6FBC 38 7E 0A 50 */ addi r3, r30, 0xa50 -/* 80CE6FC0 4B 58 0C 5D */ bl __ct__11cBgS_GndChkFv -/* 80CE6FC4 38 7E 0A 98 */ addi r3, r30, 0xa98 -/* 80CE6FC8 4B 56 2F 39 */ bl __ct__10dMsgFlow_cFv -lbl_80CE6FCC: -/* 80CE6FCC 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80CE6FD0 60 00 00 08 */ ori r0, r0, 8 -/* 80CE6FD4 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80CE6FD8: -/* 80CE6FD8 7F E3 FB 78 */ mr r3, r31 -/* 80CE6FDC 48 00 08 75 */ bl getTypeFromParam__14daObj_SSItem_cFv -/* 80CE6FE0 98 7F 0B 0E */ stb r3, 0xb0e(r31) -/* 80CE6FE4 7F E3 FB 78 */ mr r3, r31 -/* 80CE6FE8 48 00 08 B5 */ bl getFlowNodeNum__14daObj_SSItem_cFv -/* 80CE6FEC B0 7F 05 72 */ sth r3, 0x572(r31) -/* 80CE6FF0 7F E3 FB 78 */ mr r3, r31 -/* 80CE6FF4 48 00 08 E1 */ bl getValue__14daObj_SSItem_cFv -/* 80CE6FF8 B0 7F 05 74 */ sth r3, 0x574(r31) -/* 80CE6FFC 38 00 00 00 */ li r0, 0 -/* 80CE7000 90 1F 0A FC */ stw r0, 0xafc(r31) -/* 80CE7004 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80CE7008 D0 1F 0A F0 */ stfs f0, 0xaf0(r31) -/* 80CE700C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80CE7010 D0 1F 0A F4 */ stfs f0, 0xaf4(r31) -/* 80CE7014 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80CE7018 D0 1F 0A F8 */ stfs f0, 0xaf8(r31) -/* 80CE701C 38 00 FF FF */ li r0, -1 -/* 80CE7020 90 1F 0B 04 */ stw r0, 0xb04(r31) -/* 80CE7024 88 1F 0B 0E */ lbz r0, 0xb0e(r31) -/* 80CE7028 28 00 00 02 */ cmplwi r0, 2 -/* 80CE702C 40 82 00 38 */ bne lbl_80CE7064 -/* 80CE7030 38 60 02 F8 */ li r3, 0x2f8 -/* 80CE7034 3C 80 10 00 */ lis r4, 0x1000 /* 0x10000319@ha */ -/* 80CE7038 38 84 03 19 */ addi r4, r4, 0x0319 /* 0x10000319@l */ -/* 80CE703C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80CE7040 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80CE7044 7C 06 07 74 */ extsb r6, r0 -/* 80CE7048 38 FF 04 DC */ addi r7, r31, 0x4dc -/* 80CE704C 39 00 00 00 */ li r8, 0 -/* 80CE7050 39 20 FF FF */ li r9, -1 -/* 80CE7054 4B 33 2D 45 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc -/* 80CE7058 90 7F 0B 04 */ stw r3, 0xb04(r31) -/* 80CE705C 38 60 00 04 */ li r3, 4 -/* 80CE7060 48 00 00 54 */ b lbl_80CE70B4 -lbl_80CE7064: -/* 80CE7064 7F E3 FB 78 */ mr r3, r31 -/* 80CE7068 48 00 07 D1 */ bl getResName__14daObj_SSItem_cFv -/* 80CE706C 7C 64 1B 78 */ mr r4, r3 -/* 80CE7070 38 7F 05 78 */ addi r3, r31, 0x578 -/* 80CE7074 4B 34 5E 49 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CE7078 7C 7B 1B 78 */ mr r27, r3 -/* 80CE707C 2C 1B 00 04 */ cmpwi r27, 4 -/* 80CE7080 40 82 00 30 */ bne lbl_80CE70B0 -/* 80CE7084 7F E3 FB 78 */ mr r3, r31 -/* 80CE7088 3C 80 80 CE */ lis r4, createHeapCallBack__14daObj_SSItem_cFP10fopAc_ac_c@ha /* 0x80CE7758@ha */ -/* 80CE708C 38 84 77 58 */ addi r4, r4, createHeapCallBack__14daObj_SSItem_cFP10fopAc_ac_c@l /* 0x80CE7758@l */ -/* 80CE7090 38 A0 0E B0 */ li r5, 0xeb0 -/* 80CE7094 4B 33 34 1D */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80CE7098 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80CE709C 40 82 00 0C */ bne lbl_80CE70A8 -/* 80CE70A0 38 60 00 05 */ li r3, 5 -/* 80CE70A4 48 00 00 10 */ b lbl_80CE70B4 -lbl_80CE70A8: -/* 80CE70A8 7F E3 FB 78 */ mr r3, r31 -/* 80CE70AC 48 00 08 A5 */ bl initialize__14daObj_SSItem_cFv -lbl_80CE70B0: -/* 80CE70B0 7F 63 DB 78 */ mr r3, r27 -lbl_80CE70B4: -/* 80CE70B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80CE70B8 4B 67 B1 65 */ bl _restgpr_26 -/* 80CE70BC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CE70C0 7C 08 03 A6 */ mtlr r0 -/* 80CE70C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CE70C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Create__FPv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Create__FPv.s deleted file mode 100644 index 52b6a8fa859..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Create__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CE7D8C: -/* 80CE7D8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7D90 7C 08 02 A6 */ mflr r0 -/* 80CE7D94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7D98 4B FF F0 D1 */ bl create__14daObj_SSItem_cFv -/* 80CE7D9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7DA0 7C 08 03 A6 */ mtlr r0 -/* 80CE7DA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7DA8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Delete__FPv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Delete__FPv.s deleted file mode 100644 index 0b92e10cbc8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Delete__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CE7DAC: -/* 80CE7DAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7DB0 7C 08 02 A6 */ mflr r0 -/* 80CE7DB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7DB8 4B FF F5 A1 */ bl Delete__14daObj_SSItem_cFv -/* 80CE7DBC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7DC0 7C 08 03 A6 */ mtlr r0 -/* 80CE7DC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7DC8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Draw__FPv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Draw__FPv.s deleted file mode 100644 index 0028f7aefe1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Draw__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CE7DEC: -/* 80CE7DEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7DF0 7C 08 02 A6 */ mflr r0 -/* 80CE7DF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7DF8 4B FF F8 19 */ bl Draw__14daObj_SSItem_cFv -/* 80CE7DFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7E00 7C 08 03 A6 */ mtlr r0 -/* 80CE7E04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7E08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Execute__FPv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Execute__FPv.s deleted file mode 100644 index becae8aeca6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Execute__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CE7DCC: -/* 80CE7DCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7DD0 7C 08 02 A6 */ mflr r0 -/* 80CE7DD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7DD8 4B FF F5 B5 */ bl Execute__14daObj_SSItem_cFv -/* 80CE7DDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7DE0 7C 08 03 A6 */ mtlr r0 -/* 80CE7DE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7DE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/func_80CE7E94.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/func_80CE7E94.s deleted file mode 100644 index f08de6bcdb8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/func_80CE7E94.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80CE7E94: -/* 80CE7E94 38 63 FF DC */ addi r3, r3, -36 -/* 80CE7E98 4B FF F3 90 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/func_80CE7E9C.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/func_80CE7E9C.s deleted file mode 100644 index 9dca4eada96..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/func_80CE7E9C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80CE7E9C: -/* 80CE7E9C 38 63 FF EC */ addi r3, r3, -20 -/* 80CE7EA0 4B FF F3 88 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getExchangeItemPtr__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getExchangeItemPtr__14daObj_SSItem_cFv.s deleted file mode 100644 index 9769681fd47..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getExchangeItemPtr__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80CE77F8: -/* 80CE77F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE77FC 7C 08 02 A6 */ mflr r0 -/* 80CE7800 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7804 88 03 0B 0E */ lbz r0, 0xb0e(r3) -/* 80CE7808 28 00 00 02 */ cmplwi r0, 2 -/* 80CE780C 40 82 00 1C */ bne lbl_80CE7828 -/* 80CE7810 80 03 0B 04 */ lwz r0, 0xb04(r3) -/* 80CE7814 90 01 00 08 */ stw r0, 8(r1) -/* 80CE7818 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 80CE781C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 80CE7820 38 81 00 08 */ addi r4, r1, 8 -/* 80CE7824 4B 33 1F D5 */ bl fopAcIt_Judge__FPFPvPv_PvPv -lbl_80CE7828: -/* 80CE7828 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE782C 7C 08 03 A6 */ mtlr r0 -/* 80CE7830 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7834 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getFlowNodeNum__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getFlowNodeNum__14daObj_SSItem_cFv.s deleted file mode 100644 index 15181905ad5..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getFlowNodeNum__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80CE789C: -/* 80CE789C A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 80CE78A0 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 80CE78A4 38 00 00 00 */ li r0, 0 -/* 80CE78A8 28 03 FF FF */ cmplwi r3, 0xffff -/* 80CE78AC 41 82 00 0C */ beq lbl_80CE78B8 -/* 80CE78B0 28 03 00 00 */ cmplwi r3, 0 -/* 80CE78B4 40 82 00 08 */ bne lbl_80CE78BC -lbl_80CE78B8: -/* 80CE78B8 38 00 00 01 */ li r0, 1 -lbl_80CE78BC: -/* 80CE78BC 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80CE78C0 38 00 FF FF */ li r0, -1 -/* 80CE78C4 40 82 00 08 */ bne lbl_80CE78CC -/* 80CE78C8 7C 60 1B 78 */ mr r0, r3 -lbl_80CE78CC: -/* 80CE78CC 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 80CE78D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getProcessID__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getProcessID__14daObj_SSItem_cFv.s deleted file mode 100644 index 03e76c84a1e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getProcessID__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80CE77CC: -/* 80CE77CC 88 03 0B 0E */ lbz r0, 0xb0e(r3) -/* 80CE77D0 28 00 00 02 */ cmplwi r0, 2 -/* 80CE77D4 40 82 00 0C */ bne lbl_80CE77E0 -/* 80CE77D8 80 63 0B 04 */ lwz r3, 0xb04(r3) -/* 80CE77DC 4E 80 00 20 */ blr -lbl_80CE77E0: -/* 80CE77E0 28 03 00 00 */ cmplwi r3, 0 -/* 80CE77E4 41 82 00 0C */ beq lbl_80CE77F0 -/* 80CE77E8 80 63 00 04 */ lwz r3, 4(r3) -/* 80CE77EC 4E 80 00 20 */ blr -lbl_80CE77F0: -/* 80CE77F0 38 60 FF FF */ li r3, -1 -/* 80CE77F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getResName__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getResName__14daObj_SSItem_cFv.s deleted file mode 100644 index ad536d2a5b6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getResName__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80CE7838: -/* 80CE7838 88 03 0B 0E */ lbz r0, 0xb0e(r3) -/* 80CE783C 54 00 10 3A */ slwi r0, r0, 2 -/* 80CE7840 3C 60 80 CE */ lis r3, l_resFileName@ha /* 0x80CE7F34@ha */ -/* 80CE7844 38 63 7F 34 */ addi r3, r3, l_resFileName@l /* 0x80CE7F34@l */ -/* 80CE7848 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80CE784C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getTypeFromParam__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getTypeFromParam__14daObj_SSItem_cFv.s deleted file mode 100644 index 6f5ec9b896a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getTypeFromParam__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80CE7850: -/* 80CE7850 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80CE7854 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80CE7858 2C 00 00 01 */ cmpwi r0, 1 -/* 80CE785C 41 82 00 28 */ beq lbl_80CE7884 -/* 80CE7860 40 80 00 10 */ bge lbl_80CE7870 -/* 80CE7864 2C 00 00 00 */ cmpwi r0, 0 -/* 80CE7868 40 80 00 14 */ bge lbl_80CE787C -/* 80CE786C 48 00 00 28 */ b lbl_80CE7894 -lbl_80CE7870: -/* 80CE7870 2C 00 00 03 */ cmpwi r0, 3 -/* 80CE7874 40 80 00 20 */ bge lbl_80CE7894 -/* 80CE7878 48 00 00 14 */ b lbl_80CE788C -lbl_80CE787C: -/* 80CE787C 38 60 00 00 */ li r3, 0 -/* 80CE7880 4E 80 00 20 */ blr -lbl_80CE7884: -/* 80CE7884 38 60 00 01 */ li r3, 1 -/* 80CE7888 4E 80 00 20 */ blr -lbl_80CE788C: -/* 80CE788C 38 60 00 02 */ li r3, 2 -/* 80CE7890 4E 80 00 20 */ blr -lbl_80CE7894: -/* 80CE7894 38 60 00 00 */ li r3, 0 -/* 80CE7898 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getValue__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getValue__14daObj_SSItem_cFv.s deleted file mode 100644 index 1686c80b401..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getValue__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80CE78D4: -/* 80CE78D4 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80CE78D8 54 03 A4 3E */ rlwinm r3, r0, 0x14, 0x10, 0x1f -/* 80CE78DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/initialize__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/initialize__14daObj_SSItem_cFv.s deleted file mode 100644 index 4b533092d31..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/initialize__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_80CE7950: -/* 80CE7950 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CE7954 7C 08 02 A6 */ mflr r0 -/* 80CE7958 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CE795C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CE7960 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80CE7964 7C 7F 1B 78 */ mr r31, r3 -/* 80CE7968 3C 80 80 CE */ lis r4, mCcDObjInfo__14daObj_SSItem_c@ha /* 0x80CE7EB0@ha */ -/* 80CE796C 3B C4 7E B0 */ addi r30, r4, mCcDObjInfo__14daObj_SSItem_c@l /* 0x80CE7EB0@l */ -/* 80CE7970 80 83 05 80 */ lwz r4, 0x580(r3) -/* 80CE7974 38 04 00 24 */ addi r0, r4, 0x24 -/* 80CE7978 90 03 05 04 */ stw r0, 0x504(r3) -/* 80CE797C C0 3E 00 48 */ lfs f1, 0x48(r30) -/* 80CE7980 C0 5E 00 4C */ lfs f2, 0x4c(r30) -/* 80CE7984 FC 60 08 90 */ fmr f3, f1 -/* 80CE7988 C0 9E 00 50 */ lfs f4, 0x50(r30) -/* 80CE798C C0 BE 00 54 */ lfs f5, 0x54(r30) -/* 80CE7990 FC C0 20 90 */ fmr f6, f4 -/* 80CE7994 4B 33 2B B5 */ bl fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff -/* 80CE7998 7F E3 FB 78 */ mr r3, r31 -/* 80CE799C 4B FF FE 9D */ bl getResName__14daObj_SSItem_cFv -/* 80CE79A0 90 7F 01 00 */ stw r3, 0x100(r31) -/* 80CE79A4 38 00 00 00 */ li r0, 0 -/* 80CE79A8 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80CE79AC 38 00 00 06 */ li r0, 6 -/* 80CE79B0 98 1F 05 48 */ stb r0, 0x548(r31) -/* 80CE79B4 88 1F 04 9A */ lbz r0, 0x49a(r31) -/* 80CE79B8 60 00 00 04 */ ori r0, r0, 4 -/* 80CE79BC 98 1F 04 9A */ stb r0, 0x49a(r31) -/* 80CE79C0 38 7F 07 98 */ addi r3, r31, 0x798 -/* 80CE79C4 C0 3E 00 58 */ lfs f1, 0x58(r30) -/* 80CE79C8 C0 5E 00 5C */ lfs f2, 0x5c(r30) -/* 80CE79CC 4B 38 E5 8D */ bl SetWall__12dBgS_AcchCirFff -/* 80CE79D0 38 1F 04 E4 */ addi r0, r31, 0x4e4 -/* 80CE79D4 90 01 00 08 */ stw r0, 8(r1) -/* 80CE79D8 38 7F 05 84 */ addi r3, r31, 0x584 -/* 80CE79DC 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80CE79E0 38 BF 04 BC */ addi r5, r31, 0x4bc -/* 80CE79E4 7F E6 FB 78 */ mr r6, r31 -/* 80CE79E8 38 E0 00 01 */ li r7, 1 -/* 80CE79EC 39 1F 07 98 */ addi r8, r31, 0x798 -/* 80CE79F0 39 3F 04 F8 */ addi r9, r31, 0x4f8 -/* 80CE79F4 39 5F 04 DC */ addi r10, r31, 0x4dc -/* 80CE79F8 4B 38 E8 51 */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80CE79FC 38 7F 07 5C */ addi r3, r31, 0x75c -/* 80CE7A00 38 80 00 FF */ li r4, 0xff -/* 80CE7A04 38 A0 00 00 */ li r5, 0 -/* 80CE7A08 7F E6 FB 78 */ mr r6, r31 -/* 80CE7A0C 4B 39 BE 55 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80CE7A10 38 7F 07 D8 */ addi r3, r31, 0x7d8 -/* 80CE7A14 3C 80 80 CE */ lis r4, mCcDCyl__14daObj_SSItem_c@ha /* 0x80CE7F58@ha */ -/* 80CE7A18 38 84 7F 58 */ addi r4, r4, mCcDCyl__14daObj_SSItem_c@l /* 0x80CE7F58@l */ -/* 80CE7A1C 4B 39 CE 99 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80CE7A20 38 1F 07 5C */ addi r0, r31, 0x75c -/* 80CE7A24 90 1F 08 1C */ stw r0, 0x81c(r31) -/* 80CE7A28 38 7F 09 14 */ addi r3, r31, 0x914 -/* 80CE7A2C 3C 80 80 CE */ lis r4, mCcDCyl__14daObj_SSItem_c@ha /* 0x80CE7F58@ha */ -/* 80CE7A30 38 84 7F 58 */ addi r4, r4, mCcDCyl__14daObj_SSItem_c@l /* 0x80CE7F58@l */ -/* 80CE7A34 4B 39 CE 81 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80CE7A38 38 1F 07 5C */ addi r0, r31, 0x75c -/* 80CE7A3C 90 1F 09 58 */ stw r0, 0x958(r31) -/* 80CE7A40 38 7F 05 84 */ addi r3, r31, 0x584 -/* 80CE7A44 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CE7A48 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CE7A4C 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80CE7A50 4B 38 F0 5D */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80CE7A54 80 1F 06 60 */ lwz r0, 0x660(r31) -/* 80CE7A58 90 1F 0A 50 */ stw r0, 0xa50(r31) -/* 80CE7A5C 80 1F 06 64 */ lwz r0, 0x664(r31) -/* 80CE7A60 90 1F 0A 54 */ stw r0, 0xa54(r31) -/* 80CE7A64 80 1F 06 68 */ lwz r0, 0x668(r31) -/* 80CE7A68 90 1F 0A 58 */ stw r0, 0xa58(r31) -/* 80CE7A6C 88 1F 06 6C */ lbz r0, 0x66c(r31) -/* 80CE7A70 98 1F 0A 5C */ stb r0, 0xa5c(r31) -/* 80CE7A74 A0 1F 06 74 */ lhz r0, 0x674(r31) -/* 80CE7A78 B0 1F 0A 64 */ sth r0, 0xa64(r31) -/* 80CE7A7C A0 1F 06 76 */ lhz r0, 0x676(r31) -/* 80CE7A80 B0 1F 0A 66 */ sth r0, 0xa66(r31) -/* 80CE7A84 80 1F 06 78 */ lwz r0, 0x678(r31) -/* 80CE7A88 90 1F 0A 68 */ stw r0, 0xa68(r31) -/* 80CE7A8C 80 1F 06 7C */ lwz r0, 0x67c(r31) -/* 80CE7A90 90 1F 0A 6C */ stw r0, 0xa6c(r31) -/* 80CE7A94 C0 1F 06 84 */ lfs f0, 0x684(r31) -/* 80CE7A98 D0 1F 0A 74 */ stfs f0, 0xa74(r31) -/* 80CE7A9C C0 1F 06 88 */ lfs f0, 0x688(r31) -/* 80CE7AA0 D0 1F 0A 78 */ stfs f0, 0xa78(r31) -/* 80CE7AA4 C0 1F 06 8C */ lfs f0, 0x68c(r31) -/* 80CE7AA8 D0 1F 0A 7C */ stfs f0, 0xa7c(r31) -/* 80CE7AAC 80 1F 06 90 */ lwz r0, 0x690(r31) -/* 80CE7AB0 90 1F 0A 80 */ stw r0, 0xa80(r31) -/* 80CE7AB4 C0 1F 06 94 */ lfs f0, 0x694(r31) -/* 80CE7AB8 D0 1F 0A 84 */ stfs f0, 0xa84(r31) -/* 80CE7ABC 80 1F 06 98 */ lwz r0, 0x698(r31) -/* 80CE7AC0 90 1F 0A 88 */ stw r0, 0xa88(r31) -/* 80CE7AC4 C0 1F 06 1C */ lfs f0, 0x61c(r31) -/* 80CE7AC8 D0 1F 0B 00 */ stfs f0, 0xb00(r31) -/* 80CE7ACC 7F E3 FB 78 */ mr r3, r31 -/* 80CE7AD0 48 00 01 55 */ bl setEnvTevColor__14daObj_SSItem_cFv -/* 80CE7AD4 7F E3 FB 78 */ mr r3, r31 -/* 80CE7AD8 48 00 01 A9 */ bl setRoomNo__14daObj_SSItem_cFv -/* 80CE7ADC 7F E3 FB 78 */ mr r3, r31 -/* 80CE7AE0 4B FF FE 01 */ bl restart__14daObj_SSItem_cFv -/* 80CE7AE4 7F E3 FB 78 */ mr r3, r31 -/* 80CE7AE8 4B FF F8 A5 */ bl Execute__14daObj_SSItem_cFv -/* 80CE7AEC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CE7AF0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80CE7AF4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CE7AF8 7C 08 03 A6 */ mtlr r0 -/* 80CE7AFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CE7B00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/restart__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/restart__14daObj_SSItem_cFv.s deleted file mode 100644 index 87aa7dd7cda..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/restart__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80CE78E0: -/* 80CE78E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CE78E4 7C 08 02 A6 */ mflr r0 -/* 80CE78E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CE78EC A8 83 04 B6 */ lha r4, 0x4b6(r3) -/* 80CE78F0 38 00 00 00 */ li r0, 0 -/* 80CE78F4 B0 03 04 DC */ sth r0, 0x4dc(r3) -/* 80CE78F8 B0 83 04 DE */ sth r4, 0x4de(r3) -/* 80CE78FC B0 03 04 E0 */ sth r0, 0x4e0(r3) -/* 80CE7900 A8 03 04 DC */ lha r0, 0x4dc(r3) -/* 80CE7904 B0 03 04 E4 */ sth r0, 0x4e4(r3) -/* 80CE7908 A8 03 04 DE */ lha r0, 0x4de(r3) -/* 80CE790C B0 03 04 E6 */ sth r0, 0x4e6(r3) -/* 80CE7910 A8 03 04 E0 */ lha r0, 0x4e0(r3) -/* 80CE7914 B0 03 04 E8 */ sth r0, 0x4e8(r3) -/* 80CE7918 3C 80 80 CE */ lis r4, lit_4309@ha /* 0x80CE7F9C@ha */ -/* 80CE791C 38 A4 7F 9C */ addi r5, r4, lit_4309@l /* 0x80CE7F9C@l */ -/* 80CE7920 80 85 00 00 */ lwz r4, 0(r5) -/* 80CE7924 80 05 00 04 */ lwz r0, 4(r5) -/* 80CE7928 90 81 00 08 */ stw r4, 8(r1) -/* 80CE792C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80CE7930 80 05 00 08 */ lwz r0, 8(r5) -/* 80CE7934 90 01 00 10 */ stw r0, 0x10(r1) -/* 80CE7938 38 81 00 08 */ addi r4, r1, 8 -/* 80CE793C 48 00 01 C9 */ bl setProcess__14daObj_SSItem_cFM14daObj_SSItem_cFPCvPvPv_i -/* 80CE7940 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CE7944 7C 08 03 A6 */ mtlr r0 -/* 80CE7948 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CE794C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setAttnPos__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setAttnPos__14daObj_SSItem_cFv.s deleted file mode 100644 index 1ebaf9ec379..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setAttnPos__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80CE7D28: -/* 80CE7D28 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80CE7D2C D0 03 05 50 */ stfs f0, 0x550(r3) -/* 80CE7D30 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80CE7D34 D0 03 05 54 */ stfs f0, 0x554(r3) -/* 80CE7D38 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80CE7D3C D0 03 05 58 */ stfs f0, 0x558(r3) -/* 80CE7D40 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80CE7D44 D0 03 05 38 */ stfs f0, 0x538(r3) -/* 80CE7D48 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80CE7D4C D0 03 05 3C */ stfs f0, 0x53c(r3) -/* 80CE7D50 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80CE7D54 D0 03 05 40 */ stfs f0, 0x540(r3) -/* 80CE7D58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setEnvTevColor__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setEnvTevColor__14daObj_SSItem_cFv.s deleted file mode 100644 index f8946a7da88..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setEnvTevColor__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80CE7C24: -/* 80CE7C24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7C28 7C 08 02 A6 */ mflr r0 -/* 80CE7C2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7C30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE7C34 93 C1 00 08 */ stw r30, 8(r1) -/* 80CE7C38 7C 7E 1B 78 */ mr r30, r3 -/* 80CE7C3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CE7C40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CE7C44 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 80CE7C48 7F E3 FB 78 */ mr r3, r31 -/* 80CE7C4C 38 9E 0A 64 */ addi r4, r30, 0xa64 -/* 80CE7C50 4B 38 CF 99 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo -/* 80CE7C54 98 7E 04 8D */ stb r3, 0x48d(r30) -/* 80CE7C58 7F E3 FB 78 */ mr r3, r31 -/* 80CE7C5C 38 9E 0A 64 */ addi r4, r30, 0xa64 -/* 80CE7C60 4B 38 D4 A1 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80CE7C64 98 7E 04 8C */ stb r3, 0x48c(r30) -/* 80CE7C68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7C6C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CE7C70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7C74 7C 08 03 A6 */ mtlr r0 -/* 80CE7C78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7C7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setMtx__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setMtx__14daObj_SSItem_cFv.s deleted file mode 100644 index ef126e61960..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setMtx__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CE7CC4: -/* 80CE7CC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7CC8 7C 08 02 A6 */ mflr r0 -/* 80CE7CCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7CD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE7CD4 7C 7F 1B 78 */ mr r31, r3 -/* 80CE7CD8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CE7CDC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CE7CE0 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CE7CE4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CE7CE8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CE7CEC 4B 65 EB FD */ bl PSMTXTrans -/* 80CE7CF0 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80CE7CF4 4B 32 52 51 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80CE7CF8 38 7F 04 EC */ addi r3, r31, 0x4ec -/* 80CE7CFC 4B 32 51 75 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz -/* 80CE7D00 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CE7D04 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CE7D08 80 9F 05 80 */ lwz r4, 0x580(r31) -/* 80CE7D0C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CE7D10 4B 65 E7 A1 */ bl PSMTXCopy -/* 80CE7D14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7D18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7D1C 7C 08 03 A6 */ mtlr r0 -/* 80CE7D20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7D24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setParam__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setParam__14daObj_SSItem_cFv.s deleted file mode 100644 index b2341dd656f..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setParam__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80CE7BB4: -/* 80CE7BB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7BB8 7C 08 02 A6 */ mflr r0 -/* 80CE7BBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7BC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE7BC4 93 C1 00 08 */ stw r30, 8(r1) -/* 80CE7BC8 7C 7E 1B 78 */ mr r30, r3 -/* 80CE7BCC 3C 60 80 CE */ lis r3, mCcDObjInfo__14daObj_SSItem_c@ha /* 0x80CE7EB0@ha */ -/* 80CE7BD0 3B E3 7E B0 */ addi r31, r3, mCcDObjInfo__14daObj_SSItem_c@l /* 0x80CE7EB0@l */ -/* 80CE7BD4 C0 1F 00 60 */ lfs f0, 0x60(r31) -/* 80CE7BD8 D0 1E 04 EC */ stfs f0, 0x4ec(r30) -/* 80CE7BDC D0 1E 04 F0 */ stfs f0, 0x4f0(r30) -/* 80CE7BE0 D0 1E 04 F4 */ stfs f0, 0x4f4(r30) -/* 80CE7BE4 80 1E 05 5C */ lwz r0, 0x55c(r30) -/* 80CE7BE8 60 00 00 10 */ ori r0, r0, 0x10 -/* 80CE7BEC 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 80CE7BF0 38 7E 07 98 */ addi r3, r30, 0x798 -/* 80CE7BF4 C0 3F 00 58 */ lfs f1, 0x58(r31) -/* 80CE7BF8 4B 38 E3 49 */ bl SetWallR__12dBgS_AcchCirFf -/* 80CE7BFC C0 1F 00 5C */ lfs f0, 0x5c(r31) -/* 80CE7C00 D0 1E 07 C8 */ stfs f0, 0x7c8(r30) -/* 80CE7C04 C0 1F 00 64 */ lfs f0, 0x64(r31) -/* 80CE7C08 D0 1E 05 30 */ stfs f0, 0x530(r30) -/* 80CE7C0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7C10 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CE7C14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7C18 7C 08 03 A6 */ mtlr r0 -/* 80CE7C1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7C20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setProcess__14daObj_SSItem_cFM14daObj_SSItem_cFPCvPvPv_i.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setProcess__14daObj_SSItem_cFM14daObj_SSItem_cFPCvPvPv_i.s deleted file mode 100644 index e0bbbcb3689..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setProcess__14daObj_SSItem_cFM14daObj_SSItem_cFPCvPvPv_i.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80CE7B04: -/* 80CE7B04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7B08 7C 08 02 A6 */ mflr r0 -/* 80CE7B0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7B10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE7B14 93 C1 00 08 */ stw r30, 8(r1) -/* 80CE7B18 7C 7E 1B 78 */ mr r30, r3 -/* 80CE7B1C 7C 9F 23 78 */ mr r31, r4 -/* 80CE7B20 38 00 00 02 */ li r0, 2 -/* 80CE7B24 B0 03 0B 0C */ sth r0, 0xb0c(r3) -/* 80CE7B28 38 7E 0A E4 */ addi r3, r30, 0xae4 -/* 80CE7B2C 4B 67 A4 ED */ bl __ptmf_test -/* 80CE7B30 2C 03 00 00 */ cmpwi r3, 0 -/* 80CE7B34 41 82 00 18 */ beq lbl_80CE7B4C -/* 80CE7B38 7F C3 F3 78 */ mr r3, r30 -/* 80CE7B3C 38 80 00 00 */ li r4, 0 -/* 80CE7B40 39 9E 0A E4 */ addi r12, r30, 0xae4 -/* 80CE7B44 4B 67 A5 41 */ bl __ptmf_scall -/* 80CE7B48 60 00 00 00 */ nop -lbl_80CE7B4C: -/* 80CE7B4C 38 00 00 00 */ li r0, 0 -/* 80CE7B50 B0 1E 0B 0C */ sth r0, 0xb0c(r30) -/* 80CE7B54 80 7F 00 00 */ lwz r3, 0(r31) -/* 80CE7B58 80 1F 00 04 */ lwz r0, 4(r31) -/* 80CE7B5C 90 7E 0A E4 */ stw r3, 0xae4(r30) -/* 80CE7B60 90 1E 0A E8 */ stw r0, 0xae8(r30) -/* 80CE7B64 80 1F 00 08 */ lwz r0, 8(r31) -/* 80CE7B68 90 1E 0A EC */ stw r0, 0xaec(r30) -/* 80CE7B6C 38 7E 0A E4 */ addi r3, r30, 0xae4 -/* 80CE7B70 4B 67 A4 A9 */ bl __ptmf_test -/* 80CE7B74 2C 03 00 00 */ cmpwi r3, 0 -/* 80CE7B78 41 82 00 18 */ beq lbl_80CE7B90 -/* 80CE7B7C 7F C3 F3 78 */ mr r3, r30 -/* 80CE7B80 38 80 00 00 */ li r4, 0 -/* 80CE7B84 39 9E 0A E4 */ addi r12, r30, 0xae4 -/* 80CE7B88 4B 67 A4 FD */ bl __ptmf_scall -/* 80CE7B8C 60 00 00 00 */ nop -lbl_80CE7B90: -/* 80CE7B90 38 00 00 01 */ li r0, 1 -/* 80CE7B94 B0 1E 0B 0C */ sth r0, 0xb0c(r30) -/* 80CE7B98 38 60 00 01 */ li r3, 1 -/* 80CE7B9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7BA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CE7BA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7BA8 7C 08 03 A6 */ mtlr r0 -/* 80CE7BAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7BB0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setRoomNo__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setRoomNo__14daObj_SSItem_cFv.s deleted file mode 100644 index 18968c161fe..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setRoomNo__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80CE7C80: -/* 80CE7C80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE7C84 7C 08 02 A6 */ mflr r0 -/* 80CE7C88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7C8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CE7C90 7C 7F 1B 78 */ mr r31, r3 -/* 80CE7C94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CE7C98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CE7C9C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80CE7CA0 38 9F 0A 64 */ addi r4, r31, 0xa64 -/* 80CE7CA4 4B 38 D4 5D */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80CE7CA8 98 7F 04 E2 */ stb r3, 0x4e2(r31) -/* 80CE7CAC 98 7F 07 7E */ stb r3, 0x77e(r31) -/* 80CE7CB0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CE7CB4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE7CB8 7C 08 03 A6 */ mtlr r0 -/* 80CE7CBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE7CC0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setSoldOut__14daObj_SSItem_cFv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setSoldOut__14daObj_SSItem_cFv.s deleted file mode 100644 index a7b36d8b1b7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setSoldOut__14daObj_SSItem_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80CE7778: -/* 80CE7778 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CE777C 7C 08 02 A6 */ mflr r0 -/* 80CE7780 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CE7784 7C 64 1B 78 */ mr r4, r3 -/* 80CE7788 80 63 05 6C */ lwz r3, 0x56c(r3) -/* 80CE778C 28 03 00 00 */ cmplwi r3, 0 -/* 80CE7790 41 82 00 2C */ beq lbl_80CE77BC -/* 80CE7794 88 03 09 2F */ lbz r0, 0x92f(r3) -/* 80CE7798 60 00 00 01 */ ori r0, r0, 1 -/* 80CE779C 98 03 09 2F */ stb r0, 0x92f(r3) -/* 80CE77A0 80 64 05 6C */ lwz r3, 0x56c(r4) -/* 80CE77A4 28 04 00 00 */ cmplwi r4, 0 -/* 80CE77A8 41 82 00 0C */ beq lbl_80CE77B4 -/* 80CE77AC 80 84 00 04 */ lwz r4, 4(r4) -/* 80CE77B0 48 00 00 08 */ b lbl_80CE77B8 -lbl_80CE77B4: -/* 80CE77B4 38 80 FF FF */ li r4, -1 -lbl_80CE77B8: -/* 80CE77B8 4B C6 10 35 */ bl soldoutItem__8daMyna_cFUi -lbl_80CE77BC: -/* 80CE77BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CE77C0 7C 08 03 A6 */ mtlr r0 -/* 80CE77C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CE77C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/wait__14daObj_SSItem_cFPv.s b/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/wait__14daObj_SSItem_cFPv.s deleted file mode 100644 index c0c9a425f6e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/wait__14daObj_SSItem_cFPv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80CE7D5C: -/* 80CE7D5C A0 03 0B 0C */ lhz r0, 0xb0c(r3) -/* 80CE7D60 2C 00 00 00 */ cmpwi r0, 0 -/* 80CE7D64 41 82 00 0C */ beq lbl_80CE7D70 -/* 80CE7D68 41 80 00 1C */ blt lbl_80CE7D84 -/* 80CE7D6C 48 00 00 18 */ b lbl_80CE7D84 -lbl_80CE7D70: -/* 80CE7D70 3C 80 80 CE */ lis r4, lit_4205@ha /* 0x80CE7EE0@ha */ -/* 80CE7D74 C0 04 7E E0 */ lfs f0, lit_4205@l(r4) /* 0x80CE7EE0@l */ -/* 80CE7D78 D0 03 0A 8C */ stfs f0, 0xa8c(r3) -/* 80CE7D7C D0 03 0A 90 */ stfs f0, 0xa90(r3) -/* 80CE7D80 D0 03 0A 94 */ stfs f0, 0xa94(r3) -lbl_80CE7D84: -/* 80CE7D84 38 60 00 01 */ li r3, 1 -/* 80CE7D88 4E 80 00 20 */ blr diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 3c8caa2ec37..62d3e2136a8 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -136,9 +136,7 @@ struct cCcD_SrcCpsAttr { class cCcD_CpsAttr : public cCcD_ShapeAttr, public cM3dGCps { public: cCcD_CpsAttr() {} - void Set(const cCcD_SrcCpsAttr& pSrc) { - cM3dGCps::Set(pSrc.mCps); - } + void Set(const cCcD_SrcCpsAttr& pSrc) { cM3dGCps::Set(pSrc.mCps); } void Set(const cXyz& pStart, const cXyz& pEnd, float radius) { cM3dGCps::Set(pStart, pEnd, radius); } @@ -175,9 +173,7 @@ struct cCcD_SrcSphAttr { class cCcD_SphAttr : public cCcD_ShapeAttr, public cM3dGSph { public: cCcD_SphAttr() {} - void Set(const cCcD_SrcSphAttr& src) { - cM3dGSph::Set(src.mSph); - } + void Set(const cCcD_SrcSphAttr& src) { cM3dGSph::Set(src.mSph); } /* 8008721C */ virtual ~cCcD_SphAttr() {} /* 80084B44 */ virtual const cXyz& GetCoCP() const { return mCenter; } @@ -337,7 +333,7 @@ public: /* 80263984 */ f32 GetWeightF() const; /* 802649E8 vt[7] */ virtual void ClrAt() {} /* 802649EC vt[8] */ virtual void ClrTg() { mTg = 0; } - + u8 GetWeightUc() const { return mWeight; } void SetWeight(u8 weight) { mWeight = weight; } fopAc_ac_c* GetAc() { return mActor; } @@ -378,9 +374,7 @@ public: void OnSPrmBit(u32 flag) { mSPrm |= flag; } void OffSPrmBit(u32 flag) { mSPrm &= ~flag; } - void Set(cCcD_SrcObjCommonBase const& src) { - mSPrm = src.mSPrm; - } + void Set(cCcD_SrcObjCommonBase const& src) { mSPrm = src.mSPrm; } }; STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase)); @@ -446,9 +440,7 @@ public: void ClrSet() { OffSPrmBit(1); } u32 ChkHit() { return MskRPrm(1); } - void Set(cCcD_SrcObjCo const& src) { - cCcD_ObjCommonBase::Set(src.mBase); - } + void Set(cCcD_SrcObjCo const& src) { cCcD_ObjCommonBase::Set(src.mBase); } }; STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCo)); @@ -504,6 +496,7 @@ public: void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(0xC); } void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(0xC); } void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); } + void SetAtSprm(u32 prm) { mObjAt.SetSPrm(prm); } void SetTgSPrm(u32 prm) { mObjTg.SetSPrm(prm); } void SetCoSPrm(u32 prm) { mObjCo.SetSPrm(prm); } void ClrAtHit() { mObjAt.ClrHit(); } diff --git a/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h b/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h index 70c30c5ba3d..fd7d22eb44d 100644 --- a/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h +++ b/include/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h @@ -1,6 +1,64 @@ #ifndef D_A_OBJ_SS_ITEM_H #define D_A_OBJ_SS_ITEM_H +#include "SSystem/SComponent/c_phase.h" +#include "d/a/d_a_obj_ss_base.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" +#include "d/msg/d_msg_flow.h" #include "dolphin/types.h" +class daObj_SSItem_c; +typedef int (daObj_SSItem_c::*ProcessFunc)(void*); + +class daObj_SSItem_c : public daObj_SSBase_c { +public: + /* 80CE6C18 */ ~daObj_SSItem_c(); + /* 80CE6E68 */ int create(); + /* 80CE7298 */ BOOL CreateHeap(); + /* 80CE7358 */ int Delete(); + /* 80CE738C */ int Execute(); + /* 80CE7610 */ int Draw(); + /* 80CE7758 */ static int createHeapCallBack(fopAc_ac_c* i_this); + /* 80CE7778 */ void setSoldOut(); + /* 80CE77CC */ u32 getProcessID(); + /* 80CE77F8 */ daObj_SSItem_c* getExchangeItemPtr(); + /* 80CE7838 */ char* getResName(); + /* 80CE7850 */ u8 getTypeFromParam(); + /* 80CE789C */ u16 getFlowNodeNum(); + /* 80CE78D4 */ u16 getValue(); + /* 80CE78E0 */ void restart(); + /* 80CE7950 */ void initialize(); + /* 80CE7B04 */ int setProcess(ProcessFunc i_process); + /* 80CE7BB4 */ void setParam(); + /* 80CE7C24 */ void setEnvTevColor(); + /* 80CE7C80 */ void setRoomNo(); + /* 80CE7CC4 */ void setMtx(); + /* 80CE7D28 */ void setAttnPos(); + /* 80CE7D5C */ int wait(void* param_0); + + static dCcD_SrcGObjInf const mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; + + /* 0x578 */ request_of_phase_process_class mPhase; + /* 0x580 */ J3DModel* mpModel; + /* 0x584 */ dBgS_ObjAcch mAcch; + /* 0x75C */ dCcD_Stts mStts; + /* 0x798 */ dBgS_AcchCir mAcchCir; + /* 0x7D8 */ dCcD_Cyl mAtCyl; + /* 0x914 */ dCcD_Cyl mTgCyl; + /* 0xA50 */ cBgS_GndChk mGndChk; + /* 0xA8C */ cXyz field_0xA8C; + /* 0xA98 */ dMsgFlow_c mMsgFlow; + /* 0xAE4 */ ProcessFunc mProcessFunc; + /* 0xAF0 */ cXyz field_0xAF0; + /* 0xAFC */ s32 field_0xAFC; + /* 0xB00 */ f32 field_0xB00; + /* 0xB04 */ s32 field_0xB04; + /* 0xB08 */ u8 padding[4]; + /* 0xB0C */ u16 mEventType; + /* 0xB0E */ u8 field_0xB0E; +}; +STATIC_ASSERT(sizeof(daObj_SSItem_c) == 0xB10); + #endif /* D_A_OBJ_SS_ITEM_H */ diff --git a/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp b/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp index 4f139a30bac..4509c07e033 100644 --- a/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp +++ b/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp @@ -1,938 +1,386 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_ss_item -// +/** + * d_a_obj_ss_item.cpp + * + */ #include "rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c {}; - -struct daObj_SSItem_c { - /* 80CE6C18 */ ~daObj_SSItem_c(); - /* 80CE6E68 */ void create(); - /* 80CE7298 */ void CreateHeap(); - /* 80CE7358 */ void Delete(); - /* 80CE738C */ void Execute(); - /* 80CE7610 */ void Draw(); - /* 80CE7758 */ void createHeapCallBack(fopAc_ac_c*); - /* 80CE7778 */ void setSoldOut(); - /* 80CE77CC */ void getProcessID(); - /* 80CE77F8 */ void getExchangeItemPtr(); - /* 80CE7838 */ void getResName(); - /* 80CE7850 */ void getTypeFromParam(); - /* 80CE789C */ void getFlowNodeNum(); - /* 80CE78D4 */ void getValue(); - /* 80CE78E0 */ void restart(); - /* 80CE7950 */ void initialize(); - /* 80CE7B04 */ void setProcess(int (daObj_SSItem_c::*)(void*)); - /* 80CE7BB4 */ void setParam(); - /* 80CE7C24 */ void setEnvTevColor(); - /* 80CE7C80 */ void setRoomNo(); - /* 80CE7CC4 */ void setMtx(); - /* 80CE7D28 */ void setAttnPos(); - /* 80CE7D5C */ void wait(void*); - - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; -}; - -struct daObj_SSBase_c { - /* 8015E3F8 */ daObj_SSBase_c(); - /* 8015E450 */ ~daObj_SSBase_c(); -}; - -struct daMyna_c { - /* 809487EC */ void soldoutItem(unsigned int); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); -}; - -struct _GXTexObj {}; - -struct dDlst_shadowControl_c { - /* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); - - static u8 mSimpleTexObj[32]; -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCyl {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 80CE71CC */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 80084658 */ void ChkCoHit(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80CE7228 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80075F58 */ void SetWall(f32, f32); - /* 80CE715C */ ~dBgS_AcchCir(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct dBgS { - /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGPla { - /* 80CE7710 */ ~cM3dGPla(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 8026F200 */ void SetR(f32); - /* 80CE70CC */ ~cM3dGCyl(); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 80CE7114 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - -struct cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cCcD_GStts { - /* 80CE7E14 */ ~cCcD_GStts(); -}; - -struct cBgS_GndChk { - /* 80267C1C */ cBgS_GndChk(); - /* 80267C94 */ ~cBgS_GndChk(); -}; - -struct cBgS { - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __dt__14daObj_SSItem_cFv(); -extern "C" void create__14daObj_SSItem_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void CreateHeap__14daObj_SSItem_cFv(); -extern "C" void Delete__14daObj_SSItem_cFv(); -extern "C" void Execute__14daObj_SSItem_cFv(); -extern "C" void Draw__14daObj_SSItem_cFv(); -extern "C" void __dt__8cM3dGPlaFv(); -extern "C" void createHeapCallBack__14daObj_SSItem_cFP10fopAc_ac_c(); -extern "C" void setSoldOut__14daObj_SSItem_cFv(); -extern "C" void getProcessID__14daObj_SSItem_cFv(); -extern "C" void getExchangeItemPtr__14daObj_SSItem_cFv(); -extern "C" void getResName__14daObj_SSItem_cFv(); -extern "C" void getTypeFromParam__14daObj_SSItem_cFv(); -extern "C" void getFlowNodeNum__14daObj_SSItem_cFv(); -extern "C" void getValue__14daObj_SSItem_cFv(); -extern "C" void restart__14daObj_SSItem_cFv(); -extern "C" void initialize__14daObj_SSItem_cFv(); -extern "C" void setProcess__14daObj_SSItem_cFM14daObj_SSItem_cFPCvPvPv_i(); -extern "C" void setParam__14daObj_SSItem_cFv(); -extern "C" void setEnvTevColor__14daObj_SSItem_cFv(); -extern "C" void setRoomNo__14daObj_SSItem_cFv(); -extern "C" void setMtx__14daObj_SSItem_cFv(); -extern "C" void setAttnPos__14daObj_SSItem_cFv(); -extern "C" void wait__14daObj_SSItem_cFPv(); -extern "C" static void daObj_SSItem_Create__FPv(); -extern "C" static void daObj_SSItem_Delete__FPv(); -extern "C" static void daObj_SSItem_Execute__FPv(); -extern "C" static void daObj_SSItem_Draw__FPv(); -extern "C" static bool daObj_SSItem_IsDelete__FPv(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __sinit_d_a_obj_ss_item_cpp(); -extern "C" static void func_80CE7E94(); -extern "C" static void func_80CE7E9C(); -extern "C" u8 const mCcDObjInfo__14daObj_SSItem_c[48]; -extern "C" extern char const* const d_a_obj_ss_item__stringBase0; -extern "C" u8 mCcDCyl__14daObj_SSItem_c[68]; - -// -// External References: -// - -extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(); -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 getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj(); -extern "C" void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla(); -extern "C" void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWallR__12dBgS_AcchCirFf(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -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 ChkCoHit__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void __ct__14daObj_SSBase_cFv(); -extern "C" void __dt__14daObj_SSBase_cFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __ct__10dMsgFlow_cFv(); -extern "C" void __dt__10dMsgFlow_cFv(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __ct__11cBgS_GndChkFv(); -extern "C" void __dt__11cBgS_GndChkFv(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void __ptmf_test(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -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 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" void soldoutItem__8daMyna_cFUi(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80CE7F18-80CE7F18 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CE7F18 = "Always"; -SECTION_DEAD static char const* const stringBase_80CE7F1F = "Pumpkin"; -SECTION_DEAD static char const* const stringBase_80CE7F27 = ""; -SECTION_DEAD static char const* const stringBase_80CE7F28 = "pumpkin.bmd"; -#pragma pop +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_drawlist.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_ext.h" +#include "rel/d/a/d_a_myna/d_a_myna.h" /* 80CE7F34-80CE7F40 -00001 000C+00 1/1 0/0 0/0 .data l_resFileName */ -SECTION_DATA static void* l_resFileName[3] = { - (void*)&d_a_obj_ss_item__stringBase0, - (void*)&d_a_obj_ss_item__stringBase0, - (void*)(((char*)&d_a_obj_ss_item__stringBase0) + 0x7), +static char* l_resFileName[] = { + "Always", + "Always", + "Pumpkin", }; /* 80CE7F40-80CE7F4C 00000C 000C+00 1/1 0/0 0/0 .data l_bmdIdxName */ -SECTION_DATA static u8 l_bmdIdxName[12] = { - 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, -}; +static int l_bmdIdxName[] = {0x23, 0x23, 0x00}; /* 80CE7F4C-80CE7F58 -00001 000C+00 1/2 0/0 0/0 .data l_bmdFileName */ -SECTION_DATA static void* l_bmdFileName[3] = { - (void*)(((char*)&d_a_obj_ss_item__stringBase0) + 0xF), - (void*)(((char*)&d_a_obj_ss_item__stringBase0) + 0xF), - (void*)(((char*)&d_a_obj_ss_item__stringBase0) + 0x10), +static char* l_bmdFileName[] = { + "", + "", + "pumpkin.bmd", +}; + +/* 80CE7EB0-80CE7EE0 000000 0030+00 5/5 0/0 0/0 .rodata mCcDObjInfo__14daObj_SSItem_c */ +dCcD_SrcGObjInf const daObj_SSItem_c::mCcDObjInfo = { + {0, {{0, 0, 0}, {0, 0}, {0x79}}}, + {0, 0, 0, 0, {0}}, + {0, 0, 0, 0, {0}}, + {{0}}, }; /* 80CE7F58-80CE7F9C 000024 0044+00 2/2 0/0 0/0 .data mCcDCyl__14daObj_SSItem_c */ -SECTION_DATA u8 daObj_SSItem_c::mCcDCyl[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CE7F9C-80CE7FA8 -00001 000C+00 1/1 0/0 0/0 .data @4309 */ -SECTION_DATA static void* lit_4309[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)wait__14daObj_SSItem_cFPv, -}; - -/* 80CE7FA8-80CE7FC8 -00001 0020+00 1/0 0/0 0/0 .data daObj_SSItem_MethodTable */ -SECTION_DATA static void* daObj_SSItem_MethodTable[8] = { - (void*)daObj_SSItem_Create__FPv, - (void*)daObj_SSItem_Delete__FPv, - (void*)daObj_SSItem_Execute__FPv, - (void*)daObj_SSItem_IsDelete__FPv, - (void*)daObj_SSItem_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80CE7FC8-80CE7FF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SSITEM */ -SECTION_DATA extern void* g_profile_OBJ_SSITEM[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01210000, (void*)&g_fpcLf_Method, - (void*)0x00000B10, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00450000, (void*)&daObj_SSItem_MethodTable, - (void*)0x00044100, (void*)0x000E0000, -}; - -/* 80CE7FF8-80CE8004 0000C4 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGPla */ -SECTION_DATA extern void* __vt__8cM3dGPla[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGPlaFv, -}; - -/* 80CE8004-80CE8028 0000D0 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80CE7E9C, - (void*)NULL, - (void*)NULL, - (void*)func_80CE7E94, -}; - -/* 80CE8028-80CE8034 0000F4 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, -}; - -/* 80CE8034-80CE8040 000100 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, -}; - -/* 80CE8040-80CE804C 00010C 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80CE804C-80CE8058 000118 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, -}; - -/* 80CE8058-80CE8064 000124 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, -}; - -/* 80CE8064-80CE8078 000130 0014+00 2/2 0/0 0/0 .data __vt__14daObj_SSItem_c */ -SECTION_DATA extern void* __vt__14daObj_SSItem_c[5] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14daObj_SSItem_cFv, - (void*)setSoldOut__14daObj_SSItem_cFv, - (void*)getProcessID__14daObj_SSItem_cFv, -}; +dCcD_SrcCyl daObj_SSItem_c::mCcDCyl = {mCcDObjInfo, {}}; /* 80CE6C18-80CE6E68 000078 0250+00 1/0 0/0 0/0 .text __dt__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_SSItem_c::~daObj_SSItem_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__14daObj_SSItem_cFv.s" +daObj_SSItem_c::~daObj_SSItem_c() { + dComIfG_resDelete(&mPhase, getResName()); } -#pragma pop /* 80CE6E68-80CE70CC 0002C8 0264+00 1/1 0/0 0/0 .text create__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/create__14daObj_SSItem_cFv.s" -} -#pragma pop +int daObj_SSItem_c::create() { + fopAcM_SetupActor(this, daObj_SSItem_c); + field_0xB0E = getTypeFromParam(); + setFlowNodeNumber(getFlowNodeNum()); + setValueNumber(getValue()); + field_0xAFC = 0; + field_0xAF0.set(current.pos); + field_0xB04 = -1; -/* 80CE70CC-80CE7114 00052C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGCylFv.s" + if (field_0xB0E == 2) { + field_0xB04 = fopAcM_create(PROC_OBJ_PUMPKIN, 0x10000319, ¤t.pos, + fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1); + return cPhs_COMPLEATE_e; + } else { + int retVal = dComIfG_resLoad(&mPhase, getResName()); + if (retVal == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, &createHeapCallBack, 0xEB0)) { + return cPhs_ERROR_e; + } else { + initialize(); + } + } + return retVal; + } } -#pragma pop - -/* 80CE7114-80CE715C 000574 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 80CE715C-80CE71CC 0005BC 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 80CE71CC-80CE7228 00062C 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() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* 80CE7228-80CE7298 000688 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop /* 80CE7298-80CE7358 0006F8 00C0+00 1/1 0/0 0/0 .text CreateHeap__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/CreateHeap__14daObj_SSItem_cFv.s" +BOOL daObj_SSItem_c::CreateHeap() { + J3DModelData* modelData; + if (l_bmdIdxName[field_0xB0E] != 0) { + modelData = static_cast( + dComIfG_getObjectRes(getResName(), l_bmdIdxName[field_0xB0E])); + } else { + modelData = static_cast( + dComIfG_getObjectRes(getResName(), l_bmdFileName[field_0xB0E])); + } + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + return mpModel != NULL; } -#pragma pop /* 80CE7358-80CE738C 0007B8 0034+00 1/1 0/0 0/0 .text Delete__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Delete__14daObj_SSItem_cFv.s" +int daObj_SSItem_c::Delete() { + this->~daObj_SSItem_c(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CE7EB0-80CE7EE0 000000 0030+00 5/5 0/0 0/0 .rodata mCcDObjInfo__14daObj_SSItem_c */ -SECTION_RODATA u8 const daObj_SSItem_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CE7EB0, &daObj_SSItem_c::mCcDObjInfo); - -/* 80CE7EE0-80CE7EE4 000030 0004+00 1/2 0/0 0/0 .rodata @4205 */ -SECTION_RODATA static u8 const lit_4205[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CE7EE0, &lit_4205); - -/* 80CE7EE4-80CE7EE8 000034 0004+00 0/2 0/0 0/0 .rodata @4206 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4206 = -1000000000.0f; -COMPILER_STRIP_GATE(0x80CE7EE4, &lit_4206); -#pragma pop - -/* 80CE7EE8-80CE7EEC 000038 0004+00 0/1 0/0 0/0 .rodata @4207 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4207 = 8.0f; -COMPILER_STRIP_GATE(0x80CE7EE8, &lit_4207); -#pragma pop - -/* 80CE7EEC-80CE7EF0 00003C 0004+00 0/1 0/0 0/0 .rodata @4208 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4208 = 62.0f; -COMPILER_STRIP_GATE(0x80CE7EEC, &lit_4208); -#pragma pop /* 80CE738C-80CE7610 0007EC 0284+00 2/2 0/0 0/0 .text Execute__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Execute__14daObj_SSItem_cFv.s" +int daObj_SSItem_c::Execute() { + if (field_0xB0E == 2) { + return 1; + } else { + field_0xAFC = fopAcM_checkCarryNow(this); + setParam(); + if (field_0xAFC != 0) { + mAcch.ClrWallHit(); + mAcch.i_ClrGroundHit(); + speedF = 0.0f; + speed.set(0.0f, 0.0f, 0.0f); + } else { + mStts.Move(); + if (mAtCyl.ChkCoHit() != 0) { + field_0xA8C = *mStts.GetCCMoveP(); + } else { + field_0xA8C.set(0.0f, 0.0f, 0.0f); + } + fopAcM_posMoveF(this, &field_0xA8C); + mAcch.CrrPos(dComIfG_Bgsp()); + mGndChk = mAcch.m_gnd; + field_0xB00 = mAcch.GetGroundH(); + if (field_0xB00 != -1000000000.0f) { + setEnvTevColor(); + setRoomNo(); + } + } + if (mProcessFunc != NULL) { + (this->*mProcessFunc)(NULL); + } + setMtx(); + if (field_0xAFC == 0) { + mTgCyl.SetCoSPrm(0); + mTgCyl.SetTgType(0xD8FBFDFF); + mTgCyl.SetTgSPrm(0x1F); + mTgCyl.SetR(8.0f); + mTgCyl.SetH(62.0f); + cXyz currentPos = current.pos; + mTgCyl.SetC(currentPos); + dComIfG_Ccsp()->Set(&mTgCyl); + mAtCyl.SetAtType(0); + mAtCyl.SetAtSprm(0); + mAtCyl.SetR(8.0f); + mAtCyl.SetH(62.0f); + mAtCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mAtCyl); + } + setAttnPos(); + return 1; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80CE7EF0-80CE7EF4 000040 0004+00 0/1 0/0 0/0 .rodata @4234 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4234 = 20.0f; -COMPILER_STRIP_GATE(0x80CE7EF0, &lit_4234); -#pragma pop - -/* 80CE7EF4-80CE7EF8 000044 0004+00 0/1 0/0 0/0 .rodata @4235 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4235 = 1.0f; -COMPILER_STRIP_GATE(0x80CE7EF4, &lit_4235); -#pragma pop /* 80CE7610-80CE7710 000A70 0100+00 1/1 0/0 0/0 .text Draw__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/Draw__14daObj_SSItem_cFv.s" +int daObj_SSItem_c::Draw() { + if (field_0xB0E == 2) { + return 1; + } else { + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + mDoExt_modelUpdateDL(mpModel); + if (field_0xB00 != -1000000000.0f) { + cM3dGPla plane; + if (dComIfG_Bgsp().GetTriPla(mGndChk, &plane)) { + dComIfGd_setSimpleShadow(¤t.pos, field_0xB00, 20.0f, &plane.mNormal, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); + } + } + return 1; + } } -#pragma pop - -/* 80CE7710-80CE7758 000B70 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGPlaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__8cM3dGPlaFv.s" -} -#pragma pop /* 80CE7758-80CE7778 000BB8 0020+00 1/1 0/0 0/0 .text * createHeapCallBack__14daObj_SSItem_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::createHeapCallBack(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/createHeapCallBack__14daObj_SSItem_cFP10fopAc_ac_c.s" +int daObj_SSItem_c::createHeapCallBack(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 80CE7778-80CE77CC 000BD8 0054+00 1/0 0/0 0/0 .text setSoldOut__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::setSoldOut() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setSoldOut__14daObj_SSItem_cFv.s" +void daObj_SSItem_c::setSoldOut() { + if (getParentPtr() != NULL) { + static_cast(getParentPtr())->onEventFlag(0); + static_cast(getParentPtr())->soldoutItem(fopAcM_GetID(this)); + } } -#pragma pop /* 80CE77CC-80CE77F8 000C2C 002C+00 1/0 0/0 0/0 .text getProcessID__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::getProcessID() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getProcessID__14daObj_SSItem_cFv.s" +u32 daObj_SSItem_c::getProcessID() { + if (field_0xB0E == 2) { + return field_0xB04; + } else { + return fopAcM_GetID(this); + } } -#pragma pop /* 80CE77F8-80CE7838 000C58 0040+00 0/0 0/0 1/1 .text getExchangeItemPtr__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::getExchangeItemPtr() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getExchangeItemPtr__14daObj_SSItem_cFv.s" +daObj_SSItem_c* daObj_SSItem_c::getExchangeItemPtr() { + if (field_0xB0E == 2) { + return static_cast(fopAcM_SearchByID(field_0xB04)); + } + return this; } -#pragma pop /* 80CE7838-80CE7850 000C98 0018+00 4/4 0/0 0/0 .text getResName__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::getResName() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getResName__14daObj_SSItem_cFv.s" +char* daObj_SSItem_c::getResName() { + return l_resFileName[field_0xB0E]; } -#pragma pop /* 80CE7850-80CE789C 000CB0 004C+00 1/1 0/0 0/0 .text getTypeFromParam__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::getTypeFromParam() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getTypeFromParam__14daObj_SSItem_cFv.s" +u8 daObj_SSItem_c::getTypeFromParam() { + switch (fopAcM_GetParam(this) & 0xFF) { + case 0: + return 0; + case 1: + return 1; + case 2: + return 2; + default: + return 0; + } } -#pragma pop /* 80CE789C-80CE78D4 000CFC 0038+00 1/1 0/0 0/0 .text getFlowNodeNum__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::getFlowNodeNum() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getFlowNodeNum__14daObj_SSItem_cFv.s" +u16 daObj_SSItem_c::getFlowNodeNum() { + u16 num = orig.angle.x; + bool bVar1 = false; + if (num == 0xFFFF || num == 0) { + bVar1 = true; + } + + int num2; + if (!bVar1) { + num2 = num; + } else { + num2 = -1; + } + + return num2; } -#pragma pop /* 80CE78D4-80CE78E0 000D34 000C+00 1/1 0/0 0/0 .text getValue__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::getValue() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/getValue__14daObj_SSItem_cFv.s" +u16 daObj_SSItem_c::getValue() { + return (fopAcM_GetParam(this) >> 0xC) & 0xFFFF; } -#pragma pop /* 80CE78E0-80CE7950 000D40 0070+00 1/1 0/0 0/0 .text restart__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::restart() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/restart__14daObj_SSItem_cFv.s" +void daObj_SSItem_c::restart() { + current.angle.set(0, orig.angle.y, 0); + shape_angle = current.angle; + setProcess(&wait); } -#pragma pop - -/* ############################################################################################## */ -/* 80CE7EF8-80CE7EFC 000048 0004+00 0/1 0/0 0/0 .rodata @4347 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4347 = -30.0f; -COMPILER_STRIP_GATE(0x80CE7EF8, &lit_4347); -#pragma pop - -/* 80CE7EFC-80CE7F00 00004C 0004+00 0/1 0/0 0/0 .rodata @4348 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4348 = -15.0f; -COMPILER_STRIP_GATE(0x80CE7EFC, &lit_4348); -#pragma pop - -/* 80CE7F00-80CE7F04 000050 0004+00 0/1 0/0 0/0 .rodata @4349 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4349 = 30.0f; -COMPILER_STRIP_GATE(0x80CE7F00, &lit_4349); -#pragma pop - -/* 80CE7F04-80CE7F08 000054 0004+00 0/1 0/0 0/0 .rodata @4350 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4350 = 45.0f; -COMPILER_STRIP_GATE(0x80CE7F04, &lit_4350); -#pragma pop - -/* 80CE7F08-80CE7F0C 000058 0004+00 0/2 0/0 0/0 .rodata @4351 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4351 = 24.0f; -COMPILER_STRIP_GATE(0x80CE7F08, &lit_4351); -#pragma pop - -/* 80CE7F0C-80CE7F10 00005C 0004+00 0/2 0/0 0/0 .rodata @4352 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4352 = 12.0f; -COMPILER_STRIP_GATE(0x80CE7F0C, &lit_4352); -#pragma pop /* 80CE7950-80CE7B04 000DB0 01B4+00 1/1 0/0 0/0 .text initialize__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::initialize() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/initialize__14daObj_SSItem_cFv.s" +void daObj_SSItem_c::initialize() { + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox(this, -30.0f, -15.0f, -30.0f, 30.0f, 45.0f, 30.0f); + mEvtInfo.setArchiveName(getResName()); + mAttentionInfo.mFlags = 0; + mAttentionInfo.field_0x0[4] = 6; + fopAcM_OnCarryType(this, fopAcM_CARRY_SIDE); + mAcchCir.SetWall(24.0f, 12.0f); + mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + &fopAcM_GetSpeed_p(this), &fopAcM_GetAngle_p(this), &fopAcM_GetShapeAngle_p(this)); + mStts.Init(0xFF, 0, this); + mAtCyl.Set(mCcDCyl); + mAtCyl.SetStts(&mStts); + mTgCyl.Set(mCcDCyl); + mTgCyl.SetStts(&mStts); + mAcch.CrrPos(dComIfG_Bgsp()); + mGndChk = mAcch.m_gnd; + field_0xB00 = mAcch.GetGroundH(); + setEnvTevColor(); + setRoomNo(); + restart(); + Execute(); } -#pragma pop /* 80CE7B04-80CE7BB4 000F64 00B0+00 1/1 0/0 0/0 .text * setProcess__14daObj_SSItem_cFM14daObj_SSItem_cFPCvPvPv_i */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::setProcess(int (daObj_SSItem_c::*param_0)(void*)) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setProcess__14daObj_SSItem_cFM14daObj_SSItem_cFPCvPvPv_i.s" +int daObj_SSItem_c::setProcess(ProcessFunc i_process) { + mEventType = 2; + if (mProcessFunc != NULL) { + (this->*mProcessFunc)(NULL); + } + mEventType = 0; + mProcessFunc = i_process; + if (mProcessFunc != NULL) { + (this->*mProcessFunc)(NULL); + } + mEventType = 1; + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80CE7F10-80CE7F14 000060 0004+00 0/1 0/0 0/0 .rodata @4377 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4377 = 7.0f / 5.0f; -COMPILER_STRIP_GATE(0x80CE7F10, &lit_4377); -#pragma pop - -/* 80CE7F14-80CE7F18 000064 0004+00 0/1 0/0 0/0 .rodata @4378 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4378 = -5.0f; -COMPILER_STRIP_GATE(0x80CE7F14, &lit_4378); -#pragma pop /* 80CE7BB4-80CE7C24 001014 0070+00 1/1 0/0 0/0 .text setParam__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::setParam() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setParam__14daObj_SSItem_cFv.s" +void daObj_SSItem_c::setParam() { + mScale.set(1.4f, 1.4f, 1.4f); + cLib_onBit(mAttentionInfo.mFlags, 0x10); + mAcchCir.SetWallR(24.0f); + mAcchCir.SetWallH(12.0f); + mGravity = -5.0f; } -#pragma pop /* 80CE7C24-80CE7C80 001084 005C+00 2/2 0/0 0/0 .text setEnvTevColor__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::setEnvTevColor() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setEnvTevColor__14daObj_SSItem_cFv.s" +void daObj_SSItem_c::setEnvTevColor() { + mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); + mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); } -#pragma pop /* 80CE7C80-80CE7CC4 0010E0 0044+00 2/2 0/0 0/0 .text setRoomNo__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::setRoomNo() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setRoomNo__14daObj_SSItem_cFv.s" +void daObj_SSItem_c::setRoomNo() { + s32 roomId = dComIfG_Bgsp().GetRoomId(mGndChk); + fopAcM_SetRoomNo(this, roomId); + mStts.SetRoomId(roomId); } -#pragma pop /* 80CE7CC4-80CE7D28 001124 0064+00 1/1 0/0 0/0 .text setMtx__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::setMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setMtx__14daObj_SSItem_cFv.s" +void daObj_SSItem_c::setMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::scaleM(mScale); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop /* 80CE7D28-80CE7D5C 001188 0034+00 1/1 0/0 0/0 .text setAttnPos__14daObj_SSItem_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::setAttnPos() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/setAttnPos__14daObj_SSItem_cFv.s" +void daObj_SSItem_c::setAttnPos() { + mAttentionInfo.mPosition = current.pos; + mEyePos = current.pos; } -#pragma pop /* 80CE7D5C-80CE7D8C 0011BC 0030+00 1/0 0/0 0/0 .text wait__14daObj_SSItem_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_SSItem_c::wait(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/wait__14daObj_SSItem_cFPv.s" +int daObj_SSItem_c::wait(void* param_0) { + switch (mEventType) { + case 0: + field_0xA8C.set(0.0f, 0.0f, 0.0f); + case 1: + case 2: + default: + return 1; + } } -#pragma pop /* 80CE7D8C-80CE7DAC 0011EC 0020+00 1/0 0/0 0/0 .text daObj_SSItem_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_SSItem_Create(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Create__FPv.s" +static int daObj_SSItem_Create(void* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 80CE7DAC-80CE7DCC 00120C 0020+00 1/0 0/0 0/0 .text daObj_SSItem_Delete__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_SSItem_Delete(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Delete__FPv.s" +static int daObj_SSItem_Delete(void* i_this) { + return static_cast(i_this)->Delete(); } -#pragma pop /* 80CE7DCC-80CE7DEC 00122C 0020+00 1/0 0/0 0/0 .text daObj_SSItem_Execute__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_SSItem_Execute(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Execute__FPv.s" +static int daObj_SSItem_Execute(void* i_this) { + return static_cast(i_this)->Execute(); } -#pragma pop /* 80CE7DEC-80CE7E0C 00124C 0020+00 1/0 0/0 0/0 .text daObj_SSItem_Draw__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObj_SSItem_Draw(void* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/daObj_SSItem_Draw__FPv.s" +static int daObj_SSItem_Draw(void* i_this) { + return static_cast(i_this)->Draw(); } -#pragma pop /* 80CE7E0C-80CE7E14 00126C 0008+00 1/0 0/0 0/0 .text daObj_SSItem_IsDelete__FPv */ -static bool daObj_SSItem_IsDelete(void* param_0) { - return true; +static int daObj_SSItem_IsDelete(void* i_this) { + return 1; } -/* 80CE7E14-80CE7E5C 001274 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() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__dt__10cCcD_GSttsFv.s" -} -#pragma pop +/* 80CE7FA8-80CE7FC8 -00001 0020+00 1/0 0/0 0/0 .data daObj_SSItem_MethodTable */ +static actor_method_class daObj_SSItem_MethodTable = { + (process_method_func)daObj_SSItem_Create, (process_method_func)daObj_SSItem_Delete, + (process_method_func)daObj_SSItem_Execute, (process_method_func)daObj_SSItem_IsDelete, + (process_method_func)daObj_SSItem_Draw, +}; -/* 80CE7E5C-80CE7E94 0012BC 0038+00 0/0 1/0 0/0 .text __sinit_d_a_obj_ss_item_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_ss_item_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/__sinit_d_a_obj_ss_item_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80CE7E5C, __sinit_d_a_obj_ss_item_cpp); -#pragma pop - -/* 80CE7E94-80CE7E9C 0012F4 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80CE7E94() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/func_80CE7E94.s" -} -#pragma pop - -/* 80CE7E9C-80CE7EA4 0012FC 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80CE7E9C() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item/func_80CE7E9C.s" -} -#pragma pop - -/* 80CE7F18-80CE7F18 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80CE7FC8-80CE7FF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SSITEM */ +extern actor_process_profile_definition g_profile_OBJ_SSITEM = { + fpcLy_CURRENT_e, + 7, + fpcLy_CURRENT_e, + PROC_OBJ_SSITEM, + &g_fpcLf_Method.mBase, + sizeof(daObj_SSItem_c), + 0, + 0, + &g_fopAc_Method.base, + 0x45, + &daObj_SSItem_MethodTable, + 0x44100, + 0, + fopAc_CULLBOX_CUSTOM_e, +};