diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Action__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Action__10daObjCHO_cFv.s deleted file mode 100644 index 83bebc41217..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Action__10daObjCHO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80BCB210: -/* 80BCB210 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCB214 7C 08 02 A6 */ mflr r0 -/* 80BCB218 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCB21C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCB220 7C 7F 1B 78 */ mr r31, r3 -/* 80BCB224 88 03 09 80 */ lbz r0, 0x980(r3) -/* 80BCB228 2C 00 00 01 */ cmpwi r0, 1 -/* 80BCB22C 41 82 00 1C */ beq lbl_80BCB248 -/* 80BCB230 40 80 00 1C */ bge lbl_80BCB24C -/* 80BCB234 2C 00 00 00 */ cmpwi r0, 0 -/* 80BCB238 40 80 00 08 */ bge lbl_80BCB240 -/* 80BCB23C 48 00 00 10 */ b lbl_80BCB24C -lbl_80BCB240: -/* 80BCB240 4B FF F9 11 */ bl WaitAction__10daObjCHO_cFv -/* 80BCB244 48 00 00 08 */ b lbl_80BCB24C -lbl_80BCB248: -/* 80BCB248 4B FF FC 95 */ bl MoveAction__10daObjCHO_cFv -lbl_80BCB24C: -/* 80BCB24C 7F E3 FB 78 */ mr r3, r31 -/* 80BCB250 4B 59 2E 29 */ bl Insect_GetDemoMain__9dInsect_cFv -/* 80BCB254 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCB258 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCB25C 7C 08 03 A6 */ mtlr r0 -/* 80BCB260 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCB264 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/BoomChk__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/BoomChk__10daObjCHO_cFv.s deleted file mode 100644 index f82501748d3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/BoomChk__10daObjCHO_cFv.s +++ /dev/null @@ -1,162 +0,0 @@ -lbl_80BCB5C0: -/* 80BCB5C0 94 21 FF 50 */ stwu r1, -0xb0(r1) -/* 80BCB5C4 7C 08 02 A6 */ mflr r0 -/* 80BCB5C8 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 80BCB5CC 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80BCB5D0 4B 79 6C 09 */ bl _savegpr_28 -/* 80BCB5D4 7C 7E 1B 78 */ mr r30, r3 -/* 80BCB5D8 3C 60 80 BD */ lis r3, lit_3775@ha /* 0x80BCC578@ha */ -/* 80BCB5DC 3B E3 C5 78 */ addi r31, r3, lit_3775@l /* 0x80BCC578@l */ -/* 80BCB5E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCB5E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCB5E8 83 A3 5D AC */ lwz r29, 0x5dac(r3) -/* 80BCB5EC 88 1E 09 C9 */ lbz r0, 0x9c9(r30) -/* 80BCB5F0 28 00 00 00 */ cmplwi r0, 0 -/* 80BCB5F4 41 82 02 28 */ beq lbl_80BCB81C -/* 80BCB5F8 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80BCB5FC D0 01 00 08 */ stfs f0, 8(r1) -/* 80BCB600 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80BCB604 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80BCB608 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80BCB60C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BCB610 C0 1F 00 7C */ lfs f0, 0x7c(r31) -/* 80BCB614 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BCB618 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BCB61C 38 7E 09 1C */ addi r3, r30, 0x91c -/* 80BCB620 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80BCB624 38 BE 04 E6 */ addi r5, r30, 0x4e6 -/* 80BCB628 38 C0 00 00 */ li r6, 0 -/* 80BCB62C 38 E0 1C 00 */ li r7, 0x1c00 -/* 80BCB630 4B 59 30 25 */ bl posMove__20daPy_boomerangMove_cFP4cXyzPsP10fopAc_ac_cs -/* 80BCB634 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCB638 41 82 00 24 */ beq lbl_80BCB65C -/* 80BCB63C 38 7E 09 1C */ addi r3, r30, 0x91c -/* 80BCB640 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 80BCB644 4B 59 32 39 */ bl bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz -/* 80BCB648 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80BCB64C C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 80BCB650 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BCB654 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80BCB658 48 00 01 C4 */ b lbl_80BCB81C -lbl_80BCB65C: -/* 80BCB65C 38 61 00 28 */ addi r3, r1, 0x28 -/* 80BCB660 4B 4A C6 09 */ bl __ct__11dBgS_LinChkFv -/* 80BCB664 38 61 00 28 */ addi r3, r1, 0x28 -/* 80BCB668 38 81 00 08 */ addi r4, r1, 8 -/* 80BCB66C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BCB670 38 C0 00 00 */ li r6, 0 -/* 80BCB674 4B 4A C6 F1 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 80BCB678 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCB67C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCB680 3B 83 0F 38 */ addi r28, r3, 0xf38 -/* 80BCB684 7F 83 E3 78 */ mr r3, r28 -/* 80BCB688 38 81 00 28 */ addi r4, r1, 0x28 -/* 80BCB68C 4B 4A 8D 29 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 80BCB690 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BCB694 41 82 00 E4 */ beq lbl_80BCB778 -/* 80BCB698 3C 60 80 BD */ lis r3, __vt__8cM3dGPla@ha /* 0x80BCC714@ha */ -/* 80BCB69C 38 03 C7 14 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x80BCC714@l */ -/* 80BCB6A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BCB6A4 7F 83 E3 78 */ mr r3, r28 -/* 80BCB6A8 38 81 00 3C */ addi r4, r1, 0x3c -/* 80BCB6AC 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80BCB6B0 4B 4A 90 95 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 80BCB6B4 C0 01 00 58 */ lfs f0, 0x58(r1) -/* 80BCB6B8 D0 1E 04 BC */ stfs f0, 0x4bc(r30) -/* 80BCB6BC C0 01 00 5C */ lfs f0, 0x5c(r1) -/* 80BCB6C0 D0 1E 04 C0 */ stfs f0, 0x4c0(r30) -/* 80BCB6C4 C0 01 00 60 */ lfs f0, 0x60(r1) -/* 80BCB6C8 D0 1E 04 C4 */ stfs f0, 0x4c4(r30) -/* 80BCB6CC C0 1E 04 BC */ lfs f0, 0x4bc(r30) -/* 80BCB6D0 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 80BCB6D4 C0 1E 04 C0 */ lfs f0, 0x4c0(r30) -/* 80BCB6D8 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80BCB6DC C0 1E 04 C4 */ lfs f0, 0x4c4(r30) -/* 80BCB6E0 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 80BCB6E4 38 00 00 01 */ li r0, 1 -/* 80BCB6E8 98 1E 09 80 */ stb r0, 0x980(r30) -/* 80BCB6EC 38 00 00 00 */ li r0, 0 -/* 80BCB6F0 98 1E 09 81 */ stb r0, 0x981(r30) -/* 80BCB6F4 C0 1F 00 8C */ lfs f0, 0x8c(r31) -/* 80BCB6F8 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 80BCB6FC D0 1E 09 88 */ stfs f0, 0x988(r30) -/* 80BCB700 98 1E 09 C9 */ stb r0, 0x9c9(r30) -/* 80BCB704 38 00 00 64 */ li r0, 0x64 -/* 80BCB708 B0 1E 09 86 */ sth r0, 0x986(r30) -/* 80BCB70C 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCB710 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCB714 38 80 00 06 */ li r4, 6 -/* 80BCB718 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCB71C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCB720 3C A5 00 02 */ addis r5, r5, 2 -/* 80BCB724 38 C0 00 80 */ li r6, 0x80 -/* 80BCB728 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BCB72C 4B 47 0B C1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCB730 7C 64 1B 78 */ mr r4, r3 -/* 80BCB734 80 7E 0A 60 */ lwz r3, 0xa60(r30) -/* 80BCB738 38 A0 00 02 */ li r5, 2 -/* 80BCB73C C0 3F 00 8C */ lfs f1, 0x8c(r31) -/* 80BCB740 C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80BCB744 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80BCB748 C0 9F 00 90 */ lfs f4, 0x90(r31) -/* 80BCB74C 4B 44 57 25 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80BCB750 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BCB754 D0 1E 04 A8 */ stfs f0, 0x4a8(r30) -/* 80BCB758 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BCB75C D0 1E 04 AC */ stfs f0, 0x4ac(r30) -/* 80BCB760 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BCB764 D0 1E 04 B0 */ stfs f0, 0x4b0(r30) -/* 80BCB768 3C 60 80 BD */ lis r3, __vt__8cM3dGPla@ha /* 0x80BCC714@ha */ -/* 80BCB76C 38 03 C7 14 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x80BCC714@l */ -/* 80BCB770 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BCB774 48 00 00 9C */ b lbl_80BCB810 -lbl_80BCB778: -/* 80BCB778 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BCB77C D0 1E 04 A8 */ stfs f0, 0x4a8(r30) -/* 80BCB780 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BCB784 D0 1E 04 AC */ stfs f0, 0x4ac(r30) -/* 80BCB788 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BCB78C D0 1E 04 B0 */ stfs f0, 0x4b0(r30) -/* 80BCB790 38 00 00 01 */ li r0, 1 -/* 80BCB794 98 1E 09 80 */ stb r0, 0x980(r30) -/* 80BCB798 38 00 00 00 */ li r0, 0 -/* 80BCB79C 98 1E 09 81 */ stb r0, 0x981(r30) -/* 80BCB7A0 98 1E 09 C9 */ stb r0, 0x9c9(r30) -/* 80BCB7A4 C0 1F 00 8C */ lfs f0, 0x8c(r31) -/* 80BCB7A8 D0 1E 05 2C */ stfs f0, 0x52c(r30) -/* 80BCB7AC D0 1E 09 88 */ stfs f0, 0x988(r30) -/* 80BCB7B0 38 00 00 64 */ li r0, 0x64 -/* 80BCB7B4 B0 1E 09 86 */ sth r0, 0x986(r30) -/* 80BCB7B8 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCB7BC 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCB7C0 38 80 00 06 */ li r4, 6 -/* 80BCB7C4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCB7C8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCB7CC 3C A5 00 02 */ addis r5, r5, 2 -/* 80BCB7D0 38 C0 00 80 */ li r6, 0x80 -/* 80BCB7D4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BCB7D8 4B 47 0B 15 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCB7DC 7C 64 1B 78 */ mr r4, r3 -/* 80BCB7E0 80 7E 0A 60 */ lwz r3, 0xa60(r30) -/* 80BCB7E4 38 A0 00 02 */ li r5, 2 -/* 80BCB7E8 C0 3F 00 8C */ lfs f1, 0x8c(r31) -/* 80BCB7EC C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80BCB7F0 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80BCB7F4 C0 9F 00 90 */ lfs f4, 0x90(r31) -/* 80BCB7F8 4B 44 56 79 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80BCB7FC C0 3F 00 7C */ lfs f1, 0x7c(r31) -/* 80BCB800 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80BCB804 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BCB808 D0 1E 04 C0 */ stfs f0, 0x4c0(r30) -/* 80BCB80C D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -lbl_80BCB810: -/* 80BCB810 38 61 00 28 */ addi r3, r1, 0x28 -/* 80BCB814 38 80 FF FF */ li r4, -1 -/* 80BCB818 4B 4A C4 C5 */ bl __dt__11dBgS_LinChkFv -lbl_80BCB81C: -/* 80BCB81C 39 61 00 B0 */ addi r11, r1, 0xb0 -/* 80BCB820 4B 79 6A 05 */ bl _restgpr_28 -/* 80BCB824 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 80BCB828 7C 08 03 A6 */ mtlr r0 -/* 80BCB82C 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 80BCB830 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/CreateChk__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/CreateChk__10daObjCHO_cFv.s deleted file mode 100644 index 6192a647db6..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/CreateChk__10daObjCHO_cFv.s +++ /dev/null @@ -1,116 +0,0 @@ -lbl_80BCBE70: -/* 80BCBE70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCBE74 7C 08 02 A6 */ mflr r0 -/* 80BCBE78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCBE7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCBE80 7C 7F 1B 78 */ mr r31, r3 -/* 80BCBE84 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80BCBE88 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f -/* 80BCBE8C 7C 03 03 78 */ mr r3, r0 -/* 80BCBE90 28 00 00 0F */ cmplwi r0, 0xf -/* 80BCBE94 40 82 00 08 */ bne lbl_80BCBE9C -/* 80BCBE98 38 60 00 00 */ li r3, 0 -lbl_80BCBE9C: -/* 80BCBE9C 88 1F 09 C8 */ lbz r0, 0x9c8(r31) -/* 80BCBEA0 28 00 00 02 */ cmplwi r0, 2 -/* 80BCBEA4 41 82 01 60 */ beq lbl_80BCC004 -/* 80BCBEA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BCBEAC 41 82 00 6C */ beq lbl_80BCBF18 -/* 80BCBEB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCBEB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCBEB8 3B E3 07 F0 */ addi r31, r3, 0x7f0 -/* 80BCBEBC 7F E3 FB 78 */ mr r3, r31 -/* 80BCBEC0 3C 80 80 BD */ lis r4, l_musiya_num@ha /* 0x80BCC670@ha */ -/* 80BCBEC4 A0 04 C6 70 */ lhz r0, l_musiya_num@l(r4) /* 0x80BCC670@l */ -/* 80BCBEC8 54 00 08 3C */ slwi r0, r0, 1 -/* 80BCBECC 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80BCBED0 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80BCBED4 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80BCBED8 4B 46 8A E5 */ bl isEventBit__11dSv_event_cCFUs -/* 80BCBEDC 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCBEE0 41 82 00 30 */ beq lbl_80BCBF10 -/* 80BCBEE4 7F E3 FB 78 */ mr r3, r31 -/* 80BCBEE8 3C 80 80 BD */ lis r4, l_musiya_num@ha /* 0x80BCC670@ha */ -/* 80BCBEEC 38 84 C6 70 */ addi r4, r4, l_musiya_num@l /* 0x80BCC670@l */ -/* 80BCBEF0 A0 04 00 02 */ lhz r0, 2(r4) -/* 80BCBEF4 54 00 08 3C */ slwi r0, r0, 1 -/* 80BCBEF8 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80BCBEFC 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80BCBF00 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80BCBF04 4B 46 8A B9 */ bl isEventBit__11dSv_event_cCFUs -/* 80BCBF08 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCBF0C 40 82 00 F8 */ bne lbl_80BCC004 -lbl_80BCBF10: -/* 80BCBF10 38 60 00 00 */ li r3, 0 -/* 80BCBF14 48 00 00 F4 */ b lbl_80BCC008 -lbl_80BCBF18: -/* 80BCBF18 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCBF1C 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCBF20 38 63 00 06 */ addi r3, r3, 6 -/* 80BCBF24 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCBF28 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCBF2C 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 80BCBF30 4B 79 CA 65 */ bl strcmp -/* 80BCBF34 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCBF38 40 82 00 CC */ bne lbl_80BCC004 -/* 80BCBF3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCBF40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCBF44 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 80BCBF48 2C 00 00 03 */ cmpwi r0, 3 -/* 80BCBF4C 40 82 00 B8 */ bne lbl_80BCC004 -/* 80BCBF50 88 1F 05 81 */ lbz r0, 0x581(r31) -/* 80BCBF54 3C 60 80 BD */ lis r3, l_cho_itemno@ha /* 0x80BCC630@ha */ -/* 80BCBF58 38 63 C6 30 */ addi r3, r3, l_cho_itemno@l /* 0x80BCC630@l */ -/* 80BCBF5C 7C 63 00 AE */ lbzx r3, r3, r0 -/* 80BCBF60 4B 60 DF DD */ bl isCatchNotGiveInsect__14dMenu_Insect_cFUc -/* 80BCBF64 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BCBF68 41 82 00 0C */ beq lbl_80BCBF74 -/* 80BCBF6C 38 60 00 00 */ li r3, 0 -/* 80BCBF70 48 00 00 98 */ b lbl_80BCC008 -lbl_80BCBF74: -/* 80BCBF74 88 1F 05 81 */ lbz r0, 0x581(r31) -/* 80BCBF78 28 00 00 00 */ cmplwi r0, 0 -/* 80BCBF7C 40 82 00 3C */ bne lbl_80BCBFB8 -/* 80BCBF80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCBF84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCBF88 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80BCBF8C 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 80BCBF90 3C 80 80 BD */ lis r4, l_musiya_num@ha /* 0x80BCC670@ha */ -/* 80BCBF94 38 84 C6 70 */ addi r4, r4, l_musiya_num@l /* 0x80BCC670@l */ -/* 80BCBF98 7C 04 02 2E */ lhzx r0, r4, r0 -/* 80BCBF9C 54 00 08 3C */ slwi r0, r0, 1 -/* 80BCBFA0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80BCBFA4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80BCBFA8 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80BCBFAC 4B 46 8A 11 */ bl isEventBit__11dSv_event_cCFUs -/* 80BCBFB0 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCBFB4 41 82 00 48 */ beq lbl_80BCBFFC -lbl_80BCBFB8: -/* 80BCBFB8 88 1F 05 81 */ lbz r0, 0x581(r31) -/* 80BCBFBC 28 00 00 01 */ cmplwi r0, 1 -/* 80BCBFC0 40 82 00 44 */ bne lbl_80BCC004 -/* 80BCBFC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCBFC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCBFCC 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80BCBFD0 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 80BCBFD4 3C 80 80 BD */ lis r4, l_musiya_num@ha /* 0x80BCC670@ha */ -/* 80BCBFD8 38 84 C6 70 */ addi r4, r4, l_musiya_num@l /* 0x80BCC670@l */ -/* 80BCBFDC 7C 04 02 2E */ lhzx r0, r4, r0 -/* 80BCBFE0 54 00 08 3C */ slwi r0, r0, 1 -/* 80BCBFE4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80BCBFE8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80BCBFEC 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80BCBFF0 4B 46 89 CD */ bl isEventBit__11dSv_event_cCFUs -/* 80BCBFF4 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCBFF8 40 82 00 0C */ bne lbl_80BCC004 -lbl_80BCBFFC: -/* 80BCBFFC 38 60 00 00 */ li r3, 0 -/* 80BCC000 48 00 00 08 */ b lbl_80BCC008 -lbl_80BCC004: -/* 80BCC004 38 60 00 01 */ li r3, 1 -lbl_80BCC008: -/* 80BCC008 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCC00C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCC010 7C 08 03 A6 */ mtlr r0 -/* 80BCC014 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCC018 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/CreateHeap__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/CreateHeap__10daObjCHO_cFv.s deleted file mode 100644 index a9313584e94..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/CreateHeap__10daObjCHO_cFv.s +++ /dev/null @@ -1,199 +0,0 @@ -lbl_80BCA418: -/* 80BCA418 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80BCA41C 7C 08 02 A6 */ mflr r0 -/* 80BCA420 90 01 00 34 */ stw r0, 0x34(r1) -/* 80BCA424 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BCA428 4B 79 7D B1 */ bl _savegpr_28 -/* 80BCA42C 7C 7F 1B 78 */ mr r31, r3 -/* 80BCA430 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCA434 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCA438 38 80 00 0A */ li r4, 0xa -/* 80BCA43C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCA440 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCA444 3F C5 00 02 */ addis r30, r5, 2 -/* 80BCA448 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80BCA44C 7F C5 F3 78 */ mr r5, r30 -/* 80BCA450 38 C0 00 80 */ li r6, 0x80 -/* 80BCA454 4B 47 1E 99 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCA458 7C 7D 1B 78 */ mr r29, r3 -/* 80BCA45C 38 60 00 58 */ li r3, 0x58 -/* 80BCA460 4B 70 47 ED */ bl __nw__FUl -/* 80BCA464 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80BCA468 41 82 00 68 */ beq lbl_80BCA4D0 -/* 80BCA46C 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCA470 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCA474 38 80 00 06 */ li r4, 6 -/* 80BCA478 7F C5 F3 78 */ mr r5, r30 -/* 80BCA47C 38 C0 00 80 */ li r6, 0x80 -/* 80BCA480 4B 47 1E 6D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCA484 7C 67 1B 78 */ mr r7, r3 -/* 80BCA488 38 1F 09 CC */ addi r0, r31, 0x9cc -/* 80BCA48C 90 01 00 08 */ stw r0, 8(r1) -/* 80BCA490 38 00 00 00 */ li r0, 0 -/* 80BCA494 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BCA498 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000284@ha */ -/* 80BCA49C 38 03 02 84 */ addi r0, r3, 0x0284 /* 0x11000284@l */ -/* 80BCA4A0 90 01 00 10 */ stw r0, 0x10(r1) -/* 80BCA4A4 7F 83 E3 78 */ mr r3, r28 -/* 80BCA4A8 7F A4 EB 78 */ mr r4, r29 -/* 80BCA4AC 38 A0 00 00 */ li r5, 0 -/* 80BCA4B0 38 C0 00 00 */ li r6, 0 -/* 80BCA4B4 39 00 00 02 */ li r8, 2 -/* 80BCA4B8 3D 20 80 BD */ lis r9, lit_3889@ha /* 0x80BCC5C0@ha */ -/* 80BCA4BC C0 29 C5 C0 */ lfs f1, lit_3889@l(r9) /* 0x80BCC5C0@l */ -/* 80BCA4C0 39 20 00 00 */ li r9, 0 -/* 80BCA4C4 39 40 FF FF */ li r10, -1 -/* 80BCA4C8 4B 44 63 09 */ bl __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl -/* 80BCA4CC 7C 7C 1B 78 */ mr r28, r3 -lbl_80BCA4D0: -/* 80BCA4D0 93 9F 0A 60 */ stw r28, 0xa60(r31) -/* 80BCA4D4 80 7F 0A 60 */ lwz r3, 0xa60(r31) -/* 80BCA4D8 28 03 00 00 */ cmplwi r3, 0 -/* 80BCA4DC 41 82 00 10 */ beq lbl_80BCA4EC -/* 80BCA4E0 83 A3 00 04 */ lwz r29, 4(r3) -/* 80BCA4E4 28 1D 00 00 */ cmplwi r29, 0 -/* 80BCA4E8 40 82 00 0C */ bne lbl_80BCA4F4 -lbl_80BCA4EC: -/* 80BCA4EC 38 60 00 00 */ li r3, 0 -/* 80BCA4F0 48 00 01 F8 */ b lbl_80BCA6E8 -lbl_80BCA4F4: -/* 80BCA4F4 38 60 00 18 */ li r3, 0x18 -/* 80BCA4F8 4B 70 47 55 */ bl __nw__FUl -/* 80BCA4FC 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80BCA500 41 82 00 20 */ beq lbl_80BCA520 -/* 80BCA504 3C 80 80 BD */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80BCC72C@ha */ -/* 80BCA508 38 04 C7 2C */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80BCC72C@l */ -/* 80BCA50C 90 1C 00 00 */ stw r0, 0(r28) -/* 80BCA510 38 80 00 00 */ li r4, 0 -/* 80BCA514 4B 75 DE E9 */ bl init__12J3DFrameCtrlFs -/* 80BCA518 38 00 00 00 */ li r0, 0 -/* 80BCA51C 90 1C 00 14 */ stw r0, 0x14(r28) -lbl_80BCA520: -/* 80BCA520 93 9F 09 C0 */ stw r28, 0x9c0(r31) -/* 80BCA524 80 1F 09 C0 */ lwz r0, 0x9c0(r31) -/* 80BCA528 28 00 00 00 */ cmplwi r0, 0 -/* 80BCA52C 40 82 00 0C */ bne lbl_80BCA538 -/* 80BCA530 38 60 00 00 */ li r3, 0 -/* 80BCA534 48 00 01 B4 */ b lbl_80BCA6E8 -lbl_80BCA538: -/* 80BCA538 88 1F 05 81 */ lbz r0, 0x581(r31) -/* 80BCA53C 28 00 00 01 */ cmplwi r0, 1 -/* 80BCA540 40 82 00 58 */ bne lbl_80BCA598 -/* 80BCA544 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCA548 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCA54C 38 80 00 0D */ li r4, 0xd -/* 80BCA550 7F C5 F3 78 */ mr r5, r30 -/* 80BCA554 38 C0 00 80 */ li r6, 0x80 -/* 80BCA558 4B 47 1D 95 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCA55C 7C 65 1B 78 */ mr r5, r3 -/* 80BCA560 80 9D 00 04 */ lwz r4, 4(r29) -/* 80BCA564 80 7F 09 C0 */ lwz r3, 0x9c0(r31) -/* 80BCA568 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BCA56C 38 C0 00 01 */ li r6, 1 -/* 80BCA570 38 E0 00 02 */ li r7, 2 -/* 80BCA574 3D 00 80 BD */ lis r8, lit_3889@ha /* 0x80BCC5C0@ha */ -/* 80BCA578 C0 28 C5 C0 */ lfs f1, lit_3889@l(r8) /* 0x80BCC5C0@l */ -/* 80BCA57C 39 00 00 00 */ li r8, 0 -/* 80BCA580 39 20 FF FF */ li r9, -1 -/* 80BCA584 4B 44 31 89 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80BCA588 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCA58C 40 82 00 60 */ bne lbl_80BCA5EC -/* 80BCA590 38 60 00 00 */ li r3, 0 -/* 80BCA594 48 00 01 54 */ b lbl_80BCA6E8 -lbl_80BCA598: -/* 80BCA598 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCA59C 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCA5A0 38 80 00 0E */ li r4, 0xe -/* 80BCA5A4 7F C5 F3 78 */ mr r5, r30 -/* 80BCA5A8 38 C0 00 80 */ li r6, 0x80 -/* 80BCA5AC 4B 47 1D 41 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCA5B0 7C 65 1B 78 */ mr r5, r3 -/* 80BCA5B4 80 9D 00 04 */ lwz r4, 4(r29) -/* 80BCA5B8 80 7F 09 C0 */ lwz r3, 0x9c0(r31) -/* 80BCA5BC 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BCA5C0 38 C0 00 01 */ li r6, 1 -/* 80BCA5C4 38 E0 00 02 */ li r7, 2 -/* 80BCA5C8 3D 00 80 BD */ lis r8, lit_3889@ha /* 0x80BCC5C0@ha */ -/* 80BCA5CC C0 28 C5 C0 */ lfs f1, lit_3889@l(r8) /* 0x80BCC5C0@l */ -/* 80BCA5D0 39 00 00 00 */ li r8, 0 -/* 80BCA5D4 39 20 FF FF */ li r9, -1 -/* 80BCA5D8 4B 44 31 35 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80BCA5DC 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCA5E0 40 82 00 0C */ bne lbl_80BCA5EC -/* 80BCA5E4 38 60 00 00 */ li r3, 0 -/* 80BCA5E8 48 00 01 00 */ b lbl_80BCA6E8 -lbl_80BCA5EC: -/* 80BCA5EC 38 60 00 18 */ li r3, 0x18 -/* 80BCA5F0 4B 70 46 5D */ bl __nw__FUl -/* 80BCA5F4 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80BCA5F8 41 82 00 20 */ beq lbl_80BCA618 -/* 80BCA5FC 3C 80 80 BD */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80BCC72C@ha */ -/* 80BCA600 38 04 C7 2C */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80BCC72C@l */ -/* 80BCA604 90 1C 00 00 */ stw r0, 0(r28) -/* 80BCA608 38 80 00 00 */ li r4, 0 -/* 80BCA60C 4B 75 DD F1 */ bl init__12J3DFrameCtrlFs -/* 80BCA610 38 00 00 00 */ li r0, 0 -/* 80BCA614 90 1C 00 14 */ stw r0, 0x14(r28) -lbl_80BCA618: -/* 80BCA618 93 9F 09 C4 */ stw r28, 0x9c4(r31) -/* 80BCA61C 80 1F 09 C4 */ lwz r0, 0x9c4(r31) -/* 80BCA620 28 00 00 00 */ cmplwi r0, 0 -/* 80BCA624 40 82 00 0C */ bne lbl_80BCA630 -/* 80BCA628 38 60 00 00 */ li r3, 0 -/* 80BCA62C 48 00 00 BC */ b lbl_80BCA6E8 -lbl_80BCA630: -/* 80BCA630 88 1F 05 81 */ lbz r0, 0x581(r31) -/* 80BCA634 28 00 00 01 */ cmplwi r0, 1 -/* 80BCA638 40 82 00 58 */ bne lbl_80BCA690 -/* 80BCA63C 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCA640 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCA644 38 80 00 11 */ li r4, 0x11 -/* 80BCA648 7F C5 F3 78 */ mr r5, r30 -/* 80BCA64C 38 C0 00 80 */ li r6, 0x80 -/* 80BCA650 4B 47 1C 9D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCA654 7C 65 1B 78 */ mr r5, r3 -/* 80BCA658 80 9D 00 04 */ lwz r4, 4(r29) -/* 80BCA65C 80 7F 09 C4 */ lwz r3, 0x9c4(r31) -/* 80BCA660 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BCA664 38 C0 00 01 */ li r6, 1 -/* 80BCA668 38 E0 00 02 */ li r7, 2 -/* 80BCA66C 3D 00 80 BD */ lis r8, lit_3889@ha /* 0x80BCC5C0@ha */ -/* 80BCA670 C0 28 C5 C0 */ lfs f1, lit_3889@l(r8) /* 0x80BCC5C0@l */ -/* 80BCA674 39 00 00 00 */ li r8, 0 -/* 80BCA678 39 20 FF FF */ li r9, -1 -/* 80BCA67C 4B 44 2F C1 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80BCA680 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCA684 40 82 00 60 */ bne lbl_80BCA6E4 -/* 80BCA688 38 60 00 00 */ li r3, 0 -/* 80BCA68C 48 00 00 5C */ b lbl_80BCA6E8 -lbl_80BCA690: -/* 80BCA690 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCA694 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCA698 38 80 00 12 */ li r4, 0x12 -/* 80BCA69C 7F C5 F3 78 */ mr r5, r30 -/* 80BCA6A0 38 C0 00 80 */ li r6, 0x80 -/* 80BCA6A4 4B 47 1C 49 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCA6A8 7C 65 1B 78 */ mr r5, r3 -/* 80BCA6AC 80 9D 00 04 */ lwz r4, 4(r29) -/* 80BCA6B0 80 7F 09 C4 */ lwz r3, 0x9c4(r31) -/* 80BCA6B4 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BCA6B8 38 C0 00 01 */ li r6, 1 -/* 80BCA6BC 38 E0 00 02 */ li r7, 2 -/* 80BCA6C0 3D 00 80 BD */ lis r8, lit_3889@ha /* 0x80BCC5C0@ha */ -/* 80BCA6C4 C0 28 C5 C0 */ lfs f1, lit_3889@l(r8) /* 0x80BCC5C0@l */ -/* 80BCA6C8 39 00 00 00 */ li r8, 0 -/* 80BCA6CC 39 20 FF FF */ li r9, -1 -/* 80BCA6D0 4B 44 2F 6D */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80BCA6D4 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCA6D8 40 82 00 0C */ bne lbl_80BCA6E4 -/* 80BCA6DC 38 60 00 00 */ li r3, 0 -/* 80BCA6E0 48 00 00 08 */ b lbl_80BCA6E8 -lbl_80BCA6E4: -/* 80BCA6E4 38 60 00 01 */ li r3, 1 -lbl_80BCA6E8: -/* 80BCA6E8 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BCA6EC 4B 79 7B 39 */ bl _restgpr_28 -/* 80BCA6F0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BCA6F4 7C 08 03 A6 */ mtlr r0 -/* 80BCA6F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80BCA6FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Delete__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Delete__10daObjCHO_cFv.s deleted file mode 100644 index b0a625407d8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Delete__10daObjCHO_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80BCBCA8: -/* 80BCBCA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCBCAC 7C 08 02 A6 */ mflr r0 -/* 80BCBCB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCBCB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCBCB8 7C 7F 1B 78 */ mr r31, r3 -/* 80BCBCBC 38 7F 0A 64 */ addi r3, r31, 0xa64 -/* 80BCBCC0 3C 80 80 BD */ lis r4, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCBCC4 38 84 C6 78 */ addi r4, r4, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCBCC8 4B 46 13 41 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BCBCCC 88 1F 0A 6C */ lbz r0, 0xa6c(r31) -/* 80BCBCD0 28 00 00 00 */ cmplwi r0, 0 -/* 80BCBCD4 41 82 00 10 */ beq lbl_80BCBCE4 -/* 80BCBCD8 38 00 00 00 */ li r0, 0 -/* 80BCBCDC 3C 60 80 BD */ lis r3, data_80BCC750@ha /* 0x80BCC750@ha */ -/* 80BCBCE0 98 03 C7 50 */ stb r0, data_80BCC750@l(r3) /* 0x80BCC750@l */ -lbl_80BCBCE4: -/* 80BCBCE4 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 80BCBCE8 28 00 00 00 */ cmplwi r0, 0 -/* 80BCBCEC 41 82 00 0C */ beq lbl_80BCBCF8 -/* 80BCBCF0 80 7F 0A 60 */ lwz r3, 0xa60(r31) -/* 80BCBCF4 4B 44 56 1D */ bl stopZelAnime__16mDoExt_McaMorfSOFv -lbl_80BCBCF8: -/* 80BCBCF8 38 60 00 01 */ li r3, 1 -/* 80BCBCFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCBD00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCBD04 7C 08 03 A6 */ mtlr r0 -/* 80BCBD08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCBD0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Execute__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Execute__10daObjCHO_cFv.s deleted file mode 100644 index 368d3af7c62..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Execute__10daObjCHO_cFv.s +++ /dev/null @@ -1,187 +0,0 @@ -lbl_80BCB87C: -/* 80BCB87C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BCB880 7C 08 02 A6 */ mflr r0 -/* 80BCB884 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BCB888 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80BCB88C 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80BCB890 7C 7E 1B 78 */ mr r30, r3 -/* 80BCB894 3C 60 80 BD */ lis r3, lit_3775@ha /* 0x80BCC578@ha */ -/* 80BCB898 3B E3 C5 78 */ addi r31, r3, lit_3775@l /* 0x80BCC578@l */ -/* 80BCB89C 80 1E 05 8C */ lwz r0, 0x58c(r30) -/* 80BCB8A0 2C 00 00 00 */ cmpwi r0, 0 -/* 80BCB8A4 40 81 00 70 */ ble lbl_80BCB914 -/* 80BCB8A8 C0 5F 00 E8 */ lfs f2, 0xe8(r31) -/* 80BCB8AC 80 1E 09 9C */ lwz r0, 0x99c(r30) -/* 80BCB8B0 C8 3F 00 E0 */ lfd f1, 0xe0(r31) -/* 80BCB8B4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80BCB8B8 3C 00 43 30 */ lis r0, 0x4330 -/* 80BCB8BC 90 01 00 28 */ stw r0, 0x28(r1) -/* 80BCB8C0 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80BCB8C4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80BCB8C8 EC 02 00 2A */ fadds f0, f2, f0 -/* 80BCB8CC D0 1E 09 98 */ stfs f0, 0x998(r30) -/* 80BCB8D0 3C 60 00 06 */ lis r3, 0x0006 /* 0x000600A3@ha */ -/* 80BCB8D4 38 03 00 A3 */ addi r0, r3, 0x00A3 /* 0x000600A3@l */ -/* 80BCB8D8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BCB8DC 38 7E 09 CC */ addi r3, r30, 0x9cc -/* 80BCB8E0 38 81 00 24 */ addi r4, r1, 0x24 -/* 80BCB8E4 38 A0 00 00 */ li r5, 0 -/* 80BCB8E8 38 C0 FF FF */ li r6, -1 -/* 80BCB8EC 81 9E 09 CC */ lwz r12, 0x9cc(r30) -/* 80BCB8F0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80BCB8F4 7D 89 03 A6 */ mtctr r12 -/* 80BCB8F8 4E 80 04 21 */ bctrl -/* 80BCB8FC 7F C3 F3 78 */ mr r3, r30 -/* 80BCB900 4B 59 27 79 */ bl Insect_GetDemoMain__9dInsect_cFv -/* 80BCB904 7F C3 F3 78 */ mr r3, r30 -/* 80BCB908 4B FF FB 95 */ bl ParticleSet__10daObjCHO_cFv -/* 80BCB90C 38 60 00 01 */ li r3, 1 -/* 80BCB910 48 00 02 18 */ b lbl_80BCBB28 -lbl_80BCB914: -/* 80BCB914 38 60 00 00 */ li r3, 0 -/* 80BCB918 7C 64 1B 78 */ mr r4, r3 -/* 80BCB91C 38 00 00 03 */ li r0, 3 -/* 80BCB920 7C 09 03 A6 */ mtctr r0 -lbl_80BCB924: -/* 80BCB924 38 C3 09 82 */ addi r6, r3, 0x982 -/* 80BCB928 7C BE 32 AE */ lhax r5, r30, r6 -/* 80BCB92C 38 05 FF FF */ addi r0, r5, -1 -/* 80BCB930 7C 1E 33 2E */ sthx r0, r30, r6 -/* 80BCB934 7C 1E 32 AE */ lhax r0, r30, r6 -/* 80BCB938 2C 00 00 00 */ cmpwi r0, 0 -/* 80BCB93C 41 81 00 08 */ bgt lbl_80BCB944 -/* 80BCB940 7C 9E 33 2E */ sthx r4, r30, r6 -lbl_80BCB944: -/* 80BCB944 38 63 00 02 */ addi r3, r3, 2 -/* 80BCB948 42 00 FF DC */ bdnz lbl_80BCB924 -/* 80BCB94C 7F C3 F3 78 */ mr r3, r30 -/* 80BCB950 4B FF F9 5D */ bl checkGroundPos__10daObjCHO_cFv -/* 80BCB954 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BCB958 D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 80BCB95C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BCB960 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80BCB964 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BCB968 D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80BCB96C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BCB970 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80BCB974 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BCB978 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80BCB97C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BCB980 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80BCB984 C0 3E 05 3C */ lfs f1, 0x53c(r30) -/* 80BCB988 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80BCB98C EC 01 00 2A */ fadds f0, f1, f0 -/* 80BCB990 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80BCB994 88 1E 09 C8 */ lbz r0, 0x9c8(r30) -/* 80BCB998 2C 00 00 01 */ cmpwi r0, 1 -/* 80BCB99C 41 82 01 0C */ beq lbl_80BCBAA8 -/* 80BCB9A0 40 80 01 10 */ bge lbl_80BCBAB0 -/* 80BCB9A4 2C 00 00 00 */ cmpwi r0, 0 -/* 80BCB9A8 40 80 00 08 */ bge lbl_80BCB9B0 -/* 80BCB9AC 48 00 01 04 */ b lbl_80BCBAB0 -lbl_80BCB9B0: -/* 80BCB9B0 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 80BCB9B4 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 80BCB9B8 40 82 00 10 */ bne lbl_80BCB9C8 -/* 80BCB9BC 7F C3 F3 78 */ mr r3, r30 -/* 80BCB9C0 4B FF F8 51 */ bl Action__10daObjCHO_cFv -/* 80BCB9C4 48 00 00 1C */ b lbl_80BCB9E0 -lbl_80BCB9C8: -/* 80BCB9C8 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BCB9CC D0 1E 04 A8 */ stfs f0, 0x4a8(r30) -/* 80BCB9D0 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BCB9D4 D0 1E 04 AC */ stfs f0, 0x4ac(r30) -/* 80BCB9D8 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BCB9DC D0 1E 04 B0 */ stfs f0, 0x4b0(r30) -lbl_80BCB9E0: -/* 80BCB9E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCB9E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCB9E8 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80BCB9EC 38 00 00 FF */ li r0, 0xff -/* 80BCB9F0 90 01 00 08 */ stw r0, 8(r1) -/* 80BCB9F4 38 80 00 00 */ li r4, 0 -/* 80BCB9F8 90 81 00 0C */ stw r4, 0xc(r1) -/* 80BCB9FC 38 00 FF FF */ li r0, -1 -/* 80BCBA00 90 01 00 10 */ stw r0, 0x10(r1) -/* 80BCBA04 90 81 00 14 */ stw r4, 0x14(r1) -/* 80BCBA08 90 81 00 18 */ stw r4, 0x18(r1) -/* 80BCBA0C 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80BCBA10 80 9E 05 74 */ lwz r4, 0x574(r30) -/* 80BCBA14 38 A0 00 00 */ li r5, 0 -/* 80BCBA18 38 C0 0A 1C */ li r6, 0xa1c -/* 80BCBA1C 38 FE 04 D0 */ addi r7, r30, 0x4d0 -/* 80BCBA20 39 1E 01 0C */ addi r8, r30, 0x10c -/* 80BCBA24 39 3E 04 E4 */ addi r9, r30, 0x4e4 -/* 80BCBA28 39 40 00 00 */ li r10, 0 -/* 80BCBA2C C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 80BCBA30 4B 48 1A 9D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80BCBA34 90 7E 05 74 */ stw r3, 0x574(r30) -/* 80BCBA38 7F C3 F3 78 */ mr r3, r30 -/* 80BCBA3C 4B FF E9 65 */ bl SetCcSph__10daObjCHO_cFv -/* 80BCBA40 7F C3 F3 78 */ mr r3, r30 -/* 80BCBA44 48 00 00 FD */ bl ObjHit__10daObjCHO_cFv -/* 80BCBA48 7F C3 F3 78 */ mr r3, r30 -/* 80BCBA4C 4B FF FB 75 */ bl BoomChk__10daObjCHO_cFv -/* 80BCBA50 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BCBA54 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 80BCBA58 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BCBA5C D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80BCBA60 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BCBA64 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 80BCBA68 C0 1E 05 3C */ lfs f0, 0x53c(r30) -/* 80BCBA6C C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80BCBA70 EC 00 08 2A */ fadds f0, f0, f1 -/* 80BCBA74 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 80BCBA78 C0 1E 05 38 */ lfs f0, 0x538(r30) -/* 80BCBA7C D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 80BCBA80 C0 1E 05 3C */ lfs f0, 0x53c(r30) -/* 80BCBA84 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80BCBA88 C0 1E 05 40 */ lfs f0, 0x540(r30) -/* 80BCBA8C D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 80BCBA90 C0 1E 05 54 */ lfs f0, 0x554(r30) -/* 80BCBA94 EC 00 08 2A */ fadds f0, f0, f1 -/* 80BCBA98 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 80BCBA9C 7F C3 F3 78 */ mr r3, r30 -/* 80BCBAA0 4B FF F9 FD */ bl ParticleSet__10daObjCHO_cFv -/* 80BCBAA4 48 00 00 0C */ b lbl_80BCBAB0 -lbl_80BCBAA8: -/* 80BCBAA8 7F C3 F3 78 */ mr r3, r30 -/* 80BCBAAC 4B FF F7 BD */ bl ShopAction__10daObjCHO_cFv -lbl_80BCBAB0: -/* 80BCBAB0 3C 60 00 06 */ lis r3, 0x0006 /* 0x000600A3@ha */ -/* 80BCBAB4 38 03 00 A3 */ addi r0, r3, 0x00A3 /* 0x000600A3@l */ -/* 80BCBAB8 90 01 00 20 */ stw r0, 0x20(r1) -/* 80BCBABC 38 7E 09 CC */ addi r3, r30, 0x9cc -/* 80BCBAC0 38 81 00 20 */ addi r4, r1, 0x20 -/* 80BCBAC4 38 A0 00 00 */ li r5, 0 -/* 80BCBAC8 38 C0 FF FF */ li r6, -1 -/* 80BCBACC 81 9E 09 CC */ lwz r12, 0x9cc(r30) -/* 80BCBAD0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80BCBAD4 7D 89 03 A6 */ mtctr r12 -/* 80BCBAD8 4E 80 04 21 */ bctrl -/* 80BCBADC 38 7E 05 D0 */ addi r3, r30, 0x5d0 -/* 80BCBAE0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCBAE4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCBAE8 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80BCBAEC 4B 4A AF C1 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80BCBAF0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80BCBAF4 7C 03 07 74 */ extsb r3, r0 -/* 80BCBAF8 4B 46 15 75 */ bl dComIfGp_getReverb__Fi -/* 80BCBAFC 7C 65 1B 78 */ mr r5, r3 -/* 80BCBB00 80 7E 0A 60 */ lwz r3, 0xa60(r30) -/* 80BCBB04 38 80 00 00 */ li r4, 0 -/* 80BCBB08 4B 44 55 A9 */ bl play__16mDoExt_McaMorfSOFUlSc -/* 80BCBB0C 80 7E 09 C4 */ lwz r3, 0x9c4(r30) -/* 80BCBB10 4B 44 19 19 */ bl play__14mDoExt_baseAnmFv -/* 80BCBB14 80 7E 09 C0 */ lwz r3, 0x9c0(r30) -/* 80BCBB18 4B 44 19 11 */ bl play__14mDoExt_baseAnmFv -/* 80BCBB1C 7F C3 F3 78 */ mr r3, r30 -/* 80BCBB20 48 00 01 F1 */ bl setBaseMtx__10daObjCHO_cFv -/* 80BCBB24 38 60 00 01 */ li r3, 1 -lbl_80BCBB28: -/* 80BCBB28 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80BCBB2C 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80BCBB30 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BCBB34 7C 08 03 A6 */ mtlr r0 -/* 80BCBB38 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BCBB3C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/InitCcSph__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/InitCcSph__10daObjCHO_cFv.s deleted file mode 100644 index ebcd37e93e8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/InitCcSph__10daObjCHO_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80BCA334: -/* 80BCA334 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCA338 7C 08 02 A6 */ mflr r0 -/* 80BCA33C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCA340 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCA344 7C 7F 1B 78 */ mr r31, r3 -/* 80BCA348 38 7F 07 A8 */ addi r3, r31, 0x7a8 -/* 80BCA34C 38 80 00 01 */ li r4, 1 -/* 80BCA350 38 A0 00 00 */ li r5, 0 -/* 80BCA354 7F E6 FB 78 */ mr r6, r31 -/* 80BCA358 4B 4B 95 09 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80BCA35C 38 7F 07 E4 */ addi r3, r31, 0x7e4 -/* 80BCA360 3C 80 80 BD */ lis r4, ccSphSrc@ha /* 0x80BCC57C@ha */ -/* 80BCA364 38 84 C5 7C */ addi r4, r4, ccSphSrc@l /* 0x80BCC57C@l */ -/* 80BCA368 4B 4B A6 CD */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80BCA36C 38 1F 07 A8 */ addi r0, r31, 0x7a8 -/* 80BCA370 90 1F 08 28 */ stw r0, 0x828(r31) -/* 80BCA374 38 7F 09 08 */ addi r3, r31, 0x908 -/* 80BCA378 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80BCA37C 4B 6A 52 CD */ bl SetC__8cM3dGSphFRC4cXyz -/* 80BCA380 80 1F 08 80 */ lwz r0, 0x880(r31) -/* 80BCA384 60 00 00 04 */ ori r0, r0, 4 -/* 80BCA388 90 1F 08 80 */ stw r0, 0x880(r31) -/* 80BCA38C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCA390 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCA394 7C 08 03 A6 */ mtlr r0 -/* 80BCA398 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCA39C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Insect_Release__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Insect_Release__10daObjCHO_cFv.s deleted file mode 100644 index b1ab22de2e0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Insect_Release__10daObjCHO_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80BCB310: -/* 80BCB310 38 00 00 01 */ li r0, 1 -/* 80BCB314 98 03 05 6C */ stb r0, 0x56c(r3) -/* 80BCB318 98 03 09 80 */ stb r0, 0x980(r3) -/* 80BCB31C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/MoveAction__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/MoveAction__10daObjCHO_cFv.s deleted file mode 100644 index 49095c7a23d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/MoveAction__10daObjCHO_cFv.s +++ /dev/null @@ -1,224 +0,0 @@ -lbl_80BCAEDC: -/* 80BCAEDC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BCAEE0 7C 08 02 A6 */ mflr r0 -/* 80BCAEE4 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BCAEE8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BCAEEC 4B 79 72 F1 */ bl _savegpr_29 -/* 80BCAEF0 7C 7E 1B 78 */ mr r30, r3 -/* 80BCAEF4 3C 80 80 BD */ lis r4, lit_3775@ha /* 0x80BCC578@ha */ -/* 80BCAEF8 3B E4 C5 78 */ addi r31, r4, lit_3775@l /* 0x80BCC578@l */ -/* 80BCAEFC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCAF00 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCAF04 83 A4 5D AC */ lwz r29, 0x5dac(r4) -/* 80BCAF08 4B FF F8 85 */ bl SpeedSet__10daObjCHO_cFv -/* 80BCAF0C 80 7E 0A 60 */ lwz r3, 0xa60(r30) -/* 80BCAF10 C0 23 00 1C */ lfs f1, 0x1c(r3) -/* 80BCAF14 C0 1F 00 98 */ lfs f0, 0x98(r31) -/* 80BCAF18 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCAF1C 40 81 00 18 */ ble lbl_80BCAF34 -/* 80BCAF20 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80BCAF24 C0 1F 00 9C */ lfs f0, 0x9c(r31) -/* 80BCAF28 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BCAF2C D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80BCAF30 48 00 00 14 */ b lbl_80BCAF44 -lbl_80BCAF34: -/* 80BCAF34 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80BCAF38 C0 1F 00 9C */ lfs f0, 0x9c(r31) -/* 80BCAF3C EC 01 00 28 */ fsubs f0, f1, f0 -/* 80BCAF40 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -lbl_80BCAF44: -/* 80BCAF44 7F A3 EB 78 */ mr r3, r29 -/* 80BCAF48 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 80BCAF4C 81 8C 01 C8 */ lwz r12, 0x1c8(r12) -/* 80BCAF50 7D 89 03 A6 */ mtctr r12 -/* 80BCAF54 4E 80 04 21 */ bctrl -/* 80BCAF58 7C 64 1B 79 */ or. r4, r3, r3 -/* 80BCAF5C 41 82 00 10 */ beq lbl_80BCAF6C -/* 80BCAF60 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80BCAF64 4B 6A 5C A1 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 80BCAF68 B0 7E 09 90 */ sth r3, 0x990(r30) -lbl_80BCAF6C: -/* 80BCAF6C A8 1E 09 82 */ lha r0, 0x982(r30) -/* 80BCAF70 2C 00 00 00 */ cmpwi r0, 0 -/* 80BCAF74 40 82 00 94 */ bne lbl_80BCB008 -/* 80BCAF78 38 61 00 0C */ addi r3, r1, 0xc -/* 80BCAF7C 38 9E 04 A8 */ addi r4, r30, 0x4a8 -/* 80BCAF80 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BCAF84 4B 69 BB B1 */ bl __mi__4cXyzCFRC3Vec -/* 80BCAF88 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80BCAF8C D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BCAF90 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80BCAF94 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80BCAF98 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80BCAF9C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80BCAFA0 C0 3F 00 7C */ lfs f1, 0x7c(r31) -/* 80BCAFA4 4B 69 C9 E9 */ bl cM_rndFX__Ff -/* 80BCAFA8 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80BCAFAC EC 00 08 2A */ fadds f0, f0, f1 -/* 80BCAFB0 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BCAFB4 C0 3F 00 7C */ lfs f1, 0x7c(r31) -/* 80BCAFB8 4B 69 C9 D5 */ bl cM_rndFX__Ff -/* 80BCAFBC C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80BCAFC0 EC 40 08 2A */ fadds f2, f0, f1 -/* 80BCAFC4 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80BCAFC8 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 80BCAFCC 4B 69 C6 A9 */ bl cM_atan2s__Fff -/* 80BCAFD0 B0 7E 09 90 */ sth r3, 0x990(r30) -/* 80BCAFD4 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80BCAFD8 4B 69 C9 7D */ bl cM_rndF__Ff -/* 80BCAFDC C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80BCAFE0 EC 00 08 2A */ fadds f0, f0, f1 -/* 80BCAFE4 FC 00 00 1E */ fctiwz f0, f0 -/* 80BCAFE8 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80BCAFEC 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80BCAFF0 B0 1E 09 82 */ sth r0, 0x982(r30) -/* 80BCAFF4 C0 3F 00 94 */ lfs f1, 0x94(r31) -/* 80BCAFF8 4B 69 C9 5D */ bl cM_rndF__Ff -/* 80BCAFFC C0 1F 00 94 */ lfs f0, 0x94(r31) -/* 80BCB000 EC 00 08 2A */ fadds f0, f0, f1 -/* 80BCB004 D0 1E 09 88 */ stfs f0, 0x988(r30) -lbl_80BCB008: -/* 80BCB008 A8 1E 09 84 */ lha r0, 0x984(r30) -/* 80BCB00C 2C 00 00 00 */ cmpwi r0, 0 -/* 80BCB010 40 82 00 30 */ bne lbl_80BCB040 -/* 80BCB014 C0 3F 00 94 */ lfs f1, 0x94(r31) -/* 80BCB018 4B 69 C9 75 */ bl cM_rndFX__Ff -/* 80BCB01C D0 3E 09 8C */ stfs f1, 0x98c(r30) -/* 80BCB020 C0 3F 00 54 */ lfs f1, 0x54(r31) -/* 80BCB024 4B 69 C9 31 */ bl cM_rndF__Ff -/* 80BCB028 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80BCB02C EC 00 08 2A */ fadds f0, f0, f1 -/* 80BCB030 FC 00 00 1E */ fctiwz f0, f0 -/* 80BCB034 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80BCB038 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80BCB03C B0 1E 09 84 */ sth r0, 0x984(r30) -lbl_80BCB040: -/* 80BCB040 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 80BCB044 C0 1F 00 A0 */ lfs f0, 0xa0(r31) -/* 80BCB048 C0 3E 09 7C */ lfs f1, 0x97c(r30) -/* 80BCB04C EC 00 08 2A */ fadds f0, f0, f1 -/* 80BCB050 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80BCB054 40 80 00 14 */ bge lbl_80BCB068 -/* 80BCB058 C0 3F 00 94 */ lfs f1, 0x94(r31) -/* 80BCB05C 4B 69 C8 F9 */ bl cM_rndF__Ff -/* 80BCB060 D0 3E 09 8C */ stfs f1, 0x98c(r30) -/* 80BCB064 48 00 00 24 */ b lbl_80BCB088 -lbl_80BCB068: -/* 80BCB068 C0 1F 00 A4 */ lfs f0, 0xa4(r31) -/* 80BCB06C EC 00 08 2A */ fadds f0, f0, f1 -/* 80BCB070 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80BCB074 40 81 00 14 */ ble lbl_80BCB088 -/* 80BCB078 C0 3F 00 94 */ lfs f1, 0x94(r31) -/* 80BCB07C 4B 69 C8 D9 */ bl cM_rndF__Ff -/* 80BCB080 FC 00 08 50 */ fneg f0, f1 -/* 80BCB084 D0 1E 09 8C */ stfs f0, 0x98c(r30) -lbl_80BCB088: -/* 80BCB088 88 1E 09 AC */ lbz r0, 0x9ac(r30) -/* 80BCB08C 28 00 00 00 */ cmplwi r0, 0 -/* 80BCB090 40 82 00 34 */ bne lbl_80BCB0C4 -/* 80BCB094 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 80BCB098 C0 5F 00 A8 */ lfs f2, 0xa8(r31) -/* 80BCB09C C0 3E 09 8C */ lfs f1, 0x98c(r30) -/* 80BCB0A0 C0 1F 00 AC */ lfs f0, 0xac(r31) -/* 80BCB0A4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BCB0A8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80BCB0AC FC 00 00 1E */ fctiwz f0, f0 -/* 80BCB0B0 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80BCB0B4 80 81 00 2C */ lwz r4, 0x2c(r1) -/* 80BCB0B8 38 A0 00 10 */ li r5, 0x10 -/* 80BCB0BC 38 C0 10 00 */ li r6, 0x1000 -/* 80BCB0C0 4B 6A 55 49 */ bl cLib_addCalcAngleS2__FPssss -lbl_80BCB0C4: -/* 80BCB0C4 7F C3 F3 78 */ mr r3, r30 -/* 80BCB0C8 4B FF F7 C5 */ bl WallCheck__10daObjCHO_cFv -/* 80BCB0CC 38 7E 04 F8 */ addi r3, r30, 0x4f8 -/* 80BCB0D0 4B 77 C0 69 */ bl PSVECSquareMag -/* 80BCB0D4 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80BCB0D8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCB0DC 40 81 00 58 */ ble lbl_80BCB134 -/* 80BCB0E0 FC 00 08 34 */ frsqrte f0, f1 -/* 80BCB0E4 C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 80BCB0E8 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BCB0EC C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 80BCB0F0 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BCB0F4 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BCB0F8 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BCB0FC FC 02 00 32 */ fmul f0, f2, f0 -/* 80BCB100 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BCB104 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BCB108 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BCB10C FC 03 00 28 */ fsub f0, f3, f0 -/* 80BCB110 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BCB114 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BCB118 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BCB11C FC 01 00 32 */ fmul f0, f1, f0 -/* 80BCB120 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BCB124 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BCB128 FC 21 00 32 */ fmul f1, f1, f0 -/* 80BCB12C FC 20 08 18 */ frsp f1, f1 -/* 80BCB130 48 00 00 88 */ b lbl_80BCB1B8 -lbl_80BCB134: -/* 80BCB134 C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 80BCB138 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCB13C 40 80 00 10 */ bge lbl_80BCB14C -/* 80BCB140 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BCB144 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80BCB148 48 00 00 70 */ b lbl_80BCB1B8 -lbl_80BCB14C: -/* 80BCB14C D0 21 00 08 */ stfs f1, 8(r1) -/* 80BCB150 80 81 00 08 */ lwz r4, 8(r1) -/* 80BCB154 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80BCB158 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80BCB15C 7C 03 00 00 */ cmpw r3, r0 -/* 80BCB160 41 82 00 14 */ beq lbl_80BCB174 -/* 80BCB164 40 80 00 40 */ bge lbl_80BCB1A4 -/* 80BCB168 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCB16C 41 82 00 20 */ beq lbl_80BCB18C -/* 80BCB170 48 00 00 34 */ b lbl_80BCB1A4 -lbl_80BCB174: -/* 80BCB174 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BCB178 41 82 00 0C */ beq lbl_80BCB184 -/* 80BCB17C 38 00 00 01 */ li r0, 1 -/* 80BCB180 48 00 00 28 */ b lbl_80BCB1A8 -lbl_80BCB184: -/* 80BCB184 38 00 00 02 */ li r0, 2 -/* 80BCB188 48 00 00 20 */ b lbl_80BCB1A8 -lbl_80BCB18C: -/* 80BCB18C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BCB190 41 82 00 0C */ beq lbl_80BCB19C -/* 80BCB194 38 00 00 05 */ li r0, 5 -/* 80BCB198 48 00 00 10 */ b lbl_80BCB1A8 -lbl_80BCB19C: -/* 80BCB19C 38 00 00 03 */ li r0, 3 -/* 80BCB1A0 48 00 00 08 */ b lbl_80BCB1A8 -lbl_80BCB1A4: -/* 80BCB1A4 38 00 00 04 */ li r0, 4 -lbl_80BCB1A8: -/* 80BCB1A8 2C 00 00 01 */ cmpwi r0, 1 -/* 80BCB1AC 40 82 00 0C */ bne lbl_80BCB1B8 -/* 80BCB1B0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BCB1B4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80BCB1B8: -/* 80BCB1B8 38 7E 09 B0 */ addi r3, r30, 0x9b0 -/* 80BCB1BC C0 5F 00 B0 */ lfs f2, 0xb0(r31) -/* 80BCB1C0 C0 1F 00 B4 */ lfs f0, 0xb4(r31) -/* 80BCB1C4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BCB1C8 EC 22 00 2A */ fadds f1, f2, f0 -/* 80BCB1CC C0 5F 00 AC */ lfs f2, 0xac(r31) -/* 80BCB1D0 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 80BCB1D4 4B 6A 48 69 */ bl cLib_addCalc2__FPffff -/* 80BCB1D8 C0 1E 09 B0 */ lfs f0, 0x9b0(r30) -/* 80BCB1DC 80 7E 0A 60 */ lwz r3, 0xa60(r30) -/* 80BCB1E0 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80BCB1E4 A8 1E 09 86 */ lha r0, 0x986(r30) -/* 80BCB1E8 2C 00 00 00 */ cmpwi r0, 0 -/* 80BCB1EC 40 82 00 0C */ bne lbl_80BCB1F8 -/* 80BCB1F0 7F C3 F3 78 */ mr r3, r30 -/* 80BCB1F4 4B FF F7 31 */ bl SearchLink__10daObjCHO_cFv -lbl_80BCB1F8: -/* 80BCB1F8 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BCB1FC 4B 79 70 2D */ bl _restgpr_29 -/* 80BCB200 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BCB204 7C 08 03 A6 */ mtlr r0 -/* 80BCB208 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BCB20C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ObjHit__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ObjHit__10daObjCHO_cFv.s deleted file mode 100644 index 2f894168a3c..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ObjHit__10daObjCHO_cFv.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_80BCBB40: -/* 80BCBB40 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BCBB44 7C 08 02 A6 */ mflr r0 -/* 80BCBB48 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BCBB4C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BCBB50 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80BCBB54 7C 7F 1B 78 */ mr r31, r3 -/* 80BCBB58 3C 60 80 BD */ lis r3, lit_3775@ha /* 0x80BCC578@ha */ -/* 80BCBB5C 3B C3 C5 78 */ addi r30, r3, lit_3775@l /* 0x80BCC578@l */ -/* 80BCBB60 38 7F 07 E4 */ addi r3, r31, 0x7e4 -/* 80BCBB64 4B 4B 88 FD */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80BCBB68 28 03 00 00 */ cmplwi r3, 0 -/* 80BCBB6C 41 82 01 24 */ beq lbl_80BCBC90 -/* 80BCBB70 38 7F 07 E4 */ addi r3, r31, 0x7e4 -/* 80BCBB74 4B 4B 89 85 */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80BCBB78 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80BCBB7C 54 60 03 DF */ rlwinm. r0, r3, 0, 0xf, 0xf -/* 80BCBB80 41 82 00 30 */ beq lbl_80BCBBB0 -/* 80BCBB84 88 1F 09 C9 */ lbz r0, 0x9c9(r31) -/* 80BCBB88 28 00 00 00 */ cmplwi r0, 0 -/* 80BCBB8C 40 82 00 F0 */ bne lbl_80BCBC7C -/* 80BCBB90 38 00 00 01 */ li r0, 1 -/* 80BCBB94 98 1F 09 C9 */ stb r0, 0x9c9(r31) -/* 80BCBB98 38 7F 07 E4 */ addi r3, r31, 0x7e4 -/* 80BCBB9C 4B 4B 89 AD */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80BCBBA0 38 7F 09 1C */ addi r3, r31, 0x91c -/* 80BCBBA4 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80BCBBA8 4B 59 2A 09 */ bl initOffset__20daPy_boomerangMove_cFPC4cXyz -/* 80BCBBAC 48 00 00 D0 */ b lbl_80BCBC7C -lbl_80BCBBB0: -/* 80BCBBB0 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e -/* 80BCBBB4 40 82 00 C8 */ bne lbl_80BCBC7C -/* 80BCBBB8 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 -/* 80BCBBBC 41 82 00 C0 */ beq lbl_80BCBC7C -/* 80BCBBC0 C0 1E 00 4C */ lfs f0, 0x4c(r30) -/* 80BCBBC4 D0 01 00 08 */ stfs f0, 8(r1) -/* 80BCBBC8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BCBBCC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BCBBD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCBBD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCBBD8 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80BCBBDC 28 1F 00 00 */ cmplwi r31, 0 -/* 80BCBBE0 41 82 00 0C */ beq lbl_80BCBBEC -/* 80BCBBE4 80 9F 00 04 */ lwz r4, 4(r31) -/* 80BCBBE8 48 00 00 08 */ b lbl_80BCBBF0 -lbl_80BCBBEC: -/* 80BCBBEC 38 80 FF FF */ li r4, -1 -lbl_80BCBBF0: -/* 80BCBBF0 38 A1 00 08 */ addi r5, r1, 8 -/* 80BCBBF4 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80BCBBF8 81 8C 01 38 */ lwz r12, 0x138(r12) -/* 80BCBBFC 7D 89 03 A6 */ mtctr r12 -/* 80BCBC00 4E 80 04 21 */ bctrl -/* 80BCBC04 38 00 00 01 */ li r0, 1 -/* 80BCBC08 98 1F 09 80 */ stb r0, 0x980(r31) -/* 80BCBC0C 38 00 00 02 */ li r0, 2 -/* 80BCBC10 98 1F 09 81 */ stb r0, 0x981(r31) -/* 80BCBC14 38 00 00 00 */ li r0, 0 -/* 80BCBC18 98 1F 09 C9 */ stb r0, 0x9c9(r31) -/* 80BCBC1C 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCBC20 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCBC24 38 80 00 06 */ li r4, 6 -/* 80BCBC28 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCBC2C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCBC30 3C A5 00 02 */ addis r5, r5, 2 -/* 80BCBC34 38 C0 00 80 */ li r6, 0x80 -/* 80BCBC38 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BCBC3C 4B 47 06 B1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCBC40 7C 64 1B 78 */ mr r4, r3 -/* 80BCBC44 80 7F 0A 60 */ lwz r3, 0xa60(r31) -/* 80BCBC48 38 A0 00 02 */ li r5, 2 -/* 80BCBC4C C0 3E 00 8C */ lfs f1, 0x8c(r30) -/* 80BCBC50 C0 5E 00 48 */ lfs f2, 0x48(r30) -/* 80BCBC54 C0 7E 00 4C */ lfs f3, 0x4c(r30) -/* 80BCBC58 C0 9E 00 90 */ lfs f4, 0x90(r30) -/* 80BCBC5C 4B 44 52 15 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80BCBC60 C0 1E 00 EC */ lfs f0, 0xec(r30) -/* 80BCBC64 D0 1F 05 2C */ stfs f0, 0x52c(r31) -/* 80BCBC68 C0 3E 00 8C */ lfs f1, 0x8c(r30) -/* 80BCBC6C 4B 69 BC E9 */ bl cM_rndF__Ff -/* 80BCBC70 C0 1E 00 EC */ lfs f0, 0xec(r30) -/* 80BCBC74 EC 00 08 2A */ fadds f0, f0, f1 -/* 80BCBC78 D0 1F 09 88 */ stfs f0, 0x988(r31) -lbl_80BCBC7C: -/* 80BCBC7C 38 7F 07 E4 */ addi r3, r31, 0x7e4 -/* 80BCBC80 81 9F 08 20 */ lwz r12, 0x820(r31) -/* 80BCBC84 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80BCBC88 7D 89 03 A6 */ mtctr r12 -/* 80BCBC8C 4E 80 04 21 */ bctrl -lbl_80BCBC90: -/* 80BCBC90 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BCBC94 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80BCBC98 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BCBC9C 7C 08 03 A6 */ mtlr r0 -/* 80BCBCA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BCBCA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ParticleSet__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ParticleSet__10daObjCHO_cFv.s deleted file mode 100644 index d5f36146237..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ParticleSet__10daObjCHO_cFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80BCB49C: -/* 80BCB49C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BCB4A0 7C 08 02 A6 */ mflr r0 -/* 80BCB4A4 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BCB4A8 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80BCB4AC F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80BCB4B0 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80BCB4B4 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80BCB4B8 7C 7F 1B 78 */ mr r31, r3 -/* 80BCB4BC C0 43 09 98 */ lfs f2, 0x998(r3) -/* 80BCB4C0 80 03 09 9C */ lwz r0, 0x99c(r3) -/* 80BCB4C4 3C 60 80 BD */ lis r3, lit_4300@ha /* 0x80BCC658@ha */ -/* 80BCB4C8 C8 23 C6 58 */ lfd f1, lit_4300@l(r3) /* 0x80BCC658@l */ -/* 80BCB4CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BCB4D0 3C 00 43 30 */ lis r0, 0x4330 -/* 80BCB4D4 90 01 00 20 */ stw r0, 0x20(r1) -/* 80BCB4D8 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80BCB4DC EC 00 08 28 */ fsubs f0, f0, f1 -/* 80BCB4E0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80BCB4E4 40 81 00 24 */ ble lbl_80BCB508 -/* 80BCB4E8 38 7F 09 94 */ addi r3, r31, 0x994 -/* 80BCB4EC 3C 80 80 BD */ lis r4, lit_3927@ha /* 0x80BCC5C4@ha */ -/* 80BCB4F0 C0 24 C5 C4 */ lfs f1, lit_3927@l(r4) /* 0x80BCC5C4@l */ -/* 80BCB4F4 3C 80 80 BD */ lis r4, lit_3889@ha /* 0x80BCC5C0@ha */ -/* 80BCB4F8 C0 44 C5 C0 */ lfs f2, lit_3889@l(r4) /* 0x80BCC5C0@l */ -/* 80BCB4FC FC 60 10 90 */ fmr f3, f2 -/* 80BCB500 4B 6A 45 3D */ bl cLib_addCalc2__FPffff -/* 80BCB504 48 00 00 1C */ b lbl_80BCB520 -lbl_80BCB508: -/* 80BCB508 38 7F 09 94 */ addi r3, r31, 0x994 -/* 80BCB50C 3C 80 80 BD */ lis r4, lit_3889@ha /* 0x80BCC5C0@ha */ -/* 80BCB510 C0 24 C5 C0 */ lfs f1, lit_3889@l(r4) /* 0x80BCC5C0@l */ -/* 80BCB514 FC 40 08 90 */ fmr f2, f1 -/* 80BCB518 FC 60 08 90 */ fmr f3, f1 -/* 80BCB51C 4B 6A 45 21 */ bl cLib_addCalc2__FPffff -lbl_80BCB520: -/* 80BCB520 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCB524 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCB528 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80BCB52C 38 00 00 FF */ li r0, 0xff -/* 80BCB530 90 01 00 08 */ stw r0, 8(r1) -/* 80BCB534 38 80 00 00 */ li r4, 0 -/* 80BCB538 90 81 00 0C */ stw r4, 0xc(r1) -/* 80BCB53C 38 00 FF FF */ li r0, -1 -/* 80BCB540 90 01 00 10 */ stw r0, 0x10(r1) -/* 80BCB544 90 81 00 14 */ stw r4, 0x14(r1) -/* 80BCB548 90 81 00 18 */ stw r4, 0x18(r1) -/* 80BCB54C 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80BCB550 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80BCB554 38 A0 00 00 */ li r5, 0 -/* 80BCB558 38 C0 0A 1B */ li r6, 0xa1b -/* 80BCB55C 38 FF 04 D0 */ addi r7, r31, 0x4d0 -/* 80BCB560 39 1F 01 0C */ addi r8, r31, 0x10c -/* 80BCB564 39 3F 04 E4 */ addi r9, r31, 0x4e4 -/* 80BCB568 39 40 00 00 */ li r10, 0 -/* 80BCB56C 3D 60 80 BD */ lis r11, lit_3889@ha /* 0x80BCC5C0@ha */ -/* 80BCB570 C0 2B C5 C0 */ lfs f1, lit_3889@l(r11) /* 0x80BCC5C0@l */ -/* 80BCB574 4B 48 1F 59 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80BCB578 90 7F 05 70 */ stw r3, 0x570(r31) -/* 80BCB57C C3 FF 09 94 */ lfs f31, 0x994(r31) -/* 80BCB580 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80BCB584 38 63 02 10 */ addi r3, r3, 0x210 -/* 80BCB588 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80BCB58C 4B 48 03 8D */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 80BCB590 28 03 00 00 */ cmplwi r3, 0 -/* 80BCB594 41 82 00 0C */ beq lbl_80BCB5A0 -/* 80BCB598 D3 E3 00 B0 */ stfs f31, 0xb0(r3) -/* 80BCB59C D3 E3 00 B4 */ stfs f31, 0xb4(r3) -lbl_80BCB5A0: -/* 80BCB5A0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 80BCB5A4 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80BCB5A8 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80BCB5AC 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80BCB5B0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BCB5B4 7C 08 03 A6 */ mtlr r0 -/* 80BCB5B8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BCB5BC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SearchLink__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SearchLink__10daObjCHO_cFv.s deleted file mode 100644 index ccdc8f5b676..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SearchLink__10daObjCHO_cFv.s +++ /dev/null @@ -1,150 +0,0 @@ -lbl_80BCA924: -/* 80BCA924 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BCA928 7C 08 02 A6 */ mflr r0 -/* 80BCA92C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BCA930 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BCA934 4B 79 78 A9 */ bl _savegpr_29 -/* 80BCA938 7C 7F 1B 78 */ mr r31, r3 -/* 80BCA93C 3C 60 80 BD */ lis r3, lit_3775@ha /* 0x80BCC578@ha */ -/* 80BCA940 3B C3 C5 78 */ addi r30, r3, lit_3775@l /* 0x80BCC578@l */ -/* 80BCA944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCA948 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCA94C 83 A3 5D AC */ lwz r29, 0x5dac(r3) -/* 80BCA950 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) -/* 80BCA954 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80BCA958 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BCA95C C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 80BCA960 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80BCA964 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 80BCA968 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) -/* 80BCA96C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80BCA970 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BCA974 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80BCA978 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80BCA97C 38 61 00 0C */ addi r3, r1, 0xc -/* 80BCA980 38 81 00 18 */ addi r4, r1, 0x18 -/* 80BCA984 4B 77 CA 19 */ bl PSVECSquareDistance -/* 80BCA988 C0 1E 00 4C */ lfs f0, 0x4c(r30) -/* 80BCA98C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCA990 40 81 00 58 */ ble lbl_80BCA9E8 -/* 80BCA994 FC 00 08 34 */ frsqrte f0, f1 -/* 80BCA998 C8 9E 00 60 */ lfd f4, 0x60(r30) -/* 80BCA99C FC 44 00 32 */ fmul f2, f4, f0 -/* 80BCA9A0 C8 7E 00 68 */ lfd f3, 0x68(r30) -/* 80BCA9A4 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BCA9A8 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BCA9AC FC 03 00 28 */ fsub f0, f3, f0 -/* 80BCA9B0 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BCA9B4 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BCA9B8 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BCA9BC FC 01 00 32 */ fmul f0, f1, f0 -/* 80BCA9C0 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BCA9C4 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BCA9C8 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BCA9CC FC 00 00 32 */ fmul f0, f0, f0 -/* 80BCA9D0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BCA9D4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BCA9D8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BCA9DC FC 21 00 32 */ fmul f1, f1, f0 -/* 80BCA9E0 FC 20 08 18 */ frsp f1, f1 -/* 80BCA9E4 48 00 00 88 */ b lbl_80BCAA6C -lbl_80BCA9E8: -/* 80BCA9E8 C8 1E 00 70 */ lfd f0, 0x70(r30) -/* 80BCA9EC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCA9F0 40 80 00 10 */ bge lbl_80BCAA00 -/* 80BCA9F4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BCA9F8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80BCA9FC 48 00 00 70 */ b lbl_80BCAA6C -lbl_80BCAA00: -/* 80BCAA00 D0 21 00 08 */ stfs f1, 8(r1) -/* 80BCAA04 80 81 00 08 */ lwz r4, 8(r1) -/* 80BCAA08 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80BCAA0C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80BCAA10 7C 03 00 00 */ cmpw r3, r0 -/* 80BCAA14 41 82 00 14 */ beq lbl_80BCAA28 -/* 80BCAA18 40 80 00 40 */ bge lbl_80BCAA58 -/* 80BCAA1C 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCAA20 41 82 00 20 */ beq lbl_80BCAA40 -/* 80BCAA24 48 00 00 34 */ b lbl_80BCAA58 -lbl_80BCAA28: -/* 80BCAA28 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BCAA2C 41 82 00 0C */ beq lbl_80BCAA38 -/* 80BCAA30 38 00 00 01 */ li r0, 1 -/* 80BCAA34 48 00 00 28 */ b lbl_80BCAA5C -lbl_80BCAA38: -/* 80BCAA38 38 00 00 02 */ li r0, 2 -/* 80BCAA3C 48 00 00 20 */ b lbl_80BCAA5C -lbl_80BCAA40: -/* 80BCAA40 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BCAA44 41 82 00 0C */ beq lbl_80BCAA50 -/* 80BCAA48 38 00 00 05 */ li r0, 5 -/* 80BCAA4C 48 00 00 10 */ b lbl_80BCAA5C -lbl_80BCAA50: -/* 80BCAA50 38 00 00 03 */ li r0, 3 -/* 80BCAA54 48 00 00 08 */ b lbl_80BCAA5C -lbl_80BCAA58: -/* 80BCAA58 38 00 00 04 */ li r0, 4 -lbl_80BCAA5C: -/* 80BCAA5C 2C 00 00 01 */ cmpwi r0, 1 -/* 80BCAA60 40 82 00 0C */ bne lbl_80BCAA6C -/* 80BCAA64 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BCAA68 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80BCAA6C: -/* 80BCAA6C C0 1E 00 78 */ lfs f0, 0x78(r30) -/* 80BCAA70 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCAA74 40 80 00 C4 */ bge lbl_80BCAB38 -/* 80BCAA78 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) -/* 80BCAA7C C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80BCAA80 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80BCAA84 C0 1E 00 7C */ lfs f0, 0x7c(r30) -/* 80BCAA88 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCAA8C 40 80 00 AC */ bge lbl_80BCAB38 -/* 80BCAA90 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 80BCAA94 C0 1D 05 2C */ lfs f0, 0x52c(r29) -/* 80BCAA98 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80BCAA9C 40 82 00 9C */ bne lbl_80BCAB38 -/* 80BCAAA0 7F A3 EB 78 */ mr r3, r29 -/* 80BCAAA4 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 80BCAAA8 81 8C 00 B8 */ lwz r12, 0xb8(r12) -/* 80BCAAAC 7D 89 03 A6 */ mtctr r12 -/* 80BCAAB0 4E 80 04 21 */ bctrl -/* 80BCAAB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCAAB8 40 82 00 80 */ bne lbl_80BCAB38 -/* 80BCAABC 7F A3 EB 78 */ mr r3, r29 -/* 80BCAAC0 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 80BCAAC4 81 8C 02 88 */ lwz r12, 0x288(r12) -/* 80BCAAC8 7D 89 03 A6 */ mtctr r12 -/* 80BCAACC 4E 80 04 21 */ bctrl -/* 80BCAAD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BCAAD4 41 82 00 64 */ beq lbl_80BCAB38 -/* 80BCAAD8 38 00 00 00 */ li r0, 0 -/* 80BCAADC 98 1F 09 80 */ stb r0, 0x980(r31) -/* 80BCAAE0 98 1F 09 81 */ stb r0, 0x981(r31) -/* 80BCAAE4 C0 1E 00 80 */ lfs f0, 0x80(r30) -/* 80BCAAE8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80BCAAEC C0 1E 00 84 */ lfs f0, 0x84(r30) -/* 80BCAAF0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80BCAAF4 C0 1E 00 4C */ lfs f0, 0x4c(r30) -/* 80BCAAF8 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80BCAAFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCAB00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCAB04 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80BCAB08 38 80 00 09 */ li r4, 9 -/* 80BCAB0C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80BCAB10 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80BCAB14 7D 89 03 A6 */ mtctr r12 -/* 80BCAB18 4E 80 04 21 */ bctrl -/* 80BCAB1C 3C 80 80 45 */ lis r4, calc_mtx@ha /* 0x80450768@ha */ -/* 80BCAB20 38 84 07 68 */ addi r4, r4, calc_mtx@l /* 0x80450768@l */ -/* 80BCAB24 80 84 00 00 */ lwz r4, 0(r4) -/* 80BCAB28 4B 77 B9 89 */ bl PSMTXCopy -/* 80BCAB2C 38 61 00 24 */ addi r3, r1, 0x24 -/* 80BCAB30 38 9F 09 B4 */ addi r4, r31, 0x9b4 -/* 80BCAB34 4B 6A 63 B9 */ bl MtxPosition__FP4cXyzP4cXyz -lbl_80BCAB38: -/* 80BCAB38 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BCAB3C 4B 79 76 ED */ bl _restgpr_29 -/* 80BCAB40 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BCAB44 7C 08 03 A6 */ mtlr r0 -/* 80BCAB48 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BCAB4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SetCcSph__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SetCcSph__10daObjCHO_cFv.s deleted file mode 100644 index aac5bca7e08..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SetCcSph__10daObjCHO_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80BCA3A0: -/* 80BCA3A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCA3A4 7C 08 02 A6 */ mflr r0 -/* 80BCA3A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCA3AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCA3B0 7C 7F 1B 78 */ mr r31, r3 -/* 80BCA3B4 38 7F 09 08 */ addi r3, r31, 0x908 -/* 80BCA3B8 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80BCA3BC 4B 6A 52 8D */ bl SetC__8cM3dGSphFRC4cXyz -/* 80BCA3C0 38 7F 09 08 */ addi r3, r31, 0x908 -/* 80BCA3C4 3C 80 80 BD */ lis r4, lit_3788@ha /* 0x80BCC5BC@ha */ -/* 80BCA3C8 C0 24 C5 BC */ lfs f1, lit_3788@l(r4) /* 0x80BCC5BC@l */ -/* 80BCA3CC 4B 6A 53 3D */ bl SetR__8cM3dGSphFf -/* 80BCA3D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCA3D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCA3D8 38 63 23 3C */ addi r3, r3, 0x233c -/* 80BCA3DC 38 9F 07 E4 */ addi r4, r31, 0x7e4 -/* 80BCA3E0 4B 69 A7 C9 */ bl Set__4cCcSFP8cCcD_Obj -/* 80BCA3E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCA3E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCA3EC 7C 08 03 A6 */ mtlr r0 -/* 80BCA3F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCA3F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ShopAction__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ShopAction__10daObjCHO_cFv.s deleted file mode 100644 index 34789ea0a44..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ShopAction__10daObjCHO_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80BCB268: -/* 80BCB268 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCB26C 7C 08 02 A6 */ mflr r0 -/* 80BCB270 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCB274 88 03 09 80 */ lbz r0, 0x980(r3) -/* 80BCB278 2C 00 00 01 */ cmpwi r0, 1 -/* 80BCB27C 41 82 00 1C */ beq lbl_80BCB298 -/* 80BCB280 40 80 00 1C */ bge lbl_80BCB29C -/* 80BCB284 2C 00 00 00 */ cmpwi r0, 0 -/* 80BCB288 40 80 00 08 */ bge lbl_80BCB290 -/* 80BCB28C 48 00 00 10 */ b lbl_80BCB29C -lbl_80BCB290: -/* 80BCB290 4B FF F8 C1 */ bl WaitAction__10daObjCHO_cFv -/* 80BCB294 48 00 00 08 */ b lbl_80BCB29C -lbl_80BCB298: -/* 80BCB298 4B FF FC 45 */ bl MoveAction__10daObjCHO_cFv -lbl_80BCB29C: -/* 80BCB29C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCB2A0 7C 08 03 A6 */ mtlr r0 -/* 80BCB2A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCB2A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SpeedSet__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SpeedSet__10daObjCHO_cFv.s deleted file mode 100644 index f1a4c5f4679..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SpeedSet__10daObjCHO_cFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_80BCA78C: -/* 80BCA78C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80BCA790 7C 08 02 A6 */ mflr r0 -/* 80BCA794 90 01 00 34 */ stw r0, 0x34(r1) -/* 80BCA798 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80BCA79C 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80BCA7A0 7C 7E 1B 78 */ mr r30, r3 -/* 80BCA7A4 3C 60 80 BD */ lis r3, lit_3775@ha /* 0x80BCC578@ha */ -/* 80BCA7A8 3B E3 C5 78 */ addi r31, r3, lit_3775@l /* 0x80BCC578@l */ -/* 80BCA7AC C0 3E 04 FC */ lfs f1, 0x4fc(r30) -/* 80BCA7B0 C0 1E 05 30 */ lfs f0, 0x530(r30) -/* 80BCA7B4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BCA7B8 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 80BCA7BC C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80BCA7C0 C0 1E 04 FC */ lfs f0, 0x4fc(r30) -/* 80BCA7C4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BCA7C8 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 80BCA7CC C0 3E 05 2C */ lfs f1, 0x52c(r30) -/* 80BCA7D0 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80BCA7D4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80BCA7D8 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BCA7DC D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80BCA7E0 D0 01 00 08 */ stfs f0, 8(r1) -/* 80BCA7E4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BCA7E8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BCA7EC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BCA7F0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BCA7F4 A8 9E 04 DE */ lha r4, 0x4de(r30) -/* 80BCA7F8 4B 44 1B E5 */ bl mDoMtx_YrotS__FPA4_fs -/* 80BCA7FC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BCA800 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BCA804 38 81 00 14 */ addi r4, r1, 0x14 -/* 80BCA808 38 A1 00 08 */ addi r5, r1, 8 -/* 80BCA80C 4B 77 C5 61 */ bl PSMTXMultVec -/* 80BCA810 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 80BCA814 C0 01 00 08 */ lfs f0, 8(r1) -/* 80BCA818 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BCA81C D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 80BCA820 C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 80BCA824 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80BCA828 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BCA82C D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 80BCA830 38 7E 05 2C */ addi r3, r30, 0x52c -/* 80BCA834 C0 3E 09 88 */ lfs f1, 0x988(r30) -/* 80BCA838 C0 5F 00 50 */ lfs f2, 0x50(r31) -/* 80BCA83C C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 80BCA840 4B 6A 51 FD */ bl cLib_addCalc2__FPffff -/* 80BCA844 38 7E 04 FC */ addi r3, r30, 0x4fc -/* 80BCA848 C0 3E 09 8C */ lfs f1, 0x98c(r30) -/* 80BCA84C C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 80BCA850 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 80BCA854 4B 6A 51 E9 */ bl cLib_addCalc2__FPffff -/* 80BCA858 38 7E 04 DE */ addi r3, r30, 0x4de -/* 80BCA85C A8 9E 09 90 */ lha r4, 0x990(r30) -/* 80BCA860 38 A0 00 09 */ li r5, 9 -/* 80BCA864 38 C0 10 00 */ li r6, 0x1000 -/* 80BCA868 4B 6A 5D A1 */ bl cLib_addCalcAngleS2__FPssss -/* 80BCA86C A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 80BCA870 B0 1E 04 E6 */ sth r0, 0x4e6(r30) -/* 80BCA874 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80BCA878 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80BCA87C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BCA880 7C 08 03 A6 */ mtlr r0 -/* 80BCA884 38 21 00 30 */ addi r1, r1, 0x30 -/* 80BCA888 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/WaitAction__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/WaitAction__10daObjCHO_cFv.s deleted file mode 100644 index a1d5ee121ee..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/WaitAction__10daObjCHO_cFv.s +++ /dev/null @@ -1,243 +0,0 @@ -lbl_80BCAB50: -/* 80BCAB50 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BCAB54 7C 08 02 A6 */ mflr r0 -/* 80BCAB58 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BCAB5C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BCAB60 4B 79 76 7D */ bl _savegpr_29 -/* 80BCAB64 7C 7D 1B 78 */ mr r29, r3 -/* 80BCAB68 3C 60 80 BD */ lis r3, lit_3775@ha /* 0x80BCC578@ha */ -/* 80BCAB6C 3B E3 C5 78 */ addi r31, r3, lit_3775@l /* 0x80BCC578@l */ -/* 80BCAB70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCAB74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCAB78 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 80BCAB7C C0 1F 00 80 */ lfs f0, 0x80(r31) -/* 80BCAB80 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BCAB84 C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 80BCAB88 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80BCAB8C C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80BCAB90 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80BCAB94 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80BCAB98 38 80 00 09 */ li r4, 9 -/* 80BCAB9C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80BCABA0 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80BCABA4 7D 89 03 A6 */ mtctr r12 -/* 80BCABA8 4E 80 04 21 */ bctrl -/* 80BCABAC 3C 80 80 45 */ lis r4, calc_mtx@ha /* 0x80450768@ha */ -/* 80BCABB0 38 84 07 68 */ addi r4, r4, calc_mtx@l /* 0x80450768@l */ -/* 80BCABB4 80 84 00 00 */ lwz r4, 0(r4) -/* 80BCABB8 4B 77 B8 F9 */ bl PSMTXCopy -/* 80BCABBC 38 61 00 18 */ addi r3, r1, 0x18 -/* 80BCABC0 38 81 00 0C */ addi r4, r1, 0xc -/* 80BCABC4 4B 6A 63 29 */ bl MtxPosition__FP4cXyzP4cXyz -/* 80BCABC8 88 1D 09 81 */ lbz r0, 0x981(r29) -/* 80BCABCC 2C 00 00 01 */ cmpwi r0, 1 -/* 80BCABD0 41 82 00 D8 */ beq lbl_80BCACA8 -/* 80BCABD4 40 80 01 58 */ bge lbl_80BCAD2C -/* 80BCABD8 2C 00 00 00 */ cmpwi r0, 0 -/* 80BCABDC 40 80 00 08 */ bge lbl_80BCABE4 -/* 80BCABE0 48 00 01 4C */ b lbl_80BCAD2C -lbl_80BCABE4: -/* 80BCABE4 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80BCABE8 38 81 00 0C */ addi r4, r1, 0xc -/* 80BCABEC C0 3F 00 88 */ lfs f1, 0x88(r31) -/* 80BCABF0 C0 5F 00 54 */ lfs f2, 0x54(r31) -/* 80BCABF4 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80BCABF8 4B 6A 4E C1 */ bl cLib_addCalcPos__FP4cXyzRC4cXyzfff -/* 80BCABFC C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80BCAC00 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCAC04 40 80 00 74 */ bge lbl_80BCAC78 -/* 80BCAC08 88 7D 09 81 */ lbz r3, 0x981(r29) -/* 80BCAC0C 38 03 00 01 */ addi r0, r3, 1 -/* 80BCAC10 98 1D 09 81 */ stb r0, 0x981(r29) -/* 80BCAC14 38 00 00 C8 */ li r0, 0xc8 -/* 80BCAC18 B0 1D 09 82 */ sth r0, 0x982(r29) -/* 80BCAC1C 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCAC20 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCAC24 38 80 00 07 */ li r4, 7 -/* 80BCAC28 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCAC2C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCAC30 3C A5 00 02 */ addis r5, r5, 2 -/* 80BCAC34 38 C0 00 80 */ li r6, 0x80 -/* 80BCAC38 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BCAC3C 4B 47 16 B1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCAC40 7C 64 1B 78 */ mr r4, r3 -/* 80BCAC44 80 7D 0A 60 */ lwz r3, 0xa60(r29) -/* 80BCAC48 38 A0 00 02 */ li r5, 2 -/* 80BCAC4C C0 3F 00 8C */ lfs f1, 0x8c(r31) -/* 80BCAC50 C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80BCAC54 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80BCAC58 C0 9F 00 90 */ lfs f4, 0x90(r31) -/* 80BCAC5C 4B 44 62 15 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80BCAC60 C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80BCAC64 D0 1D 04 A8 */ stfs f0, 0x4a8(r29) -/* 80BCAC68 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80BCAC6C D0 1D 04 AC */ stfs f0, 0x4ac(r29) -/* 80BCAC70 C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80BCAC74 D0 1D 04 B0 */ stfs f0, 0x4b0(r29) -lbl_80BCAC78: -/* 80BCAC78 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80BCAC7C 38 81 00 0C */ addi r4, r1, 0xc -/* 80BCAC80 4B 6A 5F 85 */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 80BCAC84 B0 7D 09 90 */ sth r3, 0x990(r29) -/* 80BCAC88 38 7D 04 DE */ addi r3, r29, 0x4de -/* 80BCAC8C A8 9D 09 90 */ lha r4, 0x990(r29) -/* 80BCAC90 38 A0 00 0C */ li r5, 0xc -/* 80BCAC94 38 C0 10 00 */ li r6, 0x1000 -/* 80BCAC98 4B 6A 59 71 */ bl cLib_addCalcAngleS2__FPssss -/* 80BCAC9C A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 80BCACA0 B0 1D 04 E6 */ sth r0, 0x4e6(r29) -/* 80BCACA4 48 00 00 88 */ b lbl_80BCAD2C -lbl_80BCACA8: -/* 80BCACA8 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 80BCACAC 38 81 00 0C */ addi r4, r1, 0xc -/* 80BCACB0 C0 3F 00 94 */ lfs f1, 0x94(r31) -/* 80BCACB4 4B 6A 5A F9 */ bl cLib_chasePos__FP4cXyzRC4cXyzf -/* 80BCACB8 A8 1D 09 82 */ lha r0, 0x982(r29) -/* 80BCACBC 2C 00 00 00 */ cmpwi r0, 0 -/* 80BCACC0 40 82 00 6C */ bne lbl_80BCAD2C -/* 80BCACC4 38 00 00 01 */ li r0, 1 -/* 80BCACC8 98 1D 09 80 */ stb r0, 0x980(r29) -/* 80BCACCC 38 00 00 00 */ li r0, 0 -/* 80BCACD0 98 1D 09 81 */ stb r0, 0x981(r29) -/* 80BCACD4 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80BCACD8 D0 1D 05 2C */ stfs f0, 0x52c(r29) -/* 80BCACDC D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 80BCACE0 38 00 00 32 */ li r0, 0x32 -/* 80BCACE4 B0 1D 09 86 */ sth r0, 0x986(r29) -/* 80BCACE8 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCACEC 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCACF0 38 80 00 06 */ li r4, 6 -/* 80BCACF4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCACF8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCACFC 3C A5 00 02 */ addis r5, r5, 2 -/* 80BCAD00 38 C0 00 80 */ li r6, 0x80 -/* 80BCAD04 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BCAD08 4B 47 15 E5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCAD0C 7C 64 1B 78 */ mr r4, r3 -/* 80BCAD10 80 7D 0A 60 */ lwz r3, 0xa60(r29) -/* 80BCAD14 38 A0 00 02 */ li r5, 2 -/* 80BCAD18 C0 3F 00 8C */ lfs f1, 0x8c(r31) -/* 80BCAD1C C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80BCAD20 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80BCAD24 C0 9F 00 90 */ lfs f4, 0x90(r31) -/* 80BCAD28 4B 44 61 49 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -lbl_80BCAD2C: -/* 80BCAD2C 7F C3 F3 78 */ mr r3, r30 -/* 80BCAD30 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80BCAD34 81 8C 02 88 */ lwz r12, 0x288(r12) -/* 80BCAD38 7D 89 03 A6 */ mtctr r12 -/* 80BCAD3C 4E 80 04 21 */ bctrl -/* 80BCAD40 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BCAD44 41 82 01 00 */ beq lbl_80BCAE44 -/* 80BCAD48 38 61 00 0C */ addi r3, r1, 0xc -/* 80BCAD4C 38 9D 09 B4 */ addi r4, r29, 0x9b4 -/* 80BCAD50 4B 77 C6 4D */ bl PSVECSquareDistance -/* 80BCAD54 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80BCAD58 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCAD5C 40 81 00 58 */ ble lbl_80BCADB4 -/* 80BCAD60 FC 00 08 34 */ frsqrte f0, f1 -/* 80BCAD64 C8 9F 00 60 */ lfd f4, 0x60(r31) -/* 80BCAD68 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BCAD6C C8 7F 00 68 */ lfd f3, 0x68(r31) -/* 80BCAD70 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BCAD74 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BCAD78 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BCAD7C FC 02 00 32 */ fmul f0, f2, f0 -/* 80BCAD80 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BCAD84 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BCAD88 FC 01 00 32 */ fmul f0, f1, f0 -/* 80BCAD8C FC 03 00 28 */ fsub f0, f3, f0 -/* 80BCAD90 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BCAD94 FC 44 00 32 */ fmul f2, f4, f0 -/* 80BCAD98 FC 00 00 32 */ fmul f0, f0, f0 -/* 80BCAD9C FC 01 00 32 */ fmul f0, f1, f0 -/* 80BCADA0 FC 03 00 28 */ fsub f0, f3, f0 -/* 80BCADA4 FC 02 00 32 */ fmul f0, f2, f0 -/* 80BCADA8 FC 21 00 32 */ fmul f1, f1, f0 -/* 80BCADAC FC 20 08 18 */ frsp f1, f1 -/* 80BCADB0 48 00 00 88 */ b lbl_80BCAE38 -lbl_80BCADB4: -/* 80BCADB4 C8 1F 00 70 */ lfd f0, 0x70(r31) -/* 80BCADB8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCADBC 40 80 00 10 */ bge lbl_80BCADCC -/* 80BCADC0 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BCADC4 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80BCADC8 48 00 00 70 */ b lbl_80BCAE38 -lbl_80BCADCC: -/* 80BCADCC D0 21 00 08 */ stfs f1, 8(r1) -/* 80BCADD0 80 81 00 08 */ lwz r4, 8(r1) -/* 80BCADD4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80BCADD8 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80BCADDC 7C 03 00 00 */ cmpw r3, r0 -/* 80BCADE0 41 82 00 14 */ beq lbl_80BCADF4 -/* 80BCADE4 40 80 00 40 */ bge lbl_80BCAE24 -/* 80BCADE8 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCADEC 41 82 00 20 */ beq lbl_80BCAE0C -/* 80BCADF0 48 00 00 34 */ b lbl_80BCAE24 -lbl_80BCADF4: -/* 80BCADF4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BCADF8 41 82 00 0C */ beq lbl_80BCAE04 -/* 80BCADFC 38 00 00 01 */ li r0, 1 -/* 80BCAE00 48 00 00 28 */ b lbl_80BCAE28 -lbl_80BCAE04: -/* 80BCAE04 38 00 00 02 */ li r0, 2 -/* 80BCAE08 48 00 00 20 */ b lbl_80BCAE28 -lbl_80BCAE0C: -/* 80BCAE0C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80BCAE10 41 82 00 0C */ beq lbl_80BCAE1C -/* 80BCAE14 38 00 00 05 */ li r0, 5 -/* 80BCAE18 48 00 00 10 */ b lbl_80BCAE28 -lbl_80BCAE1C: -/* 80BCAE1C 38 00 00 03 */ li r0, 3 -/* 80BCAE20 48 00 00 08 */ b lbl_80BCAE28 -lbl_80BCAE24: -/* 80BCAE24 38 00 00 04 */ li r0, 4 -lbl_80BCAE28: -/* 80BCAE28 2C 00 00 01 */ cmpwi r0, 1 -/* 80BCAE2C 40 82 00 0C */ bne lbl_80BCAE38 -/* 80BCAE30 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80BCAE34 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80BCAE38: -/* 80BCAE38 C0 1F 00 94 */ lfs f0, 0x94(r31) -/* 80BCAE3C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCAE40 40 81 00 6C */ ble lbl_80BCAEAC -lbl_80BCAE44: -/* 80BCAE44 38 00 00 01 */ li r0, 1 -/* 80BCAE48 98 1D 09 80 */ stb r0, 0x980(r29) -/* 80BCAE4C 38 00 00 00 */ li r0, 0 -/* 80BCAE50 98 1D 09 81 */ stb r0, 0x981(r29) -/* 80BCAE54 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80BCAE58 D0 1D 05 2C */ stfs f0, 0x52c(r29) -/* 80BCAE5C D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 80BCAE60 38 00 00 32 */ li r0, 0x32 -/* 80BCAE64 B0 1D 09 86 */ sth r0, 0x986(r29) -/* 80BCAE68 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCAE6C 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCAE70 38 80 00 06 */ li r4, 6 -/* 80BCAE74 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCAE78 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCAE7C 3C A5 00 02 */ addis r5, r5, 2 -/* 80BCAE80 38 C0 00 80 */ li r6, 0x80 -/* 80BCAE84 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BCAE88 4B 47 14 65 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BCAE8C 7C 64 1B 78 */ mr r4, r3 -/* 80BCAE90 80 7D 0A 60 */ lwz r3, 0xa60(r29) -/* 80BCAE94 38 A0 00 02 */ li r5, 2 -/* 80BCAE98 C0 3F 00 8C */ lfs f1, 0x8c(r31) -/* 80BCAE9C C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80BCAEA0 C0 7F 00 4C */ lfs f3, 0x4c(r31) -/* 80BCAEA4 C0 9F 00 90 */ lfs f4, 0x90(r31) -/* 80BCAEA8 4B 44 5F C9 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -lbl_80BCAEAC: -/* 80BCAEAC C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80BCAEB0 D0 1D 09 B4 */ stfs f0, 0x9b4(r29) -/* 80BCAEB4 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80BCAEB8 D0 1D 09 B8 */ stfs f0, 0x9b8(r29) -/* 80BCAEBC C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80BCAEC0 D0 1D 09 BC */ stfs f0, 0x9bc(r29) -/* 80BCAEC4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80BCAEC8 4B 79 73 61 */ bl _restgpr_29 -/* 80BCAECC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BCAED0 7C 08 03 A6 */ mtlr r0 -/* 80BCAED4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BCAED8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/WallCheck__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/WallCheck__10daObjCHO_cFv.s deleted file mode 100644 index 907c780d49b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/WallCheck__10daObjCHO_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80BCA88C: -/* 80BCA88C 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 80BCA890 7C 08 02 A6 */ mflr r0 -/* 80BCA894 90 01 00 84 */ stw r0, 0x84(r1) -/* 80BCA898 93 E1 00 7C */ stw r31, 0x7c(r1) -/* 80BCA89C 7C 7F 1B 78 */ mr r31, r3 -/* 80BCA8A0 38 61 00 08 */ addi r3, r1, 8 -/* 80BCA8A4 4B 4A D3 C5 */ bl __ct__11dBgS_LinChkFv -/* 80BCA8A8 38 61 00 60 */ addi r3, r1, 0x60 -/* 80BCA8AC 4B 4A E5 BD */ bl SetObj__16dBgS_PolyPassChkFv -/* 80BCA8B0 38 61 00 08 */ addi r3, r1, 8 -/* 80BCA8B4 38 9F 04 BC */ addi r4, r31, 0x4bc -/* 80BCA8B8 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80BCA8BC 38 C0 00 00 */ li r6, 0 -/* 80BCA8C0 4B 4A D4 A5 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 80BCA8C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCA8C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCA8CC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BCA8D0 38 81 00 08 */ addi r4, r1, 8 -/* 80BCA8D4 4B 4A 9A E1 */ bl LineCross__4cBgSFP11cBgS_LinChk -/* 80BCA8D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BCA8DC 41 82 00 28 */ beq lbl_80BCA904 -/* 80BCA8E0 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 80BCA8E4 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80BCA8E8 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 80BCA8EC D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80BCA8F0 C0 01 00 40 */ lfs f0, 0x40(r1) -/* 80BCA8F4 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -/* 80BCA8F8 A8 7F 09 90 */ lha r3, 0x990(r31) -/* 80BCA8FC 38 03 01 00 */ addi r0, r3, 0x100 -/* 80BCA900 B0 1F 09 90 */ sth r0, 0x990(r31) -lbl_80BCA904: -/* 80BCA904 38 61 00 08 */ addi r3, r1, 8 -/* 80BCA908 38 80 FF FF */ li r4, -1 -/* 80BCA90C 4B 4A D3 D1 */ bl __dt__11dBgS_LinChkFv -/* 80BCA910 83 E1 00 7C */ lwz r31, 0x7c(r1) -/* 80BCA914 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80BCA918 7C 08 03 A6 */ mtlr r0 -/* 80BCA91C 38 21 00 80 */ addi r1, r1, 0x80 -/* 80BCA920 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Z_BufferChk__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Z_BufferChk__10daObjCHO_cFv.s deleted file mode 100644 index 496f1d41f74..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Z_BufferChk__10daObjCHO_cFv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_80BCB320: -/* 80BCB320 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80BCB324 7C 08 02 A6 */ mflr r0 -/* 80BCB328 90 01 00 64 */ stw r0, 0x64(r1) -/* 80BCB32C DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80BCB330 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80BCB334 DB C1 00 40 */ stfd f30, 0x40(r1) -/* 80BCB338 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 80BCB33C 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80BCB340 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80BCB344 7C 7E 1B 78 */ mr r30, r3 -/* 80BCB348 3C 60 80 BD */ lis r3, lit_3775@ha /* 0x80BCC578@ha */ -/* 80BCB34C 3B E3 C5 78 */ addi r31, r3, lit_3775@l /* 0x80BCC578@l */ -/* 80BCB350 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BCB354 D0 01 00 08 */ stfs f0, 8(r1) -/* 80BCB358 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80BCB35C D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80BCB360 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BCB364 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BCB368 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80BCB36C EC 01 00 2A */ fadds f0, f1, f0 -/* 80BCB370 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BCB374 38 61 00 08 */ addi r3, r1, 8 -/* 80BCB378 38 81 00 14 */ addi r4, r1, 0x14 -/* 80BCB37C 4B 44 9F 95 */ bl mDoLib_project__FP3VecP3Vec -/* 80BCB380 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCB384 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCB388 80 63 5D 74 */ lwz r3, 0x5d74(r3) -/* 80BCB38C 28 03 00 00 */ cmplwi r3, 0 -/* 80BCB390 41 82 00 0C */ beq lbl_80BCB39C -/* 80BCB394 C0 63 0B 68 */ lfs f3, 0xb68(r3) -/* 80BCB398 48 00 00 08 */ b lbl_80BCB3A0 -lbl_80BCB39C: -/* 80BCB39C C0 7F 00 4C */ lfs f3, 0x4c(r31) -lbl_80BCB3A0: -/* 80BCB3A0 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 80BCB3A4 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80BCB3A8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCB3AC 40 81 00 5C */ ble lbl_80BCB408 -/* 80BCB3B0 C0 1F 00 D0 */ lfs f0, 0xd0(r31) -/* 80BCB3B4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCB3B8 40 80 00 50 */ bge lbl_80BCB408 -/* 80BCB3BC C0 41 00 18 */ lfs f2, 0x18(r1) -/* 80BCB3C0 FC 02 18 40 */ fcmpo cr0, f2, f3 -/* 80BCB3C4 40 81 00 44 */ ble lbl_80BCB408 -/* 80BCB3C8 C0 1F 00 D4 */ lfs f0, 0xd4(r31) -/* 80BCB3CC EC 00 18 28 */ fsubs f0, f0, f3 -/* 80BCB3D0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80BCB3D4 40 80 00 34 */ bge lbl_80BCB408 -/* 80BCB3D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCB3DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCB3E0 3C 63 00 02 */ addis r3, r3, 2 -/* 80BCB3E4 FC 00 08 1E */ fctiwz f0, f1 -/* 80BCB3E8 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80BCB3EC 80 81 00 24 */ lwz r4, 0x24(r1) -/* 80BCB3F0 FC 00 10 1E */ fctiwz f0, f2 -/* 80BCB3F4 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80BCB3F8 80 A1 00 2C */ lwz r5, 0x2c(r1) -/* 80BCB3FC 38 DE 09 9C */ addi r6, r30, 0x99c -/* 80BCB400 38 63 C0 F4 */ addi r3, r3, -16140 -/* 80BCB404 4B 48 AC 15 */ bl newData__13dDlst_peekZ_cFssPUl -lbl_80BCB408: -/* 80BCB408 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCB40C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCB410 80 63 61 B0 */ lwz r3, 0x61b0(r3) -/* 80BCB414 C3 E3 00 C8 */ lfs f31, 0xc8(r3) -/* 80BCB418 C3 C3 00 CC */ lfs f30, 0xcc(r3) -/* 80BCB41C 38 61 00 08 */ addi r3, r1, 8 -/* 80BCB420 38 81 00 14 */ addi r4, r1, 0x14 -/* 80BCB424 4B 44 A0 C9 */ bl mDoLib_pos2camera__FP3VecP3Vec -/* 80BCB428 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80BCB42C C0 1F 00 A0 */ lfs f0, 0xa0(r31) -/* 80BCB430 EC 21 00 2A */ fadds f1, f1, f0 -/* 80BCB434 D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80BCB438 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80BCB43C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BCB440 40 81 00 08 */ ble lbl_80BCB448 -/* 80BCB444 D0 01 00 1C */ stfs f0, 0x1c(r1) -lbl_80BCB448: -/* 80BCB448 C0 7F 00 D8 */ lfs f3, 0xd8(r31) -/* 80BCB44C C0 5F 00 48 */ lfs f2, 0x48(r31) -/* 80BCB450 EC 3E 07 F2 */ fmuls f1, f30, f31 -/* 80BCB454 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80BCB458 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80BCB45C EC 3F 00 2A */ fadds f1, f31, f0 -/* 80BCB460 EC 1E F8 28 */ fsubs f0, f30, f31 -/* 80BCB464 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80BCB468 EC 02 00 2A */ fadds f0, f2, f0 -/* 80BCB46C EC 03 00 32 */ fmuls f0, f3, f0 -/* 80BCB470 D0 1E 09 98 */ stfs f0, 0x998(r30) -/* 80BCB474 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 80BCB478 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 80BCB47C E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 80BCB480 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 80BCB484 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80BCB488 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80BCB48C 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80BCB490 7C 08 03 A6 */ mtlr r0 -/* 80BCB494 38 21 00 60 */ addi r1, r1, 0x60 -/* 80BCB498 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__ct__14daObj_ChoHIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__ct__14daObj_ChoHIO_cFv.s deleted file mode 100644 index 20d678baba0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__ct__14daObj_ChoHIO_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80BCA30C: -/* 80BCA30C 3C 80 80 BD */ lis r4, __vt__14daObj_ChoHIO_c@ha /* 0x80BCC738@ha */ -/* 80BCA310 38 04 C7 38 */ addi r0, r4, __vt__14daObj_ChoHIO_c@l /* 0x80BCC738@l */ -/* 80BCA314 90 03 00 00 */ stw r0, 0(r3) -/* 80BCA318 38 00 FF FF */ li r0, -1 -/* 80BCA31C 98 03 00 04 */ stb r0, 4(r3) -/* 80BCA320 3C 80 80 BD */ lis r4, lit_3775@ha /* 0x80BCC578@ha */ -/* 80BCA324 C0 04 C5 78 */ lfs f0, lit_3775@l(r4) /* 0x80BCC578@l */ -/* 80BCA328 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80BCA32C D0 03 00 08 */ stfs f0, 8(r3) -/* 80BCA330 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 28827271577..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BCA700: -/* 80BCA700 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCA704 7C 08 02 A6 */ mflr r0 -/* 80BCA708 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCA70C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCA710 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BCA714 41 82 00 1C */ beq lbl_80BCA730 -/* 80BCA718 3C A0 80 BD */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80BCC72C@ha */ -/* 80BCA71C 38 05 C7 2C */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80BCC72C@l */ -/* 80BCA720 90 1F 00 00 */ stw r0, 0(r31) -/* 80BCA724 7C 80 07 35 */ extsh. r0, r4 -/* 80BCA728 40 81 00 08 */ ble lbl_80BCA730 -/* 80BCA72C 4B 70 46 11 */ bl __dl__FPv -lbl_80BCA730: -/* 80BCA730 7F E3 FB 78 */ mr r3, r31 -/* 80BCA734 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCA738 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCA73C 7C 08 03 A6 */ mtlr r0 -/* 80BCA740 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCA744 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 34330dbbacd..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BCC458: -/* 80BCC458 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCC45C 7C 08 02 A6 */ mflr r0 -/* 80BCC460 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCC464 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCC468 93 C1 00 08 */ stw r30, 8(r1) -/* 80BCC46C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BCC470 7C 9F 23 78 */ mr r31, r4 -/* 80BCC474 41 82 00 38 */ beq lbl_80BCC4AC -/* 80BCC478 3C 80 80 BD */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80BCC6F0@ha */ -/* 80BCC47C 38 84 C6 F0 */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80BCC6F0@l */ -/* 80BCC480 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80BCC484 38 04 00 0C */ addi r0, r4, 0xc -/* 80BCC488 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80BCC48C 38 04 00 18 */ addi r0, r4, 0x18 -/* 80BCC490 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80BCC494 38 80 00 00 */ li r4, 0 -/* 80BCC498 4B 4A 9A FD */ bl __dt__9dBgS_AcchFv -/* 80BCC49C 7F E0 07 35 */ extsh. r0, r31 -/* 80BCC4A0 40 81 00 0C */ ble lbl_80BCC4AC -/* 80BCC4A4 7F C3 F3 78 */ mr r3, r30 -/* 80BCC4A8 4B 70 28 95 */ bl __dl__FPv -lbl_80BCC4AC: -/* 80BCC4AC 7F C3 F3 78 */ mr r3, r30 -/* 80BCC4B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCC4B4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BCC4B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCC4BC 7C 08 03 A6 */ mtlr r0 -/* 80BCC4C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCC4C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__14daObj_ChoHIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__14daObj_ChoHIO_cFv.s deleted file mode 100644 index 2672787fdae..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__14daObj_ChoHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BCC4D0: -/* 80BCC4D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCC4D4 7C 08 02 A6 */ mflr r0 -/* 80BCC4D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCC4DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCC4E0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BCC4E4 41 82 00 1C */ beq lbl_80BCC500 -/* 80BCC4E8 3C A0 80 BD */ lis r5, __vt__14daObj_ChoHIO_c@ha /* 0x80BCC738@ha */ -/* 80BCC4EC 38 05 C7 38 */ addi r0, r5, __vt__14daObj_ChoHIO_c@l /* 0x80BCC738@l */ -/* 80BCC4F0 90 1F 00 00 */ stw r0, 0(r31) -/* 80BCC4F4 7C 80 07 35 */ extsh. r0, r4 -/* 80BCC4F8 40 81 00 08 */ ble lbl_80BCC500 -/* 80BCC4FC 4B 70 28 41 */ bl __dl__FPv -lbl_80BCC500: -/* 80BCC500 7F E3 FB 78 */ mr r3, r31 -/* 80BCC504 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCC508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCC50C 7C 08 03 A6 */ mtlr r0 -/* 80BCC510 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCC514 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGAabFv.s deleted file mode 100644 index acdbb8075a0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BCC410: -/* 80BCC410 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCC414 7C 08 02 A6 */ mflr r0 -/* 80BCC418 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCC41C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCC420 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BCC424 41 82 00 1C */ beq lbl_80BCC440 -/* 80BCC428 3C A0 80 BD */ lis r5, __vt__8cM3dGAab@ha /* 0x80BCC6E4@ha */ -/* 80BCC42C 38 05 C6 E4 */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80BCC6E4@l */ -/* 80BCC430 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80BCC434 7C 80 07 35 */ extsh. r0, r4 -/* 80BCC438 40 81 00 08 */ ble lbl_80BCC440 -/* 80BCC43C 4B 70 29 01 */ bl __dl__FPv -lbl_80BCC440: -/* 80BCC440 7F E3 FB 78 */ mr r3, r31 -/* 80BCC444 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCC448 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCC44C 7C 08 03 A6 */ mtlr r0 -/* 80BCC450 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCC454 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGPlaFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGPlaFv.s deleted file mode 100644 index a2335bbe628..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGPlaFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BCB834: -/* 80BCB834 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCB838 7C 08 02 A6 */ mflr r0 -/* 80BCB83C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCB840 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCB844 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BCB848 41 82 00 1C */ beq lbl_80BCB864 -/* 80BCB84C 3C A0 80 BD */ lis r5, __vt__8cM3dGPla@ha /* 0x80BCC714@ha */ -/* 80BCB850 38 05 C7 14 */ addi r0, r5, __vt__8cM3dGPla@l /* 0x80BCC714@l */ -/* 80BCB854 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80BCB858 7C 80 07 35 */ extsh. r0, r4 -/* 80BCB85C 40 81 00 08 */ ble lbl_80BCB864 -/* 80BCB860 4B 70 34 DD */ bl __dl__FPv -lbl_80BCB864: -/* 80BCB864 7F E3 FB 78 */ mr r3, r31 -/* 80BCB868 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCB86C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCB870 7C 08 03 A6 */ mtlr r0 -/* 80BCB874 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCB878 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGSphFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGSphFv.s deleted file mode 100644 index 508ab184396..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BCC3C8: -/* 80BCC3C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCC3CC 7C 08 02 A6 */ mflr r0 -/* 80BCC3D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCC3D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCC3D8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BCC3DC 41 82 00 1C */ beq lbl_80BCC3F8 -/* 80BCC3E0 3C A0 80 BD */ lis r5, __vt__8cM3dGSph@ha /* 0x80BCC6D8@ha */ -/* 80BCC3E4 38 05 C6 D8 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80BCC6D8@l */ -/* 80BCC3E8 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80BCC3EC 7C 80 07 35 */ extsh. r0, r4 -/* 80BCC3F0 40 81 00 08 */ ble lbl_80BCC3F8 -/* 80BCC3F4 4B 70 29 49 */ bl __dl__FPv -lbl_80BCC3F8: -/* 80BCC3F8 7F E3 FB 78 */ mr r3, r31 -/* 80BCC3FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCC400 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCC404 7C 08 03 A6 */ mtlr r0 -/* 80BCC408 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCC40C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__sinit_d_a_obj_cho_cpp.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__sinit_d_a_obj_cho_cpp.s deleted file mode 100644 index f674f3c71fc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__sinit_d_a_obj_cho_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80BCC518: -/* 80BCC518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCC51C 7C 08 02 A6 */ mflr r0 -/* 80BCC520 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCC524 3C 60 80 BD */ lis r3, l_HIO@ha /* 0x80BCC760@ha */ -/* 80BCC528 38 63 C7 60 */ addi r3, r3, l_HIO@l /* 0x80BCC760@l */ -/* 80BCC52C 4B FF DD E1 */ bl __ct__14daObj_ChoHIO_cFv -/* 80BCC530 3C 80 80 BD */ lis r4, __dt__14daObj_ChoHIO_cFv@ha /* 0x80BCC4D0@ha */ -/* 80BCC534 38 84 C4 D0 */ addi r4, r4, __dt__14daObj_ChoHIO_cFv@l /* 0x80BCC4D0@l */ -/* 80BCC538 3C A0 80 BD */ lis r5, lit_3770@ha /* 0x80BCC754@ha */ -/* 80BCC53C 38 A5 C7 54 */ addi r5, r5, lit_3770@l /* 0x80BCC754@l */ -/* 80BCC540 4B FF DD 59 */ bl __register_global_object -/* 80BCC544 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCC548 7C 08 03 A6 */ mtlr r0 -/* 80BCC54C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCC550 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/checkGroundPos__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/checkGroundPos__10daObjCHO_cFv.s deleted file mode 100644 index 68956d6d645..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/checkGroundPos__10daObjCHO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80BCB2AC: -/* 80BCB2AC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BCB2B0 7C 08 02 A6 */ mflr r0 -/* 80BCB2B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BCB2B8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BCB2BC 7C 7F 1B 78 */ mr r31, r3 -/* 80BCB2C0 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80BCB2C4 D0 01 00 08 */ stfs f0, 8(r1) -/* 80BCB2C8 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80BCB2CC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BCB2D0 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80BCB2D4 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BCB2D8 38 7F 09 28 */ addi r3, r31, 0x928 -/* 80BCB2DC 38 81 00 08 */ addi r4, r1, 8 -/* 80BCB2E0 4B 69 CA 49 */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 80BCB2E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCB2E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCB2EC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BCB2F0 38 9F 09 28 */ addi r4, r31, 0x928 -/* 80BCB2F4 4B 4A 91 AD */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 80BCB2F8 D0 3F 09 7C */ stfs f1, 0x97c(r31) -/* 80BCB2FC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BCB300 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BCB304 7C 08 03 A6 */ mtlr r0 -/* 80BCB308 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BCB30C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/create__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/create__10daObjCHO_cFv.s deleted file mode 100644 index fd386957b34..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/create__10daObjCHO_cFv.s +++ /dev/null @@ -1,249 +0,0 @@ -lbl_80BCC01C: -/* 80BCC01C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BCC020 7C 08 02 A6 */ mflr r0 -/* 80BCC024 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BCC028 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BCC02C 4B 79 61 AD */ bl _savegpr_28 -/* 80BCC030 7C 7D 1B 78 */ mr r29, r3 -/* 80BCC034 3C 80 80 BD */ lis r4, lit_3775@ha /* 0x80BCC578@ha */ -/* 80BCC038 3B E4 C5 78 */ addi r31, r4, lit_3775@l /* 0x80BCC578@l */ -/* 80BCC03C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BCC040 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BCC044 40 82 00 FC */ bne lbl_80BCC140 -/* 80BCC048 7F A0 EB 79 */ or. r0, r29, r29 -/* 80BCC04C 41 82 00 E8 */ beq lbl_80BCC134 -/* 80BCC050 7C 1E 03 78 */ mr r30, r0 -/* 80BCC054 4B 59 1F BD */ bl __ct__9dInsect_cFv -/* 80BCC058 3C 60 80 BD */ lis r3, __vt__10daObjCHO_c@ha /* 0x80BCC720@ha */ -/* 80BCC05C 38 03 C7 20 */ addi r0, r3, __vt__10daObjCHO_c@l /* 0x80BCC720@l */ -/* 80BCC060 90 1E 05 68 */ stw r0, 0x568(r30) -/* 80BCC064 38 7E 05 90 */ addi r3, r30, 0x590 -/* 80BCC068 4B 4A 9E 45 */ bl __ct__12dBgS_AcchCirFv -/* 80BCC06C 3B 9E 05 D0 */ addi r28, r30, 0x5d0 -/* 80BCC070 7F 83 E3 78 */ mr r3, r28 -/* 80BCC074 4B 4A A0 2D */ bl __ct__9dBgS_AcchFv -/* 80BCC078 3C 60 80 BD */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80BCC6F0@ha */ -/* 80BCC07C 38 63 C6 F0 */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80BCC6F0@l */ -/* 80BCC080 90 7C 00 10 */ stw r3, 0x10(r28) -/* 80BCC084 38 03 00 0C */ addi r0, r3, 0xc -/* 80BCC088 90 1C 00 14 */ stw r0, 0x14(r28) -/* 80BCC08C 38 03 00 18 */ addi r0, r3, 0x18 -/* 80BCC090 90 1C 00 24 */ stw r0, 0x24(r28) -/* 80BCC094 38 7C 00 14 */ addi r3, r28, 0x14 -/* 80BCC098 4B 4A CD D1 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80BCC09C 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80BCC0A0 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80BCC0A4 90 1E 07 C0 */ stw r0, 0x7c0(r30) -/* 80BCC0A8 38 7E 07 C4 */ addi r3, r30, 0x7c4 -/* 80BCC0AC 4B 4B 76 B5 */ bl __ct__10dCcD_GSttsFv -/* 80BCC0B0 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80BCC0B4 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80BCC0B8 90 7E 07 C0 */ stw r3, 0x7c0(r30) -/* 80BCC0BC 38 03 00 20 */ addi r0, r3, 0x20 -/* 80BCC0C0 90 1E 07 C4 */ stw r0, 0x7c4(r30) -/* 80BCC0C4 3B 9E 07 E4 */ addi r28, r30, 0x7e4 -/* 80BCC0C8 7F 83 E3 78 */ mr r3, r28 -/* 80BCC0CC 4B 4B 79 5D */ bl __ct__12dCcD_GObjInfFv -/* 80BCC0D0 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80BCC0D4 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80BCC0D8 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80BCC0DC 3C 60 80 BD */ lis r3, __vt__8cM3dGAab@ha /* 0x80BCC6E4@ha */ -/* 80BCC0E0 38 03 C6 E4 */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80BCC6E4@l */ -/* 80BCC0E4 90 1C 01 1C */ stw r0, 0x11c(r28) -/* 80BCC0E8 3C 60 80 BD */ lis r3, __vt__8cM3dGSph@ha /* 0x80BCC6D8@ha */ -/* 80BCC0EC 38 03 C6 D8 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80BCC6D8@l */ -/* 80BCC0F0 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80BCC0F4 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80BCC0F8 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80BCC0FC 90 7C 01 20 */ stw r3, 0x120(r28) -/* 80BCC100 38 03 00 58 */ addi r0, r3, 0x58 -/* 80BCC104 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80BCC108 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80BCC10C 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80BCC110 90 7C 00 3C */ stw r3, 0x3c(r28) -/* 80BCC114 38 03 00 2C */ addi r0, r3, 0x2c -/* 80BCC118 90 1C 01 20 */ stw r0, 0x120(r28) -/* 80BCC11C 38 03 00 84 */ addi r0, r3, 0x84 -/* 80BCC120 90 1C 01 34 */ stw r0, 0x134(r28) -/* 80BCC124 38 7E 09 28 */ addi r3, r30, 0x928 -/* 80BCC128 4B 4A B4 55 */ bl __ct__11dBgS_GndChkFv -/* 80BCC12C 38 7E 09 CC */ addi r3, r30, 0x9cc -/* 80BCC130 4B 6F 42 99 */ bl __ct__10Z2CreatureFv -lbl_80BCC134: -/* 80BCC134 80 1D 04 A0 */ lwz r0, 0x4a0(r29) -/* 80BCC138 60 00 00 08 */ ori r0, r0, 8 -/* 80BCC13C 90 1D 04 A0 */ stw r0, 0x4a0(r29) -lbl_80BCC140: -/* 80BCC140 38 7D 0A 64 */ addi r3, r29, 0xa64 -/* 80BCC144 3C 80 80 BD */ lis r4, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCC148 38 84 C6 78 */ addi r4, r4, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCC14C 4B 46 0D 71 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80BCC150 7C 7E 1B 78 */ mr r30, r3 -/* 80BCC154 2C 1E 00 04 */ cmpwi r30, 4 -/* 80BCC158 40 82 02 54 */ bne lbl_80BCC3AC -/* 80BCC15C 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80BCC160 54 00 07 3E */ clrlwi r0, r0, 0x1c -/* 80BCC164 98 1D 09 C8 */ stb r0, 0x9c8(r29) -/* 80BCC168 88 1D 09 C8 */ lbz r0, 0x9c8(r29) -/* 80BCC16C 28 00 00 02 */ cmplwi r0, 2 -/* 80BCC170 40 82 00 50 */ bne lbl_80BCC1C0 -/* 80BCC174 38 00 00 00 */ li r0, 0 -/* 80BCC178 98 1D 05 6C */ stb r0, 0x56c(r29) -/* 80BCC17C A8 7D 04 E4 */ lha r3, 0x4e4(r29) -/* 80BCC180 38 03 E0 00 */ addi r0, r3, -8192 -/* 80BCC184 B0 1D 04 E4 */ sth r0, 0x4e4(r29) -/* 80BCC188 80 1D 04 9C */ lwz r0, 0x49c(r29) -/* 80BCC18C 60 00 40 00 */ ori r0, r0, 0x4000 -/* 80BCC190 90 1D 04 9C */ stw r0, 0x49c(r29) -/* 80BCC194 C0 1F 00 C0 */ lfs f0, 0xc0(r31) -/* 80BCC198 D0 1D 09 8C */ stfs f0, 0x98c(r29) -/* 80BCC19C 38 00 00 14 */ li r0, 0x14 -/* 80BCC1A0 B0 1D 09 84 */ sth r0, 0x984(r29) -/* 80BCC1A4 38 00 00 64 */ li r0, 0x64 -/* 80BCC1A8 B0 1D 09 86 */ sth r0, 0x986(r29) -/* 80BCC1AC C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80BCC1B0 D0 1D 04 EC */ stfs f0, 0x4ec(r29) -/* 80BCC1B4 D0 1D 04 F0 */ stfs f0, 0x4f0(r29) -/* 80BCC1B8 D0 1D 04 F4 */ stfs f0, 0x4f4(r29) -/* 80BCC1BC 48 00 00 10 */ b lbl_80BCC1CC -lbl_80BCC1C0: -/* 80BCC1C0 38 00 00 01 */ li r0, 1 -/* 80BCC1C4 98 1D 05 6D */ stb r0, 0x56d(r29) -/* 80BCC1C8 98 1D 09 80 */ stb r0, 0x980(r29) -lbl_80BCC1CC: -/* 80BCC1CC 38 00 00 5D */ li r0, 0x5d -/* 80BCC1D0 98 1D 05 48 */ stb r0, 0x548(r29) -/* 80BCC1D4 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80BCC1D8 54 00 E7 FE */ rlwinm r0, r0, 0x1c, 0x1f, 0x1f -/* 80BCC1DC 98 1D 05 81 */ stb r0, 0x581(r29) -/* 80BCC1E0 88 1D 05 81 */ lbz r0, 0x581(r29) -/* 80BCC1E4 38 7F 00 B8 */ addi r3, r31, 0xb8 -/* 80BCC1E8 7C 03 00 AE */ lbzx r0, r3, r0 -/* 80BCC1EC 98 1D 05 80 */ stb r0, 0x580(r29) -/* 80BCC1F0 88 1D 05 81 */ lbz r0, 0x581(r29) -/* 80BCC1F4 54 00 08 3C */ slwi r0, r0, 1 -/* 80BCC1F8 38 7F 00 F8 */ addi r3, r31, 0xf8 -/* 80BCC1FC 7C 03 02 2E */ lhzx r0, r3, r0 -/* 80BCC200 B0 1D 05 82 */ sth r0, 0x582(r29) -/* 80BCC204 88 1D 05 81 */ lbz r0, 0x581(r29) -/* 80BCC208 28 00 00 01 */ cmplwi r0, 1 -/* 80BCC20C 40 82 00 20 */ bne lbl_80BCC22C -/* 80BCC210 3C 60 80 BD */ lis r3, l_HIO@ha /* 0x80BCC760@ha */ -/* 80BCC214 38 63 C7 60 */ addi r3, r3, l_HIO@l /* 0x80BCC760@l */ -/* 80BCC218 C0 03 00 08 */ lfs f0, 8(r3) -/* 80BCC21C D0 1D 04 EC */ stfs f0, 0x4ec(r29) -/* 80BCC220 D0 1D 04 F0 */ stfs f0, 0x4f0(r29) -/* 80BCC224 D0 1D 04 F4 */ stfs f0, 0x4f4(r29) -/* 80BCC228 48 00 00 24 */ b lbl_80BCC24C -lbl_80BCC22C: -/* 80BCC22C 28 00 00 00 */ cmplwi r0, 0 -/* 80BCC230 40 82 00 1C */ bne lbl_80BCC24C -/* 80BCC234 3C 60 80 BD */ lis r3, l_HIO@ha /* 0x80BCC760@ha */ -/* 80BCC238 38 63 C7 60 */ addi r3, r3, l_HIO@l /* 0x80BCC760@l */ -/* 80BCC23C C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80BCC240 D0 1D 04 EC */ stfs f0, 0x4ec(r29) -/* 80BCC244 D0 1D 04 F0 */ stfs f0, 0x4f0(r29) -/* 80BCC248 D0 1D 04 F4 */ stfs f0, 0x4f4(r29) -lbl_80BCC24C: -/* 80BCC24C 7F A3 EB 78 */ mr r3, r29 -/* 80BCC250 4B FF FC 21 */ bl CreateChk__10daObjCHO_cFv -/* 80BCC254 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BCC258 40 82 00 0C */ bne lbl_80BCC264 -/* 80BCC25C 38 60 00 05 */ li r3, 5 -/* 80BCC260 48 00 01 50 */ b lbl_80BCC3B0 -lbl_80BCC264: -/* 80BCC264 7F A3 EB 78 */ mr r3, r29 -/* 80BCC268 3C 80 80 BD */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80BCA3F8@ha */ -/* 80BCC26C 38 84 A3 F8 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80BCA3F8@l */ -/* 80BCC270 38 A0 0A A0 */ li r5, 0xaa0 -/* 80BCC274 4B 44 E2 3D */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80BCC278 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BCC27C 40 82 00 0C */ bne lbl_80BCC288 -/* 80BCC280 38 60 00 05 */ li r3, 5 -/* 80BCC284 48 00 01 2C */ b lbl_80BCC3B0 -lbl_80BCC288: -/* 80BCC288 3C 60 80 BD */ lis r3, data_80BCC750@ha /* 0x80BCC750@ha */ -/* 80BCC28C 8C 03 C7 50 */ lbzu r0, data_80BCC750@l(r3) /* 0x80BCC750@l */ -/* 80BCC290 28 00 00 00 */ cmplwi r0, 0 -/* 80BCC294 40 82 00 20 */ bne lbl_80BCC2B4 -/* 80BCC298 38 00 00 01 */ li r0, 1 -/* 80BCC29C 98 03 00 00 */ stb r0, 0(r3) -/* 80BCC2A0 98 1D 0A 6C */ stb r0, 0xa6c(r29) -/* 80BCC2A4 38 00 FF FF */ li r0, -1 -/* 80BCC2A8 3C 60 80 BD */ lis r3, l_HIO@ha /* 0x80BCC760@ha */ -/* 80BCC2AC 38 63 C7 60 */ addi r3, r3, l_HIO@l /* 0x80BCC760@l */ -/* 80BCC2B0 98 03 00 04 */ stb r0, 4(r3) -lbl_80BCC2B4: -/* 80BCC2B4 38 00 00 00 */ li r0, 0 -/* 80BCC2B8 90 01 00 08 */ stw r0, 8(r1) -/* 80BCC2BC 38 7D 05 D0 */ addi r3, r29, 0x5d0 -/* 80BCC2C0 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BCC2C4 38 BD 04 BC */ addi r5, r29, 0x4bc -/* 80BCC2C8 7F A6 EB 78 */ mr r6, r29 -/* 80BCC2CC 38 E0 00 01 */ li r7, 1 -/* 80BCC2D0 39 1D 05 90 */ addi r8, r29, 0x590 -/* 80BCC2D4 39 3D 04 F8 */ addi r9, r29, 0x4f8 -/* 80BCC2D8 39 40 00 00 */ li r10, 0 -/* 80BCC2DC 4B 4A 9F 6D */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80BCC2E0 C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80BCC2E4 D0 1D 05 30 */ stfs f0, 0x530(r29) -/* 80BCC2E8 88 1D 09 C8 */ lbz r0, 0x9c8(r29) -/* 80BCC2EC 28 00 00 00 */ cmplwi r0, 0 -/* 80BCC2F0 40 82 00 0C */ bne lbl_80BCC2FC -/* 80BCC2F4 7F A3 EB 78 */ mr r3, r29 -/* 80BCC2F8 4B FF E0 3D */ bl InitCcSph__10daObjCHO_cFv -lbl_80BCC2FC: -/* 80BCC2FC 88 1D 09 C8 */ lbz r0, 0x9c8(r29) -/* 80BCC300 28 00 00 02 */ cmplwi r0, 2 -/* 80BCC304 40 82 00 50 */ bne lbl_80BCC354 -/* 80BCC308 3C 60 80 BD */ lis r3, d_a_obj_cho__stringBase0@ha /* 0x80BCC678@ha */ -/* 80BCC30C 38 63 C6 78 */ addi r3, r3, d_a_obj_cho__stringBase0@l /* 0x80BCC678@l */ -/* 80BCC310 38 63 00 06 */ addi r3, r3, 6 -/* 80BCC314 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCC318 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCC31C 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 80BCC320 4B 79 C6 75 */ bl strcmp -/* 80BCC324 2C 03 00 00 */ cmpwi r3, 0 -/* 80BCC328 40 82 00 2C */ bne lbl_80BCC354 -/* 80BCC32C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BCC330 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BCC334 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 80BCC338 2C 00 00 03 */ cmpwi r0, 3 -/* 80BCC33C 40 82 00 18 */ bne lbl_80BCC354 -/* 80BCC340 88 1D 09 C8 */ lbz r0, 0x9c8(r29) -/* 80BCC344 60 00 00 03 */ ori r0, r0, 3 -/* 80BCC348 98 1D 09 C8 */ stb r0, 0x9c8(r29) -/* 80BCC34C 38 00 00 00 */ li r0, 0 -/* 80BCC350 98 1D 09 80 */ stb r0, 0x980(r29) -lbl_80BCC354: -/* 80BCC354 80 7D 0A 60 */ lwz r3, 0xa60(r29) -/* 80BCC358 80 63 00 04 */ lwz r3, 4(r3) -/* 80BCC35C 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BCC360 90 1D 05 04 */ stw r0, 0x504(r29) -/* 80BCC364 7F A3 EB 78 */ mr r3, r29 -/* 80BCC368 C0 3F 00 FC */ lfs f1, 0xfc(r31) -/* 80BCC36C FC 40 08 90 */ fmr f2, f1 -/* 80BCC370 FC 60 08 90 */ fmr f3, f1 -/* 80BCC374 4B 44 E1 B5 */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80BCC378 7F A3 EB 78 */ mr r3, r29 -/* 80BCC37C C0 3F 00 A0 */ lfs f1, 0xa0(r31) -/* 80BCC380 FC 40 08 90 */ fmr f2, f1 -/* 80BCC384 FC 60 08 90 */ fmr f3, f1 -/* 80BCC388 4B 44 E1 B1 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80BCC38C 38 7D 09 CC */ addi r3, r29, 0x9cc -/* 80BCC390 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BCC394 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80BCC398 38 C0 00 03 */ li r6, 3 -/* 80BCC39C 38 E0 00 01 */ li r7, 1 -/* 80BCC3A0 4B 6F 41 91 */ bl init__10Z2CreatureFP3VecP3VecUcUc -/* 80BCC3A4 7F A3 EB 78 */ mr r3, r29 -/* 80BCC3A8 4B FF FA A9 */ bl daObjCHO_Execute__FP10daObjCHO_c -lbl_80BCC3AC: -/* 80BCC3AC 7F C3 F3 78 */ mr r3, r30 -lbl_80BCC3B0: -/* 80BCC3B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BCC3B4 4B 79 5E 71 */ bl _restgpr_28 -/* 80BCC3B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BCC3BC 7C 08 03 A6 */ mtlr r0 -/* 80BCC3C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BCC3C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Create__FP10fopAc_ac_c.s deleted file mode 100644 index a282f0d0e7b..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BCA748: -/* 80BCA748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCA74C 7C 08 02 A6 */ mflr r0 -/* 80BCA750 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCA754 48 00 18 C9 */ bl create__10daObjCHO_cFv -/* 80BCA758 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCA75C 7C 08 03 A6 */ mtlr r0 -/* 80BCA760 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCA764 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Delete__FP10daObjCHO_c.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Delete__FP10daObjCHO_c.s deleted file mode 100644 index 22fea2652f7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Delete__FP10daObjCHO_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80BCA768: -/* 80BCA768 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCA76C 7C 08 02 A6 */ mflr r0 -/* 80BCA770 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCA774 48 00 15 35 */ bl Delete__10daObjCHO_cFv -/* 80BCA778 38 60 00 01 */ li r3, 1 -/* 80BCA77C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCA780 7C 08 03 A6 */ mtlr r0 -/* 80BCA784 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCA788 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Draw__FP10daObjCHO_c.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Draw__FP10daObjCHO_c.s deleted file mode 100644 index a10648b39c8..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Draw__FP10daObjCHO_c.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80BCBD70: -/* 80BCBD70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCBD74 7C 08 02 A6 */ mflr r0 -/* 80BCBD78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCBD7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCBD80 93 C1 00 08 */ stw r30, 8(r1) -/* 80BCBD84 7C 7E 1B 78 */ mr r30, r3 -/* 80BCBD88 88 03 05 6D */ lbz r0, 0x56d(r3) -/* 80BCBD8C 28 00 00 00 */ cmplwi r0, 0 -/* 80BCBD90 41 82 00 A4 */ beq lbl_80BCBE34 -/* 80BCBD94 4B FF F5 8D */ bl Z_BufferChk__10daObjCHO_cFv -/* 80BCBD98 80 7E 0A 60 */ lwz r3, 0xa60(r30) -/* 80BCBD9C 83 E3 00 04 */ lwz r31, 4(r3) -/* 80BCBDA0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BCBDA4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BCBDA8 38 80 00 00 */ li r4, 0 -/* 80BCBDAC 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BCBDB0 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80BCBDB4 4B 5D 7A 11 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BCBDB8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BCBDBC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BCBDC0 80 9F 00 04 */ lwz r4, 4(r31) -/* 80BCBDC4 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80BCBDC8 4B 5D 8F D9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BCBDCC 80 9F 00 04 */ lwz r4, 4(r31) -/* 80BCBDD0 80 7E 09 C4 */ lwz r3, 0x9c4(r30) -/* 80BCBDD4 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80BCBDD8 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BCBDDC 4B 44 18 FD */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80BCBDE0 80 9F 00 04 */ lwz r4, 4(r31) -/* 80BCBDE4 80 7E 09 C0 */ lwz r3, 0x9c0(r30) -/* 80BCBDE8 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80BCBDEC 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BCBDF0 4B 44 19 B9 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80BCBDF4 80 7E 0A 60 */ lwz r3, 0xa60(r30) -/* 80BCBDF8 4B 44 53 C9 */ bl entryDL__16mDoExt_McaMorfSOFv -/* 80BCBDFC 88 1E 09 C8 */ lbz r0, 0x9c8(r30) -/* 80BCBE00 28 00 00 00 */ cmplwi r0, 0 -/* 80BCBE04 40 82 00 30 */ bne lbl_80BCBE34 -/* 80BCBE08 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80BCBE0C C0 3E 06 68 */ lfs f1, 0x668(r30) -/* 80BCBE10 3C 80 80 BD */ lis r4, lit_4516@ha /* 0x80BCC668@ha */ -/* 80BCBE14 C0 44 C6 68 */ lfs f2, lit_4516@l(r4) /* 0x80BCC668@l */ -/* 80BCBE18 38 9E 06 C0 */ addi r4, r30, 0x6c0 -/* 80BCBE1C 38 A0 00 00 */ li r5, 0 -/* 80BCBE20 3C C0 80 BD */ lis r6, lit_4517@ha /* 0x80BCC66C@ha */ -/* 80BCBE24 C0 66 C6 6C */ lfs f3, lit_4517@l(r6) /* 0x80BCC66C@l */ -/* 80BCBE28 3C C0 80 42 */ lis r6, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80BCBE2C 38 C6 48 D0 */ addi r6, r6, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80BCBE30 4B 46 12 85 */ bl dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj -lbl_80BCBE34: -/* 80BCBE34 38 60 00 01 */ li r3, 1 -/* 80BCBE38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCBE3C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BCBE40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCBE44 7C 08 03 A6 */ mtlr r0 -/* 80BCBE48 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCBE4C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Execute__FP10daObjCHO_c.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Execute__FP10daObjCHO_c.s deleted file mode 100644 index 956c158cf7d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Execute__FP10daObjCHO_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BCBE50: -/* 80BCBE50 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCBE54 7C 08 02 A6 */ mflr r0 -/* 80BCBE58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCBE5C 4B FF FA 21 */ bl Execute__10daObjCHO_cFv -/* 80BCBE60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCBE64 7C 08 03 A6 */ mtlr r0 -/* 80BCBE68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCBE6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/func_80BCC554.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/func_80BCC554.s deleted file mode 100644 index 94cde508183..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/func_80BCC554.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BCC554: -/* 80BCC554 38 63 FF DC */ addi r3, r3, -36 -/* 80BCC558 4B FF FF 00 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/func_80BCC55C.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/func_80BCC55C.s deleted file mode 100644 index 20b587bcc1a..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/func_80BCC55C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BCC55C: -/* 80BCC55C 38 63 FF EC */ addi r3, r3, -20 -/* 80BCC560 4B FF FE F8 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/setBaseMtx__10daObjCHO_cFv.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/setBaseMtx__10daObjCHO_cFv.s deleted file mode 100644 index 8dad3d10eae..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/setBaseMtx__10daObjCHO_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80BCBD10: -/* 80BCBD10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCBD14 7C 08 02 A6 */ mflr r0 -/* 80BCBD18 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCBD1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BCBD20 7C 7F 1B 78 */ mr r31, r3 -/* 80BCBD24 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BCBD28 4B 44 10 3D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BCBD2C 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80BCBD30 4B 44 12 15 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80BCBD34 38 7F 04 EC */ addi r3, r31, 0x4ec -/* 80BCBD38 4B 44 11 39 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz -/* 80BCBD3C 80 7F 0A 60 */ lwz r3, 0xa60(r31) -/* 80BCBD40 80 83 00 04 */ lwz r4, 4(r3) -/* 80BCBD44 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BCBD48 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BCBD4C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BCBD50 4B 77 A7 61 */ bl PSMTXCopy -/* 80BCBD54 80 7F 0A 60 */ lwz r3, 0xa60(r31) -/* 80BCBD58 4B 44 54 95 */ bl modelCalc__16mDoExt_McaMorfSOFv -/* 80BCBD5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BCBD60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCBD64 7C 08 03 A6 */ mtlr r0 -/* 80BCBD68 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCBD6C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 3a9c3234de0..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BCA3F8: -/* 80BCA3F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BCA3FC 7C 08 02 A6 */ mflr r0 -/* 80BCA400 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BCA404 48 00 00 15 */ bl CreateHeap__10daObjCHO_cFv -/* 80BCA408 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BCA40C 7C 08 03 A6 */ mtlr r0 -/* 80BCA410 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BCA414 4E 80 00 20 */ blr diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index bc4394bfc1c..7e1104bbd7a 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -120,6 +120,9 @@ public: void setGlobalParticleScale(const JGeometry::TVec3& scale) { mGlobalPScl.set(scale.x, scale.y); } + void setGlobalParticleScale(f32 scaleX, f32 scaleY) { + mGlobalPScl.set(scaleX, scaleY); + } void getGlobalParticleScale(JGeometry::TVec3& scale) { scale.set(mGlobalPScl.x, mGlobalPScl.y, 1.0f); } diff --git a/include/d/d_insect.h b/include/d/d_insect.h index c9a7f7a217c..ff51196a6f8 100644 --- a/include/d/d_insect.h +++ b/include/d/d_insect.h @@ -5,20 +5,33 @@ class dInsect_c : public fopAc_ac_c { public: + enum Sex { + /* 0 */ SEX_MALE, + /* 1 */ SEX_FEMALE, + }; + + enum Location { + /* 0 */ LOC_OUTSIDE, + /* 1 */ LOC_AGITHA, + /* 2 */ LOC_UNK_2, + }; + /* 8015E010 */ dInsect_c(); /* 8015E078 */ void Insect_GetDemoMain(); /* 8015E26C */ void CalcZBuffer(f32); /* 80110648 */ virtual void Insect_Release() { field_0x56C = 1; } + bool ChkGetDemo() { return m_mode > 0; } -private: +protected: /* 0x56C */ u8 field_0x56C; - /* 0x56D */ u8 field_0x56D; - /* 0x56E */ u8 field_0x56E[10]; + /* 0x56D */ bool mDraw; + /* 0x570 */ u32 mParticleKey1; + /* 0x574 */ u32 mParticleKey2; /* 0x578 */ u32 field_0x578; /* 0x57C */ f32 field_0x57C; /* 0x580 */ u8 m_itemNo; - /* 0x581 */ u8 field_0x581; + /* 0x581 */ u8 mSex; /* 0x582 */ s16 m_saveBitNo; /* 0x584 */ u8 field_0x584; /* 0x585 */ u8 field_0x585; diff --git a/include/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h b/include/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h index 4be0dde6a76..50d53d13b5a 100644 --- a/include/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h +++ b/include/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h @@ -1,6 +1,86 @@ #ifndef D_A_OBJ_CHO_H #define D_A_OBJ_CHO_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "Z2AudioLib/Z2Creature.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" +#include "d/a/d_a_player.h" +#include "d/d_insect.h" + +class daObjCHO_c : public dInsect_c { +public: + enum Action { + /* 0 */ ACT_WAIT, + /* 1 */ ACT_MOVE, + }; + + /* 80BCA334 */ void InitCcSph(); + /* 80BCA3A0 */ void SetCcSph(); + /* 80BCA418 */ int CreateHeap(); + /* 80BCA78C */ void SpeedSet(); + /* 80BCA88C */ void WallCheck(); + /* 80BCA924 */ void SearchLink(); + /* 80BCAB50 */ void WaitAction(); + /* 80BCAEDC */ void MoveAction(); + /* 80BCB210 */ void Action(); + /* 80BCB268 */ void ShopAction(); + /* 80BCB2AC */ void checkGroundPos(); + /* 80BCB310 */ void Insect_Release(); + /* 80BCB320 */ void Z_BufferChk(); + /* 80BCB49C */ void ParticleSet(); + /* 80BCB5C0 */ void BoomChk(); + /* 80BCB87C */ int Execute(); + /* 80BCBB40 */ void ObjHit(); + /* 80BCBCA8 */ int Delete(); + /* 80BCBD10 */ void setBaseMtx(); + /* 80BCBE70 */ bool CreateChk(); + /* 80BCC01C */ cPhs__Step create(); + inline int Draw(); + + /* 0x590 */ dBgS_AcchCir mAcchCir; + /* 0x5D0 */ dBgS_ObjAcch mAcch; + /* 0x7A8 */ dCcD_Stts mCcStts; + /* 0x7E4 */ dCcD_Sph mCcSph; + /* 0x91C */ daPy_boomerangMove_c mBoomerangMove; + /* 0x928 */ dBgS_GndChk mGndChk; + /* 0x97C */ f32 mGroundPos; + /* 0x980 */ u8 mAction; + /* 0x981 */ u8 mSubAction; + /* 0x982 */ s16 mTimers[3]; + /* 0x988 */ f32 mTargetSpeedXZ; + /* 0x98C */ f32 mTargetSpeedY; + /* 0x990 */ s16 mTargetAngleY; + /* 0x994 */ f32 mParticleScale; + /* 0x998 */ f32 field_0x998; + /* 0x99C */ u32 field_0x99c; + /* 0x9A0 */ u8 field_0x9a0[0xC]; + /* 0x9AC */ bool field_0x9ac; + /* 0x9B0 */ f32 mPlaySpeed; + /* 0x9B4 */ cXyz mTargetPos; + /* 0x9C0 */ mDoExt_brkAnm* mpBrkAnm; + /* 0x9C4 */ mDoExt_btkAnm* mpBtkAnm; + /* 0x9C8 */ u8 mLocation; + /* 0x9C9 */ bool mBoomerangHit; + /* 0x9CC */ Z2Creature mCreatureSound; + /* 0xA5C */ u8 field_0xa5c[4]; + /* 0xA60 */ mDoExt_McaMorfSO* mpMorf; + /* 0xA64 */ request_of_phase_process_class mPhaseReq; + /* 0xA6C */ bool mHIOInit; +}; + +STATIC_ASSERT(sizeof(daObjCHO_c) == 0xA70); + +class daObj_ChoHIO_c { +public: + /* 80BCA30C */ daObj_ChoHIO_c(); + /* 80BCC4D0 */ virtual ~daObj_ChoHIO_c() {} + + /* 0x4 */ s8 field_0x4; + /* 0x8 */ f32 mScaleFemale; + /* 0xC */ f32 mScaleMale; +}; + +STATIC_ASSERT(sizeof(daObj_ChoHIO_c) == 0x10); #endif /* D_A_OBJ_CHO_H */ diff --git a/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp b/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp index fc66ae40cd3..8b1d577fbf9 100644 --- a/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp +++ b/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp @@ -4,1147 +4,652 @@ // #include "rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" +#include "SSystem/SComponent/c_math.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "m_Do/m_Do_lib.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" +#include "d/menu/d_menu_insect.h" +#include "d/d_procname.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CE70 */ void scaleM(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct J3DMaterialTable {}; - -struct J3DAnmTextureSRTKey {}; - -struct mDoExt_btkAnm { - /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); - /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); -}; - -struct J3DAnmTevRegKey {}; - -struct mDoExt_brkAnm { - /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); - /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; - -struct mDoExt_McaMorfSO { - /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); - /* 800110B0 */ void play(u32, s8); - /* 800111C0 */ void entryDL(); - /* 800111EC */ void modelCalc(); - /* 80011310 */ void stopZelAnime(); -}; - -struct fopAc_ac_c {}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct daObj_ChoHIO_c { - /* 80BCA30C */ daObj_ChoHIO_c(); - /* 80BCC4D0 */ ~daObj_ChoHIO_c(); -}; - -struct daObjCHO_c { - /* 80BCA334 */ void InitCcSph(); - /* 80BCA3A0 */ void SetCcSph(); - /* 80BCA418 */ void CreateHeap(); - /* 80BCA78C */ void SpeedSet(); - /* 80BCA88C */ void WallCheck(); - /* 80BCA924 */ void SearchLink(); - /* 80BCAB50 */ void WaitAction(); - /* 80BCAEDC */ void MoveAction(); - /* 80BCB210 */ void Action(); - /* 80BCB268 */ void ShopAction(); - /* 80BCB2AC */ void checkGroundPos(); - /* 80BCB310 */ void Insect_Release(); - /* 80BCB320 */ void Z_BufferChk(); - /* 80BCB49C */ void ParticleSet(); - /* 80BCB5C0 */ void BoomChk(); - /* 80BCB87C */ void Execute(); - /* 80BCBB40 */ void ObjHit(); - /* 80BCBCA8 */ void Delete(); - /* 80BCBD10 */ void setBaseMtx(); - /* 80BCBE70 */ void CreateChk(); - /* 80BCC01C */ void create(); -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dKy_tevstr_c {}; - -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 { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, - _GXColor const*, cXyz const*, f32); -}; - -struct dMenu_Insect_c { - /* 801D9F3C */ void isCatchNotGiveInsect(u8); -}; - -struct dInsect_c { - /* 8015E010 */ dInsect_c(); - /* 8015E078 */ void Insect_GetDemoMain(); -}; - -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct dDlst_peekZ_c { - /* 80056018 */ void newData(s16, s16, u32*); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 80BCC458 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077C68 */ dBgS_LinChk(); - /* 80077CDC */ ~dBgS_LinChk(); - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); -}; - -struct dBgS {}; - -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 cCcS { - /* 80264BA8 */ void Set(cCcD_Obj*); -}; - -struct cBgS_PolyInfo {}; - -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - -struct cBgS { - /* 800743B4 */ void LineCross(cBgS_LinChk*); - /* 800744A0 */ void GroundCross(cBgS_GndChk*); - /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; -}; - -struct _GXTexObj {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80BCA700 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void __ct__14daObj_ChoHIO_cFv(); -extern "C" void InitCcSph__10daObjCHO_cFv(); -extern "C" void SetCcSph__10daObjCHO_cFv(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void CreateHeap__10daObjCHO_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daObjCHO_Create__FP10fopAc_ac_c(); -extern "C" static void daObjCHO_Delete__FP10daObjCHO_c(); -extern "C" void SpeedSet__10daObjCHO_cFv(); -extern "C" void WallCheck__10daObjCHO_cFv(); -extern "C" void SearchLink__10daObjCHO_cFv(); -extern "C" void WaitAction__10daObjCHO_cFv(); -extern "C" void MoveAction__10daObjCHO_cFv(); -extern "C" void Action__10daObjCHO_cFv(); -extern "C" void ShopAction__10daObjCHO_cFv(); -extern "C" void checkGroundPos__10daObjCHO_cFv(); -extern "C" void Insect_Release__10daObjCHO_cFv(); -extern "C" void Z_BufferChk__10daObjCHO_cFv(); -extern "C" void ParticleSet__10daObjCHO_cFv(); -extern "C" void BoomChk__10daObjCHO_cFv(); -extern "C" void __dt__8cM3dGPlaFv(); -extern "C" void Execute__10daObjCHO_cFv(); -extern "C" void ObjHit__10daObjCHO_cFv(); -extern "C" void Delete__10daObjCHO_cFv(); -extern "C" void setBaseMtx__10daObjCHO_cFv(); -extern "C" static void daObjCHO_Draw__FP10daObjCHO_c(); -extern "C" static void daObjCHO_Execute__FP10daObjCHO_c(); -extern "C" void CreateChk__10daObjCHO_cFv(); -extern "C" void create__10daObjCHO_cFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" static bool daObjCHO_IsDelete__FP10daObjCHO_c(); -extern "C" void __dt__14daObj_ChoHIO_cFv(); -extern "C" void __sinit_d_a_obj_cho_cpp(); -extern "C" static void func_80BCC554(); -extern "C" static void func_80BCC55C(); -extern "C" extern char const* const d_a_obj_cho__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void -__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); -extern "C" void setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff(); -extern "C" void play__16mDoExt_McaMorfSOFUlSc(); -extern "C" void entryDL__16mDoExt_McaMorfSOFv(); -extern "C" void modelCalc__16mDoExt_McaMorfSOFv(); -extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv(); -extern "C" void mDoLib_project__FP3VecP3Vec(); -extern "C" void mDoLib_pos2camera__FP3VecP3Vec(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void newData__13dDlst_peekZ_cFssPUl(); -extern "C" void LineCross__4cBgSFP11cBgS_LinChk(); -extern "C" void GroundCross__4cBgSFP11cBgS_GndChk(); -extern "C" void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla(); -extern "C" void __ct__12dBgS_AcchCirFv(); -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 __ct__11dBgS_GndChkFv(); -extern "C" void __ct__11dBgS_LinChkFv(); -extern "C" void __dt__11dBgS_LinChkFv(); -extern "C" void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_SphFRC11dCcD_SrcSph(); -extern "C" void __ct__9dInsect_cFv(); -extern "C" void Insect_GetDemoMain__9dInsect_cFv(); -extern "C" void initOffset__20daPy_boomerangMove_cFPC4cXyz(); -extern "C" void posMove__20daPy_boomerangMove_cFP4cXyzPsP10fopAc_ac_cs(); -extern "C" void bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void isCatchNotGiveInsect__14dMenu_Insect_cFUc(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void SetPos__11cBgS_GndChkFPC4cXyz(); -extern "C" void SetC__8cM3dGSphFRC4cXyz(); -extern "C" void SetR__8cM3dGSphFf(); -extern "C" void cLib_addCalc2__FPffff(); -extern "C" void cLib_addCalcPos__FP4cXyzRC4cXyzfff(); -extern "C" void cLib_addCalcAngleS2__FPssss(); -extern "C" void cLib_chasePos__FP4cXyzRC4cXyzf(); -extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); -extern "C" void MtxPosition__FP4cXyzP4cXyz(); -extern "C" void __ct__10Z2CreatureFv(); -extern "C" void init__10Z2CreatureFP3VecP3VecUcUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_28(); -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" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[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" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BCC578-80BCC57C 000000 0004+00 10/10 0/0 0/0 .rodata @3775 */ -SECTION_RODATA static f32 const lit_3775 = 4.0f / 5.0f; -COMPILER_STRIP_GATE(0x80BCC578, &lit_3775); - -/* 80BCC688-80BCC6A8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCHO_Method */ -SECTION_DATA static void* l_daObjCHO_Method[8] = { - (void*)daObjCHO_Create__FP10fopAc_ac_c, - (void*)daObjCHO_Delete__FP10daObjCHO_c, - (void*)daObjCHO_Execute__FP10daObjCHO_c, - (void*)daObjCHO_IsDelete__FP10daObjCHO_c, - (void*)daObjCHO_Draw__FP10daObjCHO_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80BCC6A8-80BCC6D8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Cho */ -SECTION_DATA extern void* g_profile_Obj_Cho[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01410000, (void*)&g_fpcLf_Method, - (void*)0x00000A70, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01DE0000, (void*)&l_daObjCHO_Method, - (void*)0x000C0120, (void*)0x030E0000, -}; - -/* 80BCC6D8-80BCC6E4 000050 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGSph */ -SECTION_DATA extern void* __vt__8cM3dGSph[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGSphFv, -}; - -/* 80BCC6E4-80BCC6F0 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, -}; - -/* 80BCC6F0-80BCC714 000068 0024+00 2/2 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_80BCC55C, - (void*)NULL, - (void*)NULL, - (void*)func_80BCC554, -}; - -/* 80BCC714-80BCC720 00008C 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, -}; - -/* 80BCC720-80BCC72C 000098 000C+00 1/1 0/0 0/0 .data __vt__10daObjCHO_c */ -SECTION_DATA extern void* __vt__10daObjCHO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)Insect_Release__10daObjCHO_cFv, -}; - -/* 80BCC72C-80BCC738 0000A4 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80BCC738-80BCC744 0000B0 000C+00 2/2 0/0 0/0 .data __vt__14daObj_ChoHIO_c */ -SECTION_DATA extern void* __vt__14daObj_ChoHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14daObj_ChoHIO_cFv, -}; - -/* 80BCA30C-80BCA334 0000EC 0028+00 1/1 0/0 0/0 .text __ct__14daObj_ChoHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_ChoHIO_c::daObj_ChoHIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__ct__14daObj_ChoHIO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC57C-80BCC5BC 000004 0040+00 1/1 0/0 0/0 .rodata ccSphSrc$3779 */ -const static dCcD_SrcSph ccSphSrc = { - { - {0x0, {{0x0, 0x0, 0x0}, {0x14002, 0x11}, 0x0}}, // mObj - {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - -/* 80BCA334-80BCA3A0 000114 006C+00 1/1 0/0 0/0 .text InitCcSph__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::InitCcSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/InitCcSph__10daObjCHO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC5BC-80BCC5C0 000044 0004+00 1/2 0/0 0/0 .rodata @3788 */ -SECTION_RODATA static f32 const lit_3788 = 20.0f; -COMPILER_STRIP_GATE(0x80BCC5BC, &lit_3788); - -/* 80BCA3A0-80BCA3F8 000180 0058+00 1/1 0/0 0/0 .text SetCcSph__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::SetCcSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SetCcSph__10daObjCHO_cFv.s" -} -#pragma pop - -/* 80BCA3F8-80BCA418 0001D8 0020+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/useHeapInit__FP10fopAc_ac_c.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC5C0-80BCC5C4 000048 0004+00 2/7 0/0 0/0 .rodata @3889 */ -SECTION_RODATA static f32 const lit_3889 = 1.0f; -COMPILER_STRIP_GATE(0x80BCC5C0, &lit_3889); - -/* 80BCC678-80BCC678 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BCC678 = "I_Cho"; -#pragma pop - -/* 80BCA418-80BCA700 0001F8 02E8+00 1/1 0/0 0/0 .text CreateHeap__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/CreateHeap__10daObjCHO_cFv.s" -} -#pragma pop - -/* 80BCA700-80BCA748 0004E0 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop - -/* 80BCA748-80BCA768 000528 0020+00 1/0 0/0 0/0 .text daObjCHO_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjCHO_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 80BCA768-80BCA78C 000548 0024+00 1/0 0/0 0/0 .text daObjCHO_Delete__FP10daObjCHO_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjCHO_Delete(daObjCHO_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Delete__FP10daObjCHO_c.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC5C4-80BCC5C8 00004C 0004+00 1/9 0/0 0/0 .rodata @3927 */ -SECTION_RODATA static u8 const lit_3927[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BCC5C4, &lit_3927); - -/* 80BCC5C8-80BCC5CC 000050 0004+00 0/1 0/0 0/0 .rodata @3928 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3928 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(0x80BCC5C8, &lit_3928); -#pragma pop - -/* 80BCC5CC-80BCC5D0 000054 0004+00 0/4 0/0 0/0 .rodata @3929 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3929 = 10.0f; -COMPILER_STRIP_GATE(0x80BCC5CC, &lit_3929); -#pragma pop - -/* 80BCC5D0-80BCC5D8 000058 0004+04 0/1 0/0 0/0 .rodata @3930 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3930[1 + 1 /* padding */] = { - 1.0f / 50.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80BCC5D0, &lit_3930); -#pragma pop - -/* 80BCA78C-80BCA88C 00056C 0100+00 1/1 0/0 0/0 .text SpeedSet__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::SpeedSet() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SpeedSet__10daObjCHO_cFv.s" -} -#pragma pop - -/* 80BCA88C-80BCA924 00066C 0098+00 1/1 0/0 0/0 .text WallCheck__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::WallCheck() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/WallCheck__10daObjCHO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC5D8-80BCC5E0 000060 0008+00 0/3 0/0 0/0 .rodata @3999 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3999[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BCC5D8, &lit_3999); -#pragma pop - -/* 80BCC5E0-80BCC5E8 000068 0008+00 0/3 0/0 0/0 .rodata @4000 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4000[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BCC5E0, &lit_4000); -#pragma pop - -/* 80BCC5E8-80BCC5F0 000070 0008+00 0/3 0/0 0/0 .rodata @4001 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4001[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BCC5E8, &lit_4001); -#pragma pop - -/* 80BCC5F0-80BCC5F4 000078 0004+00 0/1 0/0 0/0 .rodata @4002 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4002 = 200.0f; -COMPILER_STRIP_GATE(0x80BCC5F0, &lit_4002); -#pragma pop - -/* 80BCC5F4-80BCC5F8 00007C 0004+00 0/3 0/0 0/0 .rodata @4003 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4003 = 100.0f; -COMPILER_STRIP_GATE(0x80BCC5F4, &lit_4003); -#pragma pop - -/* 80BCC5F8-80BCC5FC 000080 0004+00 0/2 0/0 0/0 .rodata @4004 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4004 = 30.0f; -COMPILER_STRIP_GATE(0x80BCC5F8, &lit_4004); -#pragma pop - -/* 80BCC5FC-80BCC600 000084 0004+00 0/2 0/0 0/0 .rodata @4005 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4005 = 70.0f; -COMPILER_STRIP_GATE(0x80BCC5FC, &lit_4005); -#pragma pop - -/* 80BCA924-80BCAB50 000704 022C+00 1/1 0/0 0/0 .text SearchLink__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::SearchLink() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/SearchLink__10daObjCHO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC600-80BCC604 000088 0004+00 0/1 0/0 0/0 .rodata @4064 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4064 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80BCC600, &lit_4064); -#pragma pop - -/* 80BCC604-80BCC608 00008C 0004+00 0/3 0/0 0/0 .rodata @4065 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4065 = 5.0f; -COMPILER_STRIP_GATE(0x80BCC604, &lit_4065); -#pragma pop - -/* 80BCC608-80BCC60C 000090 0004+00 0/3 0/0 0/0 .rodata @4066 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4066 = -1.0f; -COMPILER_STRIP_GATE(0x80BCC608, &lit_4066); -#pragma pop - -/* 80BCC60C-80BCC610 000094 0004+00 0/2 0/0 0/0 .rodata @4067 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4067 = 3.0f; -COMPILER_STRIP_GATE(0x80BCC60C, &lit_4067); -#pragma pop - -/* 80BCAB50-80BCAEDC 000930 038C+00 2/2 0/0 0/0 .text WaitAction__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::WaitAction() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/WaitAction__10daObjCHO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC610-80BCC614 000098 0004+00 0/1 0/0 0/0 .rodata @4136 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4136 = 3.5f; -COMPILER_STRIP_GATE(0x80BCC610, &lit_4136); -#pragma pop - -/* 80BCC614-80BCC618 00009C 0004+00 0/1 0/0 0/0 .rodata @4137 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4137 = 2.0f; -COMPILER_STRIP_GATE(0x80BCC614, &lit_4137); -#pragma pop - -/* 80BCC618-80BCC61C 0000A0 0004+00 0/3 0/0 0/0 .rodata @4138 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4138 = 50.0f; -COMPILER_STRIP_GATE(0x80BCC618, &lit_4138); -#pragma pop - -/* 80BCC61C-80BCC620 0000A4 0004+00 0/1 0/0 0/0 .rodata @4139 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4139 = 150.0f; -COMPILER_STRIP_GATE(0x80BCC61C, &lit_4139); -#pragma pop - -/* 80BCC620-80BCC624 0000A8 0004+00 0/1 0/0 0/0 .rodata @4140 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4140 = 4096.0f; -COMPILER_STRIP_GATE(0x80BCC620, &lit_4140); -#pragma pop - -/* 80BCC624-80BCC628 0000AC 0004+00 0/2 0/0 0/0 .rodata @4141 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4141 = 0.5f; -COMPILER_STRIP_GATE(0x80BCC624, &lit_4141); -#pragma pop - -/* 80BCC628-80BCC62C 0000B0 0004+00 0/1 0/0 0/0 .rodata @4142 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4142 = 7.0f / 10.0f; -COMPILER_STRIP_GATE(0x80BCC628, &lit_4142); -#pragma pop - -/* 80BCC62C-80BCC630 0000B4 0004+00 0/1 0/0 0/0 .rodata @4143 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4143 = 0.25f; -COMPILER_STRIP_GATE(0x80BCC62C, &lit_4143); -#pragma pop - -/* 80BCAEDC-80BCB210 000CBC 0334+00 2/2 0/0 0/0 .text MoveAction__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::MoveAction() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/MoveAction__10daObjCHO_cFv.s" -} -#pragma pop - -/* 80BCB210-80BCB268 000FF0 0058+00 1/1 0/0 0/0 .text Action__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::Action() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Action__10daObjCHO_cFv.s" -} -#pragma pop - -/* 80BCB268-80BCB2AC 001048 0044+00 1/1 0/0 0/0 .text ShopAction__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::ShopAction() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ShopAction__10daObjCHO_cFv.s" -} -#pragma pop - -/* 80BCB2AC-80BCB310 00108C 0064+00 1/1 0/0 0/0 .text checkGroundPos__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::checkGroundPos() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/checkGroundPos__10daObjCHO_cFv.s" -} -#pragma pop - -/* 80BCB310-80BCB320 0010F0 0010+00 1/0 0/0 0/0 .text Insect_Release__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::Insect_Release() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Insect_Release__10daObjCHO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC630-80BCC634 0000B8 0002+02 1/2 0/0 0/0 .rodata l_cho_itemno */ -SECTION_RODATA static u16 const l_cho_itemno[1 + 1 /* padding */] = { - 0xC2C3, - /* padding */ - 0x0000, -}; -COMPILER_STRIP_GATE(0x80BCC630, &l_cho_itemno); - -/* 80BCC634-80BCC638 0000BC 0004+00 0/0 0/0 0/0 .rodata @4226 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4226 = 4000.0f; -COMPILER_STRIP_GATE(0x80BCC634, &lit_4226); -#pragma pop - -/* 80BCC638-80BCC640 0000C0 0004+04 0/1 0/0 0/0 .rodata @4227 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4227[1 + 1 /* padding */] = { - -2.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80BCC638, &lit_4227); -#pragma pop - -/* 80BCC640-80BCC648 0000C8 0008+00 0/0 0/0 0/0 .rodata @4229 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4229[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BCC640, &lit_4229); -#pragma pop - -/* 80BCC648-80BCC64C 0000D0 0004+00 0/1 0/0 0/0 .rodata @4268 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4268 = 608.0f; -COMPILER_STRIP_GATE(0x80BCC648, &lit_4268); -#pragma pop - -/* 80BCC64C-80BCC650 0000D4 0004+00 0/1 0/0 0/0 .rodata @4269 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4269 = 448.0f; -COMPILER_STRIP_GATE(0x80BCC64C, &lit_4269); -#pragma pop - -/* 80BCC650-80BCC658 0000D8 0004+04 0/1 0/0 0/0 .rodata @4270 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4270[1 + 1 /* padding */] = { - 16777215.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80BCC650, &lit_4270); -#pragma pop - -/* 80BCB320-80BCB49C 001100 017C+00 1/1 0/0 0/0 .text Z_BufferChk__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::Z_BufferChk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Z_BufferChk__10daObjCHO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC658-80BCC660 0000E0 0008+00 1/2 0/0 0/0 .rodata @4300 */ -SECTION_RODATA static u8 const lit_4300[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BCC658, &lit_4300); - -/* 80BCB49C-80BCB5C0 00127C 0124+00 1/1 0/0 0/0 .text ParticleSet__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::ParticleSet() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ParticleSet__10daObjCHO_cFv.s" -} -#pragma pop - -/* 80BCB5C0-80BCB834 0013A0 0274+00 1/1 0/0 0/0 .text BoomChk__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::BoomChk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/BoomChk__10daObjCHO_cFv.s" -} -#pragma pop - -/* 80BCB834-80BCB87C 001614 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGPlaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGPla::~cM3dGPla() { -extern "C" asm void __dt__8cM3dGPlaFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGPlaFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC660-80BCC664 0000E8 0004+00 0/1 0/0 0/0 .rodata @4421 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4421 = 10000.0f; -COMPILER_STRIP_GATE(0x80BCC660, &lit_4421); -#pragma pop - -/* 80BCB87C-80BCBB40 00165C 02C4+00 1/1 0/0 0/0 .text Execute__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Execute__10daObjCHO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC664-80BCC668 0000EC 0004+00 0/1 0/0 0/0 .rodata @4452 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4452 = 8.0f; -COMPILER_STRIP_GATE(0x80BCC664, &lit_4452); -#pragma pop - -/* 80BCBB40-80BCBCA8 001920 0168+00 1/1 0/0 0/0 .text ObjHit__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::ObjHit() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/ObjHit__10daObjCHO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ /* 80BCC750-80BCC754 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80BCC750[4]; - -/* 80BCBCA8-80BCBD10 001A88 0068+00 1/1 0/0 0/0 .text Delete__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/Delete__10daObjCHO_cFv.s" -} -#pragma pop - -/* 80BCBD10-80BCBD70 001AF0 0060+00 1/1 0/0 0/0 .text setBaseMtx__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/setBaseMtx__10daObjCHO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC668-80BCC66C 0000F0 0004+00 1/1 0/0 0/0 .rodata @4516 */ -SECTION_RODATA static f32 const lit_4516 = 15.0f; -COMPILER_STRIP_GATE(0x80BCC668, &lit_4516); - -/* 80BCC66C-80BCC670 0000F4 0004+00 1/1 0/0 0/0 .rodata @4517 */ -SECTION_RODATA static f32 const lit_4517 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(0x80BCC66C, &lit_4517); - -/* 80BCBD70-80BCBE50 001B50 00E0+00 1/0 0/0 0/0 .text daObjCHO_Draw__FP10daObjCHO_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjCHO_Draw(daObjCHO_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Draw__FP10daObjCHO_c.s" -} -#pragma pop - -/* 80BCBE50-80BCBE70 001C30 0020+00 2/1 0/0 0/0 .text daObjCHO_Execute__FP10daObjCHO_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjCHO_Execute(daObjCHO_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/daObjCHO_Execute__FP10daObjCHO_c.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC670-80BCC674 0000F8 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ -SECTION_RODATA static u32 const l_musiya_num = 0x01930194; -COMPILER_STRIP_GATE(0x80BCC670, &l_musiya_num); - -/* 80BCC678-80BCC678 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BCC67E = "R_SP160"; -#pragma pop - -/* 80BCBE70-80BCC01C 001C50 01AC+00 1/1 0/0 0/0 .text CreateChk__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::CreateChk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/CreateChk__10daObjCHO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BCC674-80BCC678 0000FC 0004+00 0/1 0/0 0/0 .rodata @4670 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4670 = -50.0f; -COMPILER_STRIP_GATE(0x80BCC674, &lit_4670); -#pragma pop - -/* 80BCC754-80BCC760 00000C 000C+00 1/1 0/0 0/0 .bss @3770 */ -static u8 lit_3770[12]; +static bool hioInit; /* 80BCC760-80BCC770 000018 0010+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[16]; +static daObj_ChoHIO_c l_HIO; -/* 80BCC01C-80BCC3C8 001DFC 03AC+00 1/1 0/0 0/0 .text create__10daObjCHO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCHO_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/create__10daObjCHO_cFv.s" +/* 80BCA30C-80BCA334 0000EC 0028+00 1/1 0/0 0/0 .text __ct__14daObj_ChoHIO_cFv */ +daObj_ChoHIO_c::daObj_ChoHIO_c() { + field_0x4 = -1; + mScaleMale = 0.8f; + mScaleFemale = 0.8f; } -#pragma pop -/* 80BCC3C8-80BCC410 0021A8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGSphFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGSph::~cM3dGSph() { -extern "C" asm void __dt__8cM3dGSphFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__8cM3dGSphFv.s" +/* 80BCA334-80BCA3A0 000114 006C+00 1/1 0/0 0/0 .text InitCcSph__10daObjCHO_cFv */ +void daObjCHO_c::InitCcSph() { + mCcStts.Init(1, 0, this); + const static dCcD_SrcSph ccSphSrc = { + { + {0x0, {{0x0, 0x0, 0x0}, {0x14002, 0x11}, 0x0}}, // mObj + {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr + }; + mCcSph.Set(ccSphSrc); + mCcSph.SetStts(&mCcStts); + mCcSph.SetC(current.pos); + mCcSph.OnTgNoHitMark(); } -#pragma pop -/* 80BCC410-80BCC458 0021F0 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_cho/d_a_obj_cho/__dt__8cM3dGAabFv.s" +/* 80BCA3A0-80BCA3F8 000180 0058+00 1/1 0/0 0/0 .text SetCcSph__10daObjCHO_cFv */ +void daObjCHO_c::SetCcSph() { + mCcSph.SetC(current.pos); + mCcSph.SetR(20.0f); + dComIfG_Ccsp()->Set(&mCcSph); } -#pragma pop -/* 80BCC458-80BCC4C8 002238 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_cho/d_a_obj_cho/__dt__12dBgS_ObjAcchFv.s" +/* 80BCA3F8-80BCA418 0001D8 0020+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +static int useHeapInit(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop -/* 80BCC4C8-80BCC4D0 0022A8 0008+00 1/0 0/0 0/0 .text daObjCHO_IsDelete__FP10daObjCHO_c - */ -static bool daObjCHO_IsDelete(daObjCHO_c* param_0) { +/* 80BCA418-80BCA700 0001F8 02E8+00 1/1 0/0 0/0 .text CreateHeap__10daObjCHO_cFv */ +int daObjCHO_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("I_Cho", 10); + mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 6), + 2, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000284); + if (mpMorf == NULL || mpMorf->getModel() == NULL) { + return 0; + } + J3DModel* model = mpMorf->getModel(); + + mpBrkAnm = new mDoExt_brkAnm(); + if (mpBrkAnm == NULL) { + return 0; + } + if (mSex == SEX_FEMALE) { + J3DAnmTevRegKey* tev_anm = (J3DAnmTevRegKey*)dComIfG_getObjectRes("I_Cho", 13); + if (!mpBrkAnm->init(model->getModelData(), tev_anm, 1, 2, 1.0f, 0, -1)) { + return 0; + } + } else { + J3DAnmTevRegKey* tev_anm = (J3DAnmTevRegKey*)dComIfG_getObjectRes("I_Cho", 14); + if (!mpBrkAnm->init(model->getModelData(), tev_anm, 1, 2, 1.0f, 0, -1)) { + return 0; + } + } + + mpBtkAnm = new mDoExt_btkAnm(); + if (mpBtkAnm == NULL) { + return 0; + } + if (mSex == SEX_FEMALE) { + J3DAnmTextureSRTKey* tex_anm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("I_Cho", 17); + if (!mpBtkAnm->init(model->getModelData(), tex_anm, 1, 2, 1.0f, 0, -1)) { + return 0; + } + } else { + J3DAnmTextureSRTKey* tex_anm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("I_Cho", 18); + if (!mpBtkAnm->init(model->getModelData(), tex_anm, 1, 2, 1.0f, 0, -1)) { + return 0; + } + } + + return 1; +} + +/* 80BCA748-80BCA768 000528 0020+00 1/0 0/0 0/0 .text daObjCHO_Create__FP10fopAc_ac_c */ +static cPhs__Step daObjCHO_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); +} + +/* 80BCA768-80BCA78C 000548 0024+00 1/0 0/0 0/0 .text daObjCHO_Delete__FP10daObjCHO_c */ + +static int daObjCHO_Delete(daObjCHO_c* i_this) { + i_this->Delete(); + return 1; +} + +/* 80BCA78C-80BCA88C 00056C 0100+00 1/1 0/0 0/0 .text SpeedSet__10daObjCHO_cFv */ +void daObjCHO_c::SpeedSet() { + speed.y += mGravity; + current.pos.y += speed.y; + cXyz vec1(0.0f, 0.0f, speedF); + cXyz vec2(0.0f, 0.0f, 0.0f); + mDoMtx_stack_c::YrotS(current.angle.y); + mDoMtx_stack_c::multVec(&vec1, &vec2); + current.pos.x += vec2.x; + current.pos.z += vec2.z; + cLib_addCalc2(&speedF, mTargetSpeedXZ, 0.4f, 10.0f); + cLib_addCalc2(&speed.y, mTargetSpeedY, 0.02f, 10.0f); + cLib_addCalcAngleS2(¤t.angle.y, mTargetAngleY, 9, 0x1000); + shape_angle.y = current.angle.y; +} + +/* 80BCA88C-80BCA924 00066C 0098+00 1/1 0/0 0/0 .text WallCheck__10daObjCHO_cFv */ +void daObjCHO_c::WallCheck() { + dBgS_LinChk lin_chk; + lin_chk.SetObj(); + lin_chk.Set(&next.pos, ¤t.pos, NULL); + if (dComIfG_Bgsp().LineCross(&lin_chk)) { + current.pos = lin_chk.i_GetCross(); + mTargetAngleY += 0x100; + } +} + +/* 80BCA924-80BCAB50 000704 022C+00 1/1 0/0 0/0 .text SearchLink__10daObjCHO_cFv */ +void daObjCHO_c::SearchLink() { + daPy_py_c* player = daPy_getPlayerActorClass(); + if (current.pos.absXZ(player->current.pos) < 200.0f + && current.pos.y - player->current.pos.y < 100.0f + && player->speedF == 0.0f + && !player->checkCutCharge() + && player->checkItemSwordEquip()) + { + mAction = ACT_WAIT; + mSubAction = 0; + cXyz vec(30.0f, 70.0f, 0.0f); + MTXCopy(daPy_getLinkPlayerActorClass()->getModelJointMtx(9), *calc_mtx); + MtxPosition(&vec, &mTargetPos); + } +} + +/* 80BCAB50-80BCAEDC 000930 038C+00 2/2 0/0 0/0 .text WaitAction__10daObjCHO_cFv */ +void daObjCHO_c::WaitAction() { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz vec1, target; + vec1.set(30.0f, 70.0f, 0.0f); + MTXCopy(daPy_getLinkPlayerActorClass()->getModelJointMtx(9), *calc_mtx); + MtxPosition(&vec1, &target); + + switch (mSubAction) { + case 0: + if (cLib_addCalcPos(¤t.pos, target, 0.05f, 10.0f, 0.0f) < 10.0f) { + mSubAction++; + mTimers[0] = 200; + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 7); + mpMorf->setAnm(anm, 2, 5.0f, 1.0f, 0.0f, -1.0f); + orig.pos = current.pos; + } + mTargetAngleY = cLib_targetAngleY(¤t.pos, &target); + cLib_addCalcAngleS2(¤t.angle.y, mTargetAngleY, 0xc, 0x1000); + shape_angle.y = current.angle.y; + break; + + case 1: + cLib_chasePos(¤t.pos, target, 3.0f); + if (mTimers[0] == 0) { + mAction = ACT_MOVE; + mSubAction = 0; + speedF = 0.0f; + speed.y = 0.0f; + mTimers[2] = 50; + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 6); + mpMorf->setAnm(anm, 2, 5.0f, 1.0f, 0.0f, -1.0f); + } + } + + if (!player->checkItemSwordEquip() || target.abs(mTargetPos) > 3.0f) { + mAction = ACT_MOVE; + mSubAction = 0; + speedF = 0.0f; + speed.y = 0.0f; + mTimers[2] = 50; + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 6); + mpMorf->setAnm(anm, 2, 5.0f, 1.0f, 0.0f, -1.0f); + } + + mTargetPos = target; +} + +/* 80BCAEDC-80BCB210 000CBC 0334+00 2/2 0/0 0/0 .text MoveAction__10daObjCHO_cFv */ +void daObjCHO_c::MoveAction() { + daPy_py_c* player = daPy_getPlayerActorClass(); + SpeedSet(); + + if (mpMorf->getFrame() > 3.5f) { + current.pos.y += 2.0f; + } else { + current.pos.y -= 2.0f; + } + + cXyz* flame_pos = player->getKandelaarFlamePos(); + if (flame_pos != NULL) { + mTargetAngleY = cLib_targetAngleY(¤t.pos, flame_pos); + } + + if (mTimers[0] == 0) { + cXyz vec = orig.pos - current.pos; + vec.x += cM_rndFX(100.0f); + vec.z += cM_rndFX(100.0f); + mTargetAngleY = cM_atan2s(vec.x, vec.z); + mTimers[0] = cM_rndF(10.0f) + 10.0f; + mTargetSpeedXZ = cM_rndF(3.0f) + 3.0f; + } + + if (mTimers[1] == 0) { + mTargetSpeedY = cM_rndFX(3.0f); + mTimers[1] = cM_rndF(10.0f) + 10.0f; + } + + if (current.pos.y < mGroundPos + 50.0f) { + mTargetSpeedY = cM_rndF(3.0f); + } else if (current.pos.y > mGroundPos + 150.0f) { + mTargetSpeedY = -cM_rndF(3.0f); + } + + if (!field_0x9ac) { + cLib_addCalcAngleS2(&shape_angle.x, mTargetSpeedY / 2 * 0x1000, 0x10, 0x1000); + } + + WallCheck(); + cLib_addCalc2(&mPlaySpeed, speed.abs() / 4 + 0.7f, 0.5f, 10.0f); + mpMorf->setPlaySpeed(mPlaySpeed); + + if (mTimers[2] == 0) { + SearchLink(); + } +} + +/* 80BCB210-80BCB268 000FF0 0058+00 1/1 0/0 0/0 .text Action__10daObjCHO_cFv */ +void daObjCHO_c::Action() { + switch (mAction) { + case ACT_WAIT: + WaitAction(); + break; + case ACT_MOVE: + MoveAction(); + break; + } + Insect_GetDemoMain(); +} + +/* 80BCB268-80BCB2AC 001048 0044+00 1/1 0/0 0/0 .text ShopAction__10daObjCHO_cFv */ +void daObjCHO_c::ShopAction() { + switch (mAction) { + case ACT_WAIT: + WaitAction(); + break; + case ACT_MOVE: + MoveAction(); + break; + } +} + +/* 80BCB2AC-80BCB310 00108C 0064+00 1/1 0/0 0/0 .text checkGroundPos__10daObjCHO_cFv */ +void daObjCHO_c::checkGroundPos() { + cXyz pos = current.pos; + mGndChk.SetPos(&pos); + mGroundPos = dComIfG_Bgsp().GroundCross(&mGndChk); +} + +/* 80BCB310-80BCB320 0010F0 0010+00 1/0 0/0 0/0 .text Insect_Release__10daObjCHO_cFv */ +void daObjCHO_c::Insect_Release() { + field_0x56C = 1; + mAction = ACT_MOVE; +} + +/* 80BCC630-80BCC634 0000B8 0002+02 1/2 0/0 0/0 .rodata l_cho_itemno */ +static u8 const l_cho_itemno[2] = {0xC2, 0xC3}; + +// Some unused function went here. +// This fake function is here in its place to make the literals match +static f32 fake(f32 param_0, s32 param_1) { + return param_0 * -2.0f * 4000.0f * param_1; +} + +/* 80BCB320-80BCB49C 001100 017C+00 1/1 0/0 0/0 .text Z_BufferChk__10daObjCHO_cFv */ +void daObjCHO_c::Z_BufferChk() { + cXyz vec2, vec1; + vec1 = current.pos; + vec1.y += 20.0f; + mDoLib_project(&vec1, &vec2); + f32 trim_height; + camera_class* camera = dComIfGp_getCamera(0); + if (camera != NULL) { + trim_height = camera->mCamera.TrimHeight(); + } else { + trim_height = 0.0f; + } + if (vec2.x > 0.0f && vec2.x < 608.0f && vec2.y > trim_height && vec2.y < 448.0f - trim_height) { + dComIfGd_peekZ(vec2.x, vec2.y, &field_0x99c); + } + + f32 near = dComIfGd_getView()->mNear; + f32 far = dComIfGd_getView()->mFar; + mDoLib_pos2camera(&vec1, &vec2); + vec2.z += 50.0f; + if (vec2.z > 0.0f) { + vec2.z = 0.0f; + } + field_0x998 = ((near + far * near / vec2.z) / (far - near) + 1.0f) * 0xffffff; +} + +/* 80BCB49C-80BCB5C0 00127C 0124+00 1/1 0/0 0/0 .text ParticleSet__10daObjCHO_cFv */ +void daObjCHO_c::ParticleSet() { + if (field_0x998 > field_0x99c) { + cLib_addCalc2(&mParticleScale, 0.0f, 1.0f, 1.0f); + } else { + cLib_addCalc2(&mParticleScale, 1.0f, 1.0f, 1.0f); + } + mParticleKey1 = dComIfGp_particle_set(mParticleKey1, 0xa1b, ¤t.pos, &mTevStr, + &shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL); + f32 scale = mParticleScale; + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mParticleKey1); + if (emitter != NULL) { + emitter->setGlobalParticleScale(scale, scale); + } +} + +/* 80BCB5C0-80BCB834 0013A0 0274+00 1/1 0/0 0/0 .text BoomChk__10daObjCHO_cFv */ +void daObjCHO_c::BoomChk() { + daPy_py_c* player = daPy_getPlayerActorClass(); + if (mBoomerangHit) { + cXyz vec = player->current.pos; + vec.y += 100.0f; + if (mBoomerangMove.posMove(¤t.pos, &shape_angle.y, NULL, 0x1c00)) { + mBoomerangMove.bgCheckAfterOffset(¤t.pos); + current.pos.y += 0.5f; + } else { + dBgS_LinChk lin_chk; + lin_chk.Set(&vec, ¤t.pos, NULL); + if (dComIfG_Bgsp().LineCross(&lin_chk)) { + cM3dGPla plane; + dComIfG_Bgsp().GetTriPla(lin_chk, &plane); + next.pos = lin_chk.i_GetCross(); + current.pos = next.pos; + mAction = ACT_MOVE; + mSubAction = 0; + speedF = 5.0f; + mTargetSpeedXZ = 5.0f; + mBoomerangHit = false; + mTimers[2] = 100; + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 6); + mpMorf->setAnm(anm, 2, 5.0f, 1.0f, 0.0f, -1.0f); + orig.pos = current.pos; + } else { + orig.pos = current.pos; + mAction = ACT_MOVE; + mSubAction = 0; + mBoomerangHit = false; + speedF = 5.0f; + mTargetSpeedXZ = 5.0f; + mTimers[2] = 100; + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 6); + mpMorf->setAnm(anm, 2, 5.0f, 1.0f, 0.0f, -1.0f); + current.pos.y = next.pos.y = player->current.pos.y + 100.0f; + } + } + } +} + +/* 80BCB87C-80BCBB40 00165C 02C4+00 1/1 0/0 0/0 .text Execute__10daObjCHO_cFv */ +int daObjCHO_c::Execute() { + if (ChkGetDemo()) { + field_0x998 = field_0x99c + 10000.0f; + mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1); + Insect_GetDemoMain(); + ParticleSet(); + return 1; + } else { + for (int i = 0; i < 3; i++) { + mTimers[i]--; + if (mTimers[i] <= 0) { + mTimers[i] = 0; + } + } + + checkGroundPos(); + mAttentionInfo.mPosition = current.pos; + mEyePos = current.pos; + mEyePos.y += 10.0f; + + switch (mLocation) { + case LOC_OUTSIDE: + if (!fopAcM_checkHookCarryNow(this)) { + Action(); + } else { + orig.pos = current.pos; + } + mParticleKey2 = dComIfGp_particle_set(mParticleKey2, 0xa1c, ¤t.pos, &mTevStr, + &shape_angle, NULL, 0xff, NULL, -1, + NULL, NULL, NULL); + SetCcSph(); + ObjHit(); + BoomChk(); + mEyePos = current.pos; + mEyePos.y += 10.0f; + mAttentionInfo.mPosition = mEyePos; + mAttentionInfo.mPosition.y += 10.0f; + ParticleSet(); + break; + case LOC_AGITHA: + ShopAction(); + break; + } + + mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1); + mAcch.CrrPos(dComIfG_Bgsp()); + mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mpBtkAnm->play(); + mpBrkAnm->play(); + setBaseMtx(); + return 1; + } +} + +/* 80BCBB40-80BCBCA8 001920 0168+00 1/1 0/0 0/0 .text ObjHit__10daObjCHO_cFv */ +void daObjCHO_c::ObjHit() { + if (mCcSph.ChkTgHit()) { + cCcD_Obj* hit_obj = mCcSph.GetTgHitObj(); + if (hit_obj->ChkAtType(AT_TYPE_BOOMERANG)) { + if (!mBoomerangHit) { + mBoomerangHit = true; + mCcSph.GetTgHitGObj(); + mBoomerangMove.initOffset(¤t.pos); + } + } else if (!hit_obj->ChkAtType(AT_TYPE_NORMAL_SWORD) + && hit_obj->ChkAtType(AT_TYPE_HOOKSHOT)) { + cXyz offset(0.0f, 0.0f, 0.0f); + daPy_getPlayerActorClass()->setHookshotCarryOffset(fopAcM_GetID(this), &offset); + mAction = ACT_MOVE; + mSubAction = 2; + mBoomerangHit = false; + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 6); + mpMorf->setAnm(anm, 2, 5.0f, 1.0f, 0.0f, -1.0f); + speedF = 8.0f; + mTargetSpeedXZ = cM_rndF(5.0f) + 8.0f; + } + mCcSph.ClrTgHit(); + } +} + +/* 80BCBCA8-80BCBD10 001A88 0068+00 1/1 0/0 0/0 .text Delete__10daObjCHO_cFv */ +int daObjCHO_c::Delete() { + dComIfG_resDelete(&mPhaseReq, "I_Cho"); + if (mHIOInit) { + hioInit = false; + } + if (mHeap != NULL) { + mpMorf->stopZelAnime(); + } + return 1; +} + +/* 80BCBD10-80BCBD70 001AF0 0060+00 1/1 0/0 0/0 .text setBaseMtx__10daObjCHO_cFv */ +void daObjCHO_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::scaleM(mScale); + mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpMorf->modelCalc(); +} + +int daObjCHO_c::Draw() { + if (mDraw) { + Z_BufferChk(); + J3DModel* model = mpMorf->getModel(); + g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(model->mModelData, &mTevStr); + mpBtkAnm->entry(model->getModelData()); + mpBrkAnm->entry(model->getModelData()); + mpMorf->entryDL(); + if (mLocation == LOC_OUTSIDE) { + dComIfGd_setSimpleShadow(¤t.pos, mAcch.GetGroundH(), 15.0f, mAcch.m_gnd, 0, -0.6f, + dDlst_shadowControl_c::getSimpleTex()); + } + } + return 1; +} + +/* 80BCBD70-80BCBE50 001B50 00E0+00 1/0 0/0 0/0 .text daObjCHO_Draw__FP10daObjCHO_c */ +static int daObjCHO_Draw(daObjCHO_c* i_this) { + return i_this->Draw(); +} + +/* 80BCBE50-80BCBE70 001C30 0020+00 2/1 0/0 0/0 .text daObjCHO_Execute__FP10daObjCHO_c */ +static int daObjCHO_Execute(daObjCHO_c* i_this) { + return i_this->Execute(); +} + +/* 80BCC670-80BCC674 0000F8 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ +static u16 const l_musiya_num[2] = {0x0193, 0x0194}; + +/* 80BCBE70-80BCC01C 001C50 01AC+00 1/1 0/0 0/0 .text CreateChk__10daObjCHO_cFv */ +bool daObjCHO_c::CreateChk() { + u8 param = (fopAcM_GetParam(this) >> 8) & 0xf; + if (param == 0xf) { + param = 0; + } + + if (mLocation != LOC_UNK_2) { + if (param != 0) { + if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) + || !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]])) + { + return false; + } + } else { + if (!strcmp("R_SP160", dComIfGp_getStartStageName()) + && dComIfGp_getStartStageRoomNo() == 3) + { + if (dMenu_Insect_c::isCatchNotGiveInsect(l_cho_itemno[mSex])) { + return false; + } + if ((mSex == SEX_MALE && !i_dComIfGs_isEventBit( + dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]])) + || (mSex == SEX_FEMALE && !i_dComIfGs_isEventBit( + dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]))) + { + return false; + } + } + } + } + return true; } -/* 80BCC4D0-80BCC518 0022B0 0048+00 2/1 0/0 0/0 .text __dt__14daObj_ChoHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_ChoHIO_c::~daObj_ChoHIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__dt__14daObj_ChoHIO_cFv.s" +/* 80BCC01C-80BCC3C8 001DFC 03AC+00 1/1 0/0 0/0 .text create__10daObjCHO_cFv */ +cPhs__Step daObjCHO_c::create() { + fopAcM_SetupActor(this, daObjCHO_c); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "I_Cho"); + + if (step == cPhs_COMPLEATE_e) { + mLocation = fopAcM_GetParam(this) & 0xf; + if (mLocation == LOC_UNK_2) { + field_0x56C = 0; + shape_angle.x -= 0x2000; + fopAcM_OnStatus(this, 0x4000); + mTargetSpeedY = -2.0f; + mTimers[1] = 20; + mTimers[2] = 100; + mScale.set(0.0f, 0.0f, 0.0f); + } else { + mDraw = true; + mAction = ACT_MOVE; + } + mAttentionInfo.field_0x0[4] = 0x5D; + + mSex = (fopAcM_GetParam(this) >> 4) & 1; + m_itemNo = l_cho_itemno[mSex]; + m_saveBitNo = l_musiya_num[mSex]; + if (mSex == SEX_FEMALE) { + mScale.set(l_HIO.mScaleFemale, l_HIO.mScaleFemale, l_HIO.mScaleFemale); + } else if (mSex == SEX_MALE) { + mScale.set(l_HIO.mScaleMale, l_HIO.mScaleMale, l_HIO.mScaleMale); + } + + if (!CreateChk()) { + return cPhs_ERROR_e; + } + + if (!fopAcM_entrySolidHeap(this, useHeapInit, 0xaa0)) { + return cPhs_ERROR_e; + } + + if (!hioInit) { + hioInit = true; + mHIOInit = true; + l_HIO.field_0x4 = -1; + } + + mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mGravity = 0.0f; + if (mLocation == LOC_OUTSIDE) { + InitCcSph(); + } + if (mLocation == LOC_UNK_2 && !strcmp("R_SP160", dComIfGp_getStartStageName()) + && dComIfGp_getStartStageRoomNo() == 3) + { + mLocation |= LOC_AGITHA | LOC_UNK_2; + mAction = ACT_WAIT; + } + fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMin(this, -50.0f, -50.0f, -50.0f); + fopAcM_SetMax(this, 50.0f, 50.0f, 50.0f); + mCreatureSound.init(¤t.pos, &mEyePos, 3, 1); + + daObjCHO_Execute(this); + } + + return step; } -#pragma pop -/* 80BCC518-80BCC554 0022F8 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_cho_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_cho_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/__sinit_d_a_obj_cho_cpp.s" +/* 80BCC4C8-80BCC4D0 0022A8 0008+00 1/0 0/0 0/0 .text daObjCHO_IsDelete__FP10daObjCHO_c + */ +static int daObjCHO_IsDelete(daObjCHO_c* i_this) { + return 1; } -#pragma pop -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80BCC518, __sinit_d_a_obj_cho_cpp); -#pragma pop +/* 80BCC688-80BCC6A8 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCHO_Method */ +static actor_method_class l_daObjCHO_Method = { + (process_method_func)daObjCHO_Create, + (process_method_func)daObjCHO_Delete, + (process_method_func)daObjCHO_Execute, + (process_method_func)daObjCHO_IsDelete, + (process_method_func)daObjCHO_Draw, +}; -/* 80BCC554-80BCC55C 002334 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_80BCC554() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/func_80BCC554.s" -} -#pragma pop - -/* 80BCC55C-80BCC564 00233C 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_80BCC55C() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho/func_80BCC55C.s" -} -#pragma pop - -/* 80BCC678-80BCC678 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80BCC6A8-80BCC6D8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Cho */ +extern actor_process_profile_definition g_profile_Obj_Cho = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_Obj_Cho, + &g_fpcLf_Method.mBase, + sizeof(daObjCHO_c), + 0, + 0, + &g_fopAc_Method.base, + 0x1DE, + &l_daObjCHO_Method, + 0xC0120, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index 57680e0178b..4fa3ff5aeaf 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -13,7 +13,7 @@ dInsect_c::dInsect_c() { m_itemId = -1; field_0x56C = 0; - field_0x56D = 1; + mDraw = true; m_mode = 0; m_itemNo = M_MAYFLY; field_0x584 = 0; @@ -48,7 +48,7 @@ void dInsect_c::Insect_GetDemoMain() { dComIfGp_event_setItemPartnerId(m_itemId); } - field_0x56D = 0; + mDraw = false; m_mode = 2; } else { fopAcM_orderItemEvent(this, 0, 0); @@ -61,7 +61,7 @@ void dInsect_c::Insect_GetDemoMain() { if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[m_saveBitNo]) || field_0x585 != 0) { - field_0x56D = 1; + mDraw = true; m_mode = 0; if (field_0x584 == 0) { fopAcM_createItem(¤t.pos, HEART, -1, -1, NULL, NULL, 0);