diff --git a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/Create__14daObjGraWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/Create__14daObjGraWall_cFv.s deleted file mode 100644 index df99e942a02..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/Create__14daObjGraWall_cFv.s +++ /dev/null @@ -1,90 +0,0 @@ -lbl_80C10BF8: -/* 80C10BF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C10BFC 7C 08 02 A6 */ mflr r0 -/* 80C10C00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C10C04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C10C08 93 C1 00 08 */ stw r30, 8(r1) -/* 80C10C0C 7C 7F 1B 78 */ mr r31, r3 -/* 80C10C10 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C10C14 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C10C18 40 82 00 A8 */ bne lbl_80C10CC0 -/* 80C10C1C 7F E0 FB 79 */ or. r0, r31, r31 -/* 80C10C20 41 82 00 94 */ beq lbl_80C10CB4 -/* 80C10C24 7C 1E 03 78 */ mr r30, r0 -/* 80C10C28 4B 40 7F 3D */ bl __ct__10fopAc_ac_cFv -/* 80C10C2C 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80C10C30 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80C10C34 90 1E 05 80 */ stw r0, 0x580(r30) -/* 80C10C38 38 7E 05 84 */ addi r3, r30, 0x584 -/* 80C10C3C 4B 47 2B 25 */ bl __ct__10dCcD_GSttsFv -/* 80C10C40 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80C10C44 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80C10C48 90 7E 05 80 */ stw r3, 0x580(r30) -/* 80C10C4C 38 03 00 20 */ addi r0, r3, 0x20 -/* 80C10C50 90 1E 05 84 */ stw r0, 0x584(r30) -/* 80C10C54 3B DE 05 A4 */ addi r30, r30, 0x5a4 -/* 80C10C58 7F C3 F3 78 */ mr r3, r30 -/* 80C10C5C 4B 47 2D CD */ bl __ct__12dCcD_GObjInfFv -/* 80C10C60 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80C10C64 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80C10C68 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C10C6C 3C 60 80 C1 */ lis r3, __vt__8cM3dGAab@ha /* 0x80C11058@ha */ -/* 80C10C70 38 03 10 58 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80C11058@l */ -/* 80C10C74 90 1E 01 1C */ stw r0, 0x11c(r30) -/* 80C10C78 3C 60 80 C1 */ lis r3, __vt__8cM3dGCyl@ha /* 0x80C1104C@ha */ -/* 80C10C7C 38 03 10 4C */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80C1104C@l */ -/* 80C10C80 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C10C84 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80C10C88 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80C10C8C 90 7E 01 20 */ stw r3, 0x120(r30) -/* 80C10C90 38 03 00 58 */ addi r0, r3, 0x58 -/* 80C10C94 90 1E 01 38 */ stw r0, 0x138(r30) -/* 80C10C98 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80C10C9C 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80C10CA0 90 7E 00 3C */ stw r3, 0x3c(r30) -/* 80C10CA4 38 03 00 2C */ addi r0, r3, 0x2c -/* 80C10CA8 90 1E 01 20 */ stw r0, 0x120(r30) -/* 80C10CAC 38 03 00 84 */ addi r0, r3, 0x84 -/* 80C10CB0 90 1E 01 38 */ stw r0, 0x138(r30) -lbl_80C10CB4: -/* 80C10CB4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C10CB8 60 00 00 08 */ ori r0, r0, 8 -/* 80C10CBC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C10CC0: -/* 80C10CC0 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80C10CC4 98 1F 06 E0 */ stb r0, 0x6e0(r31) -/* 80C10CC8 88 9F 06 E0 */ lbz r4, 0x6e0(r31) -/* 80C10CCC 28 04 00 FF */ cmplwi r4, 0xff -/* 80C10CD0 41 82 00 28 */ beq lbl_80C10CF8 -/* 80C10CD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C10CD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C10CDC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C10CE0 7C 05 07 74 */ extsb r5, r0 -/* 80C10CE4 4B 42 46 7D */ bl isSwitch__10dSv_info_cCFii -/* 80C10CE8 2C 03 00 00 */ cmpwi r3, 0 -/* 80C10CEC 41 82 00 38 */ beq lbl_80C10D24 -/* 80C10CF0 38 60 00 05 */ li r3, 5 -/* 80C10CF4 48 00 00 3C */ b lbl_80C10D30 -lbl_80C10CF8: -/* 80C10CF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C10CFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C10D00 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C10D04 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C10D08 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C10D0C A0 84 00 7C */ lhz r4, 0x7c(r4) -/* 80C10D10 4B 42 3C AD */ bl isEventBit__11dSv_event_cCFUs -/* 80C10D14 2C 03 00 00 */ cmpwi r3, 0 -/* 80C10D18 41 82 00 0C */ beq lbl_80C10D24 -/* 80C10D1C 38 60 00 05 */ li r3, 5 -/* 80C10D20 48 00 00 10 */ b lbl_80C10D30 -lbl_80C10D24: -/* 80C10D24 7F E3 FB 78 */ mr r3, r31 -/* 80C10D28 48 00 01 59 */ bl col_init__14daObjGraWall_cFv -/* 80C10D2C 38 60 00 04 */ li r3, 4 -lbl_80C10D30: -/* 80C10D30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C10D34 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C10D38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C10D3C 7C 08 03 A6 */ mtlr r0 -/* 80C10D40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C10D44 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/Execute__14daObjGraWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/Execute__14daObjGraWall_cFv.s deleted file mode 100644 index 6576e85c106..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/Execute__14daObjGraWall_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80C10DD8: -/* 80C10DD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C10DDC 7C 08 02 A6 */ mflr r0 -/* 80C10DE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C10DE4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C10DE8 7C 7F 1B 78 */ mr r31, r3 -/* 80C10DEC 88 83 06 E0 */ lbz r4, 0x6e0(r3) -/* 80C10DF0 28 04 00 FF */ cmplwi r4, 0xff -/* 80C10DF4 41 82 00 30 */ beq lbl_80C10E24 -/* 80C10DF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C10DFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C10E00 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80C10E04 7C 05 07 74 */ extsb r5, r0 -/* 80C10E08 4B 42 45 59 */ bl isSwitch__10dSv_info_cCFii -/* 80C10E0C 2C 03 00 00 */ cmpwi r3, 0 -/* 80C10E10 41 82 00 48 */ beq lbl_80C10E58 -/* 80C10E14 7F E3 FB 78 */ mr r3, r31 -/* 80C10E18 4B 40 8E 65 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80C10E1C 38 60 00 01 */ li r3, 1 -/* 80C10E20 48 00 00 44 */ b lbl_80C10E64 -lbl_80C10E24: -/* 80C10E24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C10E28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C10E2C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80C10E30 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80C10E34 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80C10E38 A0 84 00 7C */ lhz r4, 0x7c(r4) -/* 80C10E3C 4B 42 3B 81 */ bl isEventBit__11dSv_event_cCFUs -/* 80C10E40 2C 03 00 00 */ cmpwi r3, 0 -/* 80C10E44 41 82 00 14 */ beq lbl_80C10E58 -/* 80C10E48 7F E3 FB 78 */ mr r3, r31 -/* 80C10E4C 4B 40 8E 31 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 80C10E50 38 60 00 01 */ li r3, 1 -/* 80C10E54 48 00 00 10 */ b lbl_80C10E64 -lbl_80C10E58: -/* 80C10E58 7F E3 FB 78 */ mr r3, r31 -/* 80C10E5C 48 00 00 79 */ bl col_set__14daObjGraWall_cFv -/* 80C10E60 38 60 00 01 */ li r3, 1 -lbl_80C10E64: -/* 80C10E64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C10E68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C10E6C 7C 08 03 A6 */ mtlr r0 -/* 80C10E70 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C10E74 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/__dt__8cM3dGAabFv.s deleted file mode 100644 index 6e7f679c1e7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C10D90: -/* 80C10D90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C10D94 7C 08 02 A6 */ mflr r0 -/* 80C10D98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C10D9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C10DA0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C10DA4 41 82 00 1C */ beq lbl_80C10DC0 -/* 80C10DA8 3C A0 80 C1 */ lis r5, __vt__8cM3dGAab@ha /* 0x80C11058@ha */ -/* 80C10DAC 38 05 10 58 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80C11058@l */ -/* 80C10DB0 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80C10DB4 7C 80 07 35 */ extsh. r0, r4 -/* 80C10DB8 40 81 00 08 */ ble lbl_80C10DC0 -/* 80C10DBC 4B 6B DF 81 */ bl __dl__FPv -lbl_80C10DC0: -/* 80C10DC0 7F E3 FB 78 */ mr r3, r31 -/* 80C10DC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C10DC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C10DCC 7C 08 03 A6 */ mtlr r0 -/* 80C10DD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C10DD4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/__dt__8cM3dGCylFv.s b/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/__dt__8cM3dGCylFv.s deleted file mode 100644 index a360f15d84e..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C10D48: -/* 80C10D48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C10D4C 7C 08 02 A6 */ mflr r0 -/* 80C10D50 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C10D54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C10D58 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C10D5C 41 82 00 1C */ beq lbl_80C10D78 -/* 80C10D60 3C A0 80 C1 */ lis r5, __vt__8cM3dGCyl@ha /* 0x80C1104C@ha */ -/* 80C10D64 38 05 10 4C */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80C1104C@l */ -/* 80C10D68 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80C10D6C 7C 80 07 35 */ extsh. r0, r4 -/* 80C10D70 40 81 00 08 */ ble lbl_80C10D78 -/* 80C10D74 4B 6B DF C9 */ bl __dl__FPv -lbl_80C10D78: -/* 80C10D78 7F E3 FB 78 */ mr r3, r31 -/* 80C10D7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C10D80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C10D84 7C 08 03 A6 */ mtlr r0 -/* 80C10D88 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C10D8C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/col_init__14daObjGraWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/col_init__14daObjGraWall_cFv.s deleted file mode 100644 index 4692de53a21..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/col_init__14daObjGraWall_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80C10E80: -/* 80C10E80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C10E84 7C 08 02 A6 */ mflr r0 -/* 80C10E88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C10E8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C10E90 7C 7F 1B 78 */ mr r31, r3 -/* 80C10E94 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80C10E98 38 80 00 FF */ li r4, 0xff -/* 80C10E9C 38 A0 00 FF */ li r5, 0xff -/* 80C10EA0 7F E6 FB 78 */ mr r6, r31 -/* 80C10EA4 4B 47 29 BD */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80C10EA8 38 7F 05 A4 */ addi r3, r31, 0x5a4 -/* 80C10EAC 3C 80 80 C1 */ lis r4, l_cyl_src@ha /* 0x80C10FB8@ha */ -/* 80C10EB0 38 84 0F B8 */ addi r4, r4, l_cyl_src@l /* 0x80C10FB8@l */ -/* 80C10EB4 4B 47 3A 01 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80C10EB8 38 1F 05 68 */ addi r0, r31, 0x568 -/* 80C10EBC 90 1F 05 E8 */ stw r0, 0x5e8(r31) -/* 80C10EC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C10EC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C10EC8 7C 08 03 A6 */ mtlr r0 -/* 80C10ECC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C10ED0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/col_set__14daObjGraWall_cFv.s b/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/col_set__14daObjGraWall_cFv.s deleted file mode 100644 index 402ef26281c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/col_set__14daObjGraWall_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C10ED4: -/* 80C10ED4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C10ED8 7C 08 02 A6 */ mflr r0 -/* 80C10EDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C10EE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C10EE4 7C 7F 1B 78 */ mr r31, r3 -/* 80C10EE8 38 7F 06 C8 */ addi r3, r31, 0x6c8 -/* 80C10EEC 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80C10EF0 4B 65 E2 ED */ bl SetC__8cM3dGCylFRC4cXyz -/* 80C10EF4 38 7F 06 C8 */ addi r3, r31, 0x6c8 -/* 80C10EF8 3C 80 80 C1 */ lis r4, l_DATA@ha /* 0x80C10FB0@ha */ -/* 80C10EFC 38 84 0F B0 */ addi r4, r4, l_DATA@l /* 0x80C10FB0@l */ -/* 80C10F00 C0 24 00 04 */ lfs f1, 4(r4) -/* 80C10F04 4B 65 E2 F5 */ bl SetH__8cM3dGCylFf -/* 80C10F08 38 7F 06 C8 */ addi r3, r31, 0x6c8 -/* 80C10F0C 3C 80 80 C1 */ lis r4, l_DATA@ha /* 0x80C10FB0@ha */ -/* 80C10F10 C0 24 0F B0 */ lfs f1, l_DATA@l(r4) /* 0x80C10FB0@l */ -/* 80C10F14 4B 65 E2 ED */ bl SetR__8cM3dGCylFf -/* 80C10F18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C10F1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C10F20 38 63 23 3C */ addi r3, r3, 0x233c -/* 80C10F24 38 9F 05 A4 */ addi r4, r31, 0x5a4 -/* 80C10F28 4B 65 3C 81 */ bl Set__4cCcSFP8cCcD_Obj -/* 80C10F2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C10F30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C10F34 7C 08 03 A6 */ mtlr r0 -/* 80C10F38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C10F3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_Delete__FP14daObjGraWall_c.s b/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_Delete__FP14daObjGraWall_c.s deleted file mode 100644 index e4683241175..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_Delete__FP14daObjGraWall_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C10F68: -/* 80C10F68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C10F6C 7C 08 02 A6 */ mflr r0 -/* 80C10F70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C10F74 4B FF FF 05 */ bl Delete__14daObjGraWall_cFv -/* 80C10F78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C10F7C 7C 08 03 A6 */ mtlr r0 -/* 80C10F80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C10F84 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_Execute__FP14daObjGraWall_c.s b/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_Execute__FP14daObjGraWall_c.s deleted file mode 100644 index b5b9ddf8cde..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_Execute__FP14daObjGraWall_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C10F40: -/* 80C10F40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C10F44 7C 08 02 A6 */ mflr r0 -/* 80C10F48 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C10F4C 4B FF FE 8D */ bl Execute__14daObjGraWall_cFv -/* 80C10F50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C10F54 7C 08 03 A6 */ mtlr r0 -/* 80C10F58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C10F5C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_create__FP10fopAc_ac_c.s deleted file mode 100644 index 613fc50ab22..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C10F88: -/* 80C10F88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C10F8C 7C 08 02 A6 */ mflr r0 -/* 80C10F90 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C10F94 4B FF FC 65 */ bl Create__14daObjGraWall_cFv -/* 80C10F98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C10F9C 7C 08 03 A6 */ mtlr r0 -/* 80C10FA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C10FA4 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h b/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h index 127236e869a..e65ba81ba2e 100644 --- a/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h +++ b/include/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h @@ -5,4 +5,17 @@ #include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +class daObjGraWall_c : public fopAc_ac_c { + public: + /* 80C10BF8 */ int Create(); + /* 80C10DD8 */ int Execute(); + /* 80C10E78 */ int Delete(); + /* 80C10E80 */ void col_init(); + /* 80C10ED4 */ void col_set(); + + /* 0x568 */ dCcD_Stts mStts; + /* 0x5A4 */ dCcD_Cyl mCyl; + /* 0x6E0 */ u8 field_0x6e0; +}; // Size: 0x6E4 + #endif /* D_A_OBJ_GRAWALL_H */ diff --git a/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp b/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp index 5c30a8812dc..8a7cda2c359 100644 --- a/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp +++ b/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp @@ -1,148 +1,48 @@ /** * d_a_obj_graWall.cpp - * + * Object - Goron Adult Wall (Deleted) */ #include "rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.h" #include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" -#include "dol2asm.h" - -class daObjGraWall_c : public fopAc_ac_c { -public: - /* 80C10BF8 */ int Create(); - /* 80C10DD8 */ int Execute(); - /* 80C10E78 */ int Delete(); - /* 80C10E80 */ void col_init(); - /* 80C10ED4 */ void col_set(); - - /* 0x568 */ dCcD_Stts mStts; - /* 0x5A4 */ dCcD_Cyl mCyl; - /* 0x6E0 */ u8 field_0x6e0; -}; // Size: 0x6E4 - -// -// Forward References: -// - -extern "C" void Create__14daObjGraWall_cFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void Execute__14daObjGraWall_cFv(); -extern "C" bool Delete__14daObjGraWall_cFv(); -extern "C" void col_init__14daObjGraWall_cFv(); -extern "C" void col_set__14daObjGraWall_cFv(); -extern "C" static void daObjGraWall_Execute__FP14daObjGraWall_c(); -extern "C" static bool daObjGraWall_IsDelete__FP14daObjGraWall_c(); -extern "C" static void daObjGraWall_Delete__FP14daObjGraWall_c(); -extern "C" static void daObjGraWall_create__FP10fopAc_ac_c(); - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void __dl__FPv(); -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* 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]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C10FFC-80C1101C -00001 0020+00 1/0 0/0 0/0 .data l_daObjGraWall_Method */ -SECTION_DATA static void* l_daObjGraWall_Method[8] = { - (void*)daObjGraWall_create__FP10fopAc_ac_c, - (void*)daObjGraWall_Delete__FP14daObjGraWall_c, - (void*)daObjGraWall_Execute__FP14daObjGraWall_c, - (void*)daObjGraWall_IsDelete__FP14daObjGraWall_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80C1101C-80C1104C -00001 0030+00 0/0 0/0 1/0 .data g_profile_GRA_WALL */ -SECTION_DATA extern void* g_profile_GRA_WALL[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x008B0000, (void*)&g_fpcLf_Method, - (void*)0x000006E4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02630000, (void*)&l_daObjGraWall_Method, - (void*)0x00040000, (void*)0x000E0000, -}; - -/* 80C1104C-80C11058 000050 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80C11058-80C11064 00005C 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; /* 80C10BF8-80C10D48 000078 0150+00 1/1 0/0 0/0 .text Create__14daObjGraWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjGraWall_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/Create__14daObjGraWall_cFv.s" -} -#pragma pop +int daObjGraWall_c::Create() { + fopAcM_SetupActor(this, daObjGraWall_c); + field_0x6e0 = fopAcM_GetParam(this); -/* 80C10D48-80C10D90 0001C8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/__dt__8cM3dGCylFv.s" -} -#pragma pop + if (field_0x6e0 != 0xff) { + int roomNo = fopAcM_GetRoomNo(this); + if (dComIfGs_isSwitch(field_0x6e0, roomNo) != 0) { + return cPhs_ERROR_e; + } + } else { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[62]) != 0) { + return cPhs_ERROR_e; + } + } + col_init(); -/* 80C10D90-80C10DD8 000210 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/__dt__8cM3dGAabFv.s" + return cPhs_COMPLEATE_e; } -#pragma pop /* 80C10DD8-80C10E78 000258 00A0+00 1/1 0/0 0/0 .text Execute__14daObjGraWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daObjGraWall_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/Execute__14daObjGraWall_cFv.s" +int daObjGraWall_c::Execute() { + if (field_0x6e0 != 0xff) { + if (dComIfGs_isSwitch(field_0x6e0, fopAcM_GetRoomNo(this)) != 0) { + fopAcM_delete(this); + return 1; + } + } else { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[62]) != 0) { + fopAcM_delete(this); + return 1; + } + } + col_set(); + return 1; } -#pragma pop /* 80C10E78-80C10E80 0002F8 0008+00 1/1 0/0 0/0 .text Delete__14daObjGraWall_cFv */ int daObjGraWall_c::Delete() { @@ -151,10 +51,7 @@ int daObjGraWall_c::Delete() { /* ############################################################################################## */ /* 80C10FB0-80C10FB8 000000 0008+00 1/1 0/0 0/0 .rodata l_DATA */ -SECTION_RODATA static u8 const l_DATA[8] = { - 0x43, 0x34, 0x00, 0x00, 0x43, 0x8C, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C10FB0, &l_DATA); +static const f32 l_DATA[2] = {180.0f, 280.0f}; /* 80C10FB8-80C10FFC 000008 0044+00 1/1 0/0 0/0 .rodata l_cyl_src */ const static dCcD_SrcCyl l_cyl_src = { @@ -172,34 +69,24 @@ const static dCcD_SrcCyl l_cyl_src = { }; /* 80C10E80-80C10ED4 000300 0054+00 1/1 0/0 0/0 .text col_init__14daObjGraWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjGraWall_c::col_init() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/col_init__14daObjGraWall_cFv.s" +void daObjGraWall_c::col_init() { + mStts.Init(0xff, 0xff, this); + mCyl.Set(l_cyl_src); + mCyl.SetStts(&mStts); } -#pragma pop /* 80C10ED4-80C10F40 000354 006C+00 1/1 0/0 0/0 .text col_set__14daObjGraWall_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjGraWall_c::col_set() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/col_set__14daObjGraWall_cFv.s" +void daObjGraWall_c::col_set() { + mCyl.SetC(current.pos); + mCyl.SetH(l_DATA[1]); + mCyl.SetR(l_DATA[0]); + dComIfG_Ccsp()->Set(&mCyl); } -#pragma pop /* 80C10F40-80C10F60 0003C0 0020+00 1/0 0/0 0/0 .text daObjGraWall_Execute__FP14daObjGraWall_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjGraWall_Execute(daObjGraWall_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_Execute__FP14daObjGraWall_c.s" +static int daObjGraWall_Execute(daObjGraWall_c* i_this) { + return i_this->Execute(); } -#pragma pop /* 80C10F60-80C10F68 0003E0 0008+00 1/0 0/0 0/0 .text daObjGraWall_IsDelete__FP14daObjGraWall_c */ static int daObjGraWall_IsDelete(daObjGraWall_c* i_this) { @@ -207,22 +94,40 @@ static int daObjGraWall_IsDelete(daObjGraWall_c* i_this) { } /* 80C10F68-80C10F88 0003E8 0020+00 1/0 0/0 0/0 .text daObjGraWall_Delete__FP14daObjGraWall_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjGraWall_Delete(daObjGraWall_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_Delete__FP14daObjGraWall_c.s" +static int daObjGraWall_Delete(daObjGraWall_c* i_this) { + return i_this->Delete(); } -#pragma pop /* 80C10F88-80C10FA8 000408 0020+00 1/0 0/0 0/0 .text daObjGraWall_create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int daObjGraWall_create(fopAc_ac_c* i_this) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall/daObjGraWall_create__FP10fopAc_ac_c.s" +static int daObjGraWall_create(fopAc_ac_c* i_this) { + return static_cast(i_this)->Create(); } -#pragma pop + +/* ############################################################################################## */ +/* 80C10FFC-80C1101C -00001 0020+00 1/0 0/0 0/0 .data l_daObjGraWall_Method */ +static actor_method_class l_daObjGraWall_Method = { + (process_method_func)daObjGraWall_create, + (process_method_func)daObjGraWall_Delete, + (process_method_func)daObjGraWall_Execute, + (process_method_func)daObjGraWall_IsDelete, + (process_method_func)NULL, +}; + +/* 80C1101C-80C1104C -00001 0030+00 0/0 0/0 1/0 .data g_profile_GRA_WALL */ +extern actor_process_profile_definition g_profile_GRA_WALL = { + fpcLy_CURRENT_e, + 3, + fpcPi_CURRENT_e, + PROC_GRA_WALL, + &g_fpcLf_Method.mBase, + sizeof(daObjGraWall_c), + 0, + 0, + &g_fopAc_Method.base, + 611, + &l_daObjGraWall_Method, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; \ No newline at end of file