diff --git a/Progress.md b/Progress.md index 6cf560a7b0b..a9bea36f0c4 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 54.157315% | 2177488 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 54.157315% | 2177488 | 4020672 -RELs | 37.574802% | 4321224 | 11500324 -Total | 41.870457% | 6498712 | 15520996 +RELs | 37.663808% | 4331460 | 11500324 +Total | 41.936407% | 6508948 | 15520996 ## RELs @@ -76,7 +76,7 @@ d_a_dmidna | 100.000000% | 1888 | 1888 d_a_do | 37.666220% | 14616 | 38804 d_a_door_boss | 100.000000% | 9056 | 9056 d_a_door_bossL1 | 100.000000% | 18732 | 18732 -d_a_door_bossL5 | 39.221790% | 4032 | 10280 +d_a_door_bossL5 | 100.000000% | 10280 | 10280 d_a_door_dbdoor00 | 100.000000% | 7620 | 7620 d_a_door_knob00 | 37.500000% | 4608 | 12288 d_a_door_mbossL1 | 34.467633% | 10372 | 30092 @@ -717,10 +717,10 @@ d_a_tag_attention | 100.000000% | 2024 | 2024 d_a_tag_bottle_item | 100.000000% | 2656 | 2656 d_a_tag_camera | 37.023593% | 1632 | 4408 d_a_tag_chgrestart | 100.000000% | 1768 | 1768 -d_a_tag_chkpoint | 43.726937% | 948 | 2168 +d_a_tag_chkpoint | 100.000000% | 2168 | 2168 d_a_tag_csw | 35.869565% | 3696 | 10304 d_a_tag_escape | 100.000000% | 712 | 712 -d_a_tag_event | 31.075697% | 1248 | 4016 +d_a_tag_event | 100.000000% | 4016 | 4016 d_a_tag_evt | 100.000000% | 4284 | 4284 d_a_tag_evtarea | 100.000000% | 3548 | 3548 d_a_tag_evtmsg | 100.000000% | 3616 | 3616 @@ -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 | 37.574802% | 4321224 | 11500324 +Total | 37.663808% | 4331460 | 11500324 diff --git a/asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/daTag_Chk_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/daTag_Chk_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 3cbc2ac58cd..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/daTag_Chk_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,123 +0,0 @@ -lbl_8048AA50: -/* 8048AA50 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048AA54 7C 08 02 A6 */ mflr r0 -/* 8048AA58 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048AA5C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8048AA60 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8048AA64 7C 7E 1B 78 */ mr r30, r3 -/* 8048AA68 3C 80 80 49 */ lis r4, lit_3769@ha /* 0x8048AC28@ha */ -/* 8048AA6C 3B E4 AC 28 */ addi r31, r4, lit_3769@l /* 0x8048AC28@l */ -/* 8048AA70 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8048AA74 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8048AA78 40 82 00 1C */ bne lbl_8048AA94 -/* 8048AA7C 28 1E 00 00 */ cmplwi r30, 0 -/* 8048AA80 41 82 00 08 */ beq lbl_8048AA88 -/* 8048AA84 4B B8 E0 E1 */ bl __ct__10fopAc_ac_cFv -lbl_8048AA88: -/* 8048AA88 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 8048AA8C 60 00 00 08 */ ori r0, r0, 8 -/* 8048AA90 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_8048AA94: -/* 8048AA94 A8 1E 04 B8 */ lha r0, 0x4b8(r30) -/* 8048AA98 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 8048AA9C 40 82 00 8C */ bne lbl_8048AB28 -/* 8048AAA0 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 8048AAA4 C0 5F 00 28 */ lfs f2, 0x28(r31) -/* 8048AAA8 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 8048AAAC D0 1E 04 EC */ stfs f0, 0x4ec(r30) -/* 8048AAB0 C0 3E 04 F0 */ lfs f1, 0x4f0(r30) -/* 8048AAB4 C0 1F 00 2C */ lfs f0, 0x2c(r31) -/* 8048AAB8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8048AABC D0 1E 04 F0 */ stfs f0, 0x4f0(r30) -/* 8048AAC0 C0 1E 04 F4 */ lfs f0, 0x4f4(r30) -/* 8048AAC4 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 8048AAC8 D0 1E 04 F4 */ stfs f0, 0x4f4(r30) -/* 8048AACC C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 8048AAD0 C0 1E 04 F4 */ lfs f0, 0x4f4(r30) -/* 8048AAD4 EC 61 00 28 */ fsubs f3, f1, f0 -/* 8048AAD8 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 8048AADC C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 8048AAE0 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 8048AAE4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8048AAE8 D0 1E 05 70 */ stfs f0, 0x570(r30) -/* 8048AAEC D0 5E 05 74 */ stfs f2, 0x574(r30) -/* 8048AAF0 D0 7E 05 78 */ stfs f3, 0x578(r30) -/* 8048AAF4 C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 8048AAF8 C0 1E 04 F4 */ lfs f0, 0x4f4(r30) -/* 8048AAFC EC 61 00 2A */ fadds f3, f1, f0 -/* 8048AB00 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 8048AB04 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 8048AB08 EC 41 00 2A */ fadds f2, f1, f0 -/* 8048AB0C C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 8048AB10 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 8048AB14 EC 01 00 2A */ fadds f0, f1, f0 -/* 8048AB18 D0 1E 05 7C */ stfs f0, 0x57c(r30) -/* 8048AB1C D0 5E 05 80 */ stfs f2, 0x580(r30) -/* 8048AB20 D0 7E 05 84 */ stfs f3, 0x584(r30) -/* 8048AB24 48 00 00 58 */ b lbl_8048AB7C -lbl_8048AB28: -/* 8048AB28 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 8048AB2C C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 8048AB30 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048AB34 D0 1E 04 EC */ stfs f0, 0x4ec(r30) -/* 8048AB38 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 8048AB3C EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048AB40 D0 1E 04 F0 */ stfs f0, 0x4f0(r30) -/* 8048AB44 C0 1E 04 F4 */ lfs f0, 0x4f4(r30) -/* 8048AB48 C0 5F 00 0C */ lfs f2, 0xc(r31) -/* 8048AB4C EC 00 00 B2 */ fmuls f0, f0, f2 -/* 8048AB50 D0 1E 04 F4 */ stfs f0, 0x4f4(r30) -/* 8048AB54 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8048AB58 D0 5E 05 70 */ stfs f2, 0x570(r30) -/* 8048AB5C D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 8048AB60 D0 5E 05 78 */ stfs f2, 0x578(r30) -/* 8048AB64 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) -/* 8048AB68 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 8048AB6C EC 01 00 2A */ fadds f0, f1, f0 -/* 8048AB70 D0 5E 05 7C */ stfs f2, 0x57c(r30) -/* 8048AB74 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 8048AB78 D0 5E 05 84 */ stfs f2, 0x584(r30) -lbl_8048AB7C: -/* 8048AB7C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 8048AB80 D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 8048AB84 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8048AB88 D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 8048AB8C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 8048AB90 D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 8048AB94 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8048AB98 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8048AB9C 28 00 00 FF */ cmplwi r0, 0xff -/* 8048ABA0 41 82 00 34 */ beq lbl_8048ABD4 -/* 8048ABA4 C0 7E 05 54 */ lfs f3, 0x554(r30) -/* 8048ABA8 C0 5F 00 30 */ lfs f2, 0x30(r31) -/* 8048ABAC C8 3F 00 38 */ lfd f1, 0x38(r31) -/* 8048ABB0 90 01 00 0C */ stw r0, 0xc(r1) -/* 8048ABB4 3C 00 43 30 */ lis r0, 0x4330 -/* 8048ABB8 90 01 00 08 */ stw r0, 8(r1) -/* 8048ABBC C8 01 00 08 */ lfd f0, 8(r1) -/* 8048ABC0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8048ABC4 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8048ABC8 EC 03 00 2A */ fadds f0, f3, f0 -/* 8048ABCC D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 8048ABD0 48 00 00 1C */ b lbl_8048ABEC -lbl_8048ABD4: -/* 8048ABD4 C0 5E 05 54 */ lfs f2, 0x554(r30) -/* 8048ABD8 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 8048ABDC C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 8048ABE0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8048ABE4 EC 02 00 2A */ fadds f0, f2, f0 -/* 8048ABE8 D0 1E 05 54 */ stfs f0, 0x554(r30) -lbl_8048ABEC: -/* 8048ABEC C0 1E 05 50 */ lfs f0, 0x550(r30) -/* 8048ABF0 D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 8048ABF4 C0 1E 05 54 */ lfs f0, 0x554(r30) -/* 8048ABF8 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 8048ABFC C0 1E 05 58 */ lfs f0, 0x558(r30) -/* 8048AC00 D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 8048AC04 38 60 00 04 */ li r3, 4 -/* 8048AC08 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8048AC0C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8048AC10 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048AC14 7C 08 03 A6 */ mtlr r0 -/* 8048AC18 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048AC1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/execute__11daTag_Chk_cFv.s b/asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/execute__11daTag_Chk_cFv.s deleted file mode 100644 index 5730903e92a..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/execute__11daTag_Chk_cFv.s +++ /dev/null @@ -1,210 +0,0 @@ -lbl_8048A6F8: -/* 8048A6F8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8048A6FC 7C 08 02 A6 */ mflr r0 -/* 8048A700 90 01 00 34 */ stw r0, 0x34(r1) -/* 8048A704 39 61 00 30 */ addi r11, r1, 0x30 -/* 8048A708 4B ED 7A D5 */ bl _savegpr_29 -/* 8048A70C 7C 7E 1B 78 */ mr r30, r3 -/* 8048A710 3C 60 80 49 */ lis r3, lit_3769@ha /* 0x8048AC28@ha */ -/* 8048A714 3B E3 AC 28 */ addi r31, r3, lit_3769@l /* 0x8048AC28@l */ -/* 8048A718 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8048A71C 7C 05 07 74 */ extsb r5, r0 -/* 8048A720 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8048A724 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8048A728 7C 00 07 74 */ extsb r0, r0 -/* 8048A72C 7C 05 00 00 */ cmpw r5, r0 -/* 8048A730 41 82 00 0C */ beq lbl_8048A73C -/* 8048A734 38 60 00 00 */ li r3, 0 -/* 8048A738 48 00 02 9C */ b lbl_8048A9D4 -lbl_8048A73C: -/* 8048A73C 80 7F 00 00 */ lwz r3, 0(r31) -/* 8048A740 80 1F 00 04 */ lwz r0, 4(r31) -/* 8048A744 90 61 00 0C */ stw r3, 0xc(r1) -/* 8048A748 90 01 00 10 */ stw r0, 0x10(r1) -/* 8048A74C 88 1F 00 08 */ lbz r0, 8(r31) -/* 8048A750 98 01 00 14 */ stb r0, 0x14(r1) -/* 8048A754 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8048A758 54 04 C6 3E */ rlwinm r4, r0, 0x18, 0x18, 0x1f -/* 8048A75C 28 04 00 FF */ cmplwi r4, 0xff -/* 8048A760 40 82 00 0C */ bne lbl_8048A76C -/* 8048A764 3B A0 00 00 */ li r29, 0 -/* 8048A768 48 00 00 24 */ b lbl_8048A78C -lbl_8048A76C: -/* 8048A76C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048A770 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048A774 4B BA AB ED */ bl isSwitch__10dSv_info_cCFii -/* 8048A778 2C 03 00 00 */ cmpwi r3, 0 -/* 8048A77C 41 82 00 0C */ beq lbl_8048A788 -/* 8048A780 3B A0 00 01 */ li r29, 1 -/* 8048A784 48 00 00 08 */ b lbl_8048A78C -lbl_8048A788: -/* 8048A788 3B A0 00 02 */ li r29, 2 -lbl_8048A78C: -/* 8048A78C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8048A790 54 04 86 3E */ rlwinm r4, r0, 0x10, 0x18, 0x1f -/* 8048A794 28 04 00 FF */ cmplwi r4, 0xff -/* 8048A798 40 82 00 0C */ bne lbl_8048A7A4 -/* 8048A79C 38 80 00 00 */ li r4, 0 -/* 8048A7A0 48 00 00 2C */ b lbl_8048A7CC -lbl_8048A7A4: -/* 8048A7A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048A7A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048A7AC 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8048A7B0 7C 05 07 74 */ extsb r5, r0 -/* 8048A7B4 4B BA AB AD */ bl isSwitch__10dSv_info_cCFii -/* 8048A7B8 2C 03 00 00 */ cmpwi r3, 0 -/* 8048A7BC 41 82 00 0C */ beq lbl_8048A7C8 -/* 8048A7C0 38 80 00 01 */ li r4, 1 -/* 8048A7C4 48 00 00 08 */ b lbl_8048A7CC -lbl_8048A7C8: -/* 8048A7C8 38 80 00 02 */ li r4, 2 -lbl_8048A7CC: -/* 8048A7CC 38 C0 00 00 */ li r6, 0 -/* 8048A7D0 1C 1D 00 03 */ mulli r0, r29, 3 -/* 8048A7D4 38 61 00 0C */ addi r3, r1, 0xc -/* 8048A7D8 7C 00 22 14 */ add r0, r0, r4 -/* 8048A7DC 7C 03 00 AE */ lbzx r0, r3, r0 -/* 8048A7E0 28 00 00 00 */ cmplwi r0, 0 -/* 8048A7E4 41 82 01 CC */ beq lbl_8048A9B0 -/* 8048A7E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048A7EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048A7F0 80 83 5D B4 */ lwz r4, 0x5db4(r3) -/* 8048A7F4 A8 1E 04 B8 */ lha r0, 0x4b8(r30) -/* 8048A7F8 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 -/* 8048A7FC 40 82 00 78 */ bne lbl_8048A874 -/* 8048A800 C0 1E 05 70 */ lfs f0, 0x570(r30) -/* 8048A804 C0 24 04 D0 */ lfs f1, 0x4d0(r4) -/* 8048A808 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8048A80C 4C 40 13 82 */ cror 2, 0, 2 -/* 8048A810 40 82 01 A0 */ bne lbl_8048A9B0 -/* 8048A814 C0 1E 05 7C */ lfs f0, 0x57c(r30) -/* 8048A818 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8048A81C 4C 40 13 82 */ cror 2, 0, 2 -/* 8048A820 40 82 01 90 */ bne lbl_8048A9B0 -/* 8048A824 C0 1E 05 74 */ lfs f0, 0x574(r30) -/* 8048A828 C0 24 04 D4 */ lfs f1, 0x4d4(r4) -/* 8048A82C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8048A830 4C 40 13 82 */ cror 2, 0, 2 -/* 8048A834 40 82 01 7C */ bne lbl_8048A9B0 -/* 8048A838 C0 1E 05 80 */ lfs f0, 0x580(r30) -/* 8048A83C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8048A840 4C 40 13 82 */ cror 2, 0, 2 -/* 8048A844 40 82 01 6C */ bne lbl_8048A9B0 -/* 8048A848 C0 1E 05 78 */ lfs f0, 0x578(r30) -/* 8048A84C C0 24 04 D8 */ lfs f1, 0x4d8(r4) -/* 8048A850 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8048A854 4C 40 13 82 */ cror 2, 0, 2 -/* 8048A858 40 82 01 58 */ bne lbl_8048A9B0 -/* 8048A85C C0 1E 05 84 */ lfs f0, 0x584(r30) -/* 8048A860 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8048A864 4C 40 13 82 */ cror 2, 0, 2 -/* 8048A868 40 82 01 48 */ bne lbl_8048A9B0 -/* 8048A86C 38 C0 00 01 */ li r6, 1 -/* 8048A870 48 00 01 40 */ b lbl_8048A9B0 -lbl_8048A874: -/* 8048A874 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 8048A878 C0 04 04 D0 */ lfs f0, 0x4d0(r4) -/* 8048A87C EC 41 00 28 */ fsubs f2, f1, f0 -/* 8048A880 C0 3E 04 D8 */ lfs f1, 0x4d8(r30) -/* 8048A884 C0 04 04 D8 */ lfs f0, 0x4d8(r4) -/* 8048A888 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8048A88C EC 22 00 B2 */ fmuls f1, f2, f2 -/* 8048A890 EC 00 00 32 */ fmuls f0, f0, f0 -/* 8048A894 EC 81 00 2A */ fadds f4, f1, f0 -/* 8048A898 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 8048A89C FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8048A8A0 40 81 00 58 */ ble lbl_8048A8F8 -/* 8048A8A4 FC 00 20 34 */ frsqrte f0, f4 -/* 8048A8A8 C8 7F 00 10 */ lfd f3, 0x10(r31) -/* 8048A8AC FC 23 00 32 */ fmul f1, f3, f0 -/* 8048A8B0 C8 5F 00 18 */ lfd f2, 0x18(r31) -/* 8048A8B4 FC 00 00 32 */ fmul f0, f0, f0 -/* 8048A8B8 FC 04 00 32 */ fmul f0, f4, f0 -/* 8048A8BC FC 02 00 28 */ fsub f0, f2, f0 -/* 8048A8C0 FC 01 00 32 */ fmul f0, f1, f0 -/* 8048A8C4 FC 23 00 32 */ fmul f1, f3, f0 -/* 8048A8C8 FC 00 00 32 */ fmul f0, f0, f0 -/* 8048A8CC FC 04 00 32 */ fmul f0, f4, f0 -/* 8048A8D0 FC 02 00 28 */ fsub f0, f2, f0 -/* 8048A8D4 FC 01 00 32 */ fmul f0, f1, f0 -/* 8048A8D8 FC 23 00 32 */ fmul f1, f3, f0 -/* 8048A8DC FC 00 00 32 */ fmul f0, f0, f0 -/* 8048A8E0 FC 04 00 32 */ fmul f0, f4, f0 -/* 8048A8E4 FC 02 00 28 */ fsub f0, f2, f0 -/* 8048A8E8 FC 01 00 32 */ fmul f0, f1, f0 -/* 8048A8EC FC 84 00 32 */ fmul f4, f4, f0 -/* 8048A8F0 FC 80 20 18 */ frsp f4, f4 -/* 8048A8F4 48 00 00 88 */ b lbl_8048A97C -lbl_8048A8F8: -/* 8048A8F8 C8 1F 00 20 */ lfd f0, 0x20(r31) -/* 8048A8FC FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8048A900 40 80 00 10 */ bge lbl_8048A910 -/* 8048A904 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8048A908 C0 83 0A E0 */ lfs f4, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8048A90C 48 00 00 70 */ b lbl_8048A97C -lbl_8048A910: -/* 8048A910 D0 81 00 08 */ stfs f4, 8(r1) -/* 8048A914 80 A1 00 08 */ lwz r5, 8(r1) -/* 8048A918 54 A3 00 50 */ rlwinm r3, r5, 0, 1, 8 -/* 8048A91C 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8048A920 7C 03 00 00 */ cmpw r3, r0 -/* 8048A924 41 82 00 14 */ beq lbl_8048A938 -/* 8048A928 40 80 00 40 */ bge lbl_8048A968 -/* 8048A92C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048A930 41 82 00 20 */ beq lbl_8048A950 -/* 8048A934 48 00 00 34 */ b lbl_8048A968 -lbl_8048A938: -/* 8048A938 54 A0 02 7F */ clrlwi. r0, r5, 9 -/* 8048A93C 41 82 00 0C */ beq lbl_8048A948 -/* 8048A940 38 00 00 01 */ li r0, 1 -/* 8048A944 48 00 00 28 */ b lbl_8048A96C -lbl_8048A948: -/* 8048A948 38 00 00 02 */ li r0, 2 -/* 8048A94C 48 00 00 20 */ b lbl_8048A96C -lbl_8048A950: -/* 8048A950 54 A0 02 7F */ clrlwi. r0, r5, 9 -/* 8048A954 41 82 00 0C */ beq lbl_8048A960 -/* 8048A958 38 00 00 05 */ li r0, 5 -/* 8048A95C 48 00 00 10 */ b lbl_8048A96C -lbl_8048A960: -/* 8048A960 38 00 00 03 */ li r0, 3 -/* 8048A964 48 00 00 08 */ b lbl_8048A96C -lbl_8048A968: -/* 8048A968 38 00 00 04 */ li r0, 4 -lbl_8048A96C: -/* 8048A96C 2C 00 00 01 */ cmpwi r0, 1 -/* 8048A970 40 82 00 0C */ bne lbl_8048A97C -/* 8048A974 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8048A978 C0 83 0A E0 */ lfs f4, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8048A97C: -/* 8048A97C C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 8048A980 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8048A984 40 80 00 2C */ bge lbl_8048A9B0 -/* 8048A988 C0 1E 05 74 */ lfs f0, 0x574(r30) -/* 8048A98C C0 24 04 D4 */ lfs f1, 0x4d4(r4) -/* 8048A990 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8048A994 4C 40 13 82 */ cror 2, 0, 2 -/* 8048A998 40 82 00 18 */ bne lbl_8048A9B0 -/* 8048A99C C0 1E 05 80 */ lfs f0, 0x580(r30) -/* 8048A9A0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8048A9A4 4C 40 13 82 */ cror 2, 0, 2 -/* 8048A9A8 40 82 00 08 */ bne lbl_8048A9B0 -/* 8048A9AC 38 C0 00 01 */ li r6, 1 -lbl_8048A9B0: -/* 8048A9B0 38 00 00 00 */ li r0, 0 -/* 8048A9B4 90 1E 05 5C */ stw r0, 0x55c(r30) -/* 8048A9B8 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 8048A9BC 41 82 00 14 */ beq lbl_8048A9D0 -/* 8048A9C0 38 7E 05 50 */ addi r3, r30, 0x550 -/* 8048A9C4 4B CD 4B 2D */ bl setLookPos__9daPy_py_cFP4cXyz -/* 8048A9C8 38 00 01 00 */ li r0, 0x100 -/* 8048A9CC 90 1E 05 5C */ stw r0, 0x55c(r30) -lbl_8048A9D0: -/* 8048A9D0 38 60 00 01 */ li r3, 1 -lbl_8048A9D4: -/* 8048A9D4 39 61 00 30 */ addi r11, r1, 0x30 -/* 8048A9D8 4B ED 78 51 */ bl _restgpr_29 -/* 8048A9DC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8048A9E0 7C 08 03 A6 */ mtlr r0 -/* 8048A9E4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8048A9E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionArrival__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionArrival__13daTag_Event_cFv.s deleted file mode 100644 index 93943b25e29..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionArrival__13daTag_Event_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8048B5C8: -/* 8048B5C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B5CC 7C 08 02 A6 */ mflr r0 -/* 8048B5D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B5D4 38 00 00 02 */ li r0, 2 -/* 8048B5D8 98 03 05 72 */ stb r0, 0x572(r3) -/* 8048B5DC 4B FF FF 39 */ bl actionHunt__13daTag_Event_cFv -/* 8048B5E0 38 60 00 01 */ li r3, 1 -/* 8048B5E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B5E8 7C 08 03 A6 */ mtlr r0 -/* 8048B5EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B5F0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionEvent__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionEvent__13daTag_Event_cFv.s deleted file mode 100644 index f320786d11e..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionEvent__13daTag_Event_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8048B1B0: -/* 8048B1B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B1B4 7C 08 02 A6 */ mflr r0 -/* 8048B1B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B1BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048B1C0 93 C1 00 08 */ stw r30, 8(r1) -/* 8048B1C4 7C 7E 1B 78 */ mr r30, r3 -/* 8048B1C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048B1CC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048B1D0 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 8048B1D4 A8 9E 05 68 */ lha r4, 0x568(r30) -/* 8048B1D8 4B BB C8 A1 */ bl endCheck__16dEvent_manager_cFs -/* 8048B1DC 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B1E0 41 82 00 64 */ beq lbl_8048B244 -/* 8048B1E4 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8048B1E8 4B BB 72 81 */ bl reset__14dEvt_control_cFv -/* 8048B1EC A8 1E 05 6A */ lha r0, 0x56a(r30) -/* 8048B1F0 2C 00 FF FF */ cmpwi r0, -1 -/* 8048B1F4 41 82 00 34 */ beq lbl_8048B228 -/* 8048B1F8 38 00 00 05 */ li r0, 5 -/* 8048B1FC 98 1E 05 72 */ stb r0, 0x572(r30) -/* 8048B200 7F C3 F3 78 */ mr r3, r30 -/* 8048B204 A8 9E 05 6A */ lha r4, 0x56a(r30) -/* 8048B208 A8 1E 05 6C */ lha r0, 0x56c(r30) -/* 8048B20C 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8048B210 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8048B214 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8048B218 38 E0 00 00 */ li r7, 0 -/* 8048B21C 39 00 00 01 */ li r8, 1 -/* 8048B220 4B B9 04 5D */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8048B224 48 00 00 28 */ b lbl_8048B24C -lbl_8048B228: -/* 8048B228 38 00 00 00 */ li r0, 0 -/* 8048B22C 98 1E 05 72 */ stb r0, 0x572(r30) -/* 8048B230 7F C3 F3 78 */ mr r3, r30 -/* 8048B234 4B FF FC C5 */ bl demoEndProc__13daTag_Event_cFv -/* 8048B238 38 00 FF FF */ li r0, -1 -/* 8048B23C B0 1E 05 6C */ sth r0, 0x56c(r30) -/* 8048B240 48 00 00 0C */ b lbl_8048B24C -lbl_8048B244: -/* 8048B244 7F C3 F3 78 */ mr r3, r30 -/* 8048B248 4B FF FC B5 */ bl demoProc__13daTag_Event_cFv -lbl_8048B24C: -/* 8048B24C 38 60 00 01 */ li r3, 1 -/* 8048B250 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048B254 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048B258 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B25C 7C 08 03 A6 */ mtlr r0 -/* 8048B260 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B264 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionHunt2__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionHunt2__13daTag_Event_cFv.s deleted file mode 100644 index 212653181e1..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionHunt2__13daTag_Event_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8048B5FC: -/* 8048B5FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B600 7C 08 02 A6 */ mflr r0 -/* 8048B604 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B608 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048B60C 7C 7F 1B 78 */ mr r31, r3 -/* 8048B610 4B FF F7 65 */ bl getSwbit__13daTag_Event_cFv -/* 8048B614 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8048B618 2C 04 00 FF */ cmpwi r4, 0xff -/* 8048B61C 41 82 00 2C */ beq lbl_8048B648 -/* 8048B620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048B624 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048B628 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8048B62C 7C 05 07 74 */ extsb r5, r0 -/* 8048B630 4B BA 9D 31 */ bl isSwitch__10dSv_info_cCFii -/* 8048B634 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B638 41 82 00 10 */ beq lbl_8048B648 -/* 8048B63C 38 00 00 00 */ li r0, 0 -/* 8048B640 98 1F 05 72 */ stb r0, 0x572(r31) -/* 8048B644 48 00 00 78 */ b lbl_8048B6BC -lbl_8048B648: -/* 8048B648 7F E3 FB 78 */ mr r3, r31 -/* 8048B64C 4B FF F7 A1 */ bl arrivalTerms__13daTag_Event_cFv -/* 8048B650 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B654 41 82 00 60 */ beq lbl_8048B6B4 -/* 8048B658 88 7F 05 73 */ lbz r3, 0x573(r31) -/* 8048B65C 4B FF F6 DD */ bl daTag_getBk__FUl -/* 8048B660 28 03 00 00 */ cmplwi r3, 0 -/* 8048B664 40 82 00 50 */ bne lbl_8048B6B4 -/* 8048B668 A8 7F 05 70 */ lha r3, 0x570(r31) -/* 8048B66C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B670 40 81 00 10 */ ble lbl_8048B680 -/* 8048B674 38 03 FF FF */ addi r0, r3, -1 -/* 8048B678 B0 1F 05 70 */ sth r0, 0x570(r31) -/* 8048B67C 48 00 00 40 */ b lbl_8048B6BC -lbl_8048B680: -/* 8048B680 38 00 00 04 */ li r0, 4 -/* 8048B684 98 1F 05 72 */ stb r0, 0x572(r31) -/* 8048B688 7F E3 FB 78 */ mr r3, r31 -/* 8048B68C 4B FF F6 DD */ bl getEventNo__13daTag_Event_cFv -/* 8048B690 7C 65 1B 78 */ mr r5, r3 -/* 8048B694 7F E3 FB 78 */ mr r3, r31 -/* 8048B698 A8 9F 05 68 */ lha r4, 0x568(r31) -/* 8048B69C 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8048B6A0 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8048B6A4 38 E0 00 00 */ li r7, 0 -/* 8048B6A8 39 00 00 01 */ li r8, 1 -/* 8048B6AC 4B B8 FF D1 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8048B6B0 48 00 00 0C */ b lbl_8048B6BC -lbl_8048B6B4: -/* 8048B6B4 38 00 00 41 */ li r0, 0x41 -/* 8048B6B8 B0 1F 05 70 */ sth r0, 0x570(r31) -lbl_8048B6BC: -/* 8048B6BC 38 60 00 01 */ li r3, 1 -/* 8048B6C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048B6C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B6C8 7C 08 03 A6 */ mtlr r0 -/* 8048B6CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B6D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionHunt__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionHunt__13daTag_Event_cFv.s deleted file mode 100644 index 655b1ae8c8d..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionHunt__13daTag_Event_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_8048B514: -/* 8048B514 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B518 7C 08 02 A6 */ mflr r0 -/* 8048B51C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B520 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048B524 7C 7F 1B 78 */ mr r31, r3 -/* 8048B528 4B FF F8 4D */ bl getSwbit__13daTag_Event_cFv -/* 8048B52C 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8048B530 2C 04 00 FF */ cmpwi r4, 0xff -/* 8048B534 41 82 00 2C */ beq lbl_8048B560 -/* 8048B538 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048B53C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048B540 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8048B544 7C 05 07 74 */ extsb r5, r0 -/* 8048B548 4B BA 9E 19 */ bl isSwitch__10dSv_info_cCFii -/* 8048B54C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B550 41 82 00 10 */ beq lbl_8048B560 -/* 8048B554 38 00 00 00 */ li r0, 0 -/* 8048B558 98 1F 05 72 */ stb r0, 0x572(r31) -/* 8048B55C 48 00 00 54 */ b lbl_8048B5B0 -lbl_8048B560: -/* 8048B560 7F E3 FB 78 */ mr r3, r31 -/* 8048B564 4B FF F8 89 */ bl arrivalTerms__13daTag_Event_cFv -/* 8048B568 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B56C 41 82 00 44 */ beq lbl_8048B5B0 -/* 8048B570 7F E3 FB 78 */ mr r3, r31 -/* 8048B574 4B FF FE 05 */ bl checkArea__13daTag_Event_cFv -/* 8048B578 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B57C 41 82 00 34 */ beq lbl_8048B5B0 -/* 8048B580 38 00 00 04 */ li r0, 4 -/* 8048B584 98 1F 05 72 */ stb r0, 0x572(r31) -/* 8048B588 7F E3 FB 78 */ mr r3, r31 -/* 8048B58C 4B FF F7 DD */ bl getEventNo__13daTag_Event_cFv -/* 8048B590 7C 65 1B 78 */ mr r5, r3 -/* 8048B594 7F E3 FB 78 */ mr r3, r31 -/* 8048B598 A8 9F 05 68 */ lha r4, 0x568(r31) -/* 8048B59C 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8048B5A0 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8048B5A4 38 E0 00 00 */ li r7, 0 -/* 8048B5A8 39 00 00 01 */ li r8, 1 -/* 8048B5AC 4B B9 00 D1 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -lbl_8048B5B0: -/* 8048B5B0 38 60 00 01 */ li r3, 1 -/* 8048B5B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048B5B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B5BC 7C 08 03 A6 */ mtlr r0 -/* 8048B5C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B5C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionNext__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionNext__13daTag_Event_cFv.s deleted file mode 100644 index df80c2c2bc7..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionNext__13daTag_Event_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_8048B0E4: -/* 8048B0E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B0E8 7C 08 02 A6 */ mflr r0 -/* 8048B0EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B0F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048B0F4 7C 7F 1B 78 */ mr r31, r3 -/* 8048B0F8 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 8048B0FC 28 00 00 02 */ cmplwi r0, 2 -/* 8048B100 40 82 00 78 */ bne lbl_8048B178 -/* 8048B104 A8 1F 05 6A */ lha r0, 0x56a(r31) -/* 8048B108 B0 1F 05 68 */ sth r0, 0x568(r31) -/* 8048B10C 38 00 FF FF */ li r0, -1 -/* 8048B110 B0 1F 05 6A */ sth r0, 0x56a(r31) -/* 8048B114 A8 1F 05 6C */ lha r0, 0x56c(r31) -/* 8048B118 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8048B11C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8048B120 7C 04 07 74 */ extsb r4, r0 -/* 8048B124 4B BB 83 DD */ bl searchMapEventData__14dEvt_control_cFUcl -/* 8048B128 28 03 00 00 */ cmplwi r3, 0 -/* 8048B12C 41 82 00 30 */ beq lbl_8048B15C -/* 8048B130 88 03 00 05 */ lbz r0, 5(r3) -/* 8048B134 B0 1F 05 6C */ sth r0, 0x56c(r31) -/* 8048B138 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048B13C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048B140 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8048B144 7F E4 FB 78 */ mr r4, r31 -/* 8048B148 A8 1F 05 6C */ lha r0, 0x56c(r31) -/* 8048B14C 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8048B150 4B BB C5 49 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc -/* 8048B154 B0 7F 05 6A */ sth r3, 0x56a(r31) -/* 8048B158 48 00 00 0C */ b lbl_8048B164 -lbl_8048B15C: -/* 8048B15C 38 00 FF FF */ li r0, -1 -/* 8048B160 B0 1F 05 6C */ sth r0, 0x56c(r31) -lbl_8048B164: -/* 8048B164 38 00 00 06 */ li r0, 6 -/* 8048B168 98 1F 05 72 */ stb r0, 0x572(r31) -/* 8048B16C 7F E3 FB 78 */ mr r3, r31 -/* 8048B170 48 00 00 41 */ bl actionEvent__13daTag_Event_cFv -/* 8048B174 48 00 00 24 */ b lbl_8048B198 -lbl_8048B178: -/* 8048B178 A8 9F 05 6A */ lha r4, 0x56a(r31) -/* 8048B17C A8 1F 05 6C */ lha r0, 0x56c(r31) -/* 8048B180 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8048B184 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8048B188 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8048B18C 38 E0 00 00 */ li r7, 0 -/* 8048B190 39 00 00 01 */ li r8, 1 -/* 8048B194 4B B9 04 E9 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -lbl_8048B198: -/* 8048B198 38 60 00 01 */ li r3, 1 -/* 8048B19C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048B1A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B1A4 7C 08 03 A6 */ mtlr r0 -/* 8048B1A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B1AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionReady__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionReady__13daTag_Event_cFv.s deleted file mode 100644 index 87b507fad35..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionReady__13daTag_Event_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_8048B268: -/* 8048B268 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B26C 7C 08 02 A6 */ mflr r0 -/* 8048B270 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B274 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048B278 93 C1 00 08 */ stw r30, 8(r1) -/* 8048B27C 7C 7E 1B 78 */ mr r30, r3 -/* 8048B280 4B FF FA F5 */ bl getSwbit__13daTag_Event_cFv -/* 8048B284 54 7F 06 3E */ clrlwi r31, r3, 0x18 -/* 8048B288 A0 1E 00 F8 */ lhz r0, 0xf8(r30) -/* 8048B28C 28 00 00 02 */ cmplwi r0, 2 -/* 8048B290 40 82 00 70 */ bne lbl_8048B300 -/* 8048B294 7F C3 F3 78 */ mr r3, r30 -/* 8048B298 4B FF FC 55 */ bl demoInitProc__13daTag_Event_cFv -/* 8048B29C 38 00 00 06 */ li r0, 6 -/* 8048B2A0 98 1E 05 72 */ stb r0, 0x572(r30) -/* 8048B2A4 7F C3 F3 78 */ mr r3, r30 -/* 8048B2A8 4B FF FF 09 */ bl actionEvent__13daTag_Event_cFv -/* 8048B2AC 2C 1F 00 FF */ cmpwi r31, 0xff -/* 8048B2B0 41 82 00 1C */ beq lbl_8048B2CC -/* 8048B2B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048B2B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048B2BC 7F E4 FB 78 */ mr r4, r31 -/* 8048B2C0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8048B2C4 7C 05 07 74 */ extsb r5, r0 -/* 8048B2C8 4B BA 9F 39 */ bl onSwitch__10dSv_info_cFii -lbl_8048B2CC: -/* 8048B2CC 7F C3 F3 78 */ mr r3, r30 -/* 8048B2D0 4B FF FA ED */ bl horseRodeo__13daTag_Event_cFv -/* 8048B2D4 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B2D8 41 82 00 84 */ beq lbl_8048B35C -/* 8048B2DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048B2E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048B2E4 80 63 5D B8 */ lwz r3, 0x5db8(r3) -/* 8048B2E8 28 03 00 00 */ cmplwi r3, 0 -/* 8048B2EC 41 82 00 70 */ beq lbl_8048B35C -/* 8048B2F0 80 03 17 44 */ lwz r0, 0x1744(r3) -/* 8048B2F4 64 00 80 00 */ oris r0, r0, 0x8000 -/* 8048B2F8 90 03 17 44 */ stw r0, 0x1744(r3) -/* 8048B2FC 48 00 00 60 */ b lbl_8048B35C -lbl_8048B300: -/* 8048B300 2C 1F 00 FF */ cmpwi r31, 0xff -/* 8048B304 41 82 00 30 */ beq lbl_8048B334 -/* 8048B308 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048B30C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048B310 7F E4 FB 78 */ mr r4, r31 -/* 8048B314 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8048B318 7C 05 07 74 */ extsb r5, r0 -/* 8048B31C 4B BA A0 45 */ bl isSwitch__10dSv_info_cCFii -/* 8048B320 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B324 41 82 00 10 */ beq lbl_8048B334 -/* 8048B328 38 00 00 00 */ li r0, 0 -/* 8048B32C 98 1E 05 72 */ stb r0, 0x572(r30) -/* 8048B330 48 00 00 2C */ b lbl_8048B35C -lbl_8048B334: -/* 8048B334 7F C3 F3 78 */ mr r3, r30 -/* 8048B338 4B FF FA 31 */ bl getEventNo__13daTag_Event_cFv -/* 8048B33C 7C 65 1B 78 */ mr r5, r3 -/* 8048B340 7F C3 F3 78 */ mr r3, r30 -/* 8048B344 A8 9E 05 68 */ lha r4, 0x568(r30) -/* 8048B348 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8048B34C 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8048B350 38 E0 00 00 */ li r7, 0 -/* 8048B354 39 00 00 01 */ li r8, 1 -/* 8048B358 4B B9 03 25 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -lbl_8048B35C: -/* 8048B35C 38 60 00 01 */ li r3, 1 -/* 8048B360 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048B364 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048B368 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B36C 7C 08 03 A6 */ mtlr r0 -/* 8048B370 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B374 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/arrivalTerms__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/arrivalTerms__13daTag_Event_cFv.s deleted file mode 100644 index 6a2e30c7517..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/arrivalTerms__13daTag_Event_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_8048ADEC: -/* 8048ADEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048ADF0 7C 08 02 A6 */ mflr r0 -/* 8048ADF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048ADF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048ADFC 7C 7F 1B 78 */ mr r31, r3 -/* 8048AE00 4B FF FF 81 */ bl getSwbit2__13daTag_Event_cFv -/* 8048AE04 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 8048AE08 2C 04 00 FF */ cmpwi r4, 0xff -/* 8048AE0C 41 82 00 28 */ beq lbl_8048AE34 -/* 8048AE10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048AE14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048AE18 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8048AE1C 7C 05 07 74 */ extsb r5, r0 -/* 8048AE20 4B BA A5 41 */ bl isSwitch__10dSv_info_cCFii -/* 8048AE24 2C 03 00 00 */ cmpwi r3, 0 -/* 8048AE28 40 82 00 0C */ bne lbl_8048AE34 -/* 8048AE2C 38 60 00 00 */ li r3, 0 -/* 8048AE30 48 00 00 A8 */ b lbl_8048AED8 -lbl_8048AE34: -/* 8048AE34 7F E3 FB 78 */ mr r3, r31 -/* 8048AE38 4B FF FF 61 */ bl getInvalidEventFlag__13daTag_Event_cFv -/* 8048AE3C 7C 64 1B 78 */ mr r4, r3 -/* 8048AE40 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8048AE44 28 00 7F FF */ cmplwi r0, 0x7fff -/* 8048AE48 41 82 00 3C */ beq lbl_8048AE84 -/* 8048AE4C 28 00 00 00 */ cmplwi r0, 0 -/* 8048AE50 41 82 00 34 */ beq lbl_8048AE84 -/* 8048AE54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048AE58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048AE5C 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8048AE60 54 80 0B FC */ rlwinm r0, r4, 1, 0xf, 0x1e -/* 8048AE64 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8048AE68 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8048AE6C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8048AE70 4B BA 9B 4D */ bl isEventBit__11dSv_event_cCFUs -/* 8048AE74 2C 03 00 00 */ cmpwi r3, 0 -/* 8048AE78 41 82 00 0C */ beq lbl_8048AE84 -/* 8048AE7C 38 60 00 00 */ li r3, 0 -/* 8048AE80 48 00 00 58 */ b lbl_8048AED8 -lbl_8048AE84: -/* 8048AE84 7F E3 FB 78 */ mr r3, r31 -/* 8048AE88 4B FF FF 29 */ bl getValidEventFlag__13daTag_Event_cFv -/* 8048AE8C 7C 64 1B 78 */ mr r4, r3 -/* 8048AE90 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8048AE94 28 00 FF FF */ cmplwi r0, 0xffff -/* 8048AE98 41 82 00 3C */ beq lbl_8048AED4 -/* 8048AE9C 28 00 00 00 */ cmplwi r0, 0 -/* 8048AEA0 41 82 00 34 */ beq lbl_8048AED4 -/* 8048AEA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048AEA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048AEAC 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8048AEB0 54 80 0B FC */ rlwinm r0, r4, 1, 0xf, 0x1e -/* 8048AEB4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8048AEB8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8048AEBC 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8048AEC0 4B BA 9A FD */ bl isEventBit__11dSv_event_cCFUs -/* 8048AEC4 2C 03 00 00 */ cmpwi r3, 0 -/* 8048AEC8 40 82 00 0C */ bne lbl_8048AED4 -/* 8048AECC 38 60 00 00 */ li r3, 0 -/* 8048AED0 48 00 00 08 */ b lbl_8048AED8 -lbl_8048AED4: -/* 8048AED4 38 60 00 01 */ li r3, 1 -lbl_8048AED8: -/* 8048AED8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048AEDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048AEE0 7C 08 03 A6 */ mtlr r0 -/* 8048AEE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048AEE8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/checkArea__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/checkArea__13daTag_Event_cFv.s deleted file mode 100644 index e1f15a4249e..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/checkArea__13daTag_Event_cFv.s +++ /dev/null @@ -1,108 +0,0 @@ -lbl_8048B378: -/* 8048B378 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8048B37C 7C 08 02 A6 */ mflr r0 -/* 8048B380 90 01 00 54 */ stw r0, 0x54(r1) -/* 8048B384 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 8048B388 93 C1 00 48 */ stw r30, 0x48(r1) -/* 8048B38C 7C 7E 1B 78 */ mr r30, r3 -/* 8048B390 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048B394 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048B398 83 E4 5D B4 */ lwz r31, 0x5db4(r4) -/* 8048B39C 4B FF FA 09 */ bl getAreaType__13daTag_Event_cFv -/* 8048B3A0 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8048B3A4 28 00 80 00 */ cmplwi r0, 0x8000 -/* 8048B3A8 40 82 00 C0 */ bne lbl_8048B468 -/* 8048B3AC C0 9F 04 D0 */ lfs f4, 0x4d0(r31) -/* 8048B3B0 D0 81 00 38 */ stfs f4, 0x38(r1) -/* 8048B3B4 C0 7F 04 D4 */ lfs f3, 0x4d4(r31) -/* 8048B3B8 D0 61 00 3C */ stfs f3, 0x3c(r1) -/* 8048B3BC C0 5F 04 D8 */ lfs f2, 0x4d8(r31) -/* 8048B3C0 D0 41 00 40 */ stfs f2, 0x40(r1) -/* 8048B3C4 C0 FE 04 D8 */ lfs f7, 0x4d8(r30) -/* 8048B3C8 3C 60 80 49 */ lis r3, lit_3954@ha /* 0x8048B838@ha */ -/* 8048B3CC C0 23 B8 38 */ lfs f1, lit_3954@l(r3) /* 0x8048B838@l */ -/* 8048B3D0 C0 1E 04 F4 */ lfs f0, 0x4f4(r30) -/* 8048B3D4 EC C1 00 32 */ fmuls f6, f1, f0 -/* 8048B3D8 EC A7 30 28 */ fsubs f5, f7, f6 -/* 8048B3DC C1 1E 04 D4 */ lfs f8, 0x4d4(r30) -/* 8048B3E0 C1 5E 04 D0 */ lfs f10, 0x4d0(r30) -/* 8048B3E4 C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 8048B3E8 ED 21 00 32 */ fmuls f9, f1, f0 -/* 8048B3EC EC 2A 48 28 */ fsubs f1, f10, f9 -/* 8048B3F0 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 8048B3F4 D1 01 00 30 */ stfs f8, 0x30(r1) -/* 8048B3F8 D0 A1 00 34 */ stfs f5, 0x34(r1) -/* 8048B3FC EC E7 30 2A */ fadds f7, f7, f6 -/* 8048B400 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 8048B404 EC C8 00 2A */ fadds f6, f8, f0 -/* 8048B408 EC 0A 48 2A */ fadds f0, f10, f9 -/* 8048B40C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8048B410 D0 C1 00 24 */ stfs f6, 0x24(r1) -/* 8048B414 D0 E1 00 28 */ stfs f7, 0x28(r1) -/* 8048B418 FC 01 20 40 */ fcmpo cr0, f1, f4 -/* 8048B41C 4C 40 13 82 */ cror 2, 0, 2 -/* 8048B420 40 82 00 D8 */ bne lbl_8048B4F8 -/* 8048B424 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8048B428 4C 40 13 82 */ cror 2, 0, 2 -/* 8048B42C 40 82 00 CC */ bne lbl_8048B4F8 -/* 8048B430 FC 08 18 40 */ fcmpo cr0, f8, f3 -/* 8048B434 4C 40 13 82 */ cror 2, 0, 2 -/* 8048B438 40 82 00 C0 */ bne lbl_8048B4F8 -/* 8048B43C FC 03 30 40 */ fcmpo cr0, f3, f6 -/* 8048B440 4C 40 13 82 */ cror 2, 0, 2 -/* 8048B444 40 82 00 B4 */ bne lbl_8048B4F8 -/* 8048B448 FC 05 10 40 */ fcmpo cr0, f5, f2 -/* 8048B44C 4C 40 13 82 */ cror 2, 0, 2 -/* 8048B450 40 82 00 A8 */ bne lbl_8048B4F8 -/* 8048B454 FC 02 38 40 */ fcmpo cr0, f2, f7 -/* 8048B458 4C 40 13 82 */ cror 2, 0, 2 -/* 8048B45C 40 82 00 9C */ bne lbl_8048B4F8 -/* 8048B460 38 60 00 01 */ li r3, 1 -/* 8048B464 48 00 00 98 */ b lbl_8048B4FC -lbl_8048B468: -/* 8048B468 38 61 00 14 */ addi r3, r1, 0x14 -/* 8048B46C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8048B470 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8048B474 4B DD B6 C1 */ bl __mi__4cXyzCFRC3Vec -/* 8048B478 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 8048B47C D0 01 00 38 */ stfs f0, 0x38(r1) -/* 8048B480 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 8048B484 D0 21 00 3C */ stfs f1, 0x3c(r1) -/* 8048B488 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 8048B48C D0 01 00 40 */ stfs f0, 0x40(r1) -/* 8048B490 3C 60 80 49 */ lis r3, lit_3955@ha /* 0x8048B83C@ha */ -/* 8048B494 C0 03 B8 3C */ lfs f0, lit_3955@l(r3) /* 0x8048B83C@l */ -/* 8048B498 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8048B49C 40 80 00 0C */ bge lbl_8048B4A8 -/* 8048B4A0 FC 00 08 50 */ fneg f0, f1 -/* 8048B4A4 D0 01 00 3C */ stfs f0, 0x3c(r1) -lbl_8048B4A8: -/* 8048B4A8 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 8048B4AC D0 01 00 08 */ stfs f0, 8(r1) -/* 8048B4B0 3C 60 80 49 */ lis r3, lit_3955@ha /* 0x8048B83C@ha */ -/* 8048B4B4 C0 03 B8 3C */ lfs f0, lit_3955@l(r3) /* 0x8048B83C@l */ -/* 8048B4B8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8048B4BC C0 01 00 40 */ lfs f0, 0x40(r1) -/* 8048B4C0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8048B4C4 38 61 00 08 */ addi r3, r1, 8 -/* 8048B4C8 4B EB BC 71 */ bl PSVECSquareMag -/* 8048B4CC C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 8048B4D0 EC 00 00 32 */ fmuls f0, f0, f0 -/* 8048B4D4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8048B4D8 40 80 00 20 */ bge lbl_8048B4F8 -/* 8048B4DC C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 8048B4E0 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 8048B4E4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8048B4E8 4C 40 13 82 */ cror 2, 0, 2 -/* 8048B4EC 40 82 00 0C */ bne lbl_8048B4F8 -/* 8048B4F0 38 60 00 01 */ li r3, 1 -/* 8048B4F4 48 00 00 08 */ b lbl_8048B4FC -lbl_8048B4F8: -/* 8048B4F8 38 60 00 00 */ li r3, 0 -lbl_8048B4FC: -/* 8048B4FC 83 E1 00 4C */ lwz r31, 0x4c(r1) -/* 8048B500 83 C1 00 48 */ lwz r30, 0x48(r1) -/* 8048B504 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8048B508 7C 08 03 A6 */ mtlr r0 -/* 8048B50C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8048B510 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/create__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/create__13daTag_Event_cFv.s deleted file mode 100644 index 0181405d58f..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/create__13daTag_Event_cFv.s +++ /dev/null @@ -1,131 +0,0 @@ -lbl_8048AF00: -/* 8048AF00 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048AF04 7C 08 02 A6 */ mflr r0 -/* 8048AF08 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048AF0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048AF10 4B ED 72 C9 */ bl _savegpr_28 -/* 8048AF14 7C 7F 1B 78 */ mr r31, r3 -/* 8048AF18 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8048AF1C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8048AF20 40 82 00 1C */ bne lbl_8048AF3C -/* 8048AF24 28 1F 00 00 */ cmplwi r31, 0 -/* 8048AF28 41 82 00 08 */ beq lbl_8048AF30 -/* 8048AF2C 4B B8 DC 39 */ bl __ct__10fopAc_ac_cFv -lbl_8048AF30: -/* 8048AF30 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8048AF34 60 00 00 08 */ ori r0, r0, 8 -/* 8048AF38 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8048AF3C: -/* 8048AF3C 7F E3 FB 78 */ mr r3, r31 -/* 8048AF40 4B FF FE 35 */ bl getSwbit__13daTag_Event_cFv -/* 8048AF44 54 7D 06 3E */ clrlwi r29, r3, 0x18 -/* 8048AF48 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8048AF4C 7C 00 07 74 */ extsb r0, r0 -/* 8048AF50 7C 1C 03 78 */ mr r28, r0 -/* 8048AF54 7F E3 FB 78 */ mr r3, r31 -/* 8048AF58 4B FF FE 11 */ bl getEventNo__13daTag_Event_cFv -/* 8048AF5C 7C 65 1B 78 */ mr r5, r3 -/* 8048AF60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048AF64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048AF68 3B C3 4F F8 */ addi r30, r3, 0x4ff8 -/* 8048AF6C 7F C3 F3 78 */ mr r3, r30 -/* 8048AF70 7F E4 FB 78 */ mr r4, r31 -/* 8048AF74 4B BB C7 25 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc -/* 8048AF78 B0 7F 05 68 */ sth r3, 0x568(r31) -/* 8048AF7C 38 00 FF FF */ li r0, -1 -/* 8048AF80 B0 1F 05 6C */ sth r0, 0x56c(r31) -/* 8048AF84 B0 1F 05 6A */ sth r0, 0x56a(r31) -/* 8048AF88 7F E3 FB 78 */ mr r3, r31 -/* 8048AF8C 4B FF FD DD */ bl getEventNo__13daTag_Event_cFv -/* 8048AF90 7F 84 E3 78 */ mr r4, r28 -/* 8048AF94 4B BB 85 6D */ bl searchMapEventData__14dEvt_control_cFUcl -/* 8048AF98 28 03 00 00 */ cmplwi r3, 0 -/* 8048AF9C 41 82 00 24 */ beq lbl_8048AFC0 -/* 8048AFA0 88 03 00 05 */ lbz r0, 5(r3) -/* 8048AFA4 B0 1F 05 6C */ sth r0, 0x56c(r31) -/* 8048AFA8 7F C3 F3 78 */ mr r3, r30 -/* 8048AFAC 7F E4 FB 78 */ mr r4, r31 -/* 8048AFB0 A8 1F 05 6C */ lha r0, 0x56c(r31) -/* 8048AFB4 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8048AFB8 4B BB C6 E1 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc -/* 8048AFBC B0 7F 05 6A */ sth r3, 0x56a(r31) -lbl_8048AFC0: -/* 8048AFC0 A8 1F 05 68 */ lha r0, 0x568(r31) -/* 8048AFC4 B0 1F 00 FC */ sth r0, 0xfc(r31) -/* 8048AFC8 7F E3 FB 78 */ mr r3, r31 -/* 8048AFCC 4B FF FD 9D */ bl getEventNo__13daTag_Event_cFv -/* 8048AFD0 98 7F 00 FE */ stb r3, 0xfe(r31) -/* 8048AFD4 A8 1F 05 68 */ lha r0, 0x568(r31) -/* 8048AFD8 2C 00 FF FF */ cmpwi r0, -1 -/* 8048AFDC 40 82 00 38 */ bne lbl_8048B014 -/* 8048AFE0 7F E3 FB 78 */ mr r3, r31 -/* 8048AFE4 4B FF FD D9 */ bl horseRodeo__13daTag_Event_cFv -/* 8048AFE8 2C 03 00 00 */ cmpwi r3, 0 -/* 8048AFEC 41 82 00 34 */ beq lbl_8048B020 -/* 8048AFF0 2C 1D 00 FF */ cmpwi r29, 0xff -/* 8048AFF4 41 82 00 20 */ beq lbl_8048B014 -/* 8048AFF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048AFFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048B000 7F A4 EB 78 */ mr r4, r29 -/* 8048B004 7F 85 E3 78 */ mr r5, r28 -/* 8048B008 4B BA A3 59 */ bl isSwitch__10dSv_info_cCFii -/* 8048B00C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B010 40 82 00 10 */ bne lbl_8048B020 -lbl_8048B014: -/* 8048B014 38 00 00 01 */ li r0, 1 -/* 8048B018 98 1F 05 72 */ stb r0, 0x572(r31) -/* 8048B01C 48 00 00 0C */ b lbl_8048B028 -lbl_8048B020: -/* 8048B020 38 00 00 00 */ li r0, 0 -/* 8048B024 98 1F 05 72 */ stb r0, 0x572(r31) -lbl_8048B028: -/* 8048B028 38 00 00 00 */ li r0, 0 -/* 8048B02C B0 1F 04 E8 */ sth r0, 0x4e8(r31) -/* 8048B030 B0 1F 04 E4 */ sth r0, 0x4e4(r31) -/* 8048B034 B0 1F 04 E0 */ sth r0, 0x4e0(r31) -/* 8048B038 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 8048B03C C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048B040 3C 60 80 49 */ lis r3, lit_3814@ha /* 0x8048B830@ha */ -/* 8048B044 C0 23 B8 30 */ lfs f1, lit_3814@l(r3) /* 0x8048B830@l */ -/* 8048B048 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048B04C D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048B050 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048B054 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048B058 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048B05C C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048B060 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048B064 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -/* 8048B068 7F E3 FB 78 */ mr r3, r31 -/* 8048B06C 4B FF FD 51 */ bl horseRodeo__13daTag_Event_cFv -/* 8048B070 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B074 41 82 00 54 */ beq lbl_8048B0C8 -/* 8048B078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048B07C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048B080 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8048B084 38 80 06 01 */ li r4, 0x601 -/* 8048B088 4B BA 99 35 */ bl isEventBit__11dSv_event_cCFUs -/* 8048B08C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048B090 41 82 00 0C */ beq lbl_8048B09C -/* 8048B094 38 60 00 05 */ li r3, 5 -/* 8048B098 48 00 00 34 */ b lbl_8048B0CC -lbl_8048B09C: -/* 8048B09C C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 8048B0A0 3C 60 80 49 */ lis r3, lit_3815@ha /* 0x8048B834@ha */ -/* 8048B0A4 C0 23 B8 34 */ lfs f1, lit_3815@l(r3) /* 0x8048B834@l */ -/* 8048B0A8 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048B0AC D0 1F 04 EC */ stfs f0, 0x4ec(r31) -/* 8048B0B0 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 8048B0B4 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048B0B8 D0 1F 04 F0 */ stfs f0, 0x4f0(r31) -/* 8048B0BC C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 8048B0C0 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048B0C4 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) -lbl_8048B0C8: -/* 8048B0C8 38 60 00 04 */ li r3, 4 -lbl_8048B0CC: -/* 8048B0CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048B0D0 4B ED 71 55 */ bl _restgpr_28 -/* 8048B0D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048B0D8 7C 08 03 A6 */ mtlr r0 -/* 8048B0DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048B0E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Create__FP10fopAc_ac_c.s deleted file mode 100644 index d4a88e08000..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048B808: -/* 8048B808 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B80C 7C 08 02 A6 */ mflr r0 -/* 8048B810 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B814 4B FF F6 ED */ bl create__13daTag_Event_cFv -/* 8048B818 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B81C 7C 08 03 A6 */ mtlr r0 -/* 8048B820 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B824 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Delete__FP13daTag_Event_c.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Delete__FP13daTag_Event_c.s deleted file mode 100644 index 5e2c2511f7a..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Delete__FP13daTag_Event_c.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8048B7D8: -/* 8048B7D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B7DC 7C 08 02 A6 */ mflr r0 -/* 8048B7E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B7E4 28 03 00 00 */ cmplwi r3, 0 -/* 8048B7E8 41 82 00 0C */ beq lbl_8048B7F4 -/* 8048B7EC 38 80 00 00 */ li r4, 0 -/* 8048B7F0 4B B8 D4 9D */ bl __dt__10fopAc_ac_cFv -lbl_8048B7F4: -/* 8048B7F4 38 60 00 01 */ li r3, 1 -/* 8048B7F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B7FC 7C 08 03 A6 */ mtlr r0 -/* 8048B800 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B804 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Draw__FP13daTag_Event_c.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Draw__FP13daTag_Event_c.s deleted file mode 100644 index 696098b044e..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Draw__FP13daTag_Event_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048B78C: -/* 8048B78C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B790 7C 08 02 A6 */ mflr r0 -/* 8048B794 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B798 4B FF FF ED */ bl draw__13daTag_Event_cFv -/* 8048B79C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B7A0 7C 08 03 A6 */ mtlr r0 -/* 8048B7A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B7A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Execute__FP13daTag_Event_c.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Execute__FP13daTag_Event_c.s deleted file mode 100644 index 3ce343fe599..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Execute__FP13daTag_Event_c.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8048B7AC: -/* 8048B7AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B7B0 7C 08 02 A6 */ mflr r0 -/* 8048B7B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B7B8 4B FF FF 1D */ bl execute__13daTag_Event_cFv -/* 8048B7BC 38 60 00 01 */ li r3, 1 -/* 8048B7C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B7C4 7C 08 03 A6 */ mtlr r0 -/* 8048B7C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B7CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_getBk__FUl.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_getBk__FUl.s deleted file mode 100644 index 041d59a9943..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_getBk__FUl.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8048AD38: -/* 8048AD38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048AD3C 7C 08 02 A6 */ mflr r0 -/* 8048AD40 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048AD44 7C 65 1B 78 */ mr r5, r3 -/* 8048AD48 3C 60 80 49 */ lis r3, d_a_tag_event__stringBase0@ha /* 0x8048B840@ha */ -/* 8048AD4C 38 63 B8 40 */ addi r3, r3, d_a_tag_event__stringBase0@l /* 0x8048B840@l */ -/* 8048AD50 38 80 00 0F */ li r4, 0xf -/* 8048AD54 4B B9 29 45 */ bl fopAcM_searchFromName__FPCcUlUl -/* 8048AD58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048AD5C 7C 08 03 A6 */ mtlr r0 -/* 8048AD60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048AD64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/demoInitProc__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/demoInitProc__13daTag_Event_cFv.s deleted file mode 100644 index cf3bb4422b3..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/demoInitProc__13daTag_Event_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8048AEEC: -/* 8048AEEC 38 00 00 00 */ li r0, 0 -/* 8048AEF0 B0 03 05 6E */ sth r0, 0x56e(r3) -/* 8048AEF4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/execute__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/execute__13daTag_Event_cFv.s deleted file mode 100644 index d5fa3e64a1f..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/execute__13daTag_Event_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_8048B6D4: -/* 8048B6D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B6D8 7C 08 02 A6 */ mflr r0 -/* 8048B6DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B6E0 88 03 04 BA */ lbz r0, 0x4ba(r3) -/* 8048B6E4 7C 05 07 74 */ extsb r5, r0 -/* 8048B6E8 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8048B6EC 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ -/* 8048B6F0 7C 00 07 74 */ extsb r0, r0 -/* 8048B6F4 7C 05 00 00 */ cmpw r5, r0 -/* 8048B6F8 41 82 00 0C */ beq lbl_8048B704 -/* 8048B6FC 38 60 00 00 */ li r3, 0 -/* 8048B700 48 00 00 74 */ b lbl_8048B774 -lbl_8048B704: -/* 8048B704 88 03 05 72 */ lbz r0, 0x572(r3) -/* 8048B708 2C 00 00 04 */ cmpwi r0, 4 -/* 8048B70C 41 82 00 48 */ beq lbl_8048B754 -/* 8048B710 40 80 00 1C */ bge lbl_8048B72C -/* 8048B714 2C 00 00 02 */ cmpwi r0, 2 -/* 8048B718 41 82 00 2C */ beq lbl_8048B744 -/* 8048B71C 40 80 00 30 */ bge lbl_8048B74C -/* 8048B720 2C 00 00 01 */ cmpwi r0, 1 -/* 8048B724 40 80 00 18 */ bge lbl_8048B73C -/* 8048B728 48 00 00 44 */ b lbl_8048B76C -lbl_8048B72C: -/* 8048B72C 2C 00 00 06 */ cmpwi r0, 6 -/* 8048B730 41 82 00 34 */ beq lbl_8048B764 -/* 8048B734 40 80 00 38 */ bge lbl_8048B76C -/* 8048B738 48 00 00 24 */ b lbl_8048B75C -lbl_8048B73C: -/* 8048B73C 4B FF FE 8D */ bl actionArrival__13daTag_Event_cFv -/* 8048B740 48 00 00 30 */ b lbl_8048B770 -lbl_8048B744: -/* 8048B744 4B FF FD D1 */ bl actionHunt__13daTag_Event_cFv -/* 8048B748 48 00 00 28 */ b lbl_8048B770 -lbl_8048B74C: -/* 8048B74C 4B FF FE B1 */ bl actionHunt2__13daTag_Event_cFv -/* 8048B750 48 00 00 20 */ b lbl_8048B770 -lbl_8048B754: -/* 8048B754 4B FF FB 15 */ bl actionReady__13daTag_Event_cFv -/* 8048B758 48 00 00 18 */ b lbl_8048B770 -lbl_8048B75C: -/* 8048B75C 4B FF F9 89 */ bl actionNext__13daTag_Event_cFv -/* 8048B760 48 00 00 10 */ b lbl_8048B770 -lbl_8048B764: -/* 8048B764 4B FF FA 4D */ bl actionEvent__13daTag_Event_cFv -/* 8048B768 48 00 00 08 */ b lbl_8048B770 -lbl_8048B76C: -/* 8048B76C 4B FF FE 89 */ bl actionWait__13daTag_Event_cFv -lbl_8048B770: -/* 8048B770 38 60 00 01 */ li r3, 1 -lbl_8048B774: -/* 8048B774 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B778 7C 08 03 A6 */ mtlr r0 -/* 8048B77C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B780 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getAreaType__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getAreaType__13daTag_Event_cFv.s deleted file mode 100644 index 5220977bd97..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getAreaType__13daTag_Event_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8048ADA4: -/* 8048ADA4 A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 8048ADA8 54 03 04 20 */ rlwinm r3, r0, 0, 0x10, 0x10 -/* 8048ADAC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getEventNo__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getEventNo__13daTag_Event_cFv.s deleted file mode 100644 index 93cd4c81d2f..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getEventNo__13daTag_Event_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8048AD68: -/* 8048AD68 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048AD6C 54 03 46 3E */ srwi r3, r0, 0x18 -/* 8048AD70 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getInvalidEventFlag__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getInvalidEventFlag__13daTag_Event_cFv.s deleted file mode 100644 index 163196ab2ec..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getInvalidEventFlag__13daTag_Event_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8048AD98: -/* 8048AD98 A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 8048AD9C 54 03 04 7E */ clrlwi r3, r0, 0x11 -/* 8048ADA0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getSwbit2__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getSwbit2__13daTag_Event_cFv.s deleted file mode 100644 index efb4d4fa671..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getSwbit2__13daTag_Event_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8048AD80: -/* 8048AD80 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048AD84 54 03 86 3E */ rlwinm r3, r0, 0x10, 0x18, 0x1f -/* 8048AD88 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getSwbit__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getSwbit__13daTag_Event_cFv.s deleted file mode 100644 index 015b08a499d..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getSwbit__13daTag_Event_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8048AD74: -/* 8048AD74 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048AD78 54 03 C6 3E */ rlwinm r3, r0, 0x18, 0x18, 0x1f -/* 8048AD7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getType__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getType__13daTag_Event_cFv.s deleted file mode 100644 index 3c58752db10..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getType__13daTag_Event_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8048AD8C: -/* 8048AD8C 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048AD90 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8048AD94 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getValidEventFlag__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getValidEventFlag__13daTag_Event_cFv.s deleted file mode 100644 index 7a85b664d17..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getValidEventFlag__13daTag_Event_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8048ADB0: -/* 8048ADB0 A8 03 04 B8 */ lha r0, 0x4b8(r3) -/* 8048ADB4 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 8048ADB8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/horseRodeo__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/horseRodeo__13daTag_Event_cFv.s deleted file mode 100644 index 98575f9dcce..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/horseRodeo__13daTag_Event_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8048ADBC: -/* 8048ADBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048ADC0 7C 08 02 A6 */ mflr r0 -/* 8048ADC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048ADC8 4B FF FF C5 */ bl getType__13daTag_Event_cFv -/* 8048ADCC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8048ADD0 20 00 00 05 */ subfic r0, r0, 5 -/* 8048ADD4 7C 00 00 34 */ cntlzw r0, r0 -/* 8048ADD8 54 03 D9 7E */ srwi r3, r0, 5 -/* 8048ADDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048ADE0 7C 08 03 A6 */ mtlr r0 -/* 8048ADE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048ADE8 4E 80 00 20 */ blr diff --git a/include/rel/d/a/d_a_horse/d_a_horse.h b/include/rel/d/a/d_a_horse/d_a_horse.h index 669751530dc..318b35ef47d 100644 --- a/include/rel/d/a/d_a_horse/d_a_horse.h +++ b/include/rel/d/a/d_a_horse/d_a_horse.h @@ -58,7 +58,7 @@ public: /* 0x00000080 */ NO_DRAW_WAIT = 0x80, /* 0x00010000 */ PLAYER_BACK_RIDE_LASH = 0x10000, /* 0x20000000 */ TURN_CANCEL_KEEP = 0x20000000, - /* 0x80000000 */ RODEO_MODE = 0x80000000 + /* 0x80000000 */ FLG0_RODEO_MODE = 0x80000000 }; fopAc_ac_c* getZeldaActor(); @@ -183,7 +183,7 @@ public: bool checkTurnStandCamera() const { return checkResetStateFlg0(TURN_STAND_CAMERA); } bool checkTurnStand() const { return checkResetStateFlg0(TURN_STAND); } - bool checkRodeoMode() const { return checkStateFlg0(RODEO_MODE); } + bool checkRodeoMode() const { return checkStateFlg0(FLG0_RODEO_MODE); } bool checkCutTurnCancel() const { return checkEndResetStateFlg0(CUT_TURN_CANCEL); } bool checkTurnCancelKeep() const { return checkStateFlg0(TURN_CANCEL_KEEP); } bool checkTurn() const { return field_0x16b4 == 3 && field_0x1720 == 0; } @@ -205,6 +205,7 @@ public: void onMoveAccept() { onEndResetStateFlg0(MOVE_ACCEPT); } void onPlayerLash() { onEndResetStateFlg0(ERFLG0_UNK_18); } void offPlayerBackRideLash() { offStateFlg0(PLAYER_BACK_RIDE_LASH); } + void onRodeoMode() { onStateFlg0(FLG0_RODEO_MODE); } static u8 const m_footJointTable[8]; static f32 const m_callLimitDistance2; diff --git a/include/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h b/include/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h index f8aca71ef45..ac293af7b46 100644 --- a/include/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h +++ b/include/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h @@ -6,14 +6,14 @@ class daTag_Chk_c : public fopAc_ac_c { public: - /* 8048A6F8 */ s32 execute(); + /* 8048A6F8 */ int execute(); u16 getAreaType() { return home.angle.z & 0x100; } u16 getHeight() { return fopAcM_GetParam(this) & 0xff; } u8 getSwBit() { return fopAcM_GetParam(this) >> 8; } u8 getSwBit2() { return fopAcM_GetParam(this) >> 16; } - s32 create() { + int create() { fopAcM_SetupActor(this, daTag_Chk_c); if (getAreaType() == 0) { @@ -21,30 +21,32 @@ public: scale.y *= 100.0f; scale.z *= 50.0f; - mPos1.set(current.pos.x - scale.x, current.pos.y, current.pos.z - scale.z); - mPos2.set(current.pos.x + scale.x, current.pos.y + scale.y, current.pos.z + scale.z); + mVtxA.set(current.pos.x - scale.x, current.pos.y, current.pos.z - scale.z); + mVtxB.set(current.pos.x + scale.x, current.pos.y + scale.y, current.pos.z + scale.z); } else { scale.x *= 100.0f; scale.y *= 100.0f; scale.z *= 0.0f; - mPos1.set(0.0f, current.pos.y, 0.0f); - mPos2.set(0.0f, current.pos.y + scale.y, 0.0f); + mVtxA.set(0.0f, current.pos.y, 0.0f); + mVtxB.set(0.0f, current.pos.y + scale.y, 0.0f); } attention_info.position = current.pos; - u16 l_height = getHeight(); - l_height != 0xff ? attention_info.position.y += l_height * 10.0f : attention_info.position.y += scale.y * 0.5f; + u16 height = getHeight(); + height != 0xff ? attention_info.position.y += height * 10.0f : attention_info.position.y += scale.y * 0.5f; eyePos = attention_info.position; return cPhs_COMPLEATE_e; } + private: /* 0x568 */ u8 field_0x568[8]; - /* 0x570 */ cXyz mPos1; - /* 0x57C */ cXyz mPos2; + /* 0x570 */ cXyz mVtxA; + /* 0x57C */ cXyz mVtxB; }; + STATIC_ASSERT(sizeof(daTag_Chk_c) == 0x588); #endif /* D_A_TAG_CHKPOINT_H */ diff --git a/include/rel/d/a/tag/d_a_tag_event/d_a_tag_event.h b/include/rel/d/a/tag/d_a_tag_event/d_a_tag_event.h index da8d7160572..4101684a621 100644 --- a/include/rel/d/a/tag/d_a_tag_event/d_a_tag_event.h +++ b/include/rel/d/a/tag/d_a_tag_event/d_a_tag_event.h @@ -1,6 +1,53 @@ #ifndef D_A_TAG_EVENT_H #define D_A_TAG_EVENT_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daTag_Event_c : public fopAc_ac_c { +public: + enum Action_e { + ACTION_WAIT, + ACTION_ARRIVAL, + ACTION_HUNT, + ACTION_HUNT2, + ACTION_READY, + ACTION_NEXT, + ACTION_EVENT, + }; + + /* 8048AD68 */ u8 getEventNo(); + /* 8048AD74 */ u8 getSwbit(); + /* 8048AD80 */ u8 getSwbit2(); + /* 8048AD8C */ u8 getType(); + /* 8048AD98 */ u16 getInvalidEventFlag(); + /* 8048ADA4 */ u16 getAreaType(); + /* 8048ADB0 */ u16 getValidEventFlag(); + /* 8048ADBC */ BOOL horseRodeo(); + /* 8048ADEC */ BOOL arrivalTerms(); + /* 8048AEEC */ void demoInitProc(); + /* 8048AEF8 */ void demoEndProc(); + /* 8048AEFC */ void demoProc(); + /* 8048AF00 */ int create(); + /* 8048B0E4 */ int actionNext(); + /* 8048B1B0 */ int actionEvent(); + /* 8048B268 */ int actionReady(); + /* 8048B378 */ BOOL checkArea(); + /* 8048B514 */ int actionHunt(); + /* 8048B5C8 */ int actionArrival(); + /* 8048B5F4 */ int actionWait(); + /* 8048B5FC */ int actionHunt2(); + /* 8048B6D4 */ int execute(); + /* 8048B784 */ int draw(); + + void setActio(u8 i_action) { mAction = i_action; } + + /* 0x568 */ s16 mEventIdx; + /* 0x56A */ s16 mMapEventIdx; + /* 0x56C */ s16 mMapToolId; + /* 0x56E */ s16 field_0x56e; + /* 0x570 */ s16 mHunt2Timer; + /* 0x572 */ u8 mAction; + /* 0x573 */ u8 field_0x573; +}; #endif /* D_A_TAG_EVENT_H */ diff --git a/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h b/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h index 989bdb2fa0b..4f6e14b3f3e 100644 --- a/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h +++ b/include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h @@ -6,32 +6,43 @@ class daTag_EvtArea_c : public fopAc_ac_c { public: /* 8048C4F8 */ cPhs__Step create(); - /* 8048C728 */ bool Delete(); - /* 8048C730 */ bool Execute(); - /* 8048C894 */ bool Draw(); + /* 8048C728 */ BOOL Delete(); + /* 8048C730 */ BOOL Execute(); + /* 8048C894 */ BOOL Draw(); /* 8048C89C */ BOOL isDelete(); /* 8048C94C */ BOOL chkPointInArea(cXyz, cXyz); + /* 8048CD08 */ BOOL chkPointInArea(cXyz param_0) { cXyz local_28; local_28.set(0.0f, 0.0f, 0.0f); return chkPointInArea(param_0, local_28); } + /* 8048CD68 */ virtual ~daTag_EvtArea_c() {} - inline s32 getType() { + s32 getType() { u8 type = (u8)shape_angle.z; return type == 0xff ? 0 : type; } - inline s32 getNo() { + s32 getNo() { u16 no = (shape_angle.z & 0xff00) >> 8; return no == 0xff ? 0 : no; } - inline u32 getOnEvtBit(); - inline u32 getOffEvtBit(); - inline u8 getBitSW(); - inline u8 getBitSW2(); + u32 getOnEvtBit() { + u32 ret = fopAcM_GetParam(this) & 0xfff; + return ret == 0xfff ? -1 : ret; + } + + u32 getOffEvtBit() { + u32 ret = (fopAcM_GetParam(this) & 0xfff000) >> 12; + return ret == 0xfff ? -1 : ret; + } + + u8 getBitSW() { return home.angle.x & 0xff; } + + u8 getBitSW2() { return (home.angle.x & 0xff00) >> 8; } private: /* 0x568 vtable */ diff --git a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h index 88866003e25..aff37fb6d16 100644 --- a/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h @@ -7,10 +7,14 @@ namespace std { return ::fabsf(num); } */ -float fabsf(float num) { +inline float fabsf(float num) { return ::fabsf(num); } +inline float sqrt(float x) { + return ::sqrtf(x); +} + /* float abs(float num) { return ::fabsf(num); } */ diff --git a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp index d798bf3c77d..1b531c123bd 100644 --- a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp +++ b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp @@ -1,262 +1,113 @@ /** * d_a_tag_chkpoint.cpp - * + * */ #include "rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h" -#include "dol2asm.h" +#include "cmath.h" #include "d/a/d_a_player.h" -// -// Forward References: -// - -extern "C" void execute__11daTag_Chk_cFv(); -extern "C" static bool daTag_Chk_Draw__FP11daTag_Chk_c(); -extern "C" static void daTag_Chk_Execute__FP11daTag_Chk_c(); -extern "C" static bool daTag_Chk_IsDelete__FP11daTag_Chk_c(); -extern "C" static void daTag_Chk_Delete__FP11daTag_Chk_c(); -extern "C" static void daTag_Chk_Create__FP10fopAc_ac_c(); -// extern "C" extern void* g_profile_TAG_CHKPOINT[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void setLookPos__9daPy_py_cFP4cXyz(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8048AC28-8048AC34 000000 0009+03 2/2 0/0 0/0 .rodata @3769 */ -SECTION_RODATA static u8 const lit_3769[9 + 3 /* padding */] = { - 0x01, - 0x01, - 0x00, - 0x00, - 0x00, - 0x00, - 0x01, - 0x01, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8048AC28, &lit_3769); - -/* 8048AC34-8048AC38 00000C 0004+00 0/2 0/0 0/0 .rodata @3843 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3843[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8048AC34, &lit_3843); -#pragma pop - -/* 8048AC38-8048AC40 000010 0008+00 0/1 0/0 0/0 .rodata @3844 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3844[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8048AC38, &lit_3844); -#pragma pop - -/* 8048AC40-8048AC48 000018 0008+00 0/1 0/0 0/0 .rodata @3845 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3845[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8048AC40, &lit_3845); -#pragma pop - -/* 8048AC48-8048AC50 000020 0008+00 0/1 0/0 0/0 .rodata @3846 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3846[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8048AC48, &lit_3846); -#pragma pop - /* 8048A6F8-8048A9EC 000078 02F4+00 1/1 0/0 0/0 .text execute__11daTag_Chk_cFv */ -#ifdef NONMATCHING -// still lots wrong here -s32 daTag_Chk_c::execute() { - int iVar12; - bool bVar6; - u32 local_64; - u32 local_60; - u32 local_5c; - - s32 l_roomNo = fopAcM_GetRoomNo(this); - s32 l_stayNo = dComIfGp_roomControl_getStayNo(); - - if (l_roomNo == l_stayNo) { - local_64 = 0x1010000; - local_60 = 0x101; - local_5c = 0; - - u8 l_swBit = getSwBit(); - if (l_swBit == -1) { - l_stayNo = 0; - } else { - l_roomNo = fopAcM_GetRoomNo(this); - l_stayNo = dComIfGs_isSwitch(l_swBit,l_roomNo); - - if (l_stayNo == 0) { - l_stayNo = 2; - } else { - l_stayNo = 1; - } - } - - l_swBit = getSwBit2(); - - if (l_swBit == -1) { - iVar12 = 0; - } else { - l_roomNo = fopAcM_GetRoomNo(this); - l_stayNo = dComIfGs_isSwitch(l_swBit,l_roomNo); - - if (l_stayNo == 0) { - l_stayNo = 2; - } else { - l_stayNo = 1; - } - } - - bVar6 = false; - - if (true) { - daPy_py_c* link = dComIfGp_getLinkPlayer(); - u16 areaType = getAreaType(); - } - - attention_info.flags = 0; - - if (bVar6) { - daPy_py_c::setLookPos(&attention_info.position); - attention_info.flags = 0x1000; - } - - return 1; +int daTag_Chk_c::execute() { + if (fopAcM_GetRoomNo(this) != dComIfGp_roomControl_getStayNo()) { + return 0; } - return 0; + + u8 sp64[3][3] = { + {1, 1, 0}, + {0, 0, 0}, + {1, 1, 0}, + }; + + int var_r27; + int var_r26; + + u8 swbit = getSwBit(); + if (swbit == 0xFF) { + var_r27 = 0; + } else if (dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))) { + var_r27 = 1; + } else { + var_r27 = 2; + } + + u8 swbit2 = getSwBit2(); + if (swbit2 == 0xFF) { + var_r26 = 0; + } else if (dComIfGs_isSwitch(swbit2, fopAcM_GetRoomNo(this))) { + var_r26 = 1; + } else { + var_r26 = 2; + } + + bool set_attention = false; + + if (sp64[var_r27][var_r26] != 0) { + cXyz& player_pos = dComIfGp_getLinkPlayer()->current.pos; + + if (getAreaType() == 0) { + if (mVtxA.x <= player_pos.x && player_pos.x <= mVtxB.x && mVtxA.y <= player_pos.y && + player_pos.y <= mVtxB.y && mVtxA.z <= player_pos.z && player_pos.z <= mVtxB.z) + { + set_attention = true; + } + } else { + f32 x_dist = current.pos.x - player_pos.x; + f32 z_dist = current.pos.z - player_pos.z; + + if (std::sqrt(x_dist * x_dist + z_dist * z_dist) < scale.x && mVtxA.y <= player_pos.y && + player_pos.y <= mVtxB.y) + { + set_attention = true; + } + } + } + + attention_info.flags = 0; + + if (set_attention) { + daPy_getPlayerActorClass()->setLookPos(&attention_info.position); + attention_info.flags = 0x100; + } + + return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 daTag_Chk_c::execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/execute__11daTag_Chk_cFv.s" -} -#pragma pop -#endif /* 8048A9EC-8048A9F4 00036C 0008+00 1/0 0/0 0/0 .text daTag_Chk_Draw__FP11daTag_Chk_c */ -static s32 daTag_Chk_Draw(daTag_Chk_c* i_this) { +static int daTag_Chk_Draw(daTag_Chk_c* i_this) { return 1; } /* 8048A9F4-8048AA18 000374 0024+00 1/0 0/0 0/0 .text daTag_Chk_Execute__FP11daTag_Chk_c */ -static s32 daTag_Chk_Execute(daTag_Chk_c* i_this) { +static int daTag_Chk_Execute(daTag_Chk_c* i_this) { i_this->execute(); return 1; } /* 8048AA18-8048AA20 000398 0008+00 1/0 0/0 0/0 .text daTag_Chk_IsDelete__FP11daTag_Chk_c */ -static s32 daTag_Chk_IsDelete(daTag_Chk_c* i_this) { +static int daTag_Chk_IsDelete(daTag_Chk_c* i_this) { return 1; } /* 8048AA20-8048AA50 0003A0 0030+00 1/0 0/0 0/0 .text daTag_Chk_Delete__FP11daTag_Chk_c */ -static s32 daTag_Chk_Delete(daTag_Chk_c* i_this) { +static int daTag_Chk_Delete(daTag_Chk_c* i_this) { i_this->~daTag_Chk_c(); return 1; } -/* ############################################################################################## */ -/* 8048AC50-8048AC54 000028 0004+00 0/1 0/0 0/0 .rodata @3925 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3925 = 50.0f; -COMPILER_STRIP_GATE(0x8048AC50, &lit_3925); -#pragma pop - -/* 8048AC54-8048AC58 00002C 0004+00 0/1 0/0 0/0 .rodata @3926 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3926 = 100.0f; -COMPILER_STRIP_GATE(0x8048AC54, &lit_3926); -#pragma pop - -/* 8048AC58-8048AC5C 000030 0004+00 0/1 0/0 0/0 .rodata @3927 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3927 = 10.0f; -COMPILER_STRIP_GATE(0x8048AC58, &lit_3927); -#pragma pop - -/* 8048AC5C-8048AC60 000034 0004+00 0/1 0/0 0/0 .rodata @3928 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3928 = 0.5f; -COMPILER_STRIP_GATE(0x8048AC5C, &lit_3928); -#pragma pop - -/* 8048AC60-8048AC68 000038 0008+00 0/1 0/0 0/0 .rodata @3930 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3930[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8048AC60, &lit_3930); -#pragma pop - /* 8048AA50-8048AC20 0003D0 01D0+00 1/0 0/0 0/0 .text daTag_Chk_Create__FP10fopAc_ac_c */ -#ifdef NONMATCHING -// literals -static s32 daTag_Chk_Create(fopAc_ac_c* i_this) { +static int daTag_Chk_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 daTag_Chk_Create(fopAc_ac_c* i_this) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/daTag_Chk_Create__FP10fopAc_ac_c.s" -} -#pragma pop -#endif -/* ############################################################################################## */ /* 8048AC68-8048AC88 -00001 0020+00 1/0 0/0 0/0 .data l_daTag_Chk_Method */ static actor_method_class l_daTag_Chk_Method = { - (process_method_func)daTag_Chk_Create, - (process_method_func)daTag_Chk_Delete, - (process_method_func)daTag_Chk_Execute, - (process_method_func)daTag_Chk_IsDelete, - (process_method_func)daTag_Chk_Draw -}; + (process_method_func)daTag_Chk_Create, (process_method_func)daTag_Chk_Delete, + (process_method_func)daTag_Chk_Execute, (process_method_func)daTag_Chk_IsDelete, + (process_method_func)daTag_Chk_Draw}; /* 8048AC88-8048ACB8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_CHKPOINT */ extern actor_process_profile_definition g_profile_TAG_CHKPOINT = { diff --git a/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp b/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp index 74fcf5aae87..0889a2815a1 100644 --- a/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp +++ b/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp @@ -4,455 +4,381 @@ // #include "rel/d/a/tag/d_a_tag_event/d_a_tag_event.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" - -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daTag_Event_c { - /* 8048AD68 */ void getEventNo(); - /* 8048AD74 */ void getSwbit(); - /* 8048AD80 */ void getSwbit2(); - /* 8048AD8C */ void getType(); - /* 8048AD98 */ void getInvalidEventFlag(); - /* 8048ADA4 */ void getAreaType(); - /* 8048ADB0 */ void getValidEventFlag(); - /* 8048ADBC */ void horseRodeo(); - /* 8048ADEC */ void arrivalTerms(); - /* 8048AEEC */ void demoInitProc(); - /* 8048AEF8 */ void demoEndProc(); - /* 8048AEFC */ void demoProc(); - /* 8048AF00 */ void create(); - /* 8048B0E4 */ void actionNext(); - /* 8048B1B0 */ void actionEvent(); - /* 8048B268 */ void actionReady(); - /* 8048B378 */ void checkArea(); - /* 8048B514 */ void actionHunt(); - /* 8048B5C8 */ void actionArrival(); - /* 8048B5F4 */ bool actionWait(); - /* 8048B5FC */ void actionHunt2(); - /* 8048B6D4 */ void execute(); - /* 8048B784 */ bool draw(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80043500 */ void searchMapEventData(u8, s32); -}; - -struct dEvent_manager_c { - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047A78 */ void endCheck(s16); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -// -// Forward References: -// - -extern "C" static void daTag_getBk__FUl(); -extern "C" void getEventNo__13daTag_Event_cFv(); -extern "C" void getSwbit__13daTag_Event_cFv(); -extern "C" void getSwbit2__13daTag_Event_cFv(); -extern "C" void getType__13daTag_Event_cFv(); -extern "C" void getInvalidEventFlag__13daTag_Event_cFv(); -extern "C" void getAreaType__13daTag_Event_cFv(); -extern "C" void getValidEventFlag__13daTag_Event_cFv(); -extern "C" void horseRodeo__13daTag_Event_cFv(); -extern "C" void arrivalTerms__13daTag_Event_cFv(); -extern "C" void demoInitProc__13daTag_Event_cFv(); -extern "C" void demoEndProc__13daTag_Event_cFv(); -extern "C" void demoProc__13daTag_Event_cFv(); -extern "C" void create__13daTag_Event_cFv(); -extern "C" void actionNext__13daTag_Event_cFv(); -extern "C" void actionEvent__13daTag_Event_cFv(); -extern "C" void actionReady__13daTag_Event_cFv(); -extern "C" void checkArea__13daTag_Event_cFv(); -extern "C" void actionHunt__13daTag_Event_cFv(); -extern "C" void actionArrival__13daTag_Event_cFv(); -extern "C" bool actionWait__13daTag_Event_cFv(); -extern "C" void actionHunt2__13daTag_Event_cFv(); -extern "C" void execute__13daTag_Event_cFv(); -extern "C" bool draw__13daTag_Event_cFv(); -extern "C" static void daTag_Event_Draw__FP13daTag_Event_c(); -extern "C" static void daTag_Event_Execute__FP13daTag_Event_c(); -extern "C" static bool daTag_Event_IsDelete__FP13daTag_Event_c(); -extern "C" static void daTag_Event_Delete__FP13daTag_Event_c(); -extern "C" static void daTag_Event_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_tag_event__stringBase0; -extern "C" extern void* g_profile_TAG_EVENT[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void fopAcM_searchFromName__FPCcUlUl(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void searchMapEventData__14dEvt_control_cFUcl(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void PSVECSquareMag(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8048B840-8048B840 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8048B840 = "Bk"; -#pragma pop +#include "rel/d/a/d_a_horse/d_a_horse.h" /* 8048AD38-8048AD68 000078 0030+00 1/1 0/0 0/0 .text daTag_getBk__FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_getBk(u32 param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_getBk__FUl.s" +static fopAc_ac_c* daTag_getBk(u32 param_0) { + return fopAcM_searchFromName("Bk", 0xF, param_0); } -#pragma pop /* 8048AD68-8048AD74 0000A8 000C+00 4/4 0/0 0/0 .text getEventNo__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::getEventNo() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getEventNo__13daTag_Event_cFv.s" +u8 daTag_Event_c::getEventNo() { + return fopAcM_GetParam(this) >> 0x18; } -#pragma pop /* 8048AD74-8048AD80 0000B4 000C+00 4/4 0/0 0/0 .text getSwbit__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::getSwbit() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getSwbit__13daTag_Event_cFv.s" +u8 daTag_Event_c::getSwbit() { + return fopAcM_GetParam(this) >> 0x8; } -#pragma pop /* 8048AD80-8048AD8C 0000C0 000C+00 1/1 0/0 0/0 .text getSwbit2__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::getSwbit2() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getSwbit2__13daTag_Event_cFv.s" +u8 daTag_Event_c::getSwbit2() { + return fopAcM_GetParam(this) >> 0x10; } -#pragma pop /* 8048AD8C-8048AD98 0000CC 000C+00 1/1 0/0 0/0 .text getType__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::getType() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getType__13daTag_Event_cFv.s" +u8 daTag_Event_c::getType() { + return fopAcM_GetParam(this); } -#pragma pop /* 8048AD98-8048ADA4 0000D8 000C+00 1/1 0/0 0/0 .text getInvalidEventFlag__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::getInvalidEventFlag() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getInvalidEventFlag__13daTag_Event_cFv.s" +u16 daTag_Event_c::getInvalidEventFlag() { + return home.angle.x & 0x7FFF; } -#pragma pop /* 8048ADA4-8048ADB0 0000E4 000C+00 1/1 0/0 0/0 .text getAreaType__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::getAreaType() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getAreaType__13daTag_Event_cFv.s" +u16 daTag_Event_c::getAreaType() { + return home.angle.x & 0x8000; } -#pragma pop /* 8048ADB0-8048ADBC 0000F0 000C+00 1/1 0/0 0/0 .text getValidEventFlag__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::getValidEventFlag() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/getValidEventFlag__13daTag_Event_cFv.s" +u16 daTag_Event_c::getValidEventFlag() { + return home.angle.z; } -#pragma pop /* 8048ADBC-8048ADEC 0000FC 0030+00 2/2 0/0 0/0 .text horseRodeo__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::horseRodeo() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/horseRodeo__13daTag_Event_cFv.s" +BOOL daTag_Event_c::horseRodeo() { + if (getType() == 5) { + return true; + } else { + return false; + } } -#pragma pop /* 8048ADEC-8048AEEC 00012C 0100+00 2/2 0/0 0/0 .text arrivalTerms__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::arrivalTerms() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/arrivalTerms__13daTag_Event_cFv.s" +BOOL daTag_Event_c::arrivalTerms() { + int swbit2 = getSwbit2(); + if (swbit2 != 0xFF) { + if (!dComIfGs_isSwitch(swbit2, fopAcM_GetRoomNo(this))) { + return false; + } + } + + u16 invalid_flag = getInvalidEventFlag(); + if (invalid_flag != 0x7FFF && invalid_flag != 0 && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[invalid_flag])) + { + return false; + } + + u16 valid_flag = getValidEventFlag(); + if (valid_flag != 0xFFFF && valid_flag != 0 && + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[valid_flag])) + { + return false; + } + + return true; } -#pragma pop /* 8048AEEC-8048AEF8 00022C 000C+00 1/1 0/0 0/0 .text demoInitProc__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::demoInitProc() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/demoInitProc__13daTag_Event_cFv.s" +void daTag_Event_c::demoInitProc() { + field_0x56e = 0; } -#pragma pop /* 8048AEF8-8048AEFC 000238 0004+00 1/1 0/0 0/0 .text demoEndProc__13daTag_Event_cFv */ -void daTag_Event_c::demoEndProc() { - /* empty function */ -} +void daTag_Event_c::demoEndProc() {} /* 8048AEFC-8048AF00 00023C 0004+00 1/1 0/0 0/0 .text demoProc__13daTag_Event_cFv */ -void daTag_Event_c::demoProc() { - /* empty function */ -} - -/* ############################################################################################## */ -/* 8048B830-8048B834 000000 0004+00 1/1 0/0 0/0 .rodata @3814 */ -SECTION_RODATA static f32 const lit_3814 = 100.0f; -COMPILER_STRIP_GATE(0x8048B830, &lit_3814); - -/* 8048B834-8048B838 000004 0004+00 1/1 0/0 0/0 .rodata @3815 */ -SECTION_RODATA static f32 const lit_3815 = 10.0f; -COMPILER_STRIP_GATE(0x8048B834, &lit_3815); +void daTag_Event_c::demoProc() {} /* 8048AF00-8048B0E4 000240 01E4+00 1/1 0/0 0/0 .text create__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/create__13daTag_Event_cFv.s" +int daTag_Event_c::create() { + fopAcM_SetupActor(this, daTag_Event_c); + + int swbit = getSwbit(); + int room_no = fopAcM_GetRoomNo(this); + + mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo()); + mMapToolId = -1; + mMapEventIdx = -1; + + dStage_MapEvent_dt_c* event_data = dEvt_control_c::searchMapEventData(getEventNo(), room_no); + if (event_data != NULL) { + mMapToolId = event_data->field_0x5; + mMapEventIdx = dComIfGp_getEventManager().getEventIdx(this, mMapToolId); + } + + eventInfo.setEventId(mEventIdx); + eventInfo.setMapToolId(getEventNo()); + + if (mEventIdx != -1 || horseRodeo() && (swbit == 0xFF || !dComIfGs_isSwitch(swbit, room_no))) + { + setActio(ACTION_ARRIVAL); + } else { + setActio(ACTION_WAIT); + } + + shape_angle.z = 0; + shape_angle.x = 0; + current.angle.z = 0; + current.angle.x = 0; + + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; + + if (horseRodeo()) { + if (dComIfGs_isEventBit(dSv_event_flag_c::M_023)) { + return cPhs_ERROR_e; + } + + scale.x *= 10.0f; + scale.y *= 10.0f; + scale.z *= 10.0f; + } + + return cPhs_COMPLEATE_e; } -#pragma pop /* 8048B0E4-8048B1B0 000424 00CC+00 1/1 0/0 0/0 .text actionNext__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::actionNext() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionNext__13daTag_Event_cFv.s" +int daTag_Event_c::actionNext() { + if (eventInfo.i_checkCommandDemoAccrpt()) { + mEventIdx = mMapEventIdx; + mMapEventIdx = -1; + + dStage_MapEvent_dt_c* event_data = + dEvt_control_c::searchMapEventData(mMapToolId, fopAcM_GetRoomNo(this)); + if (event_data != NULL) { + mMapToolId = event_data->field_0x5; + mMapEventIdx = dComIfGp_getEventManager().getEventIdx(this, mMapToolId); + } else { + mMapToolId = -1; + } + + setActio(ACTION_EVENT); + actionEvent(); + } else { + fopAcM_orderOtherEventId(this, mMapEventIdx, mMapToolId, 0xFFFF, 0, 1); + } + + return 1; } -#pragma pop /* 8048B1B0-8048B268 0004F0 00B8+00 3/3 0/0 0/0 .text actionEvent__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::actionEvent() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionEvent__13daTag_Event_cFv.s" +int daTag_Event_c::actionEvent() { + if (dComIfGp_evmng_endCheck(mEventIdx)) { + dComIfGp_event_reset(); + + if (mMapEventIdx != -1) { + setActio(ACTION_NEXT); + fopAcM_orderOtherEventId(this, mMapEventIdx, mMapToolId, 0xFFFF, 0, 1); + } else { + setActio(ACTION_WAIT); + demoEndProc(); + mMapToolId = -1; + } + } else { + demoProc(); + } + + return 1; } -#pragma pop /* 8048B268-8048B378 0005A8 0110+00 1/1 0/0 0/0 .text actionReady__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::actionReady() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionReady__13daTag_Event_cFv.s" +int daTag_Event_c::actionReady() { + int swbit = getSwbit(); + + if (eventInfo.i_checkCommandDemoAccrpt()) { + demoInitProc(); + setActio(ACTION_EVENT); + actionEvent(); + + if (swbit != 0xFF) { + dComIfGs_onSwitch(swbit, fopAcM_GetRoomNo(this)); + } + + if (horseRodeo() && dComIfGp_getHorseActor() != NULL) { + dComIfGp_getHorseActor()->onRodeoMode(); + } + } else { + if (swbit != 0xFF && dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))) { + setActio(ACTION_WAIT); + } else { + fopAcM_orderOtherEventId(this, mEventIdx, getEventNo(), 0xFFFF, 0, 1); + } + } + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8048B838-8048B83C 000008 0004+00 1/1 0/0 0/0 .rodata @3954 */ -SECTION_RODATA static f32 const lit_3954 = 0.5f; -COMPILER_STRIP_GATE(0x8048B838, &lit_3954); - -/* 8048B83C-8048B840 00000C 0004+00 1/1 0/0 0/0 .rodata @3955 */ -SECTION_RODATA static u8 const lit_3955[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8048B83C, &lit_3955); /* 8048B378-8048B514 0006B8 019C+00 1/1 0/0 0/0 .text checkArea__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::checkArea() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/checkArea__13daTag_Event_cFv.s" +BOOL daTag_Event_c::checkArea() { + cXyz pos; + daPy_py_c* player = dComIfGp_getLinkPlayer(); + + if (getAreaType() == 0x8000) { + pos = player->current.pos; + + cXyz start(current.pos.x - scale.x * 0.5f, current.pos.y, current.pos.z - scale.z * 0.5f); + cXyz end(current.pos.x + scale.x * 0.5f, current.pos.y + scale.y, + current.pos.z + scale.z * 0.5f); + + if (start.x <= pos.x && pos.x <= end.x && start.y <= pos.y && pos.y <= end.y && + start.z <= pos.z && pos.z <= end.z) + { + return true; + } + } else { + pos = player->current.pos - current.pos; + + if (pos.y < 0.0f) { + pos.y = -pos.y; + } + + if (pos.abs2XZ() < scale.x * scale.x && pos.y <= scale.y) { + return true; + } + } + + return false; } -#pragma pop /* 8048B514-8048B5C8 000854 00B4+00 2/2 0/0 0/0 .text actionHunt__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::actionHunt() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionHunt__13daTag_Event_cFv.s" +int daTag_Event_c::actionHunt() { + int swbit = getSwbit(); + + if (swbit != 0xFF && dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))) { + setActio(ACTION_WAIT); + } else if (arrivalTerms() && checkArea()) { + setActio(ACTION_READY); + fopAcM_orderOtherEventId(this, mEventIdx, getEventNo(), 0xFFFF, 0, 1); + } + + return 1; } -#pragma pop /* 8048B5C8-8048B5F4 000908 002C+00 1/1 0/0 0/0 .text actionArrival__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::actionArrival() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionArrival__13daTag_Event_cFv.s" +int daTag_Event_c::actionArrival() { + setActio(ACTION_HUNT); + actionHunt(); + return 1; } -#pragma pop /* 8048B5F4-8048B5FC 000934 0008+00 1/1 0/0 0/0 .text actionWait__13daTag_Event_cFv */ -bool daTag_Event_c::actionWait() { +int daTag_Event_c::actionWait() { return true; } /* 8048B5FC-8048B6D4 00093C 00D8+00 1/1 0/0 0/0 .text actionHunt2__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::actionHunt2() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/actionHunt2__13daTag_Event_cFv.s" +int daTag_Event_c::actionHunt2() { + int swbit = getSwbit(); + + if (swbit != 0xFF && dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(this))) { + setActio(ACTION_WAIT); + } else if (arrivalTerms() && daTag_getBk(field_0x573) == NULL) { + if (mHunt2Timer > 0) { + mHunt2Timer--; + } else { + setActio(ACTION_READY); + fopAcM_orderOtherEventId(this, mEventIdx, getEventNo(), 0xFFFF, 0, 1); + } + } else { + mHunt2Timer = 65; + } + + return 1; } -#pragma pop /* 8048B6D4-8048B784 000A14 00B0+00 1/1 0/0 0/0 .text execute__13daTag_Event_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Event_c::execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/execute__13daTag_Event_cFv.s" +int daTag_Event_c::execute() { + if (home.roomNo != dComIfGp_roomControl_getStayNo()) { + return 0; + } + + switch (mAction) { + case ACTION_ARRIVAL: + actionArrival(); + break; + case ACTION_HUNT: + actionHunt(); + break; + case ACTION_HUNT2: + actionHunt2(); + break; + case ACTION_READY: + actionReady(); + break; + case ACTION_NEXT: + actionNext(); + break; + case ACTION_EVENT: + actionEvent(); + break; + default: + actionWait(); + } + + return 1; } -#pragma pop /* 8048B784-8048B78C 000AC4 0008+00 1/1 0/0 0/0 .text draw__13daTag_Event_cFv */ -bool daTag_Event_c::draw() { - return true; +int daTag_Event_c::draw() { + return 1; } /* 8048B78C-8048B7AC 000ACC 0020+00 1/0 0/0 0/0 .text daTag_Event_Draw__FP13daTag_Event_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Event_Draw(daTag_Event_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Draw__FP13daTag_Event_c.s" +static int daTag_Event_Draw(daTag_Event_c* i_this) { + return i_this->draw(); } -#pragma pop /* 8048B7AC-8048B7D0 000AEC 0024+00 1/0 0/0 0/0 .text daTag_Event_Execute__FP13daTag_Event_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Event_Execute(daTag_Event_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Execute__FP13daTag_Event_c.s" +static int daTag_Event_Execute(daTag_Event_c* i_this) { + i_this->execute(); + return 1; } -#pragma pop /* 8048B7D0-8048B7D8 000B10 0008+00 1/0 0/0 0/0 .text daTag_Event_IsDelete__FP13daTag_Event_c */ -static bool daTag_Event_IsDelete(daTag_Event_c* param_0) { - return true; +static int daTag_Event_IsDelete(daTag_Event_c* i_this) { + return 1; } /* 8048B7D8-8048B808 000B18 0030+00 1/0 0/0 0/0 .text daTag_Event_Delete__FP13daTag_Event_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Event_Delete(daTag_Event_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Delete__FP13daTag_Event_c.s" +static int daTag_Event_Delete(daTag_Event_c* i_this) { + i_this->~daTag_Event_c(); + return 1; } -#pragma pop /* 8048B808-8048B828 000B48 0020+00 1/0 0/0 0/0 .text daTag_Event_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Event_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/daTag_Event_Create__FP10fopAc_ac_c.s" +static int daTag_Event_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* ############################################################################################## */ /* 8048B844-8048B864 -00001 0020+00 1/0 0/0 0/0 .data l_daTag_Event_Method */ -SECTION_DATA static void* l_daTag_Event_Method[8] = { - (void*)daTag_Event_Create__FP10fopAc_ac_c, - (void*)daTag_Event_Delete__FP13daTag_Event_c, - (void*)daTag_Event_Execute__FP13daTag_Event_c, - (void*)daTag_Event_IsDelete__FP13daTag_Event_c, - (void*)daTag_Event_Draw__FP13daTag_Event_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTag_Event_Method = { + (process_method_func)daTag_Event_Create, (process_method_func)daTag_Event_Delete, + (process_method_func)daTag_Event_Execute, (process_method_func)daTag_Event_IsDelete, + (process_method_func)daTag_Event_Draw, }; /* 8048B864-8048B894 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVENT */ -SECTION_DATA extern void* g_profile_TAG_EVENT[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02D10000, (void*)&g_fpcLf_Method, - (void*)0x00000574, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01190000, (void*)&l_daTag_Event_Method, - (void*)0x00044000, (void*)0x00060000, +extern actor_process_profile_definition g_profile_TAG_EVENT = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_TAG_EVENT, + &g_fpcLf_Method.mBase, + sizeof(daTag_Event_c), + 0, + 0, + &g_fopAc_Method.base, + 281, + &l_daTag_Event_Method, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_6_e, }; - -/* 8048B840-8048B840 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp index cb2d845a4ab..8d1d1ea3d96 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp @@ -6,129 +6,129 @@ #include "d/a/d_a_npc.h" #include "d/d_procname.h" -u32 daTag_EvtArea_c::getOnEvtBit() { - u32 ret = fopAcM_GetParam(this) & 0xfff; - return ret == 0xfff ? -1 : ret; -} - -u32 daTag_EvtArea_c::getOffEvtBit() { - u32 ret = (fopAcM_GetParam(this) & 0xfff000) >> 12; - return ret == 0xfff ? -1 : ret; -} - -u8 daTag_EvtArea_c::getBitSW() { - return home.angle.x & 0xff; -} - -u8 daTag_EvtArea_c::getBitSW2() { - return (home.angle.x & 0xff00) >> 8; -} - /* 8048C4F8-8048C728 000078 0230+00 2/1 0/0 0/0 .text create__15daTag_EvtArea_cFv */ cPhs__Step daTag_EvtArea_c::create() { fopAcM_SetupActor(this, daTag_EvtArea_c); switch (getType()) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: - case 12: - scale.x *= 100.0f; - scale.y *= 100.0f; - scale.z *= 100.0f; - break; - case 13: - scale.x *= 200.0f; - scale.y *= 200.0f; - scale.z *= 200.0f; - break; - case 14: - scale.x *= 100.0f; - scale.y *= 100.0f; - scale.z *= 100.0f; - break; - case 15: - scale.x *= 0.5f; - scale.z *= 0.5f; - scale.x *= 1000.0f; - scale.y *= 1000.0f; - scale.z *= 1000.0f; - break; - case 16: - case 17: - case 18: - case 19: - case 20: - scale.x *= 100.0f; - scale.y *= 100.0f; - scale.z *= 100.0f; - break; - case 21: - scale.x *= 1000.0f; - scale.z *= 1000.0f; - break; - case 22: - case 23: - scale.x *= 100.0f; - scale.y *= 100.0f; - scale.z *= 100.0f; - break; - default: - scale.x *= 100.0f; - scale.y *= 100.0f; - scale.z *= 100.0f; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; + break; + case 13: + scale.x *= 200.0f; + scale.y *= 200.0f; + scale.z *= 200.0f; + break; + case 14: + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; + break; + case 15: + scale.x *= 0.5f; + scale.z *= 0.5f; + scale.x *= 1000.0f; + scale.y *= 1000.0f; + scale.z *= 1000.0f; + break; + case 16: + case 17: + case 18: + case 19: + case 20: + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; + break; + case 21: + scale.x *= 1000.0f; + scale.z *= 1000.0f; + break; + case 22: + case 23: + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; + break; + default: + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; } + + // clang-format off + OS_REPORT("\t(%s:%d) no:%d, onEvt:%d, offEvt:%d, BitSW:%02x, BitSW2:%02x, scale:%f,%f,%f<%08x>\n", + fopAcM_getProcNameString(this), + getType(), + getNo(), + getOnEvtBit(), + getOffEvtBit(), + getBitSW(), + getBitSW2(), + scale.x, scale.y, scale.z, + fopAcM_GetParam(this) + ); + // clang-format on + if (isDelete()) { return cPhs_ERROR_e; - } else { - field_0x56c = 0; - return cPhs_COMPLEATE_e; } + + field_0x56c = 0; + return cPhs_COMPLEATE_e; } /* 8048C728-8048C730 0002A8 0008+00 1/1 0/0 0/0 .text Delete__15daTag_EvtArea_cFv */ -bool daTag_EvtArea_c::Delete() { +BOOL daTag_EvtArea_c::Delete() { return true; } /* 8048C730-8048C894 0002B0 0164+00 1/1 0/0 0/0 .text Execute__15daTag_EvtArea_cFv */ -bool daTag_EvtArea_c::Execute() { +BOOL daTag_EvtArea_c::Execute() { if (home.roomNo == dComIfGp_roomControl_getStayNo()) { if (isDelete()) { fopAcM_delete(this); return true; - } else { - attention_info.position = current.pos; - if (getType() == 8) { - attention_info.position.y += 100.0f; - } - group = 0; - eyePos = attention_info.position; - if (getType() == 15) { - if (chkPointInArea(daPy_getPlayerActorClass()->current.pos)) { - eyePos = daPy_getPlayerActorClass()->eyePos; - group = 4; - } - } - attention_info.flags = 0; - return true; } - } else { - return false; + + attention_info.position = current.pos; + if (getType() == 8) { + attention_info.position.y += 100.0f; + } + + fopAcM_SetGroup(this, 0); + eyePos = attention_info.position; + + if (getType() == 15) { + if (chkPointInArea(daPy_getPlayerActorClass()->current.pos)) { + eyePos = daPy_getPlayerActorClass()->eyePos; + fopAcM_SetGroup(this, 4); + } + } + + attention_info.flags = 0; + return true; } + + return false; } /* 8048C894-8048C89C 000414 0008+00 1/1 0/0 0/0 .text Draw__15daTag_EvtArea_cFv */ -bool daTag_EvtArea_c::Draw() { +BOOL daTag_EvtArea_c::Draw() { return true; } @@ -140,53 +140,72 @@ BOOL daTag_EvtArea_c::isDelete() { return true; } } + ret = false; - if (getBitSW2() != 0xff) { + if (getBitSW2() != 0xFF) { if (dComIfGs_isSwitch(getBitSW2(), fopAcM_GetRoomNo(this))) { ret = true; } } + return ret; } /* 8048C94C-8048CC80 0004CC 0334+00 1/1 0/0 16/16 .text * chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz */ -BOOL daTag_EvtArea_c::chkPointInArea(cXyz param_0, cXyz param_1) { - cXyz local_24, local_30, local_3c, local_48, local_84, local_cc, local_6c, local_90; +BOOL daTag_EvtArea_c::chkPointInArea(cXyz i_point, cXyz i_addSize) { + cXyz area_vtx[4]; + cXyz size, center, player_to_home, point_to_current; + if (field_0x56c == 0) { - if ((getOnEvtBit() != -1 && daNpcT_chkEvtBit(getOnEvtBit())) - || (getBitSW() != 0xff && dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this))) - || (getOnEvtBit() == -1 && getBitSW() == 0xff)) { - local_84 = scale + param_1; + if ((getOnEvtBit() != -1 && daNpcT_chkEvtBit(getOnEvtBit())) || + (getBitSW() != 0xff && dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this))) || + (getOnEvtBit() == -1 && getBitSW() == 0xFF)) + { + size = scale + i_addSize; + if (getType() == 15 || getType() == 16) { - local_6c = daPy_getPlayerActorClass()->current.pos; - local_6c -= home.pos; + player_to_home = daPy_getPlayerActorClass()->current.pos; + player_to_home -= home.pos; mDoMtx_YrotS(mDoMtx_stack_c::now, -current.angle.y); - mDoMtx_stack_c::multVec(&local_6c, &local_6c); - local_48.x = -local_84.x; - local_48.z = -local_84.z; - local_3c.x = local_84.x; - local_3c.z = -local_84.z; - local_30.x = local_84.x; - local_30.z = local_84.z; - local_24.x = -local_84.x; - local_24.z = local_84.z; - if (local_48.x < local_6c.x && local_48.z < local_6c.z && local_84.x > local_6c.x && local_84.z > local_6c.z) { - local_90 = param_0 - current.pos; - if (0 <= (s32)local_90.y && (s32)local_90.y < (s32)local_84.y) { + mDoMtx_stack_c::multVec(&player_to_home, &player_to_home); + + // bottom left + area_vtx[0].x = -size.x; + area_vtx[0].z = -size.z; + + // bottom right + area_vtx[1].x = size.x; + area_vtx[1].z = -size.z; + + // top right + area_vtx[2].x = size.x; + area_vtx[2].z = size.z; + + // top left + area_vtx[3].x = -size.x; + area_vtx[3].z = size.z; + + if (area_vtx[0].x < player_to_home.x && area_vtx[0].z < player_to_home.z && + area_vtx[2].x > player_to_home.x && area_vtx[2].z > player_to_home.z) + { + point_to_current = i_point - current.pos; + if (0 <= (int)point_to_current.y && (int)point_to_current.y < (int)size.y) { return true; } } } else { - local_cc = current.pos; - local_cc.y -= 10.0f; + center = current.pos; + center.y -= 10.0f; if (getType() == 21) { - return daNpcT_chkPointInArea(param_0, local_cc, local_84, shape_angle.y, 0); + return daNpcT_chkPointInArea(i_point, center, size, shape_angle.y, 0); } - return daNpcT_chkPointInArea(param_0, local_cc, local_84, shape_angle.y, 1); + + return daNpcT_chkPointInArea(i_point, center, size, shape_angle.y, 1); } } } + return false; } @@ -196,31 +215,29 @@ static cPhs__Step daTag_EvtArea_Create(void* i_this) { } /* 8048CCA0-8048CCC0 000820 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Delete__FPv */ -static bool daTag_EvtArea_Delete(void* i_this) { +static BOOL daTag_EvtArea_Delete(void* i_this) { return static_cast(i_this)->Delete(); } /* 8048CCC0-8048CCE0 000840 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Execute__FPv */ -static bool daTag_EvtArea_Execute(void* i_this) { +static BOOL daTag_EvtArea_Execute(void* i_this) { return static_cast(i_this)->Execute(); } /* 8048CCE0-8048CD00 000860 0020+00 1/0 0/0 0/0 .text daTag_EvtArea_Draw__FPv */ -static bool daTag_EvtArea_Draw(void* i_this) { +static BOOL daTag_EvtArea_Draw(void* i_this) { return static_cast(i_this)->Draw(); } /* 8048CD00-8048CD08 000880 0008+00 1/0 0/0 0/0 .text daTag_EvtArea_IsDelete__FPv */ -static bool daTag_EvtArea_IsDelete(void* i_this) { +static BOOL daTag_EvtArea_IsDelete(void* i_this) { return true; } /* 8048CE48-8048CE68 -00001 0020+00 1/0 0/0 0/0 .data daTag_EvtArea_MethodTable */ static actor_method_class daTag_EvtArea_MethodTable = { - (process_method_func)daTag_EvtArea_Create, - (process_method_func)daTag_EvtArea_Delete, - (process_method_func)daTag_EvtArea_Execute, - (process_method_func)daTag_EvtArea_IsDelete, + (process_method_func)daTag_EvtArea_Create, (process_method_func)daTag_EvtArea_Delete, + (process_method_func)daTag_EvtArea_Execute, (process_method_func)daTag_EvtArea_IsDelete, (process_method_func)daTag_EvtArea_Draw, };