diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2024-06-02 18:24:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-02 16:24:43 -0600 |
| commit | 59175a46fdaa673640a29203850ff4558379dab9 (patch) | |
| tree | 29011b764baa4e6fd3d955cc5f6c9fbb412c5e8c | |
| parent | fcf137a90218064c0d4218abadf934538ed43671 (diff) | |
d_a_obj_dan OK (#2163)
45 files changed, 622 insertions, 2837 deletions
diff --git a/Progress.md b/Progress.md index 57ae8702f5..8d1d7c440d 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 54.954197% | 2209528 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 54.954197% | 2209528 | 4020672 -RELs | 38.794003% | 4461436 | 11500324 -Total | 42.980257% | 6670964 | 15520996 +RELs | 38.860853% | 4469124 | 11500324 +Total | 43.029790% | 6678652 | 15520996 ## RELs @@ -388,7 +388,7 @@ d_a_obj_crvsteel | 48.717949% | 1520 | 3120 d_a_obj_crystal | 100.000000% | 2356 | 2356 d_a_obj_cwall | 30.455195% | 5968 | 19596 d_a_obj_damCps | 100.000000% | 504 | 504 -d_a_obj_dan | 35.198921% | 4176 | 11864 +d_a_obj_dan | 100.000000% | 11864 | 11864 d_a_obj_digholl | 100.000000% | 2272 | 2272 d_a_obj_digplace | 100.000000% | 3564 | 3564 d_a_obj_digsnow | 100.000000% | 4820 | 4820 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 38.794003% | 4461436 | 11500324 +Total | 38.860853% | 4469124 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Action__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Action__10daObjDAN_cFv.s deleted file mode 100644 index c626a15f9e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Action__10daObjDAN_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80BDAFDC: -/* 80BDAFDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDAFE0 7C 08 02 A6 */ mflr r0 -/* 80BDAFE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDAFE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDAFEC 7C 7F 1B 78 */ mr r31, r3 -/* 80BDAFF0 38 60 00 00 */ li r3, 0 -/* 80BDAFF4 7C 64 1B 78 */ mr r4, r3 -/* 80BDAFF8 38 00 00 03 */ li r0, 3 -/* 80BDAFFC 7C 09 03 A6 */ mtctr r0 -lbl_80BDB000: -/* 80BDB000 38 C3 07 6A */ addi r6, r3, 0x76a -/* 80BDB004 7C BF 32 AE */ lhax r5, r31, r6 -/* 80BDB008 38 05 FF FF */ addi r0, r5, -1 -/* 80BDB00C 7C 1F 33 2E */ sthx r0, r31, r6 -/* 80BDB010 7C 1F 32 AE */ lhax r0, r31, r6 -/* 80BDB014 2C 00 00 00 */ cmpwi r0, 0 -/* 80BDB018 41 81 00 08 */ bgt lbl_80BDB020 -/* 80BDB01C 7C 9F 33 2E */ sthx r4, r31, r6 -lbl_80BDB020: -/* 80BDB020 38 63 00 02 */ addi r3, r3, 2 -/* 80BDB024 42 00 FF DC */ bdnz lbl_80BDB000 -/* 80BDB028 88 1F 07 68 */ lbz r0, 0x768(r31) -/* 80BDB02C 2C 00 00 02 */ cmpwi r0, 2 -/* 80BDB030 41 82 00 20 */ beq lbl_80BDB050 -/* 80BDB034 40 80 00 24 */ bge lbl_80BDB058 -/* 80BDB038 2C 00 00 01 */ cmpwi r0, 1 -/* 80BDB03C 40 80 00 08 */ bge lbl_80BDB044 -/* 80BDB040 48 00 00 18 */ b lbl_80BDB058 -lbl_80BDB044: -/* 80BDB044 7F E3 FB 78 */ mr r3, r31 -/* 80BDB048 4B FF FA CD */ bl MoveAction__10daObjDAN_cFv -/* 80BDB04C 48 00 00 0C */ b lbl_80BDB058 -lbl_80BDB050: -/* 80BDB050 7F E3 FB 78 */ mr r3, r31 -/* 80BDB054 4B FF FB BD */ bl DamageAction__10daObjDAN_cFv -lbl_80BDB058: -/* 80BDB058 7F E3 FB 78 */ mr r3, r31 -/* 80BDB05C 4B 58 30 1D */ bl Insect_GetDemoMain__9dInsect_cFv -/* 80BDB060 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDB064 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDB068 7C 08 03 A6 */ mtlr r0 -/* 80BDB06C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDB070 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/BoomChk__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/BoomChk__10daObjDAN_cFv.s deleted file mode 100644 index 01bb6658d5..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/BoomChk__10daObjDAN_cFv.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_80BDB4E0: -/* 80BDB4E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BDB4E4 7C 08 02 A6 */ mflr r0 -/* 80BDB4E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BDB4EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BDB4F0 4B 78 6C ED */ bl _savegpr_29 -/* 80BDB4F4 7C 7D 1B 78 */ mr r29, r3 -/* 80BDB4F8 3C 60 80 BE */ lis r3, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDB4FC 3B E3 C3 B0 */ addi r31, r3, lit_3775@l /* 0x80BDC3B0@l */ -/* 80BDB500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB508 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 80BDB50C 88 1D 07 A9 */ lbz r0, 0x7a9(r29) -/* 80BDB510 28 00 00 00 */ cmplwi r0, 0 -/* 80BDB514 41 82 01 00 */ beq lbl_80BDB614 -/* 80BDB518 38 7D 07 04 */ addi r3, r29, 0x704 -/* 80BDB51C 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BDB520 38 BD 04 E6 */ addi r5, r29, 0x4e6 -/* 80BDB524 38 C0 00 00 */ li r6, 0 -/* 80BDB528 38 E0 1C 00 */ li r7, 0x1c00 -/* 80BDB52C 4B 58 31 29 */ bl posMove__20daPy_boomerangMove_cFP4cXyzPsP10fopAc_ac_cs -/* 80BDB530 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDB534 41 82 00 4C */ beq lbl_80BDB580 -/* 80BDB538 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80BDB53C D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 80BDB540 38 7D 07 04 */ addi r3, r29, 0x704 -/* 80BDB544 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BDB548 4B 58 33 35 */ bl bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz -/* 80BDB54C C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80BDB550 C0 1F 00 6C */ lfs f0, 0x6c(r31) -/* 80BDB554 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BDB558 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -/* 80BDB55C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80BDB560 D0 1D 04 A8 */ stfs f0, 0x4a8(r29) -/* 80BDB564 C0 1D 04 D4 */ lfs f0, 0x4d4(r29) -/* 80BDB568 D0 1D 04 AC */ stfs f0, 0x4ac(r29) -/* 80BDB56C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80BDB570 D0 1D 04 B0 */ stfs f0, 0x4b0(r29) -/* 80BDB574 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80BDB578 D0 1D 05 30 */ stfs f0, 0x530(r29) -/* 80BDB57C 48 00 00 98 */ b lbl_80BDB614 -lbl_80BDB580: -/* 80BDB580 C0 1F 00 9C */ lfs f0, 0x9c(r31) -/* 80BDB584 D0 1D 04 FC */ stfs f0, 0x4fc(r29) -/* 80BDB588 38 7D 07 04 */ addi r3, r29, 0x704 -/* 80BDB58C 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BDB590 4B 58 32 ED */ bl bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz -/* 80BDB594 38 00 00 00 */ li r0, 0 -/* 80BDB598 98 1D 07 A9 */ stb r0, 0x7a9(r29) -/* 80BDB59C C0 1F 00 68 */ lfs f0, 0x68(r31) -/* 80BDB5A0 D0 1D 05 30 */ stfs f0, 0x530(r29) -/* 80BDB5A4 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDB5A8 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDB5AC 38 80 00 06 */ li r4, 6 -/* 80BDB5B0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB5B4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB5B8 3C A5 00 02 */ addis r5, r5, 2 -/* 80BDB5BC 38 C0 00 80 */ li r6, 0x80 -/* 80BDB5C0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BDB5C4 4B 46 0D 29 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDB5C8 7C 64 1B 78 */ mr r4, r3 -/* 80BDB5CC 80 7D 08 44 */ lwz r3, 0x844(r29) -/* 80BDB5D0 38 A0 00 02 */ li r5, 2 -/* 80BDB5D4 C0 3F 00 60 */ lfs f1, 0x60(r31) -/* 80BDB5D8 C0 5F 00 00 */ lfs f2, 0(r31) -/* 80BDB5DC C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 80BDB5E0 C0 9F 00 64 */ lfs f4, 0x64(r31) -/* 80BDB5E4 4B 43 58 8D */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80BDB5E8 38 00 00 64 */ li r0, 0x64 -/* 80BDB5EC B0 1D 07 6A */ sth r0, 0x76a(r29) -/* 80BDB5F0 38 00 00 02 */ li r0, 2 -/* 80BDB5F4 98 1D 07 68 */ stb r0, 0x768(r29) -/* 80BDB5F8 38 00 00 01 */ li r0, 1 -/* 80BDB5FC 98 1D 07 69 */ stb r0, 0x769(r29) -/* 80BDB600 C0 3F 00 A0 */ lfs f1, 0xa0(r31) -/* 80BDB604 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 80BDB608 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BDB60C D0 1D 04 C0 */ stfs f0, 0x4c0(r29) -/* 80BDB610 D0 1D 04 D4 */ stfs f0, 0x4d4(r29) -lbl_80BDB614: -/* 80BDB614 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BDB618 4B 78 6C 11 */ bl _restgpr_29 -/* 80BDB61C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BDB620 7C 08 03 A6 */ mtlr r0 -/* 80BDB624 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BDB628 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/CreateChk__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/CreateChk__10daObjDAN_cFv.s deleted file mode 100644 index cb2f1e8565..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/CreateChk__10daObjDAN_cFv.s +++ /dev/null @@ -1,116 +0,0 @@ -lbl_80BDBB0C: -/* 80BDBB0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDBB10 7C 08 02 A6 */ mflr r0 -/* 80BDBB14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDBB18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDBB1C 7C 7F 1B 78 */ mr r31, r3 -/* 80BDBB20 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80BDBB24 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f -/* 80BDBB28 7C 03 03 78 */ mr r3, r0 -/* 80BDBB2C 28 00 00 0F */ cmplwi r0, 0xf -/* 80BDBB30 40 82 00 08 */ bne lbl_80BDBB38 -/* 80BDBB34 38 60 00 00 */ li r3, 0 -lbl_80BDBB38: -/* 80BDBB38 88 1F 07 A8 */ lbz r0, 0x7a8(r31) -/* 80BDBB3C 28 00 00 02 */ cmplwi r0, 2 -/* 80BDBB40 41 82 01 60 */ beq lbl_80BDBCA0 -/* 80BDBB44 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BDBB48 41 82 00 6C */ beq lbl_80BDBBB4 -/* 80BDBB4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDBB50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDBB54 3B E3 07 F0 */ addi r31, r3, 0x7f0 -/* 80BDBB58 7F E3 FB 78 */ mr r3, r31 -/* 80BDBB5C 3C 80 80 BE */ lis r4, l_musiya_num@ha /* 0x80BDC460@ha */ -/* 80BDBB60 A0 04 C4 60 */ lhz r0, l_musiya_num@l(r4) /* 0x80BDC460@l */ -/* 80BDBB64 54 00 08 3C */ slwi r0, r0, 1 -/* 80BDBB68 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80BDBB6C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80BDBB70 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80BDBB74 4B 45 8E 49 */ bl isEventBit__11dSv_event_cCFUs -/* 80BDBB78 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDBB7C 41 82 00 30 */ beq lbl_80BDBBAC -/* 80BDBB80 7F E3 FB 78 */ mr r3, r31 -/* 80BDBB84 3C 80 80 BE */ lis r4, l_musiya_num@ha /* 0x80BDC460@ha */ -/* 80BDBB88 38 84 C4 60 */ addi r4, r4, l_musiya_num@l /* 0x80BDC460@l */ -/* 80BDBB8C A0 04 00 02 */ lhz r0, 2(r4) -/* 80BDBB90 54 00 08 3C */ slwi r0, r0, 1 -/* 80BDBB94 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80BDBB98 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80BDBB9C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80BDBBA0 4B 45 8E 1D */ bl isEventBit__11dSv_event_cCFUs -/* 80BDBBA4 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDBBA8 40 82 00 F8 */ bne lbl_80BDBCA0 -lbl_80BDBBAC: -/* 80BDBBAC 38 60 00 00 */ li r3, 0 -/* 80BDBBB0 48 00 00 F4 */ b lbl_80BDBCA4 -lbl_80BDBBB4: -/* 80BDBBB4 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDBBB8 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDBBBC 38 63 00 06 */ addi r3, r3, 6 -/* 80BDBBC0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDBBC4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDBBC8 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 80BDBBCC 4B 78 CD C9 */ bl strcmp -/* 80BDBBD0 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDBBD4 40 82 00 CC */ bne lbl_80BDBCA0 -/* 80BDBBD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDBBDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDBBE0 88 03 4E 0A */ lbz r0, 0x4e0a(r3) -/* 80BDBBE4 2C 00 00 03 */ cmpwi r0, 3 -/* 80BDBBE8 40 82 00 B8 */ bne lbl_80BDBCA0 -/* 80BDBBEC 88 1F 05 81 */ lbz r0, 0x581(r31) -/* 80BDBBF0 3C 60 80 BE */ lis r3, l_dan_itemno@ha /* 0x80BDC42C@ha */ -/* 80BDBBF4 38 63 C4 2C */ addi r3, r3, l_dan_itemno@l /* 0x80BDC42C@l */ -/* 80BDBBF8 7C 63 00 AE */ lbzx r3, r3, r0 -/* 80BDBBFC 4B 5F E3 41 */ bl isCatchNotGiveInsect__14dMenu_Insect_cFUc -/* 80BDBC00 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BDBC04 41 82 00 0C */ beq lbl_80BDBC10 -/* 80BDBC08 38 60 00 00 */ li r3, 0 -/* 80BDBC0C 48 00 00 98 */ b lbl_80BDBCA4 -lbl_80BDBC10: -/* 80BDBC10 88 1F 05 81 */ lbz r0, 0x581(r31) -/* 80BDBC14 28 00 00 00 */ cmplwi r0, 0 -/* 80BDBC18 40 82 00 3C */ bne lbl_80BDBC54 -/* 80BDBC1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDBC20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDBC24 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80BDBC28 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 80BDBC2C 3C 80 80 BE */ lis r4, l_musiya_num@ha /* 0x80BDC460@ha */ -/* 80BDBC30 38 84 C4 60 */ addi r4, r4, l_musiya_num@l /* 0x80BDC460@l */ -/* 80BDBC34 7C 04 02 2E */ lhzx r0, r4, r0 -/* 80BDBC38 54 00 08 3C */ slwi r0, r0, 1 -/* 80BDBC3C 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80BDBC40 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80BDBC44 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80BDBC48 4B 45 8D 75 */ bl isEventBit__11dSv_event_cCFUs -/* 80BDBC4C 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDBC50 41 82 00 48 */ beq lbl_80BDBC98 -lbl_80BDBC54: -/* 80BDBC54 88 1F 05 81 */ lbz r0, 0x581(r31) -/* 80BDBC58 28 00 00 01 */ cmplwi r0, 1 -/* 80BDBC5C 40 82 00 44 */ bne lbl_80BDBCA0 -/* 80BDBC60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDBC64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDBC68 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 80BDBC6C 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e -/* 80BDBC70 3C 80 80 BE */ lis r4, l_musiya_num@ha /* 0x80BDC460@ha */ -/* 80BDBC74 38 84 C4 60 */ addi r4, r4, l_musiya_num@l /* 0x80BDC460@l */ -/* 80BDBC78 7C 04 02 2E */ lhzx r0, r4, r0 -/* 80BDBC7C 54 00 08 3C */ slwi r0, r0, 1 -/* 80BDBC80 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 80BDBC84 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 80BDBC88 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80BDBC8C 4B 45 8D 31 */ bl isEventBit__11dSv_event_cCFUs -/* 80BDBC90 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDBC94 40 82 00 0C */ bne lbl_80BDBCA0 -lbl_80BDBC98: -/* 80BDBC98 38 60 00 00 */ li r3, 0 -/* 80BDBC9C 48 00 00 08 */ b lbl_80BDBCA4 -lbl_80BDBCA0: -/* 80BDBCA0 38 60 00 01 */ li r3, 1 -lbl_80BDBCA4: -/* 80BDBCA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDBCA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDBCAC 7C 08 03 A6 */ mtlr r0 -/* 80BDBCB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDBCB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/CreateHeap__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/CreateHeap__10daObjDAN_cFv.s deleted file mode 100644 index 5d31ae2363..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/CreateHeap__10daObjDAN_cFv.s +++ /dev/null @@ -1,212 +0,0 @@ -lbl_80BDA698: -/* 80BDA698 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80BDA69C 7C 08 02 A6 */ mflr r0 -/* 80BDA6A0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80BDA6A4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BDA6A8 4B 78 7B 31 */ bl _savegpr_28 -/* 80BDA6AC 7C 7F 1B 78 */ mr r31, r3 -/* 80BDA6B0 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDA6B4 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDA6B8 38 80 00 0B */ li r4, 0xb -/* 80BDA6BC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDA6C0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDA6C4 3F C5 00 02 */ addis r30, r5, 2 -/* 80BDA6C8 3B DE C2 F8 */ addi r30, r30, -15624 -/* 80BDA6CC 7F C5 F3 78 */ mr r5, r30 -/* 80BDA6D0 38 C0 00 80 */ li r6, 0x80 -/* 80BDA6D4 4B 46 1C 19 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDA6D8 7C 7D 1B 78 */ mr r29, r3 -/* 80BDA6DC 38 60 00 58 */ li r3, 0x58 -/* 80BDA6E0 4B 6F 45 6D */ bl __nw__FUl -/* 80BDA6E4 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80BDA6E8 41 82 00 68 */ beq lbl_80BDA750 -/* 80BDA6EC 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDA6F0 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDA6F4 38 80 00 08 */ li r4, 8 -/* 80BDA6F8 7F C5 F3 78 */ mr r5, r30 -/* 80BDA6FC 38 C0 00 80 */ li r6, 0x80 -/* 80BDA700 4B 46 1B ED */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDA704 7C 67 1B 78 */ mr r7, r3 -/* 80BDA708 38 1F 07 B0 */ addi r0, r31, 0x7b0 -/* 80BDA70C 90 01 00 08 */ stw r0, 8(r1) -/* 80BDA710 38 00 00 00 */ li r0, 0 -/* 80BDA714 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BDA718 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000284@ha */ -/* 80BDA71C 38 03 02 84 */ addi r0, r3, 0x0284 /* 0x11000284@l */ -/* 80BDA720 90 01 00 10 */ stw r0, 0x10(r1) -/* 80BDA724 7F 83 E3 78 */ mr r3, r28 -/* 80BDA728 7F A4 EB 78 */ mr r4, r29 -/* 80BDA72C 38 A0 00 00 */ li r5, 0 -/* 80BDA730 38 C0 00 00 */ li r6, 0 -/* 80BDA734 39 00 00 02 */ li r8, 2 -/* 80BDA738 3D 20 80 BE */ lis r9, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDA73C C0 29 C3 B0 */ lfs f1, lit_3775@l(r9) /* 0x80BDC3B0@l */ -/* 80BDA740 39 20 00 00 */ li r9, 0 -/* 80BDA744 39 40 FF FF */ li r10, -1 -/* 80BDA748 4B 43 60 89 */ bl __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl -/* 80BDA74C 7C 7C 1B 78 */ mr r28, r3 -lbl_80BDA750: -/* 80BDA750 93 9F 08 44 */ stw r28, 0x844(r31) -/* 80BDA754 80 7F 08 44 */ lwz r3, 0x844(r31) -/* 80BDA758 28 03 00 00 */ cmplwi r3, 0 -/* 80BDA75C 41 82 00 10 */ beq lbl_80BDA76C -/* 80BDA760 83 A3 00 04 */ lwz r29, 4(r3) -/* 80BDA764 28 1D 00 00 */ cmplwi r29, 0 -/* 80BDA768 40 82 00 0C */ bne lbl_80BDA774 -lbl_80BDA76C: -/* 80BDA76C 38 60 00 00 */ li r3, 0 -/* 80BDA770 48 00 02 28 */ b lbl_80BDA998 -lbl_80BDA774: -/* 80BDA774 38 60 00 18 */ li r3, 0x18 -/* 80BDA778 4B 6F 44 D5 */ bl __nw__FUl -/* 80BDA77C 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80BDA780 41 82 00 20 */ beq lbl_80BDA7A0 -/* 80BDA784 3C 80 80 BE */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80BDC544@ha */ -/* 80BDA788 38 04 C5 44 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80BDC544@l */ -/* 80BDA78C 90 1C 00 00 */ stw r0, 0(r28) -/* 80BDA790 38 80 00 00 */ li r4, 0 -/* 80BDA794 4B 74 DC 69 */ bl init__12J3DFrameCtrlFs -/* 80BDA798 38 00 00 00 */ li r0, 0 -/* 80BDA79C 90 1C 00 14 */ stw r0, 0x14(r28) -lbl_80BDA7A0: -/* 80BDA7A0 93 9F 07 90 */ stw r28, 0x790(r31) -/* 80BDA7A4 80 1F 07 90 */ lwz r0, 0x790(r31) -/* 80BDA7A8 28 00 00 00 */ cmplwi r0, 0 -/* 80BDA7AC 40 82 00 0C */ bne lbl_80BDA7B8 -/* 80BDA7B0 38 60 00 00 */ li r3, 0 -/* 80BDA7B4 48 00 01 E4 */ b lbl_80BDA998 -lbl_80BDA7B8: -/* 80BDA7B8 88 1F 05 81 */ lbz r0, 0x581(r31) -/* 80BDA7BC 28 00 00 01 */ cmplwi r0, 1 -/* 80BDA7C0 40 82 00 58 */ bne lbl_80BDA818 -/* 80BDA7C4 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDA7C8 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDA7CC 38 80 00 0E */ li r4, 0xe -/* 80BDA7D0 7F C5 F3 78 */ mr r5, r30 -/* 80BDA7D4 38 C0 00 80 */ li r6, 0x80 -/* 80BDA7D8 4B 46 1B 15 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDA7DC 7C 65 1B 78 */ mr r5, r3 -/* 80BDA7E0 80 9D 00 04 */ lwz r4, 4(r29) -/* 80BDA7E4 80 7F 07 90 */ lwz r3, 0x790(r31) -/* 80BDA7E8 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BDA7EC 38 C0 00 01 */ li r6, 1 -/* 80BDA7F0 38 E0 00 02 */ li r7, 2 -/* 80BDA7F4 3D 00 80 BE */ lis r8, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDA7F8 C0 28 C3 B0 */ lfs f1, lit_3775@l(r8) /* 0x80BDC3B0@l */ -/* 80BDA7FC 39 00 00 00 */ li r8, 0 -/* 80BDA800 39 20 FF FF */ li r9, -1 -/* 80BDA804 4B 43 2F 09 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80BDA808 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDA80C 40 82 00 60 */ bne lbl_80BDA86C -/* 80BDA810 38 60 00 00 */ li r3, 0 -/* 80BDA814 48 00 01 84 */ b lbl_80BDA998 -lbl_80BDA818: -/* 80BDA818 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDA81C 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDA820 38 80 00 0F */ li r4, 0xf -/* 80BDA824 7F C5 F3 78 */ mr r5, r30 -/* 80BDA828 38 C0 00 80 */ li r6, 0x80 -/* 80BDA82C 4B 46 1A C1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDA830 7C 65 1B 78 */ mr r5, r3 -/* 80BDA834 80 9D 00 04 */ lwz r4, 4(r29) -/* 80BDA838 80 7F 07 90 */ lwz r3, 0x790(r31) -/* 80BDA83C 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BDA840 38 C0 00 01 */ li r6, 1 -/* 80BDA844 38 E0 00 02 */ li r7, 2 -/* 80BDA848 3D 00 80 BE */ lis r8, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDA84C C0 28 C3 B0 */ lfs f1, lit_3775@l(r8) /* 0x80BDC3B0@l */ -/* 80BDA850 39 00 00 00 */ li r8, 0 -/* 80BDA854 39 20 FF FF */ li r9, -1 -/* 80BDA858 4B 43 2E B5 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80BDA85C 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDA860 40 82 00 0C */ bne lbl_80BDA86C -/* 80BDA864 38 60 00 00 */ li r3, 0 -/* 80BDA868 48 00 01 30 */ b lbl_80BDA998 -lbl_80BDA86C: -/* 80BDA86C 38 60 00 18 */ li r3, 0x18 -/* 80BDA870 4B 6F 43 DD */ bl __nw__FUl -/* 80BDA874 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80BDA878 41 82 00 20 */ beq lbl_80BDA898 -/* 80BDA87C 3C 80 80 BE */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80BDC544@ha */ -/* 80BDA880 38 04 C5 44 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80BDC544@l */ -/* 80BDA884 90 1C 00 00 */ stw r0, 0(r28) -/* 80BDA888 38 80 00 00 */ li r4, 0 -/* 80BDA88C 4B 74 DB 71 */ bl init__12J3DFrameCtrlFs -/* 80BDA890 38 00 00 00 */ li r0, 0 -/* 80BDA894 90 1C 00 14 */ stw r0, 0x14(r28) -lbl_80BDA898: -/* 80BDA898 93 9F 07 94 */ stw r28, 0x794(r31) -/* 80BDA89C 80 1F 07 94 */ lwz r0, 0x794(r31) -/* 80BDA8A0 28 00 00 00 */ cmplwi r0, 0 -/* 80BDA8A4 40 82 00 0C */ bne lbl_80BDA8B0 -/* 80BDA8A8 38 60 00 00 */ li r3, 0 -/* 80BDA8AC 48 00 00 EC */ b lbl_80BDA998 -lbl_80BDA8B0: -/* 80BDA8B0 88 1F 05 81 */ lbz r0, 0x581(r31) -/* 80BDA8B4 28 00 00 01 */ cmplwi r0, 1 -/* 80BDA8B8 40 82 00 58 */ bne lbl_80BDA910 -/* 80BDA8BC 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDA8C0 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDA8C4 38 80 00 12 */ li r4, 0x12 -/* 80BDA8C8 7F C5 F3 78 */ mr r5, r30 -/* 80BDA8CC 38 C0 00 80 */ li r6, 0x80 -/* 80BDA8D0 4B 46 1A 1D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDA8D4 7C 65 1B 78 */ mr r5, r3 -/* 80BDA8D8 80 9D 00 04 */ lwz r4, 4(r29) -/* 80BDA8DC 80 7F 07 94 */ lwz r3, 0x794(r31) -/* 80BDA8E0 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BDA8E4 38 C0 00 01 */ li r6, 1 -/* 80BDA8E8 38 E0 00 02 */ li r7, 2 -/* 80BDA8EC 3D 00 80 BE */ lis r8, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDA8F0 C0 28 C3 B0 */ lfs f1, lit_3775@l(r8) /* 0x80BDC3B0@l */ -/* 80BDA8F4 39 00 00 00 */ li r8, 0 -/* 80BDA8F8 39 20 FF FF */ li r9, -1 -/* 80BDA8FC 4B 43 2D 41 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80BDA900 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDA904 40 82 00 90 */ bne lbl_80BDA994 -/* 80BDA908 38 60 00 00 */ li r3, 0 -/* 80BDA90C 48 00 00 8C */ b lbl_80BDA998 -lbl_80BDA910: -/* 80BDA910 38 60 00 18 */ li r3, 0x18 -/* 80BDA914 4B 6F 43 39 */ bl __nw__FUl -/* 80BDA918 7C 7C 1B 79 */ or. r28, r3, r3 -/* 80BDA91C 41 82 00 20 */ beq lbl_80BDA93C -/* 80BDA920 3C 80 80 BE */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80BDC544@ha */ -/* 80BDA924 38 04 C5 44 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80BDC544@l */ -/* 80BDA928 90 1C 00 00 */ stw r0, 0(r28) -/* 80BDA92C 38 80 00 00 */ li r4, 0 -/* 80BDA930 4B 74 DA CD */ bl init__12J3DFrameCtrlFs -/* 80BDA934 38 00 00 00 */ li r0, 0 -/* 80BDA938 90 1C 00 14 */ stw r0, 0x14(r28) -lbl_80BDA93C: -/* 80BDA93C 93 9F 07 94 */ stw r28, 0x794(r31) -/* 80BDA940 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDA944 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDA948 38 80 00 13 */ li r4, 0x13 -/* 80BDA94C 7F C5 F3 78 */ mr r5, r30 -/* 80BDA950 38 C0 00 80 */ li r6, 0x80 -/* 80BDA954 4B 46 19 99 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDA958 7C 65 1B 78 */ mr r5, r3 -/* 80BDA95C 80 9D 00 04 */ lwz r4, 4(r29) -/* 80BDA960 80 7F 07 94 */ lwz r3, 0x794(r31) -/* 80BDA964 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BDA968 38 C0 00 01 */ li r6, 1 -/* 80BDA96C 38 E0 00 02 */ li r7, 2 -/* 80BDA970 3D 00 80 BE */ lis r8, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDA974 C0 28 C3 B0 */ lfs f1, lit_3775@l(r8) /* 0x80BDC3B0@l */ -/* 80BDA978 39 00 00 00 */ li r8, 0 -/* 80BDA97C 39 20 FF FF */ li r9, -1 -/* 80BDA980 4B 43 2C BD */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80BDA984 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDA988 40 82 00 0C */ bne lbl_80BDA994 -/* 80BDA98C 38 60 00 00 */ li r3, 0 -/* 80BDA990 48 00 00 08 */ b lbl_80BDA998 -lbl_80BDA994: -/* 80BDA994 38 60 00 01 */ li r3, 1 -lbl_80BDA998: -/* 80BDA998 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BDA99C 4B 78 78 89 */ bl _restgpr_28 -/* 80BDA9A0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BDA9A4 7C 08 03 A6 */ mtlr r0 -/* 80BDA9A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80BDA9AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/DamageAction__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/DamageAction__10daObjDAN_cFv.s deleted file mode 100644 index a6655de4f3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/DamageAction__10daObjDAN_cFv.s +++ /dev/null @@ -1,256 +0,0 @@ -lbl_80BDAC10: -/* 80BDAC10 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BDAC14 7C 08 02 A6 */ mflr r0 -/* 80BDAC18 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BDAC1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BDAC20 4B 78 75 B9 */ bl _savegpr_28 -/* 80BDAC24 7C 7C 1B 78 */ mr r28, r3 -/* 80BDAC28 3C 80 80 BE */ lis r4, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDAC2C 3B C4 C3 B0 */ addi r30, r4, lit_3775@l /* 0x80BDC3B0@l */ -/* 80BDAC30 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDAC34 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDAC38 83 BF 5D AC */ lwz r29, 0x5dac(r31) -/* 80BDAC3C 88 03 07 69 */ lbz r0, 0x769(r3) -/* 80BDAC40 2C 00 00 01 */ cmpwi r0, 1 -/* 80BDAC44 41 82 01 0C */ beq lbl_80BDAD50 -/* 80BDAC48 40 80 00 10 */ bge lbl_80BDAC58 -/* 80BDAC4C 2C 00 00 00 */ cmpwi r0, 0 -/* 80BDAC50 40 80 00 14 */ bge lbl_80BDAC64 -/* 80BDAC54 48 00 03 68 */ b lbl_80BDAFBC -lbl_80BDAC58: -/* 80BDAC58 2C 00 00 03 */ cmpwi r0, 3 -/* 80BDAC5C 40 80 03 60 */ bge lbl_80BDAFBC -/* 80BDAC60 48 00 02 B8 */ b lbl_80BDAF18 -lbl_80BDAC64: -/* 80BDAC64 7F A4 EB 78 */ mr r4, r29 -/* 80BDAC68 4B 43 FC FD */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80BDAC6C C0 1E 00 50 */ lfs f0, 0x50(r30) -/* 80BDAC70 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDAC74 40 80 03 48 */ bge lbl_80BDAFBC -/* 80BDAC78 C0 1D 05 2C */ lfs f0, 0x52c(r29) -/* 80BDAC7C C0 5E 00 54 */ lfs f2, 0x54(r30) -/* 80BDAC80 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80BDAC84 40 81 03 38 */ ble lbl_80BDAFBC -/* 80BDAC88 A8 1D 04 DE */ lha r0, 0x4de(r29) -/* 80BDAC8C B0 1C 04 DE */ sth r0, 0x4de(r28) -/* 80BDAC90 A8 1C 04 DE */ lha r0, 0x4de(r28) -/* 80BDAC94 B0 1C 04 E6 */ sth r0, 0x4e6(r28) -/* 80BDAC98 A8 1C 04 DE */ lha r0, 0x4de(r28) -/* 80BDAC9C B0 1C 07 78 */ sth r0, 0x778(r28) -/* 80BDACA0 C0 3E 00 5C */ lfs f1, 0x5c(r30) -/* 80BDACA4 C0 1D 05 2C */ lfs f0, 0x52c(r29) -/* 80BDACA8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BDACAC D0 1C 05 2C */ stfs f0, 0x52c(r28) -/* 80BDACB0 88 7C 07 69 */ lbz r3, 0x769(r28) -/* 80BDACB4 38 03 00 01 */ addi r0, r3, 1 -/* 80BDACB8 98 1C 07 69 */ stb r0, 0x769(r28) -/* 80BDACBC D0 5C 07 70 */ stfs f2, 0x770(r28) -/* 80BDACC0 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDACC4 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDACC8 38 80 00 06 */ li r4, 6 -/* 80BDACCC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDACD0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDACD4 3C A5 00 02 */ addis r5, r5, 2 -/* 80BDACD8 38 C0 00 80 */ li r6, 0x80 -/* 80BDACDC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BDACE0 4B 46 16 0D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDACE4 7C 64 1B 78 */ mr r4, r3 -/* 80BDACE8 80 7C 08 44 */ lwz r3, 0x844(r28) -/* 80BDACEC 38 A0 00 02 */ li r5, 2 -/* 80BDACF0 C0 3E 00 60 */ lfs f1, 0x60(r30) -/* 80BDACF4 C0 5E 00 00 */ lfs f2, 0(r30) -/* 80BDACF8 C0 7E 00 54 */ lfs f3, 0x54(r30) -/* 80BDACFC C0 9E 00 64 */ lfs f4, 0x64(r30) -/* 80BDAD00 4B 43 61 71 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80BDAD04 38 00 00 64 */ li r0, 0x64 -/* 80BDAD08 B0 1C 07 6A */ sth r0, 0x76a(r28) -/* 80BDAD0C C0 1E 00 68 */ lfs f0, 0x68(r30) -/* 80BDAD10 D0 1C 05 30 */ stfs f0, 0x530(r28) -/* 80BDAD14 C0 3E 00 6C */ lfs f1, 0x6c(r30) -/* 80BDAD18 C0 1D 05 2C */ lfs f0, 0x52c(r29) -/* 80BDAD1C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BDAD20 D0 1C 04 FC */ stfs f0, 0x4fc(r28) -/* 80BDAD24 C0 3C 04 FC */ lfs f1, 0x4fc(r28) -/* 80BDAD28 C0 1E 00 70 */ lfs f0, 0x70(r30) -/* 80BDAD2C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDAD30 40 81 00 0C */ ble lbl_80BDAD3C -/* 80BDAD34 D0 1C 04 FC */ stfs f0, 0x4fc(r28) -/* 80BDAD38 48 00 02 84 */ b lbl_80BDAFBC -lbl_80BDAD3C: -/* 80BDAD3C C0 1E 00 4C */ lfs f0, 0x4c(r30) -/* 80BDAD40 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDAD44 40 80 02 78 */ bge lbl_80BDAFBC -/* 80BDAD48 D0 1C 04 FC */ stfs f0, 0x4fc(r28) -/* 80BDAD4C 48 00 02 70 */ b lbl_80BDAFBC -lbl_80BDAD50: -/* 80BDAD50 80 1C 08 B4 */ lwz r0, 0x8b4(r28) -/* 80BDAD54 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80BDAD58 41 82 00 6C */ beq lbl_80BDADC4 -/* 80BDAD5C C0 3C 04 FC */ lfs f1, 0x4fc(r28) -/* 80BDAD60 C0 1E 00 74 */ lfs f0, 0x74(r30) -/* 80BDAD64 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BDAD68 D0 1C 04 FC */ stfs f0, 0x4fc(r28) -/* 80BDAD6C 80 1C 08 B4 */ lwz r0, 0x8b4(r28) -/* 80BDAD70 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 -/* 80BDAD74 90 1C 08 B4 */ stw r0, 0x8b4(r28) -/* 80BDAD78 80 7C 07 AC */ lwz r3, 0x7ac(r28) -/* 80BDAD7C 38 03 00 01 */ addi r0, r3, 1 -/* 80BDAD80 90 1C 07 AC */ stw r0, 0x7ac(r28) -/* 80BDAD84 80 1C 07 AC */ lwz r0, 0x7ac(r28) -/* 80BDAD88 2C 00 00 05 */ cmpwi r0, 5 -/* 80BDAD8C 40 81 00 20 */ ble lbl_80BDADAC -/* 80BDAD90 38 00 00 00 */ li r0, 0 -/* 80BDAD94 90 1C 07 AC */ stw r0, 0x7ac(r28) -/* 80BDAD98 C0 1E 00 54 */ lfs f0, 0x54(r30) -/* 80BDAD9C D0 1C 04 FC */ stfs f0, 0x4fc(r28) -/* 80BDADA0 D0 1C 07 A0 */ stfs f0, 0x7a0(r28) -/* 80BDADA4 D0 1C 05 2C */ stfs f0, 0x52c(r28) -/* 80BDADA8 D0 1C 07 70 */ stfs f0, 0x770(r28) -lbl_80BDADAC: -/* 80BDADAC C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 80BDADB0 D0 1C 04 A8 */ stfs f0, 0x4a8(r28) -/* 80BDADB4 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 80BDADB8 D0 1C 04 AC */ stfs f0, 0x4ac(r28) -/* 80BDADBC C0 1C 04 D8 */ lfs f0, 0x4d8(r28) -/* 80BDADC0 D0 1C 04 B0 */ stfs f0, 0x4b0(r28) -lbl_80BDADC4: -/* 80BDADC4 7F 83 E3 78 */ mr r3, r28 -/* 80BDADC8 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 80BDADCC 4B 43 FB 99 */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80BDADD0 C0 1E 00 50 */ lfs f0, 0x50(r30) -/* 80BDADD4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDADD8 40 80 00 8C */ bge lbl_80BDAE64 -/* 80BDADDC C0 3D 05 2C */ lfs f1, 0x52c(r29) -/* 80BDADE0 C0 1E 00 54 */ lfs f0, 0x54(r30) -/* 80BDADE4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDADE8 40 81 00 7C */ ble lbl_80BDAE64 -/* 80BDADEC A8 1C 07 6C */ lha r0, 0x76c(r28) -/* 80BDADF0 2C 00 00 00 */ cmpwi r0, 0 -/* 80BDADF4 40 82 00 70 */ bne lbl_80BDAE64 -/* 80BDADF8 80 1C 08 B4 */ lwz r0, 0x8b4(r28) -/* 80BDADFC 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80BDAE00 41 82 00 64 */ beq lbl_80BDAE64 -/* 80BDAE04 A8 1D 04 E6 */ lha r0, 0x4e6(r29) -/* 80BDAE08 B0 1C 07 78 */ sth r0, 0x778(r28) -/* 80BDAE0C A8 1C 07 78 */ lha r0, 0x778(r28) -/* 80BDAE10 B0 1C 04 DE */ sth r0, 0x4de(r28) -/* 80BDAE14 C0 3E 00 78 */ lfs f1, 0x78(r30) -/* 80BDAE18 C0 1D 05 2C */ lfs f0, 0x52c(r29) -/* 80BDAE1C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80BDAE20 D0 1C 05 2C */ stfs f0, 0x52c(r28) -/* 80BDAE24 38 00 00 64 */ li r0, 0x64 -/* 80BDAE28 B0 1C 07 6A */ sth r0, 0x76a(r28) -/* 80BDAE2C 38 00 00 00 */ li r0, 0 -/* 80BDAE30 90 1C 07 AC */ stw r0, 0x7ac(r28) -/* 80BDAE34 C0 1D 05 2C */ lfs f0, 0x52c(r29) -/* 80BDAE38 D0 1C 04 FC */ stfs f0, 0x4fc(r28) -/* 80BDAE3C C0 3C 04 FC */ lfs f1, 0x4fc(r28) -/* 80BDAE40 C0 1E 00 70 */ lfs f0, 0x70(r30) -/* 80BDAE44 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDAE48 40 81 00 0C */ ble lbl_80BDAE54 -/* 80BDAE4C D0 1C 04 FC */ stfs f0, 0x4fc(r28) -/* 80BDAE50 48 00 00 14 */ b lbl_80BDAE64 -lbl_80BDAE54: -/* 80BDAE54 C0 1E 00 4C */ lfs f0, 0x4c(r30) -/* 80BDAE58 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDAE5C 40 80 00 08 */ bge lbl_80BDAE64 -/* 80BDAE60 D0 1C 04 FC */ stfs f0, 0x4fc(r28) -lbl_80BDAE64: -/* 80BDAE64 A8 1C 07 6A */ lha r0, 0x76a(r28) -/* 80BDAE68 2C 00 00 00 */ cmpwi r0, 0 -/* 80BDAE6C 40 82 00 8C */ bne lbl_80BDAEF8 -/* 80BDAE70 7F 83 E3 78 */ mr r3, r28 -/* 80BDAE74 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 80BDAE78 4B 43 FA ED */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80BDAE7C C0 1E 00 50 */ lfs f0, 0x50(r30) -/* 80BDAE80 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDAE84 40 81 00 74 */ ble lbl_80BDAEF8 -/* 80BDAE88 38 00 00 00 */ li r0, 0 -/* 80BDAE8C B0 1C 04 E4 */ sth r0, 0x4e4(r28) -/* 80BDAE90 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDAE94 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDAE98 38 80 00 07 */ li r4, 7 -/* 80BDAE9C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDAEA0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDAEA4 3C A5 00 02 */ addis r5, r5, 2 -/* 80BDAEA8 38 C0 00 80 */ li r6, 0x80 -/* 80BDAEAC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BDAEB0 4B 46 14 3D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDAEB4 7C 64 1B 78 */ mr r4, r3 -/* 80BDAEB8 80 7C 08 44 */ lwz r3, 0x844(r28) -/* 80BDAEBC 38 A0 00 00 */ li r5, 0 -/* 80BDAEC0 C0 3E 00 60 */ lfs f1, 0x60(r30) -/* 80BDAEC4 C0 5E 00 00 */ lfs f2, 0(r30) -/* 80BDAEC8 C0 7E 00 54 */ lfs f3, 0x54(r30) -/* 80BDAECC C0 9E 00 64 */ lfs f4, 0x64(r30) -/* 80BDAED0 4B 43 5F A1 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80BDAED4 88 7C 07 69 */ lbz r3, 0x769(r28) -/* 80BDAED8 38 03 00 01 */ addi r0, r3, 1 -/* 80BDAEDC 98 1C 07 69 */ stb r0, 0x769(r28) -/* 80BDAEE0 C0 1E 00 54 */ lfs f0, 0x54(r30) -/* 80BDAEE4 D0 1C 04 FC */ stfs f0, 0x4fc(r28) -/* 80BDAEE8 D0 1C 05 2C */ stfs f0, 0x52c(r28) -/* 80BDAEEC D0 1C 07 70 */ stfs f0, 0x770(r28) -/* 80BDAEF0 38 00 00 00 */ li r0, 0 -/* 80BDAEF4 90 1C 07 AC */ stw r0, 0x7ac(r28) -lbl_80BDAEF8: -/* 80BDAEF8 C0 3E 00 54 */ lfs f1, 0x54(r30) -/* 80BDAEFC C0 1C 04 FC */ lfs f0, 0x4fc(r28) -/* 80BDAF00 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80BDAF04 41 82 00 B8 */ beq lbl_80BDAFBC -/* 80BDAF08 A8 7C 07 8A */ lha r3, 0x78a(r28) -/* 80BDAF0C 38 03 05 00 */ addi r0, r3, 0x500 -/* 80BDAF10 B0 1C 07 8A */ sth r0, 0x78a(r28) -/* 80BDAF14 48 00 00 A8 */ b lbl_80BDAFBC -lbl_80BDAF18: -/* 80BDAF18 38 7C 07 8A */ addi r3, r28, 0x78a -/* 80BDAF1C 38 80 00 00 */ li r4, 0 -/* 80BDAF20 38 A0 05 00 */ li r5, 0x500 -/* 80BDAF24 4B 69 5C 6D */ bl cLib_chaseAngleS__FPsss -/* 80BDAF28 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDAF2C 41 82 00 90 */ beq lbl_80BDAFBC -/* 80BDAF30 80 7C 08 44 */ lwz r3, 0x844(r28) -/* 80BDAF34 38 80 00 01 */ li r4, 1 -/* 80BDAF38 88 03 00 11 */ lbz r0, 0x11(r3) -/* 80BDAF3C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80BDAF40 40 82 00 18 */ bne lbl_80BDAF58 -/* 80BDAF44 C0 3E 00 54 */ lfs f1, 0x54(r30) -/* 80BDAF48 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80BDAF4C FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80BDAF50 41 82 00 08 */ beq lbl_80BDAF58 -/* 80BDAF54 38 80 00 00 */ li r4, 0 -lbl_80BDAF58: -/* 80BDAF58 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 80BDAF5C 41 82 00 60 */ beq lbl_80BDAFBC -/* 80BDAF60 38 00 00 01 */ li r0, 1 -/* 80BDAF64 98 1C 07 68 */ stb r0, 0x768(r28) -/* 80BDAF68 38 00 00 00 */ li r0, 0 -/* 80BDAF6C 98 1C 07 69 */ stb r0, 0x769(r28) -/* 80BDAF70 C0 1E 00 6C */ lfs f0, 0x6c(r30) -/* 80BDAF74 D0 1C 07 70 */ stfs f0, 0x770(r28) -/* 80BDAF78 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDAF7C 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDAF80 38 80 00 08 */ li r4, 8 -/* 80BDAF84 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDAF88 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDAF8C 3C A5 00 02 */ addis r5, r5, 2 -/* 80BDAF90 38 C0 00 80 */ li r6, 0x80 -/* 80BDAF94 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BDAF98 4B 46 13 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDAF9C 7C 64 1B 78 */ mr r4, r3 -/* 80BDAFA0 80 7C 08 44 */ lwz r3, 0x844(r28) -/* 80BDAFA4 38 A0 00 02 */ li r5, 2 -/* 80BDAFA8 C0 3E 00 60 */ lfs f1, 0x60(r30) -/* 80BDAFAC C0 5E 00 00 */ lfs f2, 0(r30) -/* 80BDAFB0 C0 7E 00 54 */ lfs f3, 0x54(r30) -/* 80BDAFB4 C0 9E 00 64 */ lfs f4, 0x64(r30) -/* 80BDAFB8 4B 43 5E B9 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -lbl_80BDAFBC: -/* 80BDAFBC 7F 83 E3 78 */ mr r3, r28 -/* 80BDAFC0 4B FF FA 7D */ bl SpeedSet__10daObjDAN_cFv -/* 80BDAFC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BDAFC8 4B 78 72 5D */ bl _restgpr_28 -/* 80BDAFCC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BDAFD0 7C 08 03 A6 */ mtlr r0 -/* 80BDAFD4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BDAFD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Delete__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Delete__10daObjDAN_cFv.s deleted file mode 100644 index 7ffbe9c266..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Delete__10daObjDAN_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80BDB928: -/* 80BDB928 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDB92C 7C 08 02 A6 */ mflr r0 -/* 80BDB930 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDB934 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDB938 7C 7F 1B 78 */ mr r31, r3 -/* 80BDB93C 38 7F 0A 60 */ addi r3, r31, 0xa60 -/* 80BDB940 3C 80 80 BE */ lis r4, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDB944 38 84 C4 6C */ addi r4, r4, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDB948 4B 45 16 C1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BDB94C 88 1F 0A 68 */ lbz r0, 0xa68(r31) -/* 80BDB950 28 00 00 00 */ cmplwi r0, 0 -/* 80BDB954 41 82 00 10 */ beq lbl_80BDB964 -/* 80BDB958 38 00 00 00 */ li r0, 0 -/* 80BDB95C 3C 60 80 BE */ lis r3, data_80BDC568@ha /* 0x80BDC568@ha */ -/* 80BDB960 98 03 C5 68 */ stb r0, data_80BDC568@l(r3) /* 0x80BDC568@l */ -lbl_80BDB964: -/* 80BDB964 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 80BDB968 28 00 00 00 */ cmplwi r0, 0 -/* 80BDB96C 41 82 00 0C */ beq lbl_80BDB978 -/* 80BDB970 80 7F 08 44 */ lwz r3, 0x844(r31) -/* 80BDB974 4B 43 59 9D */ bl stopZelAnime__16mDoExt_McaMorfSOFv -lbl_80BDB978: -/* 80BDB978 38 60 00 01 */ li r3, 1 -/* 80BDB97C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDB980 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDB984 7C 08 03 A6 */ mtlr r0 -/* 80BDB988 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDB98C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Execute__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Execute__10daObjDAN_cFv.s deleted file mode 100644 index 08ce4af56b..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Execute__10daObjDAN_cFv.s +++ /dev/null @@ -1,203 +0,0 @@ -lbl_80BDB62C: -/* 80BDB62C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BDB630 7C 08 02 A6 */ mflr r0 -/* 80BDB634 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BDB638 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80BDB63C 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80BDB640 7C 7F 1B 78 */ mr r31, r3 -/* 80BDB644 3C 80 80 BE */ lis r4, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDB648 3B C4 C3 B0 */ addi r30, r4, lit_3775@l /* 0x80BDC3B0@l */ -/* 80BDB64C 80 03 05 8C */ lwz r0, 0x58c(r3) -/* 80BDB650 2C 00 00 00 */ cmpwi r0, 0 -/* 80BDB654 40 81 00 70 */ ble lbl_80BDB6C4 -/* 80BDB658 C0 5E 00 A4 */ lfs f2, 0xa4(r30) -/* 80BDB65C 80 1F 07 9C */ lwz r0, 0x79c(r31) -/* 80BDB660 C8 3E 00 90 */ lfd f1, 0x90(r30) -/* 80BDB664 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80BDB668 3C 00 43 30 */ lis r0, 0x4330 -/* 80BDB66C 90 01 00 28 */ stw r0, 0x28(r1) -/* 80BDB670 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80BDB674 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80BDB678 EC 02 00 2A */ fadds f0, f2, f0 -/* 80BDB67C D0 1F 07 98 */ stfs f0, 0x798(r31) -/* 80BDB680 3C 60 00 06 */ lis r3, 0x0006 /* 0x000600A3@ha */ -/* 80BDB684 38 03 00 A3 */ addi r0, r3, 0x00A3 /* 0x000600A3@l */ -/* 80BDB688 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BDB68C 38 7F 07 B0 */ addi r3, r31, 0x7b0 -/* 80BDB690 38 81 00 24 */ addi r4, r1, 0x24 -/* 80BDB694 38 A0 00 00 */ li r5, 0 -/* 80BDB698 38 C0 FF FF */ li r6, -1 -/* 80BDB69C 81 9F 07 B0 */ lwz r12, 0x7b0(r31) -/* 80BDB6A0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80BDB6A4 7D 89 03 A6 */ mtctr r12 -/* 80BDB6A8 4E 80 04 21 */ bctrl -/* 80BDB6AC 7F E3 FB 78 */ mr r3, r31 -/* 80BDB6B0 4B 58 29 C9 */ bl Insect_GetDemoMain__9dInsect_cFv -/* 80BDB6B4 7F E3 FB 78 */ mr r3, r31 -/* 80BDB6B8 4B FF FB AD */ bl ParticleSet__10daObjDAN_cFv -/* 80BDB6BC 38 60 00 01 */ li r3, 1 -/* 80BDB6C0 48 00 02 50 */ b lbl_80BDB910 -lbl_80BDB6C4: -/* 80BDB6C4 4B FF F9 B1 */ bl checkGroundPos__10daObjDAN_cFv -/* 80BDB6C8 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80BDB6CC D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 80BDB6D0 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80BDB6D4 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 80BDB6D8 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80BDB6DC D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 80BDB6E0 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80BDB6E4 D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 80BDB6E8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80BDB6EC D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80BDB6F0 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80BDB6F4 D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 80BDB6F8 C0 3F 05 3C */ lfs f1, 0x53c(r31) -/* 80BDB6FC C0 1E 00 4C */ lfs f0, 0x4c(r30) -/* 80BDB700 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BDB704 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80BDB708 88 1F 07 A8 */ lbz r0, 0x7a8(r31) -/* 80BDB70C 2C 00 00 01 */ cmpwi r0, 1 -/* 80BDB710 41 82 01 14 */ beq lbl_80BDB824 -/* 80BDB714 40 80 01 78 */ bge lbl_80BDB88C -/* 80BDB718 2C 00 00 00 */ cmpwi r0, 0 -/* 80BDB71C 40 80 00 08 */ bge lbl_80BDB724 -/* 80BDB720 48 00 01 6C */ b lbl_80BDB88C -lbl_80BDB724: -/* 80BDB724 80 1F 04 9C */ lwz r0, 0x49c(r31) -/* 80BDB728 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 80BDB72C 40 82 00 10 */ bne lbl_80BDB73C -/* 80BDB730 7F E3 FB 78 */ mr r3, r31 -/* 80BDB734 4B FF F8 A9 */ bl Action__10daObjDAN_cFv -/* 80BDB738 48 00 00 24 */ b lbl_80BDB75C -lbl_80BDB73C: -/* 80BDB73C C0 1E 00 54 */ lfs f0, 0x54(r30) -/* 80BDB740 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 80BDB744 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80BDB748 D0 1F 04 A8 */ stfs f0, 0x4a8(r31) -/* 80BDB74C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80BDB750 D0 1F 04 AC */ stfs f0, 0x4ac(r31) -/* 80BDB754 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80BDB758 D0 1F 04 B0 */ stfs f0, 0x4b0(r31) -lbl_80BDB75C: -/* 80BDB75C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB760 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB764 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80BDB768 38 00 00 FF */ li r0, 0xff -/* 80BDB76C 90 01 00 08 */ stw r0, 8(r1) -/* 80BDB770 38 80 00 00 */ li r4, 0 -/* 80BDB774 90 81 00 0C */ stw r4, 0xc(r1) -/* 80BDB778 38 00 FF FF */ li r0, -1 -/* 80BDB77C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80BDB780 90 81 00 14 */ stw r4, 0x14(r1) -/* 80BDB784 90 81 00 18 */ stw r4, 0x18(r1) -/* 80BDB788 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80BDB78C 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80BDB790 38 A0 00 00 */ li r5, 0 -/* 80BDB794 38 C0 0A 1C */ li r6, 0xa1c -/* 80BDB798 38 FF 04 D0 */ addi r7, r31, 0x4d0 -/* 80BDB79C 39 1F 01 0C */ addi r8, r31, 0x10c -/* 80BDB7A0 39 3F 04 E4 */ addi r9, r31, 0x4e4 -/* 80BDB7A4 39 40 00 00 */ li r10, 0 -/* 80BDB7A8 C0 3E 00 00 */ lfs f1, 0(r30) -/* 80BDB7AC 4B 47 1D 21 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80BDB7B0 90 7F 05 74 */ stw r3, 0x574(r31) -/* 80BDB7B4 7F E3 FB 78 */ mr r3, r31 -/* 80BDB7B8 4B FF FB D1 */ bl ObjHit__10daObjDAN_cFv -/* 80BDB7BC 7F E3 FB 78 */ mr r3, r31 -/* 80BDB7C0 4B FF FD 21 */ bl BoomChk__10daObjDAN_cFv -/* 80BDB7C4 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80BDB7C8 D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 80BDB7CC C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80BDB7D0 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80BDB7D4 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 80BDB7D8 D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 80BDB7DC C0 1F 05 3C */ lfs f0, 0x53c(r31) -/* 80BDB7E0 C0 3E 00 4C */ lfs f1, 0x4c(r30) -/* 80BDB7E4 EC 00 08 2A */ fadds f0, f0, f1 -/* 80BDB7E8 D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 80BDB7EC C0 1F 05 38 */ lfs f0, 0x538(r31) -/* 80BDB7F0 D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 80BDB7F4 C0 1F 05 3C */ lfs f0, 0x53c(r31) -/* 80BDB7F8 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 80BDB7FC C0 1F 05 40 */ lfs f0, 0x540(r31) -/* 80BDB800 D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 80BDB804 C0 1F 05 54 */ lfs f0, 0x554(r31) -/* 80BDB808 EC 00 08 2A */ fadds f0, f0, f1 -/* 80BDB80C D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 80BDB810 7F E3 FB 78 */ mr r3, r31 -/* 80BDB814 4B FF EE 0D */ bl SetCcSph__10daObjDAN_cFv -/* 80BDB818 7F E3 FB 78 */ mr r3, r31 -/* 80BDB81C 4B FF FA 49 */ bl ParticleSet__10daObjDAN_cFv -/* 80BDB820 48 00 00 6C */ b lbl_80BDB88C -lbl_80BDB824: -/* 80BDB824 38 60 00 00 */ li r3, 0 -/* 80BDB828 7C 64 1B 78 */ mr r4, r3 -/* 80BDB82C 38 00 00 03 */ li r0, 3 -/* 80BDB830 7C 09 03 A6 */ mtctr r0 -lbl_80BDB834: -/* 80BDB834 38 C3 07 6A */ addi r6, r3, 0x76a -/* 80BDB838 7C BF 32 AE */ lhax r5, r31, r6 -/* 80BDB83C 38 05 FF FF */ addi r0, r5, -1 -/* 80BDB840 7C 1F 33 2E */ sthx r0, r31, r6 -/* 80BDB844 7C 1F 32 AE */ lhax r0, r31, r6 -/* 80BDB848 2C 00 00 00 */ cmpwi r0, 0 -/* 80BDB84C 41 81 00 08 */ bgt lbl_80BDB854 -/* 80BDB850 7C 9F 33 2E */ sthx r4, r31, r6 -lbl_80BDB854: -/* 80BDB854 38 63 00 02 */ addi r3, r3, 2 -/* 80BDB858 42 00 FF DC */ bdnz lbl_80BDB834 -/* 80BDB85C 88 1F 07 68 */ lbz r0, 0x768(r31) -/* 80BDB860 2C 00 00 02 */ cmpwi r0, 2 -/* 80BDB864 41 82 00 20 */ beq lbl_80BDB884 -/* 80BDB868 40 80 00 24 */ bge lbl_80BDB88C -/* 80BDB86C 2C 00 00 01 */ cmpwi r0, 1 -/* 80BDB870 40 80 00 08 */ bge lbl_80BDB878 -/* 80BDB874 48 00 00 18 */ b lbl_80BDB88C -lbl_80BDB878: -/* 80BDB878 7F E3 FB 78 */ mr r3, r31 -/* 80BDB87C 4B FF F2 99 */ bl MoveAction__10daObjDAN_cFv -/* 80BDB880 48 00 00 0C */ b lbl_80BDB88C -lbl_80BDB884: -/* 80BDB884 7F E3 FB 78 */ mr r3, r31 -/* 80BDB888 4B FF F3 89 */ bl DamageAction__10daObjDAN_cFv -lbl_80BDB88C: -/* 80BDB88C 3C 60 00 06 */ lis r3, 0x0006 /* 0x000600A3@ha */ -/* 80BDB890 38 03 00 A3 */ addi r0, r3, 0x00A3 /* 0x000600A3@l */ -/* 80BDB894 90 01 00 20 */ stw r0, 0x20(r1) -/* 80BDB898 38 7F 07 B0 */ addi r3, r31, 0x7b0 -/* 80BDB89C 38 81 00 20 */ addi r4, r1, 0x20 -/* 80BDB8A0 38 A0 00 00 */ li r5, 0 -/* 80BDB8A4 38 C0 FF FF */ li r6, -1 -/* 80BDB8A8 81 9F 07 B0 */ lwz r12, 0x7b0(r31) -/* 80BDB8AC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80BDB8B0 7D 89 03 A6 */ mtctr r12 -/* 80BDB8B4 4E 80 04 21 */ bctrl -/* 80BDB8B8 7F E3 FB 78 */ mr r3, r31 -/* 80BDB8BC 38 9F 05 90 */ addi r4, r31, 0x590 -/* 80BDB8C0 4B 43 EE 0D */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 80BDB8C4 38 7F 08 88 */ addi r3, r31, 0x888 -/* 80BDB8C8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB8CC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB8D0 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80BDB8D4 4B 49 B1 D9 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 80BDB8D8 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80BDB8DC 7C 03 07 74 */ extsb r3, r0 -/* 80BDB8E0 4B 45 17 8D */ bl dComIfGp_getReverb__Fi -/* 80BDB8E4 7C 65 1B 78 */ mr r5, r3 -/* 80BDB8E8 80 7F 08 44 */ lwz r3, 0x844(r31) -/* 80BDB8EC 38 80 00 00 */ li r4, 0 -/* 80BDB8F0 4B 43 57 C1 */ bl play__16mDoExt_McaMorfSOFUlSc -/* 80BDB8F4 80 7F 07 90 */ lwz r3, 0x790(r31) -/* 80BDB8F8 4B 43 1B 31 */ bl play__14mDoExt_baseAnmFv -/* 80BDB8FC 80 7F 07 94 */ lwz r3, 0x794(r31) -/* 80BDB900 4B 43 1B 29 */ bl play__14mDoExt_baseAnmFv -/* 80BDB904 7F E3 FB 78 */ mr r3, r31 -/* 80BDB908 48 00 00 89 */ bl setBaseMtx__10daObjDAN_cFv -/* 80BDB90C 38 60 00 01 */ li r3, 1 -lbl_80BDB910: -/* 80BDB910 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80BDB914 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80BDB918 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BDB91C 7C 08 03 A6 */ mtlr r0 -/* 80BDB920 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BDB924 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/InitCcSph__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/InitCcSph__10daObjDAN_cFv.s deleted file mode 100644 index 0cfc7e0d3c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/InitCcSph__10daObjDAN_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80BDA5B4: -/* 80BDA5B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDA5B8 7C 08 02 A6 */ mflr r0 -/* 80BDA5BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDA5C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDA5C4 7C 7F 1B 78 */ mr r31, r3 -/* 80BDA5C8 38 7F 05 90 */ addi r3, r31, 0x590 -/* 80BDA5CC 38 80 00 01 */ li r4, 1 -/* 80BDA5D0 38 A0 00 00 */ li r5, 0 -/* 80BDA5D4 7F E6 FB 78 */ mr r6, r31 -/* 80BDA5D8 4B 4A 92 89 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80BDA5DC 38 7F 05 CC */ addi r3, r31, 0x5cc -/* 80BDA5E0 3C 80 80 BE */ lis r4, ccSphSrc@ha /* 0x80BDC3B4@ha */ -/* 80BDA5E4 38 84 C3 B4 */ addi r4, r4, ccSphSrc@l /* 0x80BDC3B4@l */ -/* 80BDA5E8 4B 4A A4 4D */ bl Set__8dCcD_SphFRC11dCcD_SrcSph -/* 80BDA5EC 38 1F 05 90 */ addi r0, r31, 0x590 -/* 80BDA5F0 90 1F 06 10 */ stw r0, 0x610(r31) -/* 80BDA5F4 38 7F 06 F0 */ addi r3, r31, 0x6f0 -/* 80BDA5F8 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80BDA5FC 4B 69 50 4D */ bl SetC__8cM3dGSphFRC4cXyz -/* 80BDA600 80 1F 06 68 */ lwz r0, 0x668(r31) -/* 80BDA604 60 00 00 04 */ ori r0, r0, 4 -/* 80BDA608 90 1F 06 68 */ stw r0, 0x668(r31) -/* 80BDA60C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDA610 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDA614 7C 08 03 A6 */ mtlr r0 -/* 80BDA618 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDA61C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Insect_Release__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Insect_Release__10daObjDAN_cFv.s deleted file mode 100644 index 77efe0d4db..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Insect_Release__10daObjDAN_cFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80BDB0D8: -/* 80BDB0D8 38 00 00 01 */ li r0, 1 -/* 80BDB0DC 98 03 05 6C */ stb r0, 0x56c(r3) -/* 80BDB0E0 98 03 07 68 */ stb r0, 0x768(r3) -/* 80BDB0E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/LinkChk__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/LinkChk__10daObjDAN_cFv.s deleted file mode 100644 index 13e58226b2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/LinkChk__10daObjDAN_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80BDAA9C: -/* 80BDAA9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDAAA0 7C 08 02 A6 */ mflr r0 -/* 80BDAAA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDAAA8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDAAAC 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDAAB0 7C 7E 1B 78 */ mr r30, r3 -/* 80BDAAB4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDAAB8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDAABC 83 E4 5D AC */ lwz r31, 0x5dac(r4) -/* 80BDAAC0 7F E4 FB 78 */ mr r4, r31 -/* 80BDAAC4 4B 43 FE A1 */ bl fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80BDAAC8 3C 60 80 BE */ lis r3, lit_3938@ha /* 0x80BDC400@ha */ -/* 80BDAACC C0 03 C4 00 */ lfs f0, lit_3938@l(r3) /* 0x80BDC400@l */ -/* 80BDAAD0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDAAD4 40 80 00 28 */ bge lbl_80BDAAFC -/* 80BDAAD8 C0 3F 05 2C */ lfs f1, 0x52c(r31) -/* 80BDAADC 3C 60 80 BE */ lis r3, lit_3939@ha /* 0x80BDC404@ha */ -/* 80BDAAE0 C0 03 C4 04 */ lfs f0, lit_3939@l(r3) /* 0x80BDC404@l */ -/* 80BDAAE4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDAAE8 40 81 00 14 */ ble lbl_80BDAAFC -/* 80BDAAEC 38 00 00 02 */ li r0, 2 -/* 80BDAAF0 98 1E 07 68 */ stb r0, 0x768(r30) -/* 80BDAAF4 38 00 00 00 */ li r0, 0 -/* 80BDAAF8 98 1E 07 69 */ stb r0, 0x769(r30) -lbl_80BDAAFC: -/* 80BDAAFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDAB00 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDAB04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDAB08 7C 08 03 A6 */ mtlr r0 -/* 80BDAB0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDAB10 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/MoveAction__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/MoveAction__10daObjDAN_cFv.s deleted file mode 100644 index e5538fea87..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/MoveAction__10daObjDAN_cFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_80BDAB14: -/* 80BDAB14 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BDAB18 7C 08 02 A6 */ mflr r0 -/* 80BDAB1C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BDAB20 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80BDAB24 7C 7F 1B 78 */ mr r31, r3 -/* 80BDAB28 A8 03 07 6A */ lha r0, 0x76a(r3) -/* 80BDAB2C 2C 00 00 00 */ cmpwi r0, 0 -/* 80BDAB30 40 82 00 90 */ bne lbl_80BDABC0 -/* 80BDAB34 38 61 00 0C */ addi r3, r1, 0xc -/* 80BDAB38 38 9F 04 A8 */ addi r4, r31, 0x4a8 -/* 80BDAB3C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80BDAB40 4B 68 BF F5 */ bl __mi__4cXyzCFRC3Vec -/* 80BDAB44 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80BDAB48 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BDAB4C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80BDAB50 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80BDAB54 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 80BDAB58 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80BDAB5C 3C 60 80 BE */ lis r3, lit_3960@ha /* 0x80BDC408@ha */ -/* 80BDAB60 C0 23 C4 08 */ lfs f1, lit_3960@l(r3) /* 0x80BDC408@l */ -/* 80BDAB64 4B 68 CE 29 */ bl cM_rndFX__Ff -/* 80BDAB68 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80BDAB6C EC 00 08 2A */ fadds f0, f0, f1 -/* 80BDAB70 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BDAB74 3C 60 80 BE */ lis r3, lit_3960@ha /* 0x80BDC408@ha */ -/* 80BDAB78 C0 23 C4 08 */ lfs f1, lit_3960@l(r3) /* 0x80BDC408@l */ -/* 80BDAB7C 4B 68 CE 11 */ bl cM_rndFX__Ff -/* 80BDAB80 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80BDAB84 EC 40 08 2A */ fadds f2, f0, f1 -/* 80BDAB88 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80BDAB8C C0 21 00 18 */ lfs f1, 0x18(r1) -/* 80BDAB90 4B 68 CA E5 */ bl cM_atan2s__Fff -/* 80BDAB94 B0 7F 07 78 */ sth r3, 0x778(r31) -/* 80BDAB98 3C 60 80 BE */ lis r3, lit_3938@ha /* 0x80BDC400@ha */ -/* 80BDAB9C C0 23 C4 00 */ lfs f1, lit_3938@l(r3) /* 0x80BDC400@l */ -/* 80BDABA0 4B 68 CD B5 */ bl cM_rndF__Ff -/* 80BDABA4 3C 60 80 BE */ lis r3, lit_3938@ha /* 0x80BDC400@ha */ -/* 80BDABA8 C0 03 C4 00 */ lfs f0, lit_3938@l(r3) /* 0x80BDC400@l */ -/* 80BDABAC EC 00 08 2A */ fadds f0, f0, f1 -/* 80BDABB0 FC 00 00 1E */ fctiwz f0, f0 -/* 80BDABB4 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80BDABB8 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80BDABBC B0 1F 07 6A */ sth r0, 0x76a(r31) -lbl_80BDABC0: -/* 80BDABC0 7F E3 FB 78 */ mr r3, r31 -/* 80BDABC4 4B FF FE 79 */ bl SpeedSet__10daObjDAN_cFv -/* 80BDABC8 7F E3 FB 78 */ mr r3, r31 -/* 80BDABCC 4B FF FE D1 */ bl LinkChk__10daObjDAN_cFv -/* 80BDABD0 3C 60 00 06 */ lis r3, 0x0006 /* 0x000600A5@ha */ -/* 80BDABD4 38 03 00 A5 */ addi r0, r3, 0x00A5 /* 0x000600A5@l */ -/* 80BDABD8 90 01 00 08 */ stw r0, 8(r1) -/* 80BDABDC 38 7F 07 B0 */ addi r3, r31, 0x7b0 -/* 80BDABE0 38 81 00 08 */ addi r4, r1, 8 -/* 80BDABE4 38 A0 00 00 */ li r5, 0 -/* 80BDABE8 38 C0 FF FF */ li r6, -1 -/* 80BDABEC 81 9F 07 B0 */ lwz r12, 0x7b0(r31) -/* 80BDABF0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80BDABF4 7D 89 03 A6 */ mtctr r12 -/* 80BDABF8 4E 80 04 21 */ bctrl -/* 80BDABFC 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80BDAC00 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BDAC04 7C 08 03 A6 */ mtlr r0 -/* 80BDAC08 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BDAC0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/ObjHit__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/ObjHit__10daObjDAN_cFv.s deleted file mode 100644 index 0ae477a241..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/ObjHit__10daObjDAN_cFv.s +++ /dev/null @@ -1,92 +0,0 @@ -lbl_80BDB388: -/* 80BDB388 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BDB38C 7C 08 02 A6 */ mflr r0 -/* 80BDB390 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BDB394 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BDB398 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80BDB39C 7C 7F 1B 78 */ mr r31, r3 -/* 80BDB3A0 3C 60 80 BE */ lis r3, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDB3A4 3B C3 C3 B0 */ addi r30, r3, lit_3775@l /* 0x80BDC3B0@l */ -/* 80BDB3A8 38 7F 05 CC */ addi r3, r31, 0x5cc -/* 80BDB3AC 4B 4A 90 B5 */ bl ChkTgHit__12dCcD_GObjInfFv -/* 80BDB3B0 28 03 00 00 */ cmplwi r3, 0 -/* 80BDB3B4 41 82 01 14 */ beq lbl_80BDB4C8 -/* 80BDB3B8 38 7F 05 CC */ addi r3, r31, 0x5cc -/* 80BDB3BC 4B 4A 91 3D */ bl GetTgHitObj__12dCcD_GObjInfFv -/* 80BDB3C0 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80BDB3C4 54 60 03 DF */ rlwinm. r0, r3, 0, 0xf, 0xf -/* 80BDB3C8 41 82 00 44 */ beq lbl_80BDB40C -/* 80BDB3CC 88 1F 07 A9 */ lbz r0, 0x7a9(r31) -/* 80BDB3D0 28 00 00 00 */ cmplwi r0, 0 -/* 80BDB3D4 40 82 00 E0 */ bne lbl_80BDB4B4 -/* 80BDB3D8 38 00 00 01 */ li r0, 1 -/* 80BDB3DC 98 1F 07 A9 */ stb r0, 0x7a9(r31) -/* 80BDB3E0 38 7F 08 88 */ addi r3, r31, 0x888 -/* 80BDB3E4 4B 49 BF C1 */ bl ClrMoveBGOnly__9dBgS_AcchFv -/* 80BDB3E8 80 1F 08 B4 */ lwz r0, 0x8b4(r31) -/* 80BDB3EC 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 80BDB3F0 90 1F 08 B4 */ stw r0, 0x8b4(r31) -/* 80BDB3F4 38 7F 05 CC */ addi r3, r31, 0x5cc -/* 80BDB3F8 4B 4A 91 51 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 80BDB3FC 38 7F 07 04 */ addi r3, r31, 0x704 -/* 80BDB400 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80BDB404 4B 58 31 AD */ bl initOffset__20daPy_boomerangMove_cFPC4cXyz -/* 80BDB408 48 00 00 AC */ b lbl_80BDB4B4 -lbl_80BDB40C: -/* 80BDB40C 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e -/* 80BDB410 40 82 00 A4 */ bne lbl_80BDB4B4 -/* 80BDB414 C0 1E 00 54 */ lfs f0, 0x54(r30) -/* 80BDB418 D0 01 00 08 */ stfs f0, 8(r1) -/* 80BDB41C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BDB420 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BDB424 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB428 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB42C 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 80BDB430 28 1F 00 00 */ cmplwi r31, 0 -/* 80BDB434 41 82 00 0C */ beq lbl_80BDB440 -/* 80BDB438 80 9F 00 04 */ lwz r4, 4(r31) -/* 80BDB43C 48 00 00 08 */ b lbl_80BDB444 -lbl_80BDB440: -/* 80BDB440 38 80 FF FF */ li r4, -1 -lbl_80BDB444: -/* 80BDB444 38 A1 00 08 */ addi r5, r1, 8 -/* 80BDB448 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80BDB44C 81 8C 01 38 */ lwz r12, 0x138(r12) -/* 80BDB450 7D 89 03 A6 */ mtctr r12 -/* 80BDB454 4E 80 04 21 */ bctrl -/* 80BDB458 38 00 00 02 */ li r0, 2 -/* 80BDB45C 98 1F 07 68 */ stb r0, 0x768(r31) -/* 80BDB460 38 00 00 01 */ li r0, 1 -/* 80BDB464 98 1F 07 69 */ stb r0, 0x769(r31) -/* 80BDB468 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDB46C 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDB470 38 80 00 06 */ li r4, 6 -/* 80BDB474 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB478 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB47C 3C A5 00 02 */ addis r5, r5, 2 -/* 80BDB480 38 C0 00 80 */ li r6, 0x80 -/* 80BDB484 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BDB488 4B 46 0E 65 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDB48C 7C 64 1B 78 */ mr r4, r3 -/* 80BDB490 80 7F 08 44 */ lwz r3, 0x844(r31) -/* 80BDB494 38 A0 00 02 */ li r5, 2 -/* 80BDB498 C0 3E 00 60 */ lfs f1, 0x60(r30) -/* 80BDB49C C0 5E 00 00 */ lfs f2, 0(r30) -/* 80BDB4A0 C0 7E 00 54 */ lfs f3, 0x54(r30) -/* 80BDB4A4 C0 9E 00 64 */ lfs f4, 0x64(r30) -/* 80BDB4A8 4B 43 59 C9 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80BDB4AC 38 00 00 64 */ li r0, 0x64 -/* 80BDB4B0 B0 1F 07 6A */ sth r0, 0x76a(r31) -lbl_80BDB4B4: -/* 80BDB4B4 38 7F 05 CC */ addi r3, r31, 0x5cc -/* 80BDB4B8 81 9F 06 08 */ lwz r12, 0x608(r31) -/* 80BDB4BC 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80BDB4C0 7D 89 03 A6 */ mtctr r12 -/* 80BDB4C4 4E 80 04 21 */ bctrl -lbl_80BDB4C8: -/* 80BDB4C8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BDB4CC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80BDB4D0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BDB4D4 7C 08 03 A6 */ mtlr r0 -/* 80BDB4D8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BDB4DC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/ParticleSet__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/ParticleSet__10daObjDAN_cFv.s deleted file mode 100644 index ff8204b28e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/ParticleSet__10daObjDAN_cFv.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80BDB264: -/* 80BDB264 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80BDB268 7C 08 02 A6 */ mflr r0 -/* 80BDB26C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80BDB270 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80BDB274 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80BDB278 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80BDB27C 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80BDB280 7C 7F 1B 78 */ mr r31, r3 -/* 80BDB284 C0 43 07 98 */ lfs f2, 0x798(r3) -/* 80BDB288 80 03 07 9C */ lwz r0, 0x79c(r3) -/* 80BDB28C 3C 60 80 BE */ lis r3, lit_4158@ha /* 0x80BDC440@ha */ -/* 80BDB290 C8 23 C4 40 */ lfd f1, lit_4158@l(r3) /* 0x80BDC440@l */ -/* 80BDB294 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BDB298 3C 00 43 30 */ lis r0, 0x4330 -/* 80BDB29C 90 01 00 20 */ stw r0, 0x20(r1) -/* 80BDB2A0 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80BDB2A4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80BDB2A8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80BDB2AC 40 81 00 24 */ ble lbl_80BDB2D0 -/* 80BDB2B0 38 7F 07 A4 */ addi r3, r31, 0x7a4 -/* 80BDB2B4 3C 80 80 BE */ lis r4, lit_3939@ha /* 0x80BDC404@ha */ -/* 80BDB2B8 C0 24 C4 04 */ lfs f1, lit_3939@l(r4) /* 0x80BDC404@l */ -/* 80BDB2BC 3C 80 80 BE */ lis r4, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDB2C0 C0 44 C3 B0 */ lfs f2, lit_3775@l(r4) /* 0x80BDC3B0@l */ -/* 80BDB2C4 FC 60 10 90 */ fmr f3, f2 -/* 80BDB2C8 4B 69 47 75 */ bl cLib_addCalc2__FPffff -/* 80BDB2CC 48 00 00 1C */ b lbl_80BDB2E8 -lbl_80BDB2D0: -/* 80BDB2D0 38 7F 07 A4 */ addi r3, r31, 0x7a4 -/* 80BDB2D4 3C 80 80 BE */ lis r4, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDB2D8 C0 24 C3 B0 */ lfs f1, lit_3775@l(r4) /* 0x80BDC3B0@l */ -/* 80BDB2DC FC 40 08 90 */ fmr f2, f1 -/* 80BDB2E0 FC 60 08 90 */ fmr f3, f1 -/* 80BDB2E4 4B 69 47 59 */ bl cLib_addCalc2__FPffff -lbl_80BDB2E8: -/* 80BDB2E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB2EC 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB2F0 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80BDB2F4 38 00 00 FF */ li r0, 0xff -/* 80BDB2F8 90 01 00 08 */ stw r0, 8(r1) -/* 80BDB2FC 38 80 00 00 */ li r4, 0 -/* 80BDB300 90 81 00 0C */ stw r4, 0xc(r1) -/* 80BDB304 38 00 FF FF */ li r0, -1 -/* 80BDB308 90 01 00 10 */ stw r0, 0x10(r1) -/* 80BDB30C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80BDB310 90 81 00 18 */ stw r4, 0x18(r1) -/* 80BDB314 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80BDB318 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80BDB31C 38 A0 00 00 */ li r5, 0 -/* 80BDB320 38 C0 0A 1B */ li r6, 0xa1b -/* 80BDB324 38 FF 04 D0 */ addi r7, r31, 0x4d0 -/* 80BDB328 39 1F 01 0C */ addi r8, r31, 0x10c -/* 80BDB32C 39 3F 04 E4 */ addi r9, r31, 0x4e4 -/* 80BDB330 39 40 00 00 */ li r10, 0 -/* 80BDB334 3D 60 80 BE */ lis r11, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDB338 C0 2B C3 B0 */ lfs f1, lit_3775@l(r11) /* 0x80BDC3B0@l */ -/* 80BDB33C 4B 47 21 91 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80BDB340 90 7F 05 70 */ stw r3, 0x570(r31) -/* 80BDB344 C3 FF 07 A4 */ lfs f31, 0x7a4(r31) -/* 80BDB348 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80BDB34C 38 63 02 10 */ addi r3, r3, 0x210 -/* 80BDB350 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80BDB354 4B 47 05 C5 */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 80BDB358 28 03 00 00 */ cmplwi r3, 0 -/* 80BDB35C 41 82 00 0C */ beq lbl_80BDB368 -/* 80BDB360 D3 E3 00 B0 */ stfs f31, 0xb0(r3) -/* 80BDB364 D3 E3 00 B4 */ stfs f31, 0xb4(r3) -lbl_80BDB368: -/* 80BDB368 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 80BDB36C CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80BDB370 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80BDB374 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80BDB378 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80BDB37C 7C 08 03 A6 */ mtlr r0 -/* 80BDB380 38 21 00 40 */ addi r1, r1, 0x40 -/* 80BDB384 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/SetCcSph__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/SetCcSph__10daObjDAN_cFv.s deleted file mode 100644 index d5aadd9530..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/SetCcSph__10daObjDAN_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80BDA620: -/* 80BDA620 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDA624 7C 08 02 A6 */ mflr r0 -/* 80BDA628 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDA62C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDA630 7C 7F 1B 78 */ mr r31, r3 -/* 80BDA634 38 7F 06 F0 */ addi r3, r31, 0x6f0 -/* 80BDA638 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80BDA63C 4B 69 50 0D */ bl SetC__8cM3dGSphFRC4cXyz -/* 80BDA640 38 7F 06 F0 */ addi r3, r31, 0x6f0 -/* 80BDA644 3C 80 80 BE */ lis r4, lit_3788@ha /* 0x80BDC3F4@ha */ -/* 80BDA648 C0 24 C3 F4 */ lfs f1, lit_3788@l(r4) /* 0x80BDC3F4@l */ -/* 80BDA64C 4B 69 50 BD */ bl SetR__8cM3dGSphFf -/* 80BDA650 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDA654 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDA658 38 63 23 3C */ addi r3, r3, 0x233c -/* 80BDA65C 38 9F 05 CC */ addi r4, r31, 0x5cc -/* 80BDA660 4B 68 A5 49 */ bl Set__4cCcSFP8cCcD_Obj -/* 80BDA664 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDA668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDA66C 7C 08 03 A6 */ mtlr r0 -/* 80BDA670 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDA674 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/SpeedSet__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/SpeedSet__10daObjDAN_cFv.s deleted file mode 100644 index 6060919541..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/SpeedSet__10daObjDAN_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80BDAA3C: -/* 80BDAA3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDAA40 7C 08 02 A6 */ mflr r0 -/* 80BDAA44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDAA48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDAA4C 7C 7F 1B 78 */ mr r31, r3 -/* 80BDAA50 38 7F 05 2C */ addi r3, r31, 0x52c -/* 80BDAA54 C0 3F 07 70 */ lfs f1, 0x770(r31) -/* 80BDAA58 3C 80 80 BE */ lis r4, lit_3923@ha /* 0x80BDC3F8@ha */ -/* 80BDAA5C C0 44 C3 F8 */ lfs f2, lit_3923@l(r4) /* 0x80BDC3F8@l */ -/* 80BDAA60 3C 80 80 BE */ lis r4, lit_3924@ha /* 0x80BDC3FC@ha */ -/* 80BDAA64 C0 64 C3 FC */ lfs f3, lit_3924@l(r4) /* 0x80BDC3FC@l */ -/* 80BDAA68 4B 69 4F D5 */ bl cLib_addCalc2__FPffff -/* 80BDAA6C 38 7F 04 DE */ addi r3, r31, 0x4de -/* 80BDAA70 A8 9F 07 78 */ lha r4, 0x778(r31) -/* 80BDAA74 38 A0 00 A0 */ li r5, 0xa0 -/* 80BDAA78 38 C0 01 00 */ li r6, 0x100 -/* 80BDAA7C 4B 69 5B 8D */ bl cLib_addCalcAngleS2__FPssss -/* 80BDAA80 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 80BDAA84 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 80BDAA88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDAA8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDAA90 7C 08 03 A6 */ mtlr r0 -/* 80BDAA94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDAA98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Z_BufferChk__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Z_BufferChk__10daObjDAN_cFv.s deleted file mode 100644 index ccb444b2fd..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Z_BufferChk__10daObjDAN_cFv.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_80BDB0E8: -/* 80BDB0E8 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 80BDB0EC 7C 08 02 A6 */ mflr r0 -/* 80BDB0F0 90 01 00 64 */ stw r0, 0x64(r1) -/* 80BDB0F4 DB E1 00 50 */ stfd f31, 0x50(r1) -/* 80BDB0F8 F3 E1 00 58 */ psq_st f31, 88(r1), 0, 0 /* qr0 */ -/* 80BDB0FC DB C1 00 40 */ stfd f30, 0x40(r1) -/* 80BDB100 F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0 /* qr0 */ -/* 80BDB104 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80BDB108 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80BDB10C 7C 7E 1B 78 */ mr r30, r3 -/* 80BDB110 3C 60 80 BE */ lis r3, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDB114 3B E3 C3 B0 */ addi r31, r3, lit_3775@l /* 0x80BDC3B0@l */ -/* 80BDB118 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80BDB11C D0 01 00 08 */ stfs f0, 8(r1) -/* 80BDB120 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 80BDB124 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 80BDB128 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80BDB12C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BDB130 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80BDB134 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BDB138 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BDB13C 38 61 00 08 */ addi r3, r1, 8 -/* 80BDB140 38 81 00 14 */ addi r4, r1, 0x14 -/* 80BDB144 4B 43 A1 CD */ bl mDoLib_project__FP3VecP3Vec -/* 80BDB148 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB14C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB150 80 63 5D 74 */ lwz r3, 0x5d74(r3) -/* 80BDB154 28 03 00 00 */ cmplwi r3, 0 -/* 80BDB158 41 82 00 0C */ beq lbl_80BDB164 -/* 80BDB15C C0 63 0B 68 */ lfs f3, 0xb68(r3) -/* 80BDB160 48 00 00 08 */ b lbl_80BDB168 -lbl_80BDB164: -/* 80BDB164 C0 7F 00 54 */ lfs f3, 0x54(r31) -lbl_80BDB168: -/* 80BDB168 C0 21 00 14 */ lfs f1, 0x14(r1) -/* 80BDB16C C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80BDB170 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDB174 40 81 00 5C */ ble lbl_80BDB1D0 -/* 80BDB178 C0 1F 00 80 */ lfs f0, 0x80(r31) -/* 80BDB17C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDB180 40 80 00 50 */ bge lbl_80BDB1D0 -/* 80BDB184 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 80BDB188 FC 02 18 40 */ fcmpo cr0, f2, f3 -/* 80BDB18C 40 81 00 44 */ ble lbl_80BDB1D0 -/* 80BDB190 C0 1F 00 84 */ lfs f0, 0x84(r31) -/* 80BDB194 EC 00 18 28 */ fsubs f0, f0, f3 -/* 80BDB198 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80BDB19C 40 80 00 34 */ bge lbl_80BDB1D0 -/* 80BDB1A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB1A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB1A8 3C 63 00 02 */ addis r3, r3, 2 -/* 80BDB1AC FC 00 08 1E */ fctiwz f0, f1 -/* 80BDB1B0 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80BDB1B4 80 81 00 24 */ lwz r4, 0x24(r1) -/* 80BDB1B8 FC 00 10 1E */ fctiwz f0, f2 -/* 80BDB1BC D8 01 00 28 */ stfd f0, 0x28(r1) -/* 80BDB1C0 80 A1 00 2C */ lwz r5, 0x2c(r1) -/* 80BDB1C4 38 DE 07 9C */ addi r6, r30, 0x79c -/* 80BDB1C8 38 63 C0 F4 */ addi r3, r3, -16140 -/* 80BDB1CC 4B 47 AE 4D */ bl newData__13dDlst_peekZ_cFssPUl -lbl_80BDB1D0: -/* 80BDB1D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB1D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB1D8 80 63 61 B0 */ lwz r3, 0x61b0(r3) -/* 80BDB1DC C3 E3 00 C8 */ lfs f31, 0xc8(r3) -/* 80BDB1E0 C3 C3 00 CC */ lfs f30, 0xcc(r3) -/* 80BDB1E4 38 61 00 08 */ addi r3, r1, 8 -/* 80BDB1E8 38 81 00 14 */ addi r4, r1, 0x14 -/* 80BDB1EC 4B 43 A3 01 */ bl mDoLib_pos2camera__FP3VecP3Vec -/* 80BDB1F0 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80BDB1F4 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 80BDB1F8 EC 21 00 2A */ fadds f1, f1, f0 -/* 80BDB1FC D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 80BDB200 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 80BDB204 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80BDB208 40 81 00 08 */ ble lbl_80BDB210 -/* 80BDB20C D0 01 00 1C */ stfs f0, 0x1c(r1) -lbl_80BDB210: -/* 80BDB210 C0 7F 00 88 */ lfs f3, 0x88(r31) -/* 80BDB214 C0 5F 00 00 */ lfs f2, 0(r31) -/* 80BDB218 EC 3E 07 F2 */ fmuls f1, f30, f31 -/* 80BDB21C C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80BDB220 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80BDB224 EC 3F 00 2A */ fadds f1, f31, f0 -/* 80BDB228 EC 1E F8 28 */ fsubs f0, f30, f31 -/* 80BDB22C EC 01 00 24 */ fdivs f0, f1, f0 -/* 80BDB230 EC 02 00 2A */ fadds f0, f2, f0 -/* 80BDB234 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80BDB238 D0 1E 07 98 */ stfs f0, 0x798(r30) -/* 80BDB23C E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ -/* 80BDB240 CB E1 00 50 */ lfd f31, 0x50(r1) -/* 80BDB244 E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0 /* qr0 */ -/* 80BDB248 CB C1 00 40 */ lfd f30, 0x40(r1) -/* 80BDB24C 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80BDB250 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80BDB254 80 01 00 64 */ lwz r0, 0x64(r1) -/* 80BDB258 7C 08 03 A6 */ mtlr r0 -/* 80BDB25C 38 21 00 60 */ addi r1, r1, 0x60 -/* 80BDB260 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__ct__14daObj_DanHIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__ct__14daObj_DanHIO_cFv.s deleted file mode 100644 index cc4789da79..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__ct__14daObj_DanHIO_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80BDA58C: -/* 80BDA58C 3C 80 80 BE */ lis r4, __vt__14daObj_DanHIO_c@ha /* 0x80BDC550@ha */ -/* 80BDA590 38 04 C5 50 */ addi r0, r4, __vt__14daObj_DanHIO_c@l /* 0x80BDC550@l */ -/* 80BDA594 90 03 00 00 */ stw r0, 0(r3) -/* 80BDA598 38 00 FF FF */ li r0, -1 -/* 80BDA59C 98 03 00 04 */ stb r0, 4(r3) -/* 80BDA5A0 3C 80 80 BE */ lis r4, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDA5A4 C0 04 C3 B0 */ lfs f0, lit_3775@l(r4) /* 0x80BDC3B0@l */ -/* 80BDA5A8 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80BDA5AC D0 03 00 08 */ stfs f0, 8(r3) -/* 80BDA5B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index af17ba0e53..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BDA9B0: -/* 80BDA9B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDA9B4 7C 08 02 A6 */ mflr r0 -/* 80BDA9B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDA9BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDA9C0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BDA9C4 41 82 00 1C */ beq lbl_80BDA9E0 -/* 80BDA9C8 3C A0 80 BE */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80BDC544@ha */ -/* 80BDA9CC 38 05 C5 44 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80BDC544@l */ -/* 80BDA9D0 90 1F 00 00 */ stw r0, 0(r31) -/* 80BDA9D4 7C 80 07 35 */ extsh. r0, r4 -/* 80BDA9D8 40 81 00 08 */ ble lbl_80BDA9E0 -/* 80BDA9DC 4B 6F 43 61 */ bl __dl__FPv -lbl_80BDA9E0: -/* 80BDA9E0 7F E3 FB 78 */ mr r3, r31 -/* 80BDA9E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDA9E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDA9EC 7C 08 03 A6 */ mtlr r0 -/* 80BDA9F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDA9F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 621e26ee26..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80BDC1E8: -/* 80BDC1E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC1EC 7C 08 02 A6 */ mflr r0 -/* 80BDC1F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC1F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDC1F8 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDC1FC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BDC200 7C 9F 23 78 */ mr r31, r4 -/* 80BDC204 41 82 00 38 */ beq lbl_80BDC23C -/* 80BDC208 3C 80 80 BE */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x80BDC4FC@ha */ -/* 80BDC20C 38 84 C4 FC */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x80BDC4FC@l */ -/* 80BDC210 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80BDC214 38 04 00 0C */ addi r0, r4, 0xc -/* 80BDC218 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80BDC21C 38 04 00 18 */ addi r0, r4, 0x18 -/* 80BDC220 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80BDC224 38 80 00 00 */ li r4, 0 -/* 80BDC228 4B 49 9D 6D */ bl __dt__9dBgS_AcchFv -/* 80BDC22C 7F E0 07 35 */ extsh. r0, r31 -/* 80BDC230 40 81 00 0C */ ble lbl_80BDC23C -/* 80BDC234 7F C3 F3 78 */ mr r3, r30 -/* 80BDC238 4B 6F 2B 05 */ bl __dl__FPv -lbl_80BDC23C: -/* 80BDC23C 7F C3 F3 78 */ mr r3, r30 -/* 80BDC240 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDC244 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDC248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC24C 7C 08 03 A6 */ mtlr r0 -/* 80BDC250 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC254 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__14dBgS_ObjGndChkFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__14dBgS_ObjGndChkFv.s deleted file mode 100644 index ece8b6bbff..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__14dBgS_ObjGndChkFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80BDC170: -/* 80BDC170 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC174 7C 08 02 A6 */ mflr r0 -/* 80BDC178 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC17C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDC180 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDC184 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80BDC188 7C 9F 23 78 */ mr r31, r4 -/* 80BDC18C 41 82 00 40 */ beq lbl_80BDC1CC -/* 80BDC190 3C 80 80 BE */ lis r4, __vt__14dBgS_ObjGndChk@ha /* 0x80BDC4CC@ha */ -/* 80BDC194 38 84 C4 CC */ addi r4, r4, __vt__14dBgS_ObjGndChk@l /* 0x80BDC4CC@l */ -/* 80BDC198 90 9E 00 10 */ stw r4, 0x10(r30) -/* 80BDC19C 38 04 00 0C */ addi r0, r4, 0xc -/* 80BDC1A0 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80BDC1A4 38 04 00 18 */ addi r0, r4, 0x18 -/* 80BDC1A8 90 1E 00 3C */ stw r0, 0x3c(r30) -/* 80BDC1AC 38 04 00 24 */ addi r0, r4, 0x24 -/* 80BDC1B0 90 1E 00 4C */ stw r0, 0x4c(r30) -/* 80BDC1B4 38 80 00 00 */ li r4, 0 -/* 80BDC1B8 4B 49 B4 39 */ bl __dt__11dBgS_GndChkFv -/* 80BDC1BC 7F E0 07 35 */ extsh. r0, r31 -/* 80BDC1C0 40 81 00 0C */ ble lbl_80BDC1CC -/* 80BDC1C4 7F C3 F3 78 */ mr r3, r30 -/* 80BDC1C8 4B 6F 2B 75 */ bl __dl__FPv -lbl_80BDC1CC: -/* 80BDC1CC 7F C3 F3 78 */ mr r3, r30 -/* 80BDC1D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDC1D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDC1D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC1DC 7C 08 03 A6 */ mtlr r0 -/* 80BDC1E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC1E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__14daObj_DanHIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__14daObj_DanHIO_cFv.s deleted file mode 100644 index e48fefdd94..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__14daObj_DanHIO_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BDC2F0: -/* 80BDC2F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC2F4 7C 08 02 A6 */ mflr r0 -/* 80BDC2F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC2FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDC300 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BDC304 41 82 00 1C */ beq lbl_80BDC320 -/* 80BDC308 3C A0 80 BE */ lis r5, __vt__14daObj_DanHIO_c@ha /* 0x80BDC550@ha */ -/* 80BDC30C 38 05 C5 50 */ addi r0, r5, __vt__14daObj_DanHIO_c@l /* 0x80BDC550@l */ -/* 80BDC310 90 1F 00 00 */ stw r0, 0(r31) -/* 80BDC314 7C 80 07 35 */ extsh. r0, r4 -/* 80BDC318 40 81 00 08 */ ble lbl_80BDC320 -/* 80BDC31C 4B 6F 2A 21 */ bl __dl__FPv -lbl_80BDC320: -/* 80BDC320 7F E3 FB 78 */ mr r3, r31 -/* 80BDC324 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDC328 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC32C 7C 08 03 A6 */ mtlr r0 -/* 80BDC330 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC334 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__8cM3dGAabFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__8cM3dGAabFv.s deleted file mode 100644 index a51762b9db..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BDC2A0: -/* 80BDC2A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC2A4 7C 08 02 A6 */ mflr r0 -/* 80BDC2A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC2AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDC2B0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BDC2B4 41 82 00 1C */ beq lbl_80BDC2D0 -/* 80BDC2B8 3C A0 80 BE */ lis r5, __vt__8cM3dGAab@ha /* 0x80BDC52C@ha */ -/* 80BDC2BC 38 05 C5 2C */ addi r0, r5, __vt__8cM3dGAab@l /* 0x80BDC52C@l */ -/* 80BDC2C0 90 1F 00 18 */ stw r0, 0x18(r31) -/* 80BDC2C4 7C 80 07 35 */ extsh. r0, r4 -/* 80BDC2C8 40 81 00 08 */ ble lbl_80BDC2D0 -/* 80BDC2CC 4B 6F 2A 71 */ bl __dl__FPv -lbl_80BDC2D0: -/* 80BDC2D0 7F E3 FB 78 */ mr r3, r31 -/* 80BDC2D4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDC2D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC2DC 7C 08 03 A6 */ mtlr r0 -/* 80BDC2E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC2E4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__8cM3dGSphFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__8cM3dGSphFv.s deleted file mode 100644 index b2f2f154d1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__8cM3dGSphFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80BDC258: -/* 80BDC258 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC25C 7C 08 02 A6 */ mflr r0 -/* 80BDC260 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC264 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDC268 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80BDC26C 41 82 00 1C */ beq lbl_80BDC288 -/* 80BDC270 3C A0 80 BE */ lis r5, __vt__8cM3dGSph@ha /* 0x80BDC520@ha */ -/* 80BDC274 38 05 C5 20 */ addi r0, r5, __vt__8cM3dGSph@l /* 0x80BDC520@l */ -/* 80BDC278 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80BDC27C 7C 80 07 35 */ extsh. r0, r4 -/* 80BDC280 40 81 00 08 */ ble lbl_80BDC288 -/* 80BDC284 4B 6F 2A B9 */ bl __dl__FPv -lbl_80BDC288: -/* 80BDC288 7F E3 FB 78 */ mr r3, r31 -/* 80BDC28C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDC290 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC294 7C 08 03 A6 */ mtlr r0 -/* 80BDC298 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC29C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__sinit_d_a_obj_dan_cpp.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__sinit_d_a_obj_dan_cpp.s deleted file mode 100644 index ce823cb545..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__sinit_d_a_obj_dan_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80BDC338: -/* 80BDC338 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDC33C 7C 08 02 A6 */ mflr r0 -/* 80BDC340 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDC344 3C 60 80 BE */ lis r3, l_HIO@ha /* 0x80BDC578@ha */ -/* 80BDC348 38 63 C5 78 */ addi r3, r3, l_HIO@l /* 0x80BDC578@l */ -/* 80BDC34C 4B FF E2 41 */ bl __ct__14daObj_DanHIO_cFv -/* 80BDC350 3C 80 80 BE */ lis r4, __dt__14daObj_DanHIO_cFv@ha /* 0x80BDC2F0@ha */ -/* 80BDC354 38 84 C2 F0 */ addi r4, r4, __dt__14daObj_DanHIO_cFv@l /* 0x80BDC2F0@l */ -/* 80BDC358 3C A0 80 BE */ lis r5, lit_3770@ha /* 0x80BDC56C@ha */ -/* 80BDC35C 38 A5 C5 6C */ addi r5, r5, lit_3770@l /* 0x80BDC56C@l */ -/* 80BDC360 4B FF E1 B9 */ bl __register_global_object -/* 80BDC364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDC368 7C 08 03 A6 */ mtlr r0 -/* 80BDC36C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDC370 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/checkGroundPos__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/checkGroundPos__10daObjDAN_cFv.s deleted file mode 100644 index 2e40f01ea2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/checkGroundPos__10daObjDAN_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80BDB074: -/* 80BDB074 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BDB078 7C 08 02 A6 */ mflr r0 -/* 80BDB07C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BDB080 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BDB084 7C 7F 1B 78 */ mr r31, r3 -/* 80BDB088 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 80BDB08C D0 01 00 08 */ stfs f0, 8(r1) -/* 80BDB090 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80BDB094 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BDB098 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 80BDB09C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BDB0A0 38 7F 07 10 */ addi r3, r31, 0x710 -/* 80BDB0A4 38 81 00 08 */ addi r4, r1, 8 -/* 80BDB0A8 4B 68 CC 81 */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 80BDB0AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDB0B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDB0B4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BDB0B8 38 9F 07 10 */ addi r4, r31, 0x710 -/* 80BDB0BC 4B 49 93 E5 */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 80BDB0C0 D0 3F 07 64 */ stfs f1, 0x764(r31) -/* 80BDB0C4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BDB0C8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BDB0CC 7C 08 03 A6 */ mtlr r0 -/* 80BDB0D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BDB0D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/create__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/create__10daObjDAN_cFv.s deleted file mode 100644 index 60e5bc02b0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/create__10daObjDAN_cFv.s +++ /dev/null @@ -1,317 +0,0 @@ -lbl_80BDBCB8: -/* 80BDBCB8 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80BDBCBC 7C 08 02 A6 */ mflr r0 -/* 80BDBCC0 90 01 00 94 */ stw r0, 0x94(r1) -/* 80BDBCC4 39 61 00 90 */ addi r11, r1, 0x90 -/* 80BDBCC8 4B 78 65 05 */ bl _savegpr_25 -/* 80BDBCCC 7C 7D 1B 78 */ mr r29, r3 -/* 80BDBCD0 3C 80 80 BE */ lis r4, lit_3775@ha /* 0x80BDC3B0@ha */ -/* 80BDBCD4 3B E4 C3 B0 */ addi r31, r4, lit_3775@l /* 0x80BDC3B0@l */ -/* 80BDBCD8 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BDBCDC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BDBCE0 40 82 00 FC */ bne lbl_80BDBDDC -/* 80BDBCE4 7F A0 EB 79 */ or. r0, r29, r29 -/* 80BDBCE8 41 82 00 E8 */ beq lbl_80BDBDD0 -/* 80BDBCEC 7C 1E 03 78 */ mr r30, r0 -/* 80BDBCF0 4B 58 23 21 */ bl __ct__9dInsect_cFv -/* 80BDBCF4 3C 60 80 BE */ lis r3, __vt__10daObjDAN_c@ha /* 0x80BDC538@ha */ -/* 80BDBCF8 38 03 C5 38 */ addi r0, r3, __vt__10daObjDAN_c@l /* 0x80BDC538@l */ -/* 80BDBCFC 90 1E 05 68 */ stw r0, 0x568(r30) -/* 80BDBD00 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80BDBD04 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80BDBD08 90 1E 05 A8 */ stw r0, 0x5a8(r30) -/* 80BDBD0C 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 80BDBD10 4B 4A 7A 51 */ bl __ct__10dCcD_GSttsFv -/* 80BDBD14 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80BDBD18 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80BDBD1C 90 7E 05 A8 */ stw r3, 0x5a8(r30) -/* 80BDBD20 38 03 00 20 */ addi r0, r3, 0x20 -/* 80BDBD24 90 1E 05 AC */ stw r0, 0x5ac(r30) -/* 80BDBD28 3B 5E 05 CC */ addi r26, r30, 0x5cc -/* 80BDBD2C 7F 43 D3 78 */ mr r3, r26 -/* 80BDBD30 4B 4A 7C F9 */ bl __ct__12dCcD_GObjInfFv -/* 80BDBD34 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80BDBD38 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80BDBD3C 90 1A 01 20 */ stw r0, 0x120(r26) -/* 80BDBD40 3C 60 80 BE */ lis r3, __vt__8cM3dGAab@ha /* 0x80BDC52C@ha */ -/* 80BDBD44 38 03 C5 2C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x80BDC52C@l */ -/* 80BDBD48 90 1A 01 1C */ stw r0, 0x11c(r26) -/* 80BDBD4C 3C 60 80 BE */ lis r3, __vt__8cM3dGSph@ha /* 0x80BDC520@ha */ -/* 80BDBD50 38 03 C5 20 */ addi r0, r3, __vt__8cM3dGSph@l /* 0x80BDC520@l */ -/* 80BDBD54 90 1A 01 34 */ stw r0, 0x134(r26) -/* 80BDBD58 3C 60 80 3C */ lis r3, __vt__12cCcD_SphAttr@ha /* 0x803C3540@ha */ -/* 80BDBD5C 38 63 35 40 */ addi r3, r3, __vt__12cCcD_SphAttr@l /* 0x803C3540@l */ -/* 80BDBD60 90 7A 01 20 */ stw r3, 0x120(r26) -/* 80BDBD64 38 03 00 58 */ addi r0, r3, 0x58 -/* 80BDBD68 90 1A 01 34 */ stw r0, 0x134(r26) -/* 80BDBD6C 3C 60 80 3B */ lis r3, __vt__8dCcD_Sph@ha /* 0x803ABFC0@ha */ -/* 80BDBD70 38 63 BF C0 */ addi r3, r3, __vt__8dCcD_Sph@l /* 0x803ABFC0@l */ -/* 80BDBD74 90 7A 00 3C */ stw r3, 0x3c(r26) -/* 80BDBD78 38 03 00 2C */ addi r0, r3, 0x2c -/* 80BDBD7C 90 1A 01 20 */ stw r0, 0x120(r26) -/* 80BDBD80 38 03 00 84 */ addi r0, r3, 0x84 -/* 80BDBD84 90 1A 01 34 */ stw r0, 0x134(r26) -/* 80BDBD88 38 7E 07 10 */ addi r3, r30, 0x710 -/* 80BDBD8C 4B 49 B7 F1 */ bl __ct__11dBgS_GndChkFv -/* 80BDBD90 38 7E 07 B0 */ addi r3, r30, 0x7b0 -/* 80BDBD94 4B 6E 46 35 */ bl __ct__10Z2CreatureFv -/* 80BDBD98 38 7E 08 48 */ addi r3, r30, 0x848 -/* 80BDBD9C 4B 49 A1 11 */ bl __ct__12dBgS_AcchCirFv -/* 80BDBDA0 3B 5E 08 88 */ addi r26, r30, 0x888 -/* 80BDBDA4 7F 43 D3 78 */ mr r3, r26 -/* 80BDBDA8 4B 49 A2 F9 */ bl __ct__9dBgS_AcchFv -/* 80BDBDAC 3C 60 80 BE */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x80BDC4FC@ha */ -/* 80BDBDB0 38 63 C4 FC */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x80BDC4FC@l */ -/* 80BDBDB4 90 7A 00 10 */ stw r3, 0x10(r26) -/* 80BDBDB8 38 03 00 0C */ addi r0, r3, 0xc -/* 80BDBDBC 90 1A 00 14 */ stw r0, 0x14(r26) -/* 80BDBDC0 38 03 00 18 */ addi r0, r3, 0x18 -/* 80BDBDC4 90 1A 00 24 */ stw r0, 0x24(r26) -/* 80BDBDC8 38 7A 00 14 */ addi r3, r26, 0x14 -/* 80BDBDCC 4B 49 D0 9D */ bl SetObj__16dBgS_PolyPassChkFv -lbl_80BDBDD0: -/* 80BDBDD0 80 1D 04 A0 */ lwz r0, 0x4a0(r29) -/* 80BDBDD4 60 00 00 08 */ ori r0, r0, 8 -/* 80BDBDD8 90 1D 04 A0 */ stw r0, 0x4a0(r29) -lbl_80BDBDDC: -/* 80BDBDDC 38 7D 0A 60 */ addi r3, r29, 0xa60 -/* 80BDBDE0 3C 80 80 BE */ lis r4, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDBDE4 38 84 C4 6C */ addi r4, r4, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDBDE8 4B 45 10 D5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80BDBDEC 7C 7E 1B 78 */ mr r30, r3 -/* 80BDBDF0 2C 1E 00 04 */ cmpwi r30, 4 -/* 80BDBDF4 40 82 03 60 */ bne lbl_80BDC154 -/* 80BDBDF8 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80BDBDFC 54 00 07 3E */ clrlwi r0, r0, 0x1c -/* 80BDBE00 98 1D 07 A8 */ stb r0, 0x7a8(r29) -/* 80BDBE04 88 1D 07 A8 */ lbz r0, 0x7a8(r29) -/* 80BDBE08 28 00 00 02 */ cmplwi r0, 2 -/* 80BDBE0C 40 82 00 28 */ bne lbl_80BDBE34 -/* 80BDBE10 38 00 00 00 */ li r0, 0 -/* 80BDBE14 98 1D 05 6C */ stb r0, 0x56c(r29) -/* 80BDBE18 A8 7D 04 E4 */ lha r3, 0x4e4(r29) -/* 80BDBE1C 38 03 E0 00 */ addi r0, r3, -8192 -/* 80BDBE20 B0 1D 04 E4 */ sth r0, 0x4e4(r29) -/* 80BDBE24 80 1D 04 9C */ lwz r0, 0x49c(r29) -/* 80BDBE28 60 00 40 00 */ ori r0, r0, 0x4000 -/* 80BDBE2C 90 1D 04 9C */ stw r0, 0x49c(r29) -/* 80BDBE30 48 00 00 0C */ b lbl_80BDBE3C -lbl_80BDBE34: -/* 80BDBE34 38 00 00 01 */ li r0, 1 -/* 80BDBE38 98 1D 05 6D */ stb r0, 0x56d(r29) -lbl_80BDBE3C: -/* 80BDBE3C 80 1D 00 B0 */ lwz r0, 0xb0(r29) -/* 80BDBE40 54 00 E7 FE */ rlwinm r0, r0, 0x1c, 0x1f, 0x1f -/* 80BDBE44 98 1D 05 81 */ stb r0, 0x581(r29) -/* 80BDBE48 38 00 00 5D */ li r0, 0x5d -/* 80BDBE4C 98 1D 05 48 */ stb r0, 0x548(r29) -/* 80BDBE50 88 1D 05 81 */ lbz r0, 0x581(r29) -/* 80BDBE54 38 7F 00 7C */ addi r3, r31, 0x7c -/* 80BDBE58 7C 03 00 AE */ lbzx r0, r3, r0 -/* 80BDBE5C 98 1D 05 80 */ stb r0, 0x580(r29) -/* 80BDBE60 88 1D 05 81 */ lbz r0, 0x581(r29) -/* 80BDBE64 54 00 08 3C */ slwi r0, r0, 1 -/* 80BDBE68 38 7F 00 B0 */ addi r3, r31, 0xb0 -/* 80BDBE6C 7C 03 02 2E */ lhzx r0, r3, r0 -/* 80BDBE70 B0 1D 05 82 */ sth r0, 0x582(r29) -/* 80BDBE74 88 1D 05 81 */ lbz r0, 0x581(r29) -/* 80BDBE78 28 00 00 01 */ cmplwi r0, 1 -/* 80BDBE7C 40 82 00 20 */ bne lbl_80BDBE9C -/* 80BDBE80 3C 60 80 BE */ lis r3, l_HIO@ha /* 0x80BDC578@ha */ -/* 80BDBE84 38 63 C5 78 */ addi r3, r3, l_HIO@l /* 0x80BDC578@l */ -/* 80BDBE88 C0 03 00 08 */ lfs f0, 8(r3) -/* 80BDBE8C D0 1D 04 EC */ stfs f0, 0x4ec(r29) -/* 80BDBE90 D0 1D 04 F0 */ stfs f0, 0x4f0(r29) -/* 80BDBE94 D0 1D 04 F4 */ stfs f0, 0x4f4(r29) -/* 80BDBE98 48 00 00 24 */ b lbl_80BDBEBC -lbl_80BDBE9C: -/* 80BDBE9C 28 00 00 00 */ cmplwi r0, 0 -/* 80BDBEA0 40 82 00 1C */ bne lbl_80BDBEBC -/* 80BDBEA4 3C 60 80 BE */ lis r3, l_HIO@ha /* 0x80BDC578@ha */ -/* 80BDBEA8 38 63 C5 78 */ addi r3, r3, l_HIO@l /* 0x80BDC578@l */ -/* 80BDBEAC C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80BDBEB0 D0 1D 04 EC */ stfs f0, 0x4ec(r29) -/* 80BDBEB4 D0 1D 04 F0 */ stfs f0, 0x4f0(r29) -/* 80BDBEB8 D0 1D 04 F4 */ stfs f0, 0x4f4(r29) -lbl_80BDBEBC: -/* 80BDBEBC 7F A3 EB 78 */ mr r3, r29 -/* 80BDBEC0 4B FF FC 4D */ bl CreateChk__10daObjDAN_cFv -/* 80BDBEC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BDBEC8 40 82 00 0C */ bne lbl_80BDBED4 -/* 80BDBECC 38 60 00 05 */ li r3, 5 -/* 80BDBED0 48 00 02 88 */ b lbl_80BDC158 -lbl_80BDBED4: -/* 80BDBED4 7F A3 EB 78 */ mr r3, r29 -/* 80BDBED8 3C 80 80 BE */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80BDA678@ha */ -/* 80BDBEDC 38 84 A6 78 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80BDA678@l */ -/* 80BDBEE0 38 A0 12 00 */ li r5, 0x1200 -/* 80BDBEE4 4B 43 E5 CD */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80BDBEE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BDBEEC 40 82 00 0C */ bne lbl_80BDBEF8 -/* 80BDBEF0 38 60 00 05 */ li r3, 5 -/* 80BDBEF4 48 00 02 64 */ b lbl_80BDC158 -lbl_80BDBEF8: -/* 80BDBEF8 3C 60 80 BE */ lis r3, data_80BDC568@ha /* 0x80BDC568@ha */ -/* 80BDBEFC 8C 03 C5 68 */ lbzu r0, data_80BDC568@l(r3) /* 0x80BDC568@l */ -/* 80BDBF00 28 00 00 00 */ cmplwi r0, 0 -/* 80BDBF04 40 82 00 20 */ bne lbl_80BDBF24 -/* 80BDBF08 38 00 00 01 */ li r0, 1 -/* 80BDBF0C 98 03 00 00 */ stb r0, 0(r3) -/* 80BDBF10 98 1D 0A 68 */ stb r0, 0xa68(r29) -/* 80BDBF14 38 00 FF FF */ li r0, -1 -/* 80BDBF18 3C 60 80 BE */ lis r3, l_HIO@ha /* 0x80BDC578@ha */ -/* 80BDBF1C 38 63 C5 78 */ addi r3, r3, l_HIO@l /* 0x80BDC578@l */ -/* 80BDBF20 98 03 00 04 */ stb r0, 4(r3) -lbl_80BDBF24: -/* 80BDBF24 38 7D 08 48 */ addi r3, r29, 0x848 -/* 80BDBF28 C0 3F 00 9C */ lfs f1, 0x9c(r31) -/* 80BDBF2C C0 5F 00 50 */ lfs f2, 0x50(r31) -/* 80BDBF30 4B 49 A0 29 */ bl SetWall__12dBgS_AcchCirFff -/* 80BDBF34 38 00 00 00 */ li r0, 0 -/* 80BDBF38 90 01 00 08 */ stw r0, 8(r1) -/* 80BDBF3C 38 7D 08 88 */ addi r3, r29, 0x888 -/* 80BDBF40 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BDBF44 38 BD 04 BC */ addi r5, r29, 0x4bc -/* 80BDBF48 7F A6 EB 78 */ mr r6, r29 -/* 80BDBF4C 38 E0 00 01 */ li r7, 1 -/* 80BDBF50 39 1D 08 48 */ addi r8, r29, 0x848 -/* 80BDBF54 39 3D 04 F8 */ addi r9, r29, 0x4f8 -/* 80BDBF58 39 40 00 00 */ li r10, 0 -/* 80BDBF5C 4B 49 A2 ED */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80BDBF60 C0 1F 00 6C */ lfs f0, 0x6c(r31) -/* 80BDBF64 D0 1D 07 70 */ stfs f0, 0x770(r29) -/* 80BDBF68 C0 1F 00 68 */ lfs f0, 0x68(r31) -/* 80BDBF6C D0 1D 05 30 */ stfs f0, 0x530(r29) -/* 80BDBF70 38 00 00 01 */ li r0, 1 -/* 80BDBF74 98 1D 07 68 */ stb r0, 0x768(r29) -/* 80BDBF78 88 1D 07 A8 */ lbz r0, 0x7a8(r29) -/* 80BDBF7C 28 00 00 00 */ cmplwi r0, 0 -/* 80BDBF80 40 82 00 0C */ bne lbl_80BDBF8C -/* 80BDBF84 7F A3 EB 78 */ mr r3, r29 -/* 80BDBF88 4B FF E6 2D */ bl InitCcSph__10daObjDAN_cFv -lbl_80BDBF8C: -/* 80BDBF8C 88 1D 07 A8 */ lbz r0, 0x7a8(r29) -/* 80BDBF90 28 00 00 02 */ cmplwi r0, 2 -/* 80BDBF94 40 82 00 A4 */ bne lbl_80BDC038 -/* 80BDBF98 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDBF9C 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDBFA0 38 63 00 06 */ addi r3, r3, 6 -/* 80BDBFA4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDBFA8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDBFAC 38 84 4E 00 */ addi r4, r4, 0x4e00 -/* 80BDBFB0 4B 78 C9 E5 */ bl strcmp -/* 80BDBFB4 2C 03 00 00 */ cmpwi r3, 0 -/* 80BDBFB8 40 82 00 80 */ bne lbl_80BDC038 -/* 80BDBFBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDBFC0 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDBFC4 88 05 4E 0A */ lbz r0, 0x4e0a(r5) -/* 80BDBFC8 2C 00 00 03 */ cmpwi r0, 3 -/* 80BDBFCC 40 82 00 6C */ bne lbl_80BDC038 -/* 80BDBFD0 88 1D 07 A8 */ lbz r0, 0x7a8(r29) -/* 80BDBFD4 54 00 06 36 */ rlwinm r0, r0, 0, 0x18, 0x1b -/* 80BDBFD8 98 1D 07 A8 */ stb r0, 0x7a8(r29) -/* 80BDBFDC C0 1F 00 68 */ lfs f0, 0x68(r31) -/* 80BDBFE0 D0 1D 05 30 */ stfs f0, 0x530(r29) -/* 80BDBFE4 38 00 00 02 */ li r0, 2 -/* 80BDBFE8 98 1D 07 68 */ stb r0, 0x768(r29) -/* 80BDBFEC 38 00 00 01 */ li r0, 1 -/* 80BDBFF0 98 1D 07 69 */ stb r0, 0x769(r29) -/* 80BDBFF4 3C 60 80 BE */ lis r3, d_a_obj_dan__stringBase0@ha /* 0x80BDC46C@ha */ -/* 80BDBFF8 38 63 C4 6C */ addi r3, r3, d_a_obj_dan__stringBase0@l /* 0x80BDC46C@l */ -/* 80BDBFFC 38 80 00 06 */ li r4, 6 -/* 80BDC000 3C A5 00 02 */ addis r5, r5, 2 -/* 80BDC004 38 C0 00 80 */ li r6, 0x80 -/* 80BDC008 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80BDC00C 4B 46 02 E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BDC010 7C 64 1B 78 */ mr r4, r3 -/* 80BDC014 80 7D 08 44 */ lwz r3, 0x844(r29) -/* 80BDC018 38 A0 00 02 */ li r5, 2 -/* 80BDC01C C0 3F 00 60 */ lfs f1, 0x60(r31) -/* 80BDC020 C0 5F 00 00 */ lfs f2, 0(r31) -/* 80BDC024 C0 7F 00 54 */ lfs f3, 0x54(r31) -/* 80BDC028 C0 9F 00 64 */ lfs f4, 0x64(r31) -/* 80BDC02C 4B 43 4E 45 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80BDC030 38 00 00 64 */ li r0, 0x64 -/* 80BDC034 B0 1D 07 6A */ sth r0, 0x76a(r29) -lbl_80BDC038: -/* 80BDC038 80 1D 08 B4 */ lwz r0, 0x8b4(r29) -/* 80BDC03C 60 00 80 00 */ ori r0, r0, 0x8000 -/* 80BDC040 90 1D 08 B4 */ stw r0, 0x8b4(r29) -/* 80BDC044 3B 21 00 1C */ addi r25, r1, 0x1c -/* 80BDC048 7F 23 CB 78 */ mr r3, r25 -/* 80BDC04C 4B 49 B5 31 */ bl __ct__11dBgS_GndChkFv -/* 80BDC050 3C 60 80 BE */ lis r3, __vt__14dBgS_ObjGndChk@ha /* 0x80BDC4CC@ha */ -/* 80BDC054 38 63 C4 CC */ addi r3, r3, __vt__14dBgS_ObjGndChk@l /* 0x80BDC4CC@l */ -/* 80BDC058 90 61 00 2C */ stw r3, 0x2c(r1) -/* 80BDC05C 3B 83 00 0C */ addi r28, r3, 0xc -/* 80BDC060 93 81 00 3C */ stw r28, 0x3c(r1) -/* 80BDC064 3B 63 00 18 */ addi r27, r3, 0x18 -/* 80BDC068 93 61 00 58 */ stw r27, 0x58(r1) -/* 80BDC06C 3B 43 00 24 */ addi r26, r3, 0x24 -/* 80BDC070 93 41 00 68 */ stw r26, 0x68(r1) -/* 80BDC074 38 79 00 3C */ addi r3, r25, 0x3c -/* 80BDC078 4B 49 CD F1 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80BDC07C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) -/* 80BDC080 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80BDC084 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) -/* 80BDC088 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80BDC08C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) -/* 80BDC090 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80BDC094 C0 1F 00 98 */ lfs f0, 0x98(r31) -/* 80BDC098 EC 01 00 2A */ fadds f0, f1, f0 -/* 80BDC09C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80BDC0A0 7F 23 CB 78 */ mr r3, r25 -/* 80BDC0A4 38 81 00 10 */ addi r4, r1, 0x10 -/* 80BDC0A8 4B 68 BC 81 */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 80BDC0AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BDC0B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BDC0B4 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80BDC0B8 7F 24 CB 78 */ mr r4, r25 -/* 80BDC0BC 4B 49 83 E5 */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 80BDC0C0 C0 1F 00 B4 */ lfs f0, 0xb4(r31) -/* 80BDC0C4 FC 00 08 00 */ fcmpu cr0, f0, f1 -/* 80BDC0C8 41 82 00 08 */ beq lbl_80BDC0D0 -/* 80BDC0CC D0 3D 04 D4 */ stfs f1, 0x4d4(r29) -lbl_80BDC0D0: -/* 80BDC0D0 38 00 00 00 */ li r0, 0 -/* 80BDC0D4 90 1D 07 AC */ stw r0, 0x7ac(r29) -/* 80BDC0D8 80 7D 08 44 */ lwz r3, 0x844(r29) -/* 80BDC0DC 80 63 00 04 */ lwz r3, 4(r3) -/* 80BDC0E0 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BDC0E4 90 1D 05 04 */ stw r0, 0x504(r29) -/* 80BDC0E8 7F A3 EB 78 */ mr r3, r29 -/* 80BDC0EC C0 3F 00 B8 */ lfs f1, 0xb8(r31) -/* 80BDC0F0 FC 40 08 90 */ fmr f2, f1 -/* 80BDC0F4 FC 60 08 90 */ fmr f3, f1 -/* 80BDC0F8 4B 43 E4 31 */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 80BDC0FC 7F A3 EB 78 */ mr r3, r29 -/* 80BDC100 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80BDC104 FC 40 08 90 */ fmr f2, f1 -/* 80BDC108 FC 60 08 90 */ fmr f3, f1 -/* 80BDC10C 4B 43 E4 2D */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 80BDC110 38 7D 07 B0 */ addi r3, r29, 0x7b0 -/* 80BDC114 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 80BDC118 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80BDC11C 38 C0 00 03 */ li r6, 3 -/* 80BDC120 38 E0 00 01 */ li r7, 1 -/* 80BDC124 4B 6E 44 0D */ bl init__10Z2CreatureFP3VecP3VecUcUc -/* 80BDC128 7F A3 EB 78 */ mr r3, r29 -/* 80BDC12C 4B FF F9 C1 */ bl daObjDAN_Execute__FP10daObjDAN_c -/* 80BDC130 3C 60 80 BE */ lis r3, __vt__14dBgS_ObjGndChk@ha /* 0x80BDC4CC@ha */ -/* 80BDC134 38 03 C4 CC */ addi r0, r3, __vt__14dBgS_ObjGndChk@l /* 0x80BDC4CC@l */ -/* 80BDC138 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80BDC13C 93 81 00 3C */ stw r28, 0x3c(r1) -/* 80BDC140 93 61 00 58 */ stw r27, 0x58(r1) -/* 80BDC144 93 41 00 68 */ stw r26, 0x68(r1) -/* 80BDC148 38 61 00 1C */ addi r3, r1, 0x1c -/* 80BDC14C 38 80 00 00 */ li r4, 0 -/* 80BDC150 4B 49 B4 A1 */ bl __dt__11dBgS_GndChkFv -lbl_80BDC154: -/* 80BDC154 7F C3 F3 78 */ mr r3, r30 -lbl_80BDC158: -/* 80BDC158 39 61 00 90 */ addi r11, r1, 0x90 -/* 80BDC15C 4B 78 60 BD */ bl _restgpr_25 -/* 80BDC160 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80BDC164 7C 08 03 A6 */ mtlr r0 -/* 80BDC168 38 21 00 90 */ addi r1, r1, 0x90 -/* 80BDC16C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 50d7764e7a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDA9F8: -/* 80BDA9F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDA9FC 7C 08 02 A6 */ mflr r0 -/* 80BDAA00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDAA04 48 00 12 B5 */ bl create__10daObjDAN_cFv -/* 80BDAA08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDAA0C 7C 08 03 A6 */ mtlr r0 -/* 80BDAA10 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDAA14 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Delete__FP10daObjDAN_c.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Delete__FP10daObjDAN_c.s deleted file mode 100644 index d7a661ad21..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Delete__FP10daObjDAN_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80BDAA18: -/* 80BDAA18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDAA1C 7C 08 02 A6 */ mflr r0 -/* 80BDAA20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDAA24 48 00 0F 05 */ bl Delete__10daObjDAN_cFv -/* 80BDAA28 38 60 00 01 */ li r3, 1 -/* 80BDAA2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDAA30 7C 08 03 A6 */ mtlr r0 -/* 80BDAA34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDAA38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Draw__FP10daObjDAN_c.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Draw__FP10daObjDAN_c.s deleted file mode 100644 index 83fe587fbf..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Draw__FP10daObjDAN_c.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_80BDBA0C: -/* 80BDBA0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDBA10 7C 08 02 A6 */ mflr r0 -/* 80BDBA14 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDBA18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BDBA1C 93 C1 00 08 */ stw r30, 8(r1) -/* 80BDBA20 7C 7E 1B 78 */ mr r30, r3 -/* 80BDBA24 88 03 05 6D */ lbz r0, 0x56d(r3) -/* 80BDBA28 28 00 00 00 */ cmplwi r0, 0 -/* 80BDBA2C 41 82 00 A4 */ beq lbl_80BDBAD0 -/* 80BDBA30 4B FF F6 B9 */ bl Z_BufferChk__10daObjDAN_cFv -/* 80BDBA34 80 7E 08 44 */ lwz r3, 0x844(r30) -/* 80BDBA38 83 E3 00 04 */ lwz r31, 4(r3) -/* 80BDBA3C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BDBA40 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BDBA44 38 80 00 10 */ li r4, 0x10 -/* 80BDBA48 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80BDBA4C 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80BDBA50 4B 5C 7D 75 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BDBA54 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BDBA58 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BDBA5C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80BDBA60 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80BDBA64 4B 5C 93 3D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BDBA68 80 9F 00 04 */ lwz r4, 4(r31) -/* 80BDBA6C 80 7E 07 94 */ lwz r3, 0x794(r30) -/* 80BDBA70 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80BDBA74 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BDBA78 4B 43 1C 61 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef -/* 80BDBA7C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80BDBA80 80 7E 07 90 */ lwz r3, 0x790(r30) -/* 80BDBA84 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80BDBA88 38 84 00 58 */ addi r4, r4, 0x58 -/* 80BDBA8C 4B 43 1D 1D */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef -/* 80BDBA90 80 7E 08 44 */ lwz r3, 0x844(r30) -/* 80BDBA94 4B 43 57 2D */ bl entryDL__16mDoExt_McaMorfSOFv -/* 80BDBA98 88 1E 07 A8 */ lbz r0, 0x7a8(r30) -/* 80BDBA9C 28 00 00 00 */ cmplwi r0, 0 -/* 80BDBAA0 40 82 00 30 */ bne lbl_80BDBAD0 -/* 80BDBAA4 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80BDBAA8 C0 3E 09 20 */ lfs f1, 0x920(r30) -/* 80BDBAAC 3C 80 80 BE */ lis r4, lit_4050@ha /* 0x80BDC420@ha */ -/* 80BDBAB0 C0 44 C4 20 */ lfs f2, lit_4050@l(r4) /* 0x80BDC420@l */ -/* 80BDBAB4 38 9E 09 78 */ addi r4, r30, 0x978 -/* 80BDBAB8 38 A0 00 00 */ li r5, 0 -/* 80BDBABC 3C C0 80 BE */ lis r6, lit_4354@ha /* 0x80BDC45C@ha */ -/* 80BDBAC0 C0 66 C4 5C */ lfs f3, lit_4354@l(r6) /* 0x80BDC45C@l */ -/* 80BDBAC4 3C C0 80 42 */ lis r6, mSimpleTexObj__21dDlst_shadowControl_c@ha /* 0x804248D0@ha */ -/* 80BDBAC8 38 C6 48 D0 */ addi r6, r6, mSimpleTexObj__21dDlst_shadowControl_c@l /* 0x804248D0@l */ -/* 80BDBACC 4B 45 15 E9 */ bl dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj -lbl_80BDBAD0: -/* 80BDBAD0 38 60 00 01 */ li r3, 1 -/* 80BDBAD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BDBAD8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BDBADC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDBAE0 7C 08 03 A6 */ mtlr r0 -/* 80BDBAE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDBAE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Execute__FP10daObjDAN_c.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Execute__FP10daObjDAN_c.s deleted file mode 100644 index 6df8f02b7d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Execute__FP10daObjDAN_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDBAEC: -/* 80BDBAEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDBAF0 7C 08 02 A6 */ mflr r0 -/* 80BDBAF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDBAF8 4B FF FB 35 */ bl Execute__10daObjDAN_cFv -/* 80BDBAFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDBB00 7C 08 03 A6 */ mtlr r0 -/* 80BDBB04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDBB08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC374.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC374.s deleted file mode 100644 index dccc94799a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC374.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BDC374: -/* 80BDC374 38 63 FF DC */ addi r3, r3, -36 -/* 80BDC378 4B FF FE 70 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC37C.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC37C.s deleted file mode 100644 index 0a68873ffe..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC37C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BDC37C: -/* 80BDC37C 38 63 FF EC */ addi r3, r3, -20 -/* 80BDC380 4B FF FE 68 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC384.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC384.s deleted file mode 100644 index 670151c388..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC384.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BDC384: -/* 80BDC384 38 63 FF EC */ addi r3, r3, -20 -/* 80BDC388 4B FF FD E8 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC38C.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC38C.s deleted file mode 100644 index aa08002092..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC38C.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BDC38C: -/* 80BDC38C 38 63 FF B4 */ addi r3, r3, -76 -/* 80BDC390 4B FF FD E0 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC394.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC394.s deleted file mode 100644 index b5c7c38d44..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC394.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80BDC394: -/* 80BDC394 38 63 FF C4 */ addi r3, r3, -60 -/* 80BDC398 4B FF FD D8 */ b __dt__14dBgS_ObjGndChkFv diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/setBaseMtx__10daObjDAN_cFv.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/setBaseMtx__10daObjDAN_cFv.s deleted file mode 100644 index 2e12069ac0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/setBaseMtx__10daObjDAN_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80BDB990: -/* 80BDB990 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BDB994 7C 08 02 A6 */ mflr r0 -/* 80BDB998 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BDB99C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80BDB9A0 7C 7F 1B 78 */ mr r31, r3 -/* 80BDB9A4 3C 60 80 BE */ lis r3, lit_3939@ha /* 0x80BDC404@ha */ -/* 80BDB9A8 C0 23 C4 04 */ lfs f1, lit_3939@l(r3) /* 0x80BDC404@l */ -/* 80BDB9AC D0 21 00 08 */ stfs f1, 8(r1) -/* 80BDB9B0 3C 60 80 BE */ lis r3, lit_4311@ha /* 0x80BDC458@ha */ -/* 80BDB9B4 C0 03 C4 58 */ lfs f0, lit_4311@l(r3) /* 0x80BDC458@l */ -/* 80BDB9B8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80BDB9BC D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80BDB9C0 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BDB9C4 4B 43 13 A1 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BDB9C8 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80BDB9CC 4B 43 15 79 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80BDB9D0 38 7F 04 EC */ addi r3, r31, 0x4ec -/* 80BDB9D4 4B 43 14 9D */ bl scaleM__14mDoMtx_stack_cFRC4cXyz -/* 80BDB9D8 80 7F 08 44 */ lwz r3, 0x844(r31) -/* 80BDB9DC 80 83 00 04 */ lwz r4, 4(r3) -/* 80BDB9E0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BDB9E4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BDB9E8 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BDB9EC 4B 76 AA C5 */ bl PSMTXCopy -/* 80BDB9F0 80 7F 08 44 */ lwz r3, 0x844(r31) -/* 80BDB9F4 4B 43 57 F9 */ bl modelCalc__16mDoExt_McaMorfSOFv -/* 80BDB9F8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80BDB9FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BDBA00 7C 08 03 A6 */ mtlr r0 -/* 80BDBA04 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BDBA08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index f1187aaf7c..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BDA678: -/* 80BDA678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BDA67C 7C 08 02 A6 */ mflr r0 -/* 80BDA680 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BDA684 48 00 00 15 */ bl CreateHeap__10daObjDAN_cFv -/* 80BDA688 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BDA68C 7C 08 03 A6 */ mtlr r0 -/* 80BDA690 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BDA694 4E 80 00 20 */ blr diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index c1df22e415..02b0555962 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -142,6 +142,7 @@ public: void ClrGroundFind() { m_flags &= ~GROUND_FIND; } u32 MaskRoofHit() { return m_flags & ROOF_HIT; } bool ChkRoofHit() { return MaskRoofHit(); } + void OffClrSpeedY() { m_flags |= CLR_SPEED_Y; } bool ChkClrSpeedY() { return !(m_flags & CLR_SPEED_Y); } void SetGroundFind() { m_flags |= GROUND_FIND; } void SetGroundHit() { m_flags |= GROUND_HIT; } diff --git a/include/d/d_insect.h b/include/d/d_insect.h index 4c42d342f0..57256b6e96 100644 --- a/include/d/d_insect.h +++ b/include/d/d_insect.h @@ -23,6 +23,8 @@ public: /* 80110648 */ virtual void Insect_Release() { field_0x56C = 1; } bool ChkGetDemo() { return m_mode > 0; } + void setItemNo(u8 i_itemNo) { m_itemNo = i_itemNo; } + void setSaveBitNo(s16 i_saveBitNo) { m_saveBitNo = i_saveBitNo; } protected: /* 0x56C */ u8 field_0x56C; diff --git a/include/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h b/include/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h index e9f35f2abe..1b62159569 100644 --- a/include/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h +++ b/include/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h @@ -1,7 +1,11 @@ #ifndef D_A_OBJ_DAN_H #define D_A_OBJ_DAN_H -#include "f_op/f_op_actor_mng.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" /** @@ -12,11 +16,11 @@ * @details * */ -class daObjDAN_c : public fopAc_ac_c { +class daObjDAN_c : public dInsect_c { public: /* 80BDA5B4 */ void InitCcSph(); /* 80BDA620 */ void SetCcSph(); - /* 80BDA698 */ void CreateHeap(); + /* 80BDA698 */ int CreateHeap(); /* 80BDAA3C */ void SpeedSet(); /* 80BDAA9C */ void LinkChk(); /* 80BDAB14 */ void MoveAction(); @@ -28,22 +32,63 @@ public: /* 80BDB264 */ void ParticleSet(); /* 80BDB388 */ void ObjHit(); /* 80BDB4E0 */ void BoomChk(); - /* 80BDB62C */ void Execute(); - /* 80BDB928 */ void Delete(); + /* 80BDB62C */ int Execute(); + /* 80BDB928 */ int Delete(); /* 80BDB990 */ void setBaseMtx(); - /* 80BDBB0C */ void CreateChk(); - /* 80BDBCB8 */ void create(); + /* inline */ inline int Draw(); + /* 80BDBB0C */ bool CreateChk(); + /* 80BDBCB8 */ cPhs__Step create(); private: - /* 0x568 */ u8 field_0x568[0xa6c - 0x568]; + /* 0x590 */ dCcD_Stts mCcStts; + /* 0x5CC */ dCcD_Sph mCcSph; + /* 0x704 */ daPy_boomerangMove_c mBoomerangMove; + /* 0x710 */ dBgS_GndChk mGndChk; + /* 0x764 */ f32 mGroundH; + /* 0x768 */ u8 mAction; + /* 0x769 */ u8 mMode; + /* 0x76A */ s16 mTimer[3]; + /* 0x770 */ f32 mTargetSpeed; + /* 0x774 */ u8 field_0x774[4]; + /* 0x778 */ s16 mTargetAngleY; + /* 0x77A */ u8 field_0x77a[0x10]; + /* 0x78A */ s16 field_0x78a; + /* 0x78C */ u8 field_0x78c[4]; + /* 0x790 */ mDoExt_brkAnm* mpBrkAnm; + /* 0x794 */ mDoExt_btkAnm* mpBtkAnm; + /* 0x798 */ f32 mScreenZ; + /* 0x79C */ u32 mBufferZ; + /* 0x7A0 */ f32 field_0x7a0; + /* 0x7A4 */ f32 mParticleScale; + /* 0x7A8 */ u8 mLocation; + /* 0x7A9 */ bool mBoomerangHit; + /* 0x7AC */ int mBounceCount; + /* 0x7B0 */ Z2Creature mCreatureSound; + /* 0x840 */ u8 field_0x840[4]; + /* 0x844 */ mDoExt_McaMorfSO* mpMorf; + /* 0x848 */ dBgS_AcchCir mAcchCir; + /* 0x888 */ dBgS_ObjAcch mAcch; + /* 0xA60 */ request_of_phase_process_class mPhase; + /* 0xA68 */ bool mHIOInit; + + enum Action { + /* 1 */ ACT_MOVE = 1, + /* 2 */ ACT_DAMAGE, + }; }; -STATIC_ASSERT(sizeof(daObjDAN_c) == 0xa6c); +STATIC_ASSERT(sizeof(daObjDAN_c) == 0xa6c); class daObj_DanHIO_c { public: /* 80BDA58C */ daObj_DanHIO_c(); - /* 80BDC2F0 */ ~daObj_DanHIO_c(); + /* 80BDC2F0 */ virtual ~daObj_DanHIO_c() {} + + /* 0x4 */ s8 field_0x4; + /* 0x8 */ f32 mScaleFemale; + /* 0xC */ f32 mScaleMale; }; +STATIC_ASSERT(sizeof(daObj_DanHIO_c) == 0x10); + #endif /* D_A_OBJ_DAN_H */ diff --git a/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp b/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp index 6f1d9f8504..79b29a1dac 100644 --- a/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp +++ b/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp @@ -646,8 +646,8 @@ cPhs__Step daObjARI_c::create() { attention_info.distances[fopAc_attn_CARRY_e] = 0x5D; mSex = (fopAcM_GetParam(this) >> 4) & 1; - m_itemNo = l_ari_itemno[mSex]; - m_saveBitNo = l_musiya_num[mSex]; + setItemNo(l_ari_itemno[mSex]); + setSaveBitNo(l_musiya_num[mSex]); if (mSex == SEX_FEMALE) { scale.set(l_HIO.mScaleFemale, l_HIO.mScaleFemale, l_HIO.mScaleFemale); 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 8938a02849..4717c89ce4 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 @@ -574,8 +574,8 @@ cPhs__Step daObjCHO_c::create() { attention_info.distances[fopAc_attn_CARRY_e] = 0x5D; mSex = (fopAcM_GetParam(this) >> 4) & 1; - m_itemNo = l_cho_itemno[mSex]; - m_saveBitNo = l_musiya_num[mSex]; + setItemNo(l_cho_itemno[mSex]); + setSaveBitNo(l_musiya_num[mSex]); if (mSex == SEX_FEMALE) { scale.set(l_HIO.mScaleFemale, l_HIO.mScaleFemale, l_HIO.mScaleFemale); } else if (mSex == SEX_MALE) { diff --git a/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp b/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp index e11446bc96..8449544c4b 100644 --- a/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp +++ b/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp @@ -1,862 +1,646 @@ /** * @file d_a_obj_dan.cpp - * + * Insect - Pillbug */ #include "rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" - - - -// -// Forward References: -// - -extern "C" void __ct__14daObj_DanHIO_cFv(); -extern "C" void InitCcSph__10daObjDAN_cFv(); -extern "C" void SetCcSph__10daObjDAN_cFv(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void CreateHeap__10daObjDAN_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daObjDAN_Create__FP10fopAc_ac_c(); -extern "C" static void daObjDAN_Delete__FP10daObjDAN_c(); -extern "C" void SpeedSet__10daObjDAN_cFv(); -extern "C" void LinkChk__10daObjDAN_cFv(); -extern "C" void MoveAction__10daObjDAN_cFv(); -extern "C" void DamageAction__10daObjDAN_cFv(); -extern "C" void Action__10daObjDAN_cFv(); -extern "C" void checkGroundPos__10daObjDAN_cFv(); -extern "C" void Insect_Release__10daObjDAN_cFv(); -extern "C" void Z_BufferChk__10daObjDAN_cFv(); -extern "C" void ParticleSet__10daObjDAN_cFv(); -extern "C" void ObjHit__10daObjDAN_cFv(); -extern "C" void BoomChk__10daObjDAN_cFv(); -extern "C" void Execute__10daObjDAN_cFv(); -extern "C" void Delete__10daObjDAN_cFv(); -extern "C" void setBaseMtx__10daObjDAN_cFv(); -extern "C" static void daObjDAN_Draw__FP10daObjDAN_c(); -extern "C" static void daObjDAN_Execute__FP10daObjDAN_c(); -extern "C" void CreateChk__10daObjDAN_cFv(); -extern "C" void create__10daObjDAN_cFv(); -extern "C" void __dt__14dBgS_ObjGndChkFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__8cM3dGSphFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" static bool daObjDAN_IsDelete__FP10daObjDAN_c(); -extern "C" void __dt__14daObj_DanHIO_cFv(); -extern "C" void __sinit_d_a_obj_dan_cpp(); -extern "C" static void func_80BDC374(); -extern "C" static void func_80BDC37C(); -extern "C" static void func_80BDC384(); -extern "C" static void func_80BDC38C(); -extern "C" static void func_80BDC394(); -extern "C" extern char const* const d_a_obj_dan__stringBase0; - -// -// External References: -// - -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 fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(); -extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(); -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 GroundCross__4cBgSFP11cBgS_GndChk(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void ClrMoveBGOnly__9dBgS_AcchFv(); -extern "C" void __ct__11dBgS_GndChkFv(); -extern "C" void __dt__11dBgS_GndChkFv(); -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_addCalcAngleS2__FPssss(); -extern "C" void cLib_chaseAngleS__FPsss(); -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 _savegpr_25(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -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" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80BDC3B0-80BDC3B4 000000 0004+00 9/9 0/0 0/0 .rodata @3775 */ -SECTION_RODATA static f32 const lit_3775 = 1.0f; -COMPILER_STRIP_GATE(0x80BDC3B0, &lit_3775); +#include "SSystem/SComponent/c_math.h" +#include "m_Do/m_Do_lib.h" +#include "d/com/d_com_inf_game.h" +#include "d/menu/d_menu_insect.h" +#include "d/d_procname.h" -/* 80BDC47C-80BDC49C -00001 0020+00 1/0 0/0 0/0 .data l_daObjDAN_Method */ -static actor_method_class l_daObjDAN_Method = { - (process_method_func)daObjDAN_Create__FP10fopAc_ac_c, - (process_method_func)daObjDAN_Delete__FP10daObjDAN_c, - (process_method_func)daObjDAN_Execute__FP10daObjDAN_c, - (process_method_func)daObjDAN_IsDelete__FP10daObjDAN_c, - (process_method_func)daObjDAN_Draw__FP10daObjDAN_c, -}; - -/* 80BDC49C-80BDC4CC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Dan */ -extern actor_process_profile_definition g_profile_Obj_Dan = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Dan, // mProcName - &g_fpcLf_Method.mBase, // sub_method - sizeof(daObjDAN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 481, // mPriority - &l_daObjDAN_Method, // sub_method - 0x000C0120, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80BDC4CC-80BDC4FC 000050 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */ -SECTION_DATA extern void* __vt__14dBgS_ObjGndChk[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14dBgS_ObjGndChkFv, - (void*)NULL, - (void*)NULL, - (void*)func_80BDC384, - (void*)NULL, - (void*)NULL, - (void*)func_80BDC394, - (void*)NULL, - (void*)NULL, - (void*)func_80BDC38C, -}; - -/* 80BDC4FC-80BDC520 000080 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_80BDC37C, - (void*)NULL, - (void*)NULL, - (void*)func_80BDC374, -}; - -/* 80BDC520-80BDC52C 0000A4 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, -}; - -/* 80BDC52C-80BDC538 0000B0 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, -}; - -/* 80BDC538-80BDC544 0000BC 000C+00 1/1 0/0 0/0 .data __vt__10daObjDAN_c */ -SECTION_DATA extern void* __vt__10daObjDAN_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)Insect_Release__10daObjDAN_cFv, -}; - -/* 80BDC544-80BDC550 0000C8 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, -}; +/* 80BDC568-80BDC56C 000008 0004+00 2/2 0/0 0/0 .bss None */ +static bool hioInit; -/* 80BDC550-80BDC55C 0000D4 000C+00 2/2 0/0 0/0 .data __vt__14daObj_DanHIO_c */ -SECTION_DATA extern void* __vt__14daObj_DanHIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14daObj_DanHIO_cFv, -}; +/* 80BDC578-80BDC588 000018 0010+00 2/2 0/0 0/0 .bss l_HIO */ +static daObj_DanHIO_c l_HIO; /* 80BDA58C-80BDA5B4 0000EC 0028+00 1/1 0/0 0/0 .text __ct__14daObj_DanHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_DanHIO_c::daObj_DanHIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__ct__14daObj_DanHIO_cFv.s" +daObj_DanHIO_c::daObj_DanHIO_c() { + field_0x4 = -1; + mScaleMale = 1.0f; + mScaleFemale = 1.0f; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC3B4-80BDC3F4 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 -}; /* 80BDA5B4-80BDA620 000114 006C+00 1/1 0/0 0/0 .text InitCcSph__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::InitCcSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/InitCcSph__10daObjDAN_cFv.s" +void daObjDAN_c::InitCcSph() { + 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 + }; + + mCcStts.Init(1, 0, this); + mCcSph.Set(ccSphSrc); + mCcSph.SetStts(&mCcStts); + mCcSph.SetC(current.pos); + mCcSph.OnTgNoHitMark(); } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC3F4-80BDC3F8 000044 0004+00 1/2 0/0 0/0 .rodata @3788 */ -SECTION_RODATA static f32 const lit_3788 = 20.0f; -COMPILER_STRIP_GATE(0x80BDC3F4, &lit_3788); /* 80BDA620-80BDA678 000180 0058+00 1/1 0/0 0/0 .text SetCcSph__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::SetCcSph() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/SetCcSph__10daObjDAN_cFv.s" +void daObjDAN_c::SetCcSph() { + mCcSph.SetC(current.pos); + mCcSph.SetR(20.0f); + dComIfG_Ccsp()->Set(&mCcSph); } -#pragma pop /* 80BDA678-80BDA698 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_dan/d_a_obj_dan/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + return static_cast<daObjDAN_c*>(i_this)->CreateHeap(); } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC46C-80BDC46C 0000BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BDC46C = "I_Dan"; -#pragma pop /* 80BDA698-80BDA9B0 0001F8 0318+00 1/1 0/0 0/0 .text CreateHeap__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/CreateHeap__10daObjDAN_cFv.s" -} -#pragma pop - -/* 80BDA9B0-80BDA9F8 000510 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" asm void __dt__12J3DFrameCtrlFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__12J3DFrameCtrlFv.s" +int daObjDAN_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("I_Dan", 11); + mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 8)), + J3DFrameCtrl::LOOP_REPEAT_e, 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 = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("I_Dan", 14)); + if (!mpBrkAnm->init(model->getModelData(), tev_anm, TRUE, + J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) { + return 0; + } + } else { + J3DAnmTevRegKey* tev_anm = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("I_Dan", 15)); + if (!mpBrkAnm->init(model->getModelData(), tev_anm, TRUE, + J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) { + return 0; + } + } + + mpBtkAnm = new mDoExt_btkAnm(); + if (mpBtkAnm == NULL) { + return 0; + } + if (mSex == SEX_FEMALE) { + J3DAnmTextureSRTKey* tex_anm = + static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("I_Dan", 18)); + if (!mpBtkAnm->init(model->getModelData(), tex_anm, TRUE, + J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) { + return 0; + } + } else { + mpBtkAnm = new mDoExt_btkAnm(); + J3DAnmTextureSRTKey* tex_anm = + static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("I_Dan", 19)); + if (!mpBtkAnm->init(model->getModelData(), tex_anm, TRUE, + J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1)) { + return 0; + } + } + + return 1; } -#pragma pop /* 80BDA9F8-80BDAA18 000558 0020+00 1/0 0/0 0/0 .text daObjDAN_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDAN_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Create__FP10fopAc_ac_c.s" +static cPhs__Step daObjDAN_Create(fopAc_ac_c* i_this) { + return static_cast<daObjDAN_c*>(i_this)->create(); } -#pragma pop /* 80BDAA18-80BDAA3C 000578 0024+00 1/0 0/0 0/0 .text daObjDAN_Delete__FP10daObjDAN_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDAN_Delete(daObjDAN_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Delete__FP10daObjDAN_c.s" +static int daObjDAN_Delete(daObjDAN_c* i_this) { + i_this->Delete(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC3F8-80BDC3FC 000048 0004+00 1/1 0/0 0/0 .rodata @3923 */ -SECTION_RODATA static f32 const lit_3923 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80BDC3F8, &lit_3923); - -/* 80BDC3FC-80BDC400 00004C 0004+00 1/3 0/0 0/0 .rodata @3924 */ -SECTION_RODATA static f32 const lit_3924 = 10.0f; -COMPILER_STRIP_GATE(0x80BDC3FC, &lit_3924); /* 80BDAA3C-80BDAA9C 00059C 0060+00 2/2 0/0 0/0 .text SpeedSet__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::SpeedSet() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/SpeedSet__10daObjDAN_cFv.s" +void daObjDAN_c::SpeedSet() { + cLib_addCalc2(&speedF, mTargetSpeed, 0.1f, 10.0f); + cLib_addCalcAngleS2(¤t.angle.y, mTargetAngleY, 0xa0, 0x100); + shape_angle.y = current.angle.y; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC400-80BDC404 000050 0004+00 2/5 0/0 0/0 .rodata @3938 */ -SECTION_RODATA static f32 const lit_3938 = 50.0f; -COMPILER_STRIP_GATE(0x80BDC400, &lit_3938); - -/* 80BDC404-80BDC408 000054 0004+00 3/9 0/0 0/0 .rodata @3939 */ -SECTION_RODATA static u8 const lit_3939[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80BDC404, &lit_3939); /* 80BDAA9C-80BDAB14 0005FC 0078+00 1/1 0/0 0/0 .text LinkChk__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::LinkChk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/LinkChk__10daObjDAN_cFv.s" +void daObjDAN_c::LinkChk() { + daPy_py_c* player = daPy_getPlayerActorClass(); + if (fopAcM_searchPlayerDistanceXZ(this) < 50.0f && player->speedF > 0.0f) { + mAction = ACT_DAMAGE; + mMode = 0; + } } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC408-80BDC40C 000058 0004+00 1/1 0/0 0/0 .rodata @3960 */ -SECTION_RODATA static f32 const lit_3960 = 550.0f; -COMPILER_STRIP_GATE(0x80BDC408, &lit_3960); /* 80BDAB14-80BDAC10 000674 00FC+00 2/2 0/0 0/0 .text MoveAction__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::MoveAction() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/MoveAction__10daObjDAN_cFv.s" +void daObjDAN_c::MoveAction() { + if (mTimer[0] == 0) { + cXyz delta = home.pos - current.pos; + delta.x += cM_rndFX(550.0f); + delta.z += cM_rndFX(550.0f); + mTargetAngleY = cM_atan2s(delta.x, delta.z); + mTimer[0] = cM_rndF(50.0f) + 50.0f; + } + + SpeedSet(); + LinkChk(); + mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KSKS, 0, -1); } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC40C-80BDC410 00005C 0004+00 0/1 0/0 0/0 .rodata @4045 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4045 = 1.5f; -COMPILER_STRIP_GATE(0x80BDC40C, &lit_4045); -#pragma pop - -/* 80BDC410-80BDC414 000060 0004+00 0/4 0/0 0/0 .rodata @4046 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4046 = 5.0f; -COMPILER_STRIP_GATE(0x80BDC410, &lit_4046); -#pragma pop - -/* 80BDC414-80BDC418 000064 0004+00 0/4 0/0 0/0 .rodata @4047 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4047 = -1.0f; -COMPILER_STRIP_GATE(0x80BDC414, &lit_4047); -#pragma pop - -/* 80BDC418-80BDC41C 000068 0004+00 0/3 0/0 0/0 .rodata @4048 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4048 = -3.0f; -COMPILER_STRIP_GATE(0x80BDC418, &lit_4048); -#pragma pop - -/* 80BDC41C-80BDC420 00006C 0004+00 0/3 0/0 0/0 .rodata @4049 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4049 = 0.5f; -COMPILER_STRIP_GATE(0x80BDC41C, &lit_4049); -#pragma pop - -/* 80BDC420-80BDC424 000070 0004+00 1/2 0/0 0/0 .rodata @4050 */ -SECTION_RODATA static f32 const lit_4050 = 15.0f; -COMPILER_STRIP_GATE(0x80BDC420, &lit_4050); - -/* 80BDC424-80BDC428 000074 0004+00 0/1 0/0 0/0 .rodata @4051 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4051 = -0.5f; -COMPILER_STRIP_GATE(0x80BDC424, &lit_4051); -#pragma pop - -/* 80BDC428-80BDC42C 000078 0004+00 0/1 0/0 0/0 .rodata @4052 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4052 = 2.0f; -COMPILER_STRIP_GATE(0x80BDC428, &lit_4052); -#pragma pop /* 80BDAC10-80BDAFDC 000770 03CC+00 2/2 0/0 0/0 .text DamageAction__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::DamageAction() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/DamageAction__10daObjDAN_cFv.s" +void daObjDAN_c::DamageAction() { + daPy_py_c* player = daPy_getPlayerActorClass(); + + switch (mMode) { + case 0: + if (fopAcM_searchPlayerDistanceXZ(this) < 50.0f && player->speedF > 0.0f) { + current.angle.y = player->current.angle.y; + shape_angle.y = current.angle.y; + mTargetAngleY = current.angle.y; + speedF = player->speedF * 1.5f; + mMode++; + mTargetSpeed = 0.0f; + mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 6)), + J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f); + mTimer[0] = 100; + gravity = -3.0f; + speed.y = player->speedF * 0.5f; + if (speed.y > 15.0f) { + speed.y = 15.0f; + } else if (speed.y < 10.0f) { + speed.y = 10.0f; + } + } + break; + + case 1: + if (mAcch.i_ChkGroundHit()) { + speed.y *= -0.5f; + mAcch.ClrGroundLanding(); + mBounceCount++; + if (mBounceCount > 5) { + mBounceCount = 0; + speed.y = 0.0f; + field_0x7a0 = 0.0f; + speedF = 0.0f; + mTargetSpeed = 0.0f; + } + home.pos = current.pos; + } + + if (fopAcM_searchPlayerDistanceXZ(this) < 50.0f && player->speedF > 0.0f + && mTimer[1] == 0 && mAcch.ChkGroundHit()) + { + mTargetAngleY = player->shape_angle.y; + current.angle.y = mTargetAngleY; + speedF = player->speedF * 2.0f; + mTimer[0] = 100; + mBounceCount = 0; + speed.y = player->speedF; + if (speed.y > 15.0f) { + speed.y = 15.0f; + } else if (speed.y < 10.0f) { + speed.y = 10.0f; + } + } + + if (mTimer[0] == 0 && fopAcM_searchPlayerDistanceXZ(this) > 50.0f) { + shape_angle.x = 0; + mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 7)), + J3DFrameCtrl::LOOP_ONCE_e, 5.0f, 1.0f, 0.0f, -1.0f); + mMode++; + speed.y = 0.0f; + speedF = 0.0f; + mTargetSpeed = 0.0f; + mBounceCount = 0; + } + + if (speed.y != 0.0f) { + field_0x78a += 0x500; + } + break; + + case 2: + if (cLib_chaseAngleS(&field_0x78a, 0, 0x500) && mpMorf->isStop()) { + mAction = ACT_MOVE; + mMode = 0; + mTargetSpeed = 0.5f; + mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 8)), + J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f); + } + break; + } + + SpeedSet(); } -#pragma pop /* 80BDAFDC-80BDB074 000B3C 0098+00 1/1 0/0 0/0 .text Action__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::Action() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Action__10daObjDAN_cFv.s" +void daObjDAN_c::Action() { + for (int i = 0; i < 3; i++) { + mTimer[i]--; + if (mTimer[i] <= 0) { + mTimer[i] = 0; + } + } + + switch (mAction) { + case ACT_MOVE: + MoveAction(); + break; + case ACT_DAMAGE: + DamageAction(); + break; + } + + Insect_GetDemoMain(); } -#pragma pop /* 80BDB074-80BDB0D8 000BD4 0064+00 1/1 0/0 0/0 .text checkGroundPos__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::checkGroundPos() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/checkGroundPos__10daObjDAN_cFv.s" +void daObjDAN_c::checkGroundPos() { + cXyz pos = current.pos; + mGndChk.SetPos(&pos); + mGroundH = dComIfG_Bgsp().GroundCross(&mGndChk); } -#pragma pop /* 80BDB0D8-80BDB0E8 000C38 0010+00 1/0 0/0 0/0 .text Insect_Release__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::Insect_Release() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Insect_Release__10daObjDAN_cFv.s" +void daObjDAN_c::Insect_Release() { + field_0x56C = 1; + mAction = ACT_MOVE; } -#pragma pop -/* ############################################################################################## */ /* 80BDC42C-80BDC430 00007C 0002+02 1/2 0/0 0/0 .rodata l_dan_itemno */ -SECTION_RODATA static u16 const l_dan_itemno[1 + 1 /* padding */] = { - 0xCACB, - /* padding */ - 0x0000, -}; -COMPILER_STRIP_GATE(0x80BDC42C, &l_dan_itemno); - -/* 80BDC430-80BDC434 000080 0004+00 0/1 0/0 0/0 .rodata @4126 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4126 = 608.0f; -COMPILER_STRIP_GATE(0x80BDC430, &lit_4126); -#pragma pop - -/* 80BDC434-80BDC438 000084 0004+00 0/1 0/0 0/0 .rodata @4127 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4127 = 448.0f; -COMPILER_STRIP_GATE(0x80BDC434, &lit_4127); -#pragma pop - -/* 80BDC438-80BDC440 000088 0004+04 0/1 0/0 0/0 .rodata @4128 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4128[1 + 1 /* padding */] = { - 16777215.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80BDC438, &lit_4128); -#pragma pop +static u8 const l_dan_itemno[2] = {0xCA, 0xCB}; /* 80BDB0E8-80BDB264 000C48 017C+00 1/1 0/0 0/0 .text Z_BufferChk__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::Z_BufferChk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Z_BufferChk__10daObjDAN_cFv.s" +void daObjDAN_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, &mBufferZ); + } + + 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; + } + mScreenZ = ((near + far * near / vec2.z) / (far - near) + 1.0f) * 0xffffff; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC440-80BDC448 000090 0008+00 1/2 0/0 0/0 .rodata @4158 */ -SECTION_RODATA static u8 const lit_4158[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BDC440, &lit_4158); /* 80BDB264-80BDB388 000DC4 0124+00 1/1 0/0 0/0 .text ParticleSet__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::ParticleSet() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/ParticleSet__10daObjDAN_cFv.s" +void daObjDAN_c::ParticleSet() { + if (mScreenZ > mBufferZ) { + 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, &tevStr, + &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); + } } -#pragma pop /* 80BDB388-80BDB4E0 000EE8 0158+00 1/1 0/0 0/0 .text ObjHit__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::ObjHit() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/ObjHit__10daObjDAN_cFv.s" +void daObjDAN_c::ObjHit() { + if (mCcSph.ChkTgHit()) { + cCcD_Obj* hit_obj = mCcSph.GetTgHitObj(); + if (hit_obj->ChkAtType(AT_TYPE_BOOMERANG)) { + if (!mBoomerangHit) { + mBoomerangHit = true; + mAcch.ClrMoveBGOnly(); + mAcch.ClrGrndNone(); + mCcSph.GetTgHitGObj(); + mBoomerangMove.initOffset(¤t.pos); + } + } else if (!hit_obj->ChkAtType(AT_TYPE_NORMAL_SWORD)) { + cXyz offset(0.0f, 0.0f, 0.0f); + daPy_getPlayerActorClass()->setHookshotCarryOffset(fopAcM_GetID(this), &offset); + mAction = ACT_DAMAGE; + mMode = 1; + mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 6)), + J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f); + mTimer[0] = 100; + } + mCcSph.ClrTgHit(); + } +} + +static f32 dummy() { + return 100.0f; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC448-80BDC44C 000098 0004+00 0/1 0/0 0/0 .rodata @4188 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4188 = 100.0f; -COMPILER_STRIP_GATE(0x80BDC448, &lit_4188); -#pragma pop - -/* 80BDC44C-80BDC450 00009C 0004+00 0/2 0/0 0/0 .rodata @4236 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4236 = 30.0f; -COMPILER_STRIP_GATE(0x80BDC44C, &lit_4236); -#pragma pop - -/* 80BDC450-80BDC454 0000A0 0004+00 0/1 0/0 0/0 .rodata @4237 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4237 = 150.0f; -COMPILER_STRIP_GATE(0x80BDC450, &lit_4237); -#pragma pop /* 80BDB4E0-80BDB62C 001040 014C+00 1/1 0/0 0/0 .text BoomChk__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::BoomChk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/BoomChk__10daObjDAN_cFv.s" +void daObjDAN_c::BoomChk() { + daPy_py_c* player = daPy_getPlayerActorClass(); + + if (mBoomerangHit) { + if (mBoomerangMove.posMove(¤t.pos, &shape_angle.y, NULL, 0x1c00)) { + speed.y = 0.0f; + mBoomerangMove.bgCheckAfterOffset(¤t.pos); + current.pos.y += 0.5f; + home.pos = current.pos; + gravity = 0.0f; + } else { + speed.y = 30.0f; + mBoomerangMove.bgCheckAfterOffset(¤t.pos); + mBoomerangHit = false; + gravity = -3.0f; + mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 6)), + J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f); + mTimer[0] = 100; + mAction = ACT_DAMAGE; + mMode = 1; + current.pos.y = old.pos.y = player->current.pos.y + 150.0f; + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC454-80BDC458 0000A4 0004+00 0/1 0/0 0/0 .rodata @4286 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4286 = 10000.0f; -COMPILER_STRIP_GATE(0x80BDC454, &lit_4286); -#pragma pop /* 80BDB62C-80BDB928 00118C 02FC+00 1/1 0/0 0/0 .text Execute__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Execute__10daObjDAN_cFv.s" +int daObjDAN_c::Execute() { + if (ChkGetDemo()) { + mScreenZ = mBufferZ + 10000.0f; + mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1); + Insect_GetDemoMain(); + ParticleSet(); + return 1; + } + + checkGroundPos(); + attention_info.position = current.pos; + eyePos = current.pos; + eyePos.y += 10.0f; + + switch (mLocation) { + case LOC_OUTSIDE: + if (!fopAcM_checkHookCarryNow(this)) { + Action(); + } else { + speed.y = 0.0f; + home.pos = current.pos; + } + + mParticleKey2 = dComIfGp_particle_set(mParticleKey2, 0xa1c, ¤t.pos, &tevStr, + &shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL); + ObjHit(); + BoomChk(); + eyePos = current.pos; + eyePos.y += 10.0f; + attention_info.position = eyePos; + attention_info.position.y += 10.0f; + SetCcSph(); + ParticleSet(); + break; + + case LOC_AGITHA: + for (int i = 0; i < 3; i++) { + mTimer[i]--; + if (mTimer[i] <= 0) { + mTimer[i] = 0; + } + } + + switch (mAction) { + case ACT_MOVE: + MoveAction(); + break; + case ACT_DAMAGE: + DamageAction(); + break; + } + + break; + } + + mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1); + fopAcM_posMoveF(this, mCcStts.GetCCMoveP()); + mAcch.CrrPos(dComIfG_Bgsp()); + mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mpBrkAnm->play(); + mpBtkAnm->play(); + setBaseMtx(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC568-80BDC56C 000008 0004+00 2/2 0/0 0/0 .bss None */ -static u8 data_80BDC568[4]; /* 80BDB928-80BDB990 001488 0068+00 1/1 0/0 0/0 .text Delete__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/Delete__10daObjDAN_cFv.s" +int daObjDAN_c::Delete() { + dComIfG_resDelete(&mPhase, "I_Dan"); + if (mHIOInit) { + hioInit = false; + } + if (heap != NULL) { + mpMorf->stopZelAnime(); + } + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC458-80BDC45C 0000A8 0004+00 1/1 0/0 0/0 .rodata @4311 */ -SECTION_RODATA static f32 const lit_4311 = -4.0f; -COMPILER_STRIP_GATE(0x80BDC458, &lit_4311); /* 80BDB990-80BDBA0C 0014F0 007C+00 1/1 0/0 0/0 .text setBaseMtx__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/setBaseMtx__10daObjDAN_cFv.s" +void daObjDAN_c::setBaseMtx() { + cXyz vec(0.0f, -4.0f, 0.0f); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::scaleM(scale); + mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); + mpMorf->modelCalc(); +} + +int daObjDAN_c::Draw() { + if (mDraw) { + Z_BufferChk(); + J3DModel* model = mpMorf->getModel(); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model, &tevStr); + 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; } -#pragma pop - -/* ############################################################################################## */ -/* 80BDC45C-80BDC460 0000AC 0004+00 1/1 0/0 0/0 .rodata @4354 */ -SECTION_RODATA static f32 const lit_4354 = -3.0f / 5.0f; -COMPILER_STRIP_GATE(0x80BDC45C, &lit_4354); /* 80BDBA0C-80BDBAEC 00156C 00E0+00 1/0 0/0 0/0 .text daObjDAN_Draw__FP10daObjDAN_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDAN_Draw(daObjDAN_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Draw__FP10daObjDAN_c.s" +static int daObjDAN_Draw(daObjDAN_c* i_this) { + return i_this->Draw(); } -#pragma pop /* 80BDBAEC-80BDBB0C 00164C 0020+00 2/1 0/0 0/0 .text daObjDAN_Execute__FP10daObjDAN_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDAN_Execute(daObjDAN_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/daObjDAN_Execute__FP10daObjDAN_c.s" +static int daObjDAN_Execute(daObjDAN_c* i_this) { + return i_this->Execute(); } -#pragma pop -/* ############################################################################################## */ /* 80BDC460-80BDC464 0000B0 0004+00 1/2 0/0 0/0 .rodata l_musiya_num */ -SECTION_RODATA static u32 const l_musiya_num = 0x019B019C; -COMPILER_STRIP_GATE(0x80BDC460, &l_musiya_num); - -/* 80BDC46C-80BDC46C 0000BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BDC472 = "R_SP160"; -#pragma pop +static u16 const l_musiya_num[2] = {0x019B, 0x019C}; /* 80BDBB0C-80BDBCB8 00166C 01AC+00 1/1 0/0 0/0 .text CreateChk__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::CreateChk() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/CreateChk__10daObjDAN_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BDC464-80BDC468 0000B4 0004+00 0/1 0/0 0/0 .rodata @4521 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4521 = -1000000000.0f; -COMPILER_STRIP_GATE(0x80BDC464, &lit_4521); -#pragma pop - -/* 80BDC468-80BDC46C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4522 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4522 = -50.0f; -COMPILER_STRIP_GATE(0x80BDC468, &lit_4522); -#pragma pop - -/* 80BDC56C-80BDC578 00000C 000C+00 1/1 0/0 0/0 .bss @3770 */ -static u8 lit_3770[12]; +bool daObjDAN_c::CreateChk() { + u8 param = (fopAcM_GetParam(this) >> 8) & 0xf; + if (param == 0xf) { + param = 0; + } + + if (mLocation != LOC_UNK_2) { + if (param != 0) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) + || !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_dan_itemno[mSex])) { + return false; + } + if ((mSex == SEX_MALE && !dComIfGs_isEventBit( + dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]])) + || (mSex == SEX_FEMALE && !dComIfGs_isEventBit( + dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]))) + { + return false; + } + } + } + } -/* 80BDC578-80BDC588 000018 0010+00 2/2 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[16]; + return true; +} /* 80BDBCB8-80BDC170 001818 04B8+00 1/1 0/0 0/0 .text create__10daObjDAN_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDAN_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/create__10daObjDAN_cFv.s" -} -#pragma pop - -/* 80BDC170-80BDC1E8 001CD0 0078+00 4/3 0/0 0/0 .text __dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { -extern "C" asm void __dt__14dBgS_ObjGndChkFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__14dBgS_ObjGndChkFv.s" -} -#pragma pop - -/* 80BDC1E8-80BDC258 001D48 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() { -extern "C" asm void __dt__12dBgS_ObjAcchFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80BDC258-80BDC2A0 001DB8 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_dan/d_a_obj_dan/__dt__8cM3dGSphFv.s" +cPhs__Step daObjDAN_c::create() { + fopAcM_SetupActor(this, daObjDAN_c); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "I_Dan"); + + 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); + } else { + mDraw = true; + } + + mSex = (fopAcM_GetParam(this) >> 4) & 1; + attention_info.distances[fopAc_attn_CARRY_e] = 0x5D; + setItemNo(l_dan_itemno[mSex]); + setSaveBitNo(l_musiya_num[mSex]); + + if (mSex == SEX_FEMALE) { + scale.set(l_HIO.mScaleFemale, l_HIO.mScaleFemale, l_HIO.mScaleFemale); + } else if (mSex == SEX_MALE) { + scale.set(l_HIO.mScaleMale, l_HIO.mScaleMale, l_HIO.mScaleMale); + } + + if (!CreateChk()) { + return cPhs_ERROR_e; + } + + if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x1200)) { + return cPhs_ERROR_e; + } + + if (!hioInit) { + hioInit = true; + mHIOInit = true; + l_HIO.field_0x4 = -1; + } + + mAcchCir.SetWall(30.0f, 50.0f); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), NULL, NULL); + mTargetSpeed = 0.5f; + gravity = -3.0f; + mAction = ACT_MOVE; + + if (mLocation == LOC_OUTSIDE) { + InitCcSph(); + } + if (mLocation == LOC_UNK_2 && !strcmp("R_SP160", dComIfGp_getStartStageName()) + && dComIfGp_getStartStageRoomNo() == 3) + { + mLocation &= 0xf0; + gravity = -3.0f; + mAction = ACT_DAMAGE; + mMode = 1; + mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("I_Dan", 6)), + J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, 1.0f, 0.0f, -1.0f); + mTimer[0] = 100; + } + + mAcch.OffClrSpeedY(); + + dBgS_ObjGndChk gnd_chk; + cXyz pos = current.pos; + pos.y += 100.0f; + gnd_chk.SetPos(&pos); + f32 cross = dComIfG_Bgsp().GroundCross(&gnd_chk); + if (cross != -1e9f) { + current.pos.y = cross; + } + + mBounceCount = 0; + 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, &eyePos, 3, 1); + daObjDAN_Execute(this); + } + + return step; } -#pragma pop - -/* 80BDC2A0-80BDC2E8 001E00 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_dan/d_a_obj_dan/__dt__8cM3dGAabFv.s" -} -#pragma pop /* 80BDC2E8-80BDC2F0 001E48 0008+00 1/0 0/0 0/0 .text daObjDAN_IsDelete__FP10daObjDAN_c */ -static bool daObjDAN_IsDelete(daObjDAN_c* param_0) { - return true; +static int daObjDAN_IsDelete(daObjDAN_c* i_this) { + return 1; } -/* 80BDC2F0-80BDC338 001E50 0048+00 2/1 0/0 0/0 .text __dt__14daObj_DanHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObj_DanHIO_c::~daObj_DanHIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__dt__14daObj_DanHIO_cFv.s" -} -#pragma pop - -/* 80BDC338-80BDC374 001E98 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_dan_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_dan_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/__sinit_d_a_obj_dan_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80BDC338, __sinit_d_a_obj_dan_cpp); -#pragma pop - -/* 80BDC374-80BDC37C 001ED4 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_80BDC374() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC374.s" -} -#pragma pop - -/* 80BDC37C-80BDC384 001EDC 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_80BDC37C() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC37C.s" -} -#pragma pop - -/* 80BDC384-80BDC38C 001EE4 0008+00 1/0 0/0 0/0 .text @20@__dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BDC384() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC384.s" -} -#pragma pop - -/* 80BDC38C-80BDC394 001EEC 0008+00 1/0 0/0 0/0 .text @76@__dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BDC38C() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC38C.s" -} -#pragma pop - -/* 80BDC394-80BDC39C 001EF4 0008+00 1/0 0/0 0/0 .text @60@__dt__14dBgS_ObjGndChkFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80BDC394() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan/func_80BDC394.s" -} -#pragma pop +/* 80BDC47C-80BDC49C -00001 0020+00 1/0 0/0 0/0 .data l_daObjDAN_Method */ +static actor_method_class l_daObjDAN_Method = { + (process_method_func)daObjDAN_Create, + (process_method_func)daObjDAN_Delete, + (process_method_func)daObjDAN_Execute, + (process_method_func)daObjDAN_IsDelete, + (process_method_func)daObjDAN_Draw, +}; -/* 80BDC46C-80BDC46C 0000BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80BDC49C-80BDC4CC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Dan */ +extern actor_process_profile_definition g_profile_Obj_Dan = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_Obj_Dan, + &g_fpcLf_Method.mBase, + sizeof(daObjDAN_c), + 0, + 0, + &g_fopAc_Method.base, + 0x1E1, + &l_daObjDAN_Method, + 0xC0120, + fopAc_ENV_e, + fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp b/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp index 064c7b200a..e04af17f68 100644 --- a/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp +++ b/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp @@ -766,8 +766,8 @@ cPhs__Step daObjKABUTO_c::create() { } mSex = (fopAcM_GetParam(this) >> 4) & 1; - m_itemNo = l_kab_itemno[mSex]; - m_saveBitNo = l_musiya_num[mSex]; + setItemNo(l_kab_itemno[mSex]); + setSaveBitNo(l_musiya_num[mSex]); if (!CreateChk()) { return cPhs_ERROR_e; |