From 493c5d75e1740c4a6ecedad51af08eded82077a9 Mon Sep 17 00:00:00 2001 From: Jacob Patzer <37888505+jakepatzer@users.noreply.github.com> Date: Sun, 5 Nov 2023 22:10:29 -0800 Subject: [PATCH] d_a_tag_evt OK (#1977) --- Progress.md | 8 +- .../d_a_tag_evt/__dt__11daTag_Evt_cFv.s | 30 - .../d_a_tag_evt/create__11daTag_Evt_cFv.s | 52 -- .../d_a_tag_evt/daTag_Evt_Create__FPv.s | 9 - .../d_a_tag_evt/daTag_Evt_Delete__FPv.s | 9 - .../d_a_tag_evt/daTag_Evt_Draw__FPv.s | 9 - .../d_a_tag_evt/daTag_Evt_Execute__FPv.s | 9 - .../d_a_tag_evt/destroy__11daTag_Evt_cFv.s | 14 - .../doEvtCutNext__11daTag_Evt_cFi.s | 49 -- .../doEvtCutTalk__11daTag_Evt_cFi.s | 44 -- .../doEvtCutWait__11daTag_Evt_cFi.s | 41 -- .../d_a_tag_evt/execute__11daTag_Evt_cFv.s | 294 --------- .../d_a_tag_evt/d_a_tag_evt/func_8048C374.s | 9 - .../d_a_tag_evt/getParam__11daTag_Evt_cFv.s | 76 --- .../d_a_tag_evt/isDelete__11daTag_Evt_cFv.s | 87 --- include/d/com/d_com_static.h | 1 + include/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.h | 38 ++ rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp | 573 +++++++----------- 18 files changed, 258 insertions(+), 1094 deletions(-) delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/__dt__11daTag_Evt_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/create__11daTag_Evt_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Create__FPv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Delete__FPv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Draw__FPv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Execute__FPv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/destroy__11daTag_Evt_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutNext__11daTag_Evt_cFi.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutTalk__11daTag_Evt_cFi.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutWait__11daTag_Evt_cFi.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/execute__11daTag_Evt_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/func_8048C374.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/getParam__11daTag_Evt_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/isDelete__11daTag_Evt_cFv.s diff --git a/Progress.md b/Progress.md index d36036b3f3c..a653b5b9c2e 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 41.462024% | 1667052 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 41.462024% | 1667052 | 4020672 -RELs | 34.736587% | 3994820 | 11500324 -Total | 36.478793% | 5661872 | 15520996 +RELs | 34.759751% | 3997484 | 11500324 +Total | 36.495957% | 5664536 | 15520996 ## RELs @@ -721,7 +721,7 @@ d_a_tag_chkpoint | 43.726937% | 948 | 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_evt | 37.815126% | 1620 | 4284 +d_a_tag_evt | 100.000000% | 4284 | 4284 d_a_tag_evtarea | 100.000000% | 3548 | 3548 d_a_tag_evtmsg | 100.000000% | 3616 | 3616 d_a_tag_firewall | 35.325132% | 1608 | 4552 @@ -785,4 +785,4 @@ d_a_vrbox2 | 44.907111% | 2804 | 6244 d_a_warp_bug | 100.000000% | 2024 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 34.736587% | 3994820 | 11500324 +Total | 34.759751% | 3997484 | 11500324 diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/__dt__11daTag_Evt_cFv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/__dt__11daTag_Evt_cFv.s deleted file mode 100644 index b61a8232149..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/__dt__11daTag_Evt_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8048C304: -/* 8048C304 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048C308 7C 08 02 A6 */ mflr r0 -/* 8048C30C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048C310 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048C314 93 C1 00 08 */ stw r30, 8(r1) -/* 8048C318 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8048C31C 7C 9F 23 78 */ mr r31, r4 -/* 8048C320 41 82 00 38 */ beq lbl_8048C358 -/* 8048C324 3C 60 80 49 */ lis r3, __vt__11daTag_Evt_c@ha /* 0x8048C464@ha */ -/* 8048C328 38 03 C4 64 */ addi r0, r3, __vt__11daTag_Evt_c@l /* 0x8048C464@l */ -/* 8048C32C 90 1E 05 E8 */ stw r0, 0x5e8(r30) -/* 8048C330 38 7E 05 78 */ addi r3, r30, 0x578 -/* 8048C334 38 80 FF FF */ li r4, -1 -/* 8048C338 4B DB DC 11 */ bl __dt__10dMsgFlow_cFv -/* 8048C33C 7F C3 F3 78 */ mr r3, r30 -/* 8048C340 38 80 00 00 */ li r4, 0 -/* 8048C344 4B B8 C9 49 */ bl __dt__10fopAc_ac_cFv -/* 8048C348 7F E0 07 35 */ extsh. r0, r31 -/* 8048C34C 40 81 00 0C */ ble lbl_8048C358 -/* 8048C350 7F C3 F3 78 */ mr r3, r30 -/* 8048C354 4B E4 29 E9 */ bl __dl__FPv -lbl_8048C358: -/* 8048C358 7F C3 F3 78 */ mr r3, r30 -/* 8048C35C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048C360 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048C364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048C368 7C 08 03 A6 */ mtlr r0 -/* 8048C36C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048C370 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/create__11daTag_Evt_cFv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/create__11daTag_Evt_cFv.s deleted file mode 100644 index cf0b6e5c031..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/create__11daTag_Evt_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8048B918: -/* 8048B918 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B91C 7C 08 02 A6 */ mflr r0 -/* 8048B920 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B924 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048B928 93 C1 00 08 */ stw r30, 8(r1) -/* 8048B92C 7C 7E 1B 78 */ mr r30, r3 -/* 8048B930 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8048B934 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8048B938 40 82 00 34 */ bne lbl_8048B96C -/* 8048B93C 7F C0 F3 79 */ or. r0, r30, r30 -/* 8048B940 41 82 00 20 */ beq lbl_8048B960 -/* 8048B944 7C 1F 03 78 */ mr r31, r0 -/* 8048B948 4B B8 D2 1D */ bl __ct__10fopAc_ac_cFv -/* 8048B94C 3C 60 80 49 */ lis r3, __vt__11daTag_Evt_c@ha /* 0x8048C464@ha */ -/* 8048B950 38 03 C4 64 */ addi r0, r3, __vt__11daTag_Evt_c@l /* 0x8048C464@l */ -/* 8048B954 90 1F 05 E8 */ stw r0, 0x5e8(r31) -/* 8048B958 38 7F 05 78 */ addi r3, r31, 0x578 -/* 8048B95C 4B DB E5 A5 */ bl __ct__10dMsgFlow_cFv -lbl_8048B960: -/* 8048B960 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 8048B964 60 00 00 08 */ ori r0, r0, 8 -/* 8048B968 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_8048B96C: -/* 8048B96C 38 7E 05 C4 */ addi r3, r30, 0x5c4 -/* 8048B970 3C 80 80 49 */ lis r4, l_resFileName@ha /* 0x8048C404@ha */ -/* 8048B974 38 84 C4 04 */ addi r4, r4, l_resFileName@l /* 0x8048C404@l */ -/* 8048B978 80 84 00 00 */ lwz r4, 0(r4) -/* 8048B97C 4B BA 15 41 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8048B980 7C 7F 1B 78 */ mr r31, r3 -/* 8048B984 2C 1F 00 04 */ cmpwi r31, 4 -/* 8048B988 40 82 00 34 */ bne lbl_8048B9BC -/* 8048B98C 3C 60 80 49 */ lis r3, l_resFileName@ha /* 0x8048C404@ha */ -/* 8048B990 80 03 C4 04 */ lwz r0, l_resFileName@l(r3) /* 0x8048C404@l */ -/* 8048B994 90 1E 01 00 */ stw r0, 0x100(r30) -/* 8048B998 38 7E 05 68 */ addi r3, r30, 0x568 -/* 8048B99C 3C 80 80 49 */ lis r4, d_a_tag_evt__stringBase0@ha /* 0x8048C3BC@ha */ -/* 8048B9A0 38 84 C3 BC */ addi r4, r4, d_a_tag_evt__stringBase0@l /* 0x8048C3BC@l */ -/* 8048B9A4 38 84 00 25 */ addi r4, r4, 0x25 -/* 8048B9A8 4B ED D1 85 */ bl strcpy -/* 8048B9AC 7F C3 F3 78 */ mr r3, r30 -/* 8048B9B0 48 00 04 9D */ bl getParam__11daTag_Evt_cFv -/* 8048B9B4 38 00 FF FF */ li r0, -1 -/* 8048B9B8 B0 1E 05 72 */ sth r0, 0x572(r30) -lbl_8048B9BC: -/* 8048B9BC 7F E3 FB 78 */ mr r3, r31 -/* 8048B9C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048B9C4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048B9C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048B9CC 7C 08 03 A6 */ mtlr r0 -/* 8048B9D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048B9D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Create__FPv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Create__FPv.s deleted file mode 100644 index 387eed614a8..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Create__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048C27C: -/* 8048C27C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048C280 7C 08 02 A6 */ mflr r0 -/* 8048C284 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048C288 4B FF F6 91 */ bl create__11daTag_Evt_cFv -/* 8048C28C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048C290 7C 08 03 A6 */ mtlr r0 -/* 8048C294 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048C298 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Delete__FPv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Delete__FPv.s deleted file mode 100644 index 405ff640256..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Delete__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048C29C: -/* 8048C29C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048C2A0 7C 08 02 A6 */ mflr r0 -/* 8048C2A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048C2A8 4B FF F7 31 */ bl destroy__11daTag_Evt_cFv -/* 8048C2AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048C2B0 7C 08 03 A6 */ mtlr r0 -/* 8048C2B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048C2B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Draw__FPv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Draw__FPv.s deleted file mode 100644 index c8cdbcf7b64..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Draw__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048C2DC: -/* 8048C2DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048C2E0 7C 08 02 A6 */ mflr r0 -/* 8048C2E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048C2E8 4B FF FB 5D */ bl draw__11daTag_Evt_cFv -/* 8048C2EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048C2F0 7C 08 03 A6 */ mtlr r0 -/* 8048C2F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048C2F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Execute__FPv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Execute__FPv.s deleted file mode 100644 index f98d40261c3..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Execute__FPv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048C2BC: -/* 8048C2BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048C2C0 7C 08 02 A6 */ mflr r0 -/* 8048C2C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048C2C8 4B FF F7 45 */ bl execute__11daTag_Evt_cFv -/* 8048C2CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048C2D0 7C 08 03 A6 */ mtlr r0 -/* 8048C2D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048C2D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/destroy__11daTag_Evt_cFv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/destroy__11daTag_Evt_cFv.s deleted file mode 100644 index ed1a59c93d2..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/destroy__11daTag_Evt_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8048B9D8: -/* 8048B9D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048B9DC 7C 08 02 A6 */ mflr r0 -/* 8048B9E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048B9E4 3C 80 80 49 */ lis r4, l_resFileName@ha /* 0x8048C404@ha */ -/* 8048B9E8 38 84 C4 04 */ addi r4, r4, l_resFileName@l /* 0x8048C404@l */ -/* 8048B9EC 80 84 00 00 */ lwz r4, 0(r4) -/* 8048B9F0 38 63 05 C4 */ addi r3, r3, 0x5c4 -/* 8048B9F4 4B BA 16 15 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8048B9F8 38 60 00 01 */ li r3, 1 -/* 8048B9FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048BA00 7C 08 03 A6 */ mtlr r0 -/* 8048BA04 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048BA08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutNext__11daTag_Evt_cFi.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutNext__11daTag_Evt_cFi.s deleted file mode 100644 index e9dc59439e1..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutNext__11daTag_Evt_cFi.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8048C1C8: -/* 8048C1C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048C1CC 7C 08 02 A6 */ mflr r0 -/* 8048C1D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048C1D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048C1D8 93 C1 00 08 */ stw r30, 8(r1) -/* 8048C1DC 7C 7E 1B 78 */ mr r30, r3 -/* 8048C1E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048C1E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048C1E8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8048C1EC 4B BB BB 61 */ bl getIsAddvance__16dEvent_manager_cFi -/* 8048C1F0 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C1F4 41 82 00 6C */ beq lbl_8048C260 -/* 8048C1F8 88 7E 05 E4 */ lbz r3, 0x5e4(r30) -/* 8048C1FC 7C 60 07 75 */ extsb. r0, r3 -/* 8048C200 41 82 00 10 */ beq lbl_8048C210 -/* 8048C204 7C 60 07 74 */ extsb r0, r3 -/* 8048C208 2C 00 00 01 */ cmpwi r0, 1 -/* 8048C20C 40 82 00 24 */ bne lbl_8048C230 -lbl_8048C210: -/* 8048C210 88 9E 05 DE */ lbz r4, 0x5de(r30) -/* 8048C214 28 04 00 FF */ cmplwi r4, 0xff -/* 8048C218 41 82 00 18 */ beq lbl_8048C230 -/* 8048C21C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048C220 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048C224 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8048C228 7C 05 07 74 */ extsb r5, r0 -/* 8048C22C 4B BA 8F D5 */ bl onSwitch__10dSv_info_cFii -lbl_8048C230: -/* 8048C230 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8048C234 7C 1F 07 74 */ extsb r31, r0 -/* 8048C238 38 60 00 00 */ li r3, 0 -/* 8048C23C 4B BA 07 41 */ bl getLayerNo__14dComIfG_play_cFi -/* 8048C240 7C 67 1B 78 */ mr r7, r3 -/* 8048C244 80 7E 05 D4 */ lwz r3, 0x5d4(r30) -/* 8048C248 3C 80 80 49 */ lis r4, lit_3785@ha /* 0x8048C39C@ha */ -/* 8048C24C C0 24 C3 9C */ lfs f1, lit_3785@l(r4) /* 0x8048C39C@l */ -/* 8048C250 38 80 00 00 */ li r4, 0 -/* 8048C254 7F E5 FB 78 */ mr r5, r31 -/* 8048C258 38 C0 00 00 */ li r6, 0 -/* 8048C25C 4B B9 AF 15 */ bl dStage_changeScene__FifUlScsi -lbl_8048C260: -/* 8048C260 38 60 00 00 */ li r3, 0 -/* 8048C264 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048C268 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048C26C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048C270 7C 08 03 A6 */ mtlr r0 -/* 8048C274 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048C278 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutTalk__11daTag_Evt_cFi.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutTalk__11daTag_Evt_cFi.s deleted file mode 100644 index 55a0593b119..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutTalk__11daTag_Evt_cFi.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8048C124: -/* 8048C124 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048C128 7C 08 02 A6 */ mflr r0 -/* 8048C12C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048C130 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048C134 4B ED 60 A9 */ bl _savegpr_29 -/* 8048C138 7C 7D 1B 78 */ mr r29, r3 -/* 8048C13C 7C 9E 23 78 */ mr r30, r4 -/* 8048C140 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048C144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048C148 3B E3 4F F8 */ addi r31, r3, 0x4ff8 -/* 8048C14C 7F E3 FB 78 */ mr r3, r31 -/* 8048C150 4B BB BB FD */ bl getIsAddvance__16dEvent_manager_cFi -/* 8048C154 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C158 41 82 00 44 */ beq lbl_8048C19C -/* 8048C15C 7F E3 FB 78 */ mr r3, r31 -/* 8048C160 7F C4 F3 78 */ mr r4, r30 -/* 8048C164 3C A0 80 49 */ lis r5, d_a_tag_evt__stringBase0@ha /* 0x8048C3BC@ha */ -/* 8048C168 38 A5 C3 BC */ addi r5, r5, d_a_tag_evt__stringBase0@l /* 0x8048C3BC@l */ -/* 8048C16C 38 A5 00 32 */ addi r5, r5, 0x32 -/* 8048C170 38 C0 00 03 */ li r6, 3 -/* 8048C174 4B BB BF 79 */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 8048C178 7C 65 1B 78 */ mr r5, r3 -/* 8048C17C 38 7D 05 78 */ addi r3, r29, 0x578 -/* 8048C180 7F A4 EB 78 */ mr r4, r29 -/* 8048C184 80 A5 00 00 */ lwz r5, 0(r5) -/* 8048C188 38 C0 00 00 */ li r6, 0 -/* 8048C18C 38 E0 00 00 */ li r7, 0 -/* 8048C190 4B DB DE 01 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 8048C194 38 60 00 00 */ li r3, 0 -/* 8048C198 48 00 00 18 */ b lbl_8048C1B0 -lbl_8048C19C: -/* 8048C19C 38 7D 05 78 */ addi r3, r29, 0x578 -/* 8048C1A0 7F A4 EB 78 */ mr r4, r29 -/* 8048C1A4 38 A0 00 00 */ li r5, 0 -/* 8048C1A8 38 C0 00 00 */ li r6, 0 -/* 8048C1AC 4B DB E1 2D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -lbl_8048C1B0: -/* 8048C1B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048C1B4 4B ED 60 75 */ bl _restgpr_29 -/* 8048C1B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048C1BC 7C 08 03 A6 */ mtlr r0 -/* 8048C1C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048C1C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutWait__11daTag_Evt_cFi.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutWait__11daTag_Evt_cFi.s deleted file mode 100644 index db5318501b2..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutWait__11daTag_Evt_cFi.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8048C090: -/* 8048C090 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048C094 7C 08 02 A6 */ mflr r0 -/* 8048C098 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048C09C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048C0A0 4B ED 61 3D */ bl _savegpr_29 -/* 8048C0A4 7C 7D 1B 78 */ mr r29, r3 -/* 8048C0A8 7C 9E 23 78 */ mr r30, r4 -/* 8048C0AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048C0B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048C0B4 3B E3 4F F8 */ addi r31, r3, 0x4ff8 -/* 8048C0B8 7F E3 FB 78 */ mr r3, r31 -/* 8048C0BC 4B BB BC 91 */ bl getIsAddvance__16dEvent_manager_cFi -/* 8048C0C0 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C0C4 41 82 00 38 */ beq lbl_8048C0FC -/* 8048C0C8 7F E3 FB 78 */ mr r3, r31 -/* 8048C0CC 7F C4 F3 78 */ mr r4, r30 -/* 8048C0D0 3C A0 80 49 */ lis r5, d_a_tag_evt__stringBase0@ha /* 0x8048C3BC@ha */ -/* 8048C0D4 38 A5 C3 BC */ addi r5, r5, d_a_tag_evt__stringBase0@l /* 0x8048C3BC@l */ -/* 8048C0D8 38 A5 00 2C */ addi r5, r5, 0x2c -/* 8048C0DC 38 C0 00 03 */ li r6, 3 -/* 8048C0E0 4B BB C0 0D */ bl getMySubstanceP__16dEvent_manager_cFiPCci -/* 8048C0E4 28 03 00 00 */ cmplwi r3, 0 -/* 8048C0E8 40 82 00 0C */ bne lbl_8048C0F4 -/* 8048C0EC 38 00 00 00 */ li r0, 0 -/* 8048C0F0 48 00 00 08 */ b lbl_8048C0F8 -lbl_8048C0F4: -/* 8048C0F4 80 03 00 00 */ lwz r0, 0(r3) -lbl_8048C0F8: -/* 8048C0F8 90 1D 05 CC */ stw r0, 0x5cc(r29) -lbl_8048C0FC: -/* 8048C0FC 38 7D 05 CC */ addi r3, r29, 0x5cc -/* 8048C100 48 00 02 75 */ bl func_8048C374 -/* 8048C104 7C 60 00 34 */ cntlzw r0, r3 -/* 8048C108 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8048C10C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048C110 4B ED 61 19 */ bl _restgpr_29 -/* 8048C114 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048C118 7C 08 03 A6 */ mtlr r0 -/* 8048C11C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048C120 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/execute__11daTag_Evt_cFv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/execute__11daTag_Evt_cFv.s deleted file mode 100644 index e06a7dbae91..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/execute__11daTag_Evt_cFv.s +++ /dev/null @@ -1,294 +0,0 @@ -lbl_8048BA0C: -/* 8048BA0C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8048BA10 7C 08 02 A6 */ mflr r0 -/* 8048BA14 90 01 00 54 */ stw r0, 0x54(r1) -/* 8048BA18 39 61 00 50 */ addi r11, r1, 0x50 -/* 8048BA1C 4B ED 67 B5 */ bl _savegpr_26 -/* 8048BA20 7C 7C 1B 78 */ mr r28, r3 -/* 8048BA24 3C 80 80 49 */ lis r4, lit_3784@ha /* 0x8048C398@ha */ -/* 8048BA28 3B C4 C3 98 */ addi r30, r4, lit_3784@l /* 0x8048C398@l */ -/* 8048BA2C 3B A0 00 01 */ li r29, 1 -/* 8048BA30 C0 43 04 D8 */ lfs f2, 0x4d8(r3) -/* 8048BA34 C0 3E 00 00 */ lfs f1, 0(r30) -/* 8048BA38 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 8048BA3C EC 21 00 2A */ fadds f1, f1, f0 -/* 8048BA40 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 8048BA44 D0 03 05 38 */ stfs f0, 0x538(r3) -/* 8048BA48 D0 23 05 3C */ stfs f1, 0x53c(r3) -/* 8048BA4C D0 43 05 40 */ stfs f2, 0x540(r3) -/* 8048BA50 C0 03 05 38 */ lfs f0, 0x538(r3) -/* 8048BA54 D0 03 05 50 */ stfs f0, 0x550(r3) -/* 8048BA58 C0 03 05 3C */ lfs f0, 0x53c(r3) -/* 8048BA5C D0 03 05 54 */ stfs f0, 0x554(r3) -/* 8048BA60 C0 03 05 40 */ lfs f0, 0x540(r3) -/* 8048BA64 D0 03 05 58 */ stfs f0, 0x558(r3) -/* 8048BA68 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8048BA6C 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ -/* 8048BA70 98 03 04 E2 */ stb r0, 0x4e2(r3) -/* 8048BA74 88 83 05 E4 */ lbz r4, 0x5e4(r3) -/* 8048BA78 7C 80 07 75 */ extsb. r0, r4 -/* 8048BA7C 41 82 00 10 */ beq lbl_8048BA8C -/* 8048BA80 7C 80 07 74 */ extsb r0, r4 -/* 8048BA84 2C 00 00 01 */ cmpwi r0, 1 -/* 8048BA88 40 82 03 84 */ bne lbl_8048BE0C -lbl_8048BA8C: -/* 8048BA8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048BA90 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048BA94 88 1F 4F AD */ lbz r0, 0x4fad(r31) -/* 8048BA98 28 00 00 00 */ cmplwi r0, 0 -/* 8048BA9C 41 82 01 94 */ beq lbl_8048BC30 -/* 8048BAA0 3B A0 00 00 */ li r29, 0 -/* 8048BAA4 3B 5F 4F F8 */ addi r26, r31, 0x4ff8 -/* 8048BAA8 7F 43 D3 78 */ mr r3, r26 -/* 8048BAAC 38 9C 05 68 */ addi r4, r28, 0x568 -/* 8048BAB0 38 A0 00 00 */ li r5, 0 -/* 8048BAB4 38 C0 00 00 */ li r6, 0 -/* 8048BAB8 4B BB C0 65 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 8048BABC 7C 7B 1B 78 */ mr r27, r3 -/* 8048BAC0 A0 1C 00 F8 */ lhz r0, 0xf8(r28) -/* 8048BAC4 28 00 00 01 */ cmplwi r0, 1 -/* 8048BAC8 41 82 00 E0 */ beq lbl_8048BBA8 -/* 8048BACC 28 00 00 02 */ cmplwi r0, 2 -/* 8048BAD0 40 82 01 60 */ bne lbl_8048BC30 -/* 8048BAD4 7F 43 D3 78 */ mr r3, r26 -/* 8048BAD8 A8 9C 05 72 */ lha r4, 0x572(r28) -/* 8048BADC 4B BB BF 9D */ bl endCheck__16dEvent_manager_cFs -/* 8048BAE0 2C 03 00 00 */ cmpwi r3, 0 -/* 8048BAE4 41 82 00 24 */ beq lbl_8048BB08 -/* 8048BAE8 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8048BAEC 4B BB 69 7D */ bl reset__14dEvt_control_cFv -/* 8048BAF0 38 00 00 00 */ li r0, 0 -/* 8048BAF4 B0 1C 05 70 */ sth r0, 0x570(r28) -/* 8048BAF8 38 00 FF FF */ li r0, -1 -/* 8048BAFC B0 1C 05 72 */ sth r0, 0x572(r28) -/* 8048BB00 3B A0 00 01 */ li r29, 1 -/* 8048BB04 48 00 01 2C */ b lbl_8048BC30 -lbl_8048BB08: -/* 8048BB08 2C 1B FF FF */ cmpwi r27, -1 -/* 8048BB0C 41 82 01 24 */ beq lbl_8048BC30 -/* 8048BB10 7F 43 D3 78 */ mr r3, r26 -/* 8048BB14 7F 64 DB 78 */ mr r4, r27 -/* 8048BB18 3C A0 80 49 */ lis r5, mEvtCutList__11daTag_Evt_c@ha /* 0x8048C408@ha */ -/* 8048BB1C 38 A5 C4 08 */ addi r5, r5, mEvtCutList__11daTag_Evt_c@l /* 0x8048C408@l */ -/* 8048BB20 38 C0 00 03 */ li r6, 3 -/* 8048BB24 38 E0 00 00 */ li r7, 0 -/* 8048BB28 39 00 00 00 */ li r8, 0 -/* 8048BB2C 4B BB C2 E5 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 8048BB30 38 00 00 00 */ li r0, 0 -/* 8048BB34 2C 03 00 01 */ cmpwi r3, 1 -/* 8048BB38 41 82 00 34 */ beq lbl_8048BB6C -/* 8048BB3C 40 80 00 10 */ bge lbl_8048BB4C -/* 8048BB40 2C 03 00 00 */ cmpwi r3, 0 -/* 8048BB44 40 80 00 14 */ bge lbl_8048BB58 -/* 8048BB48 48 00 00 48 */ b lbl_8048BB90 -lbl_8048BB4C: -/* 8048BB4C 2C 03 00 03 */ cmpwi r3, 3 -/* 8048BB50 40 80 00 40 */ bge lbl_8048BB90 -/* 8048BB54 48 00 00 2C */ b lbl_8048BB80 -lbl_8048BB58: -/* 8048BB58 7F 83 E3 78 */ mr r3, r28 -/* 8048BB5C 7F 64 DB 78 */ mr r4, r27 -/* 8048BB60 48 00 05 31 */ bl doEvtCutWait__11daTag_Evt_cFi -/* 8048BB64 7C 60 1B 78 */ mr r0, r3 -/* 8048BB68 48 00 00 28 */ b lbl_8048BB90 -lbl_8048BB6C: -/* 8048BB6C 7F 83 E3 78 */ mr r3, r28 -/* 8048BB70 7F 64 DB 78 */ mr r4, r27 -/* 8048BB74 48 00 05 B1 */ bl doEvtCutTalk__11daTag_Evt_cFi -/* 8048BB78 7C 60 1B 78 */ mr r0, r3 -/* 8048BB7C 48 00 00 14 */ b lbl_8048BB90 -lbl_8048BB80: -/* 8048BB80 7F 83 E3 78 */ mr r3, r28 -/* 8048BB84 7F 64 DB 78 */ mr r4, r27 -/* 8048BB88 48 00 06 41 */ bl doEvtCutNext__11daTag_Evt_cFi -/* 8048BB8C 7C 60 1B 78 */ mr r0, r3 -lbl_8048BB90: -/* 8048BB90 2C 00 00 00 */ cmpwi r0, 0 -/* 8048BB94 41 82 00 9C */ beq lbl_8048BC30 -/* 8048BB98 7F 43 D3 78 */ mr r3, r26 -/* 8048BB9C 7F 64 DB 78 */ mr r4, r27 -/* 8048BBA0 4B BB C5 DD */ bl cutEnd__16dEvent_manager_cFi -/* 8048BBA4 48 00 00 8C */ b lbl_8048BC30 -lbl_8048BBA8: -/* 8048BBA8 88 1C 05 DC */ lbz r0, 0x5dc(r28) -/* 8048BBAC 28 00 00 00 */ cmplwi r0, 0 -/* 8048BBB0 41 82 00 60 */ beq lbl_8048BC10 -/* 8048BBB4 38 7C 05 78 */ addi r3, r28, 0x578 -/* 8048BBB8 7F 84 E3 78 */ mr r4, r28 -/* 8048BBBC 38 A0 00 00 */ li r5, 0 -/* 8048BBC0 38 C0 00 00 */ li r6, 0 -/* 8048BBC4 4B DB E7 15 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci -/* 8048BBC8 2C 03 00 00 */ cmpwi r3, 0 -/* 8048BBCC 41 82 00 64 */ beq lbl_8048BC30 -/* 8048BBD0 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8048BBD4 4B BB 68 95 */ bl reset__14dEvt_control_cFv -/* 8048BBD8 38 7C 05 78 */ addi r3, r28, 0x578 -/* 8048BBDC 38 80 00 00 */ li r4, 0 -/* 8048BBE0 4B DB E9 49 */ bl getEventId__10dMsgFlow_cFPi -/* 8048BBE4 54 60 04 3F */ clrlwi. r0, r3, 0x10 -/* 8048BBE8 41 82 00 1C */ beq lbl_8048BC04 -/* 8048BBEC 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8048BBF0 4B BA 5A 1D */ bl daNpcMsg_setEvtNum__FUc -/* 8048BBF4 38 00 00 01 */ li r0, 1 -/* 8048BBF8 B0 1C 05 70 */ sth r0, 0x570(r28) -/* 8048BBFC 3B A0 00 01 */ li r29, 1 -/* 8048BC00 48 00 00 30 */ b lbl_8048BC30 -lbl_8048BC04: -/* 8048BC04 7F 83 E3 78 */ mr r3, r28 -/* 8048BC08 4B B8 E0 75 */ bl fopAcM_delete__FP10fopAc_ac_c -/* 8048BC0C 48 00 00 24 */ b lbl_8048BC30 -lbl_8048BC10: -/* 8048BC10 38 7C 05 78 */ addi r3, r28, 0x578 -/* 8048BC14 7F 84 E3 78 */ mr r4, r28 -/* 8048BC18 80 BC 05 74 */ lwz r5, 0x574(r28) -/* 8048BC1C 38 C0 00 00 */ li r6, 0 -/* 8048BC20 38 E0 00 00 */ li r7, 0 -/* 8048BC24 4B DB E3 6D */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c -/* 8048BC28 38 00 00 01 */ li r0, 1 -/* 8048BC2C 98 1C 05 DC */ stb r0, 0x5dc(r28) -lbl_8048BC30: -/* 8048BC30 7F 83 E3 78 */ mr r3, r28 -/* 8048BC34 48 00 03 31 */ bl isDelete__11daTag_Evt_cFv -/* 8048BC38 2C 03 00 00 */ cmpwi r3, 0 -/* 8048BC3C 40 82 01 74 */ bne lbl_8048BDB0 -/* 8048BC40 38 7C 05 D0 */ addi r3, r28, 0x5d0 -/* 8048BC44 48 00 07 31 */ bl func_8048C374 -/* 8048BC48 2C 03 00 00 */ cmpwi r3, 0 -/* 8048BC4C 40 82 01 64 */ bne lbl_8048BDB0 -/* 8048BC50 38 61 00 18 */ addi r3, r1, 0x18 -/* 8048BC54 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048BC58 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048BC5C 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 8048BC60 38 84 04 D0 */ addi r4, r4, 0x4d0 -/* 8048BC64 38 BC 04 D0 */ addi r5, r28, 0x4d0 -/* 8048BC68 4B DD AE CD */ bl __mi__4cXyzCFRC3Vec -/* 8048BC6C C0 41 00 18 */ lfs f2, 0x18(r1) -/* 8048BC70 D0 41 00 24 */ stfs f2, 0x24(r1) -/* 8048BC74 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 8048BC78 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8048BC7C C0 21 00 20 */ lfs f1, 0x20(r1) -/* 8048BC80 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 8048BC84 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 8048BC88 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8048BC8C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8048BC90 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 8048BC94 38 61 00 0C */ addi r3, r1, 0xc -/* 8048BC98 4B EB B4 A1 */ bl PSVECSquareMag -/* 8048BC9C C0 1E 00 04 */ lfs f0, 4(r30) -/* 8048BCA0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8048BCA4 40 81 00 58 */ ble lbl_8048BCFC -/* 8048BCA8 FC 00 08 34 */ frsqrte f0, f1 -/* 8048BCAC C8 9E 00 08 */ lfd f4, 8(r30) -/* 8048BCB0 FC 44 00 32 */ fmul f2, f4, f0 -/* 8048BCB4 C8 7E 00 10 */ lfd f3, 0x10(r30) -/* 8048BCB8 FC 00 00 32 */ fmul f0, f0, f0 -/* 8048BCBC FC 01 00 32 */ fmul f0, f1, f0 -/* 8048BCC0 FC 03 00 28 */ fsub f0, f3, f0 -/* 8048BCC4 FC 02 00 32 */ fmul f0, f2, f0 -/* 8048BCC8 FC 44 00 32 */ fmul f2, f4, f0 -/* 8048BCCC FC 00 00 32 */ fmul f0, f0, f0 -/* 8048BCD0 FC 01 00 32 */ fmul f0, f1, f0 -/* 8048BCD4 FC 03 00 28 */ fsub f0, f3, f0 -/* 8048BCD8 FC 02 00 32 */ fmul f0, f2, f0 -/* 8048BCDC FC 44 00 32 */ fmul f2, f4, f0 -/* 8048BCE0 FC 00 00 32 */ fmul f0, f0, f0 -/* 8048BCE4 FC 01 00 32 */ fmul f0, f1, f0 -/* 8048BCE8 FC 03 00 28 */ fsub f0, f3, f0 -/* 8048BCEC FC 02 00 32 */ fmul f0, f2, f0 -/* 8048BCF0 FC 21 00 32 */ fmul f1, f1, f0 -/* 8048BCF4 FC 20 08 18 */ frsp f1, f1 -/* 8048BCF8 48 00 00 88 */ b lbl_8048BD80 -lbl_8048BCFC: -/* 8048BCFC C8 1E 00 18 */ lfd f0, 0x18(r30) -/* 8048BD00 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8048BD04 40 80 00 10 */ bge lbl_8048BD14 -/* 8048BD08 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8048BD0C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8048BD10 48 00 00 70 */ b lbl_8048BD80 -lbl_8048BD14: -/* 8048BD14 D0 21 00 08 */ stfs f1, 8(r1) -/* 8048BD18 80 81 00 08 */ lwz r4, 8(r1) -/* 8048BD1C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8048BD20 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8048BD24 7C 03 00 00 */ cmpw r3, r0 -/* 8048BD28 41 82 00 14 */ beq lbl_8048BD3C -/* 8048BD2C 40 80 00 40 */ bge lbl_8048BD6C -/* 8048BD30 2C 03 00 00 */ cmpwi r3, 0 -/* 8048BD34 41 82 00 20 */ beq lbl_8048BD54 -/* 8048BD38 48 00 00 34 */ b lbl_8048BD6C -lbl_8048BD3C: -/* 8048BD3C 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8048BD40 41 82 00 0C */ beq lbl_8048BD4C -/* 8048BD44 38 00 00 01 */ li r0, 1 -/* 8048BD48 48 00 00 28 */ b lbl_8048BD70 -lbl_8048BD4C: -/* 8048BD4C 38 00 00 02 */ li r0, 2 -/* 8048BD50 48 00 00 20 */ b lbl_8048BD70 -lbl_8048BD54: -/* 8048BD54 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8048BD58 41 82 00 0C */ beq lbl_8048BD64 -/* 8048BD5C 38 00 00 05 */ li r0, 5 -/* 8048BD60 48 00 00 10 */ b lbl_8048BD70 -lbl_8048BD64: -/* 8048BD64 38 00 00 03 */ li r0, 3 -/* 8048BD68 48 00 00 08 */ b lbl_8048BD70 -lbl_8048BD6C: -/* 8048BD6C 38 00 00 04 */ li r0, 4 -lbl_8048BD70: -/* 8048BD70 2C 00 00 01 */ cmpwi r0, 1 -/* 8048BD74 40 82 00 0C */ bne lbl_8048BD80 -/* 8048BD78 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8048BD7C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8048BD80: -/* 8048BD80 C0 1C 04 EC */ lfs f0, 0x4ec(r28) -/* 8048BD84 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8048BD88 40 80 00 28 */ bge lbl_8048BDB0 -/* 8048BD8C C0 3C 04 F0 */ lfs f1, 0x4f0(r28) -/* 8048BD90 FC 00 08 50 */ fneg f0, f1 -/* 8048BD94 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 8048BD98 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 8048BD9C 40 80 00 14 */ bge lbl_8048BDB0 -/* 8048BDA0 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 8048BDA4 40 80 00 0C */ bge lbl_8048BDB0 -/* 8048BDA8 38 00 00 01 */ li r0, 1 -/* 8048BDAC B0 1C 05 70 */ sth r0, 0x570(r28) -lbl_8048BDB0: -/* 8048BDB0 2C 1D 00 00 */ cmpwi r29, 0 -/* 8048BDB4 41 82 00 74 */ beq lbl_8048BE28 -/* 8048BDB8 A0 1C 05 70 */ lhz r0, 0x570(r28) -/* 8048BDBC 28 00 00 00 */ cmplwi r0, 0 -/* 8048BDC0 41 82 00 68 */ beq lbl_8048BE28 -/* 8048BDC4 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 8048BDC8 7F 84 E3 78 */ mr r4, r28 -/* 8048BDCC 54 00 13 BA */ rlwinm r0, r0, 2, 0xe, 0x1d -/* 8048BDD0 3C A0 80 49 */ lis r5, l_evtNameList@ha /* 0x8048C3FC@ha */ -/* 8048BDD4 38 A5 C3 FC */ addi r5, r5, l_evtNameList@l /* 0x8048C3FC@l */ -/* 8048BDD8 7C A5 00 2E */ lwzx r5, r5, r0 -/* 8048BDDC 38 C0 00 FF */ li r6, 0xff -/* 8048BDE0 4B BB B9 79 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc -/* 8048BDE4 B0 7C 05 72 */ sth r3, 0x572(r28) -/* 8048BDE8 7F 83 E3 78 */ mr r3, r28 -/* 8048BDEC A8 9C 05 72 */ lha r4, 0x572(r28) -/* 8048BDF0 38 A0 00 FF */ li r5, 0xff -/* 8048BDF4 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8048BDF8 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8048BDFC 38 E0 00 00 */ li r7, 0 -/* 8048BE00 39 00 00 01 */ li r8, 1 -/* 8048BE04 4B B8 F8 79 */ bl fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs -/* 8048BE08 48 00 00 20 */ b lbl_8048BE28 -lbl_8048BE0C: -/* 8048BE0C 2C 00 00 02 */ cmpwi r0, 2 -/* 8048BE10 40 82 00 18 */ bne lbl_8048BE28 -/* 8048BE14 48 00 01 51 */ bl isDelete__11daTag_Evt_cFv -/* 8048BE18 2C 03 00 00 */ cmpwi r3, 0 -/* 8048BE1C 41 82 00 0C */ beq lbl_8048BE28 -/* 8048BE20 7F 83 E3 78 */ mr r3, r28 -/* 8048BE24 4B B8 DE 59 */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_8048BE28: -/* 8048BE28 38 60 00 01 */ li r3, 1 -/* 8048BE2C 39 61 00 50 */ addi r11, r1, 0x50 -/* 8048BE30 4B ED 63 ED */ bl _restgpr_26 -/* 8048BE34 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8048BE38 7C 08 03 A6 */ mtlr r0 -/* 8048BE3C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8048BE40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/func_8048C374.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/func_8048C374.s deleted file mode 100644 index fe1862649c9..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/func_8048C374.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048C374: -/* 8048C374 80 83 00 00 */ lwz r4, 0(r3) -/* 8048C378 2C 04 00 00 */ cmpwi r4, 0 -/* 8048C37C 41 82 00 0C */ beq lbl_8048C388 -/* 8048C380 38 04 FF FF */ addi r0, r4, -1 -/* 8048C384 90 03 00 00 */ stw r0, 0(r3) -lbl_8048C388: -/* 8048C388 80 63 00 00 */ lwz r3, 0(r3) -/* 8048C38C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/getParam__11daTag_Evt_cFv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/getParam__11daTag_Evt_cFv.s deleted file mode 100644 index 14279381421..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/getParam__11daTag_Evt_cFv.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_8048BE4C: -/* 8048BE4C 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048BE50 54 00 05 3E */ clrlwi r0, r0, 0x14 -/* 8048BE54 B0 03 05 E0 */ sth r0, 0x5e0(r3) -/* 8048BE58 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048BE5C 54 00 A5 3E */ rlwinm r0, r0, 0x14, 0x14, 0x1f -/* 8048BE60 B0 03 05 E2 */ sth r0, 0x5e2(r3) -/* 8048BE64 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048BE68 54 04 01 0E */ rlwinm r4, r0, 0, 4, 7 -/* 8048BE6C 3C 04 F1 00 */ addis r0, r4, 0xf100 -/* 8048BE70 28 00 00 00 */ cmplwi r0, 0 -/* 8048BE74 41 82 00 10 */ beq lbl_8048BE84 -/* 8048BE78 54 80 46 3E */ srwi r0, r4, 0x18 -/* 8048BE7C 90 03 05 D8 */ stw r0, 0x5d8(r3) -/* 8048BE80 48 00 00 0C */ b lbl_8048BE8C -lbl_8048BE84: -/* 8048BE84 38 00 FF FF */ li r0, -1 -/* 8048BE88 90 03 05 D8 */ stw r0, 0x5d8(r3) -lbl_8048BE8C: -/* 8048BE8C 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048BE90 54 00 17 BE */ srwi r0, r0, 0x1e -/* 8048BE94 98 03 05 E4 */ stb r0, 0x5e4(r3) -/* 8048BE98 A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 8048BE9C 98 03 05 DD */ stb r0, 0x5dd(r3) -/* 8048BEA0 A8 03 04 B4 */ lha r0, 0x4b4(r3) -/* 8048BEA4 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8048BEA8 98 03 05 DE */ stb r0, 0x5de(r3) -/* 8048BEAC A8 03 04 B8 */ lha r0, 0x4b8(r3) -/* 8048BEB0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8048BEB4 90 03 05 D4 */ stw r0, 0x5d4(r3) -/* 8048BEB8 A8 03 04 B8 */ lha r0, 0x4b8(r3) -/* 8048BEBC 54 04 04 2E */ rlwinm r4, r0, 0, 0x10, 0x17 -/* 8048BEC0 3C 04 00 00 */ addis r0, r4, 0 -/* 8048BEC4 28 00 FF 00 */ cmplwi r0, 0xff00 -/* 8048BEC8 41 82 00 14 */ beq lbl_8048BEDC -/* 8048BECC 7C 80 46 70 */ srawi r0, r4, 8 -/* 8048BED0 1C 00 00 1E */ mulli r0, r0, 0x1e -/* 8048BED4 90 03 05 D0 */ stw r0, 0x5d0(r3) -/* 8048BED8 48 00 00 0C */ b lbl_8048BEE4 -lbl_8048BEDC: -/* 8048BEDC 38 00 00 00 */ li r0, 0 -/* 8048BEE0 90 03 05 D0 */ stw r0, 0x5d0(r3) -lbl_8048BEE4: -/* 8048BEE4 38 00 FF FF */ li r0, -1 -/* 8048BEE8 90 03 05 74 */ stw r0, 0x574(r3) -/* 8048BEEC C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8048BEF0 3C 80 80 49 */ lis r4, lit_3784@ha /* 0x8048C398@ha */ -/* 8048BEF4 C0 24 C3 98 */ lfs f1, lit_3784@l(r4) /* 0x8048C398@l */ -/* 8048BEF8 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048BEFC D0 03 04 EC */ stfs f0, 0x4ec(r3) -/* 8048BF00 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 8048BF04 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048BF08 D0 03 04 F0 */ stfs f0, 0x4f0(r3) -/* 8048BF0C C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8048BF10 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048BF14 D0 03 04 F4 */ stfs f0, 0x4f4(r3) -/* 8048BF18 88 03 05 E4 */ lbz r0, 0x5e4(r3) -/* 8048BF1C 2C 00 00 01 */ cmpwi r0, 1 -/* 8048BF20 40 82 00 30 */ bne lbl_8048BF50 -/* 8048BF24 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8048BF28 3C 80 80 49 */ lis r4, lit_3815@ha /* 0x8048C3B8@ha */ -/* 8048BF2C C0 24 C3 B8 */ lfs f1, lit_3815@l(r4) /* 0x8048C3B8@l */ -/* 8048BF30 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048BF34 D0 03 04 EC */ stfs f0, 0x4ec(r3) -/* 8048BF38 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 8048BF3C EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048BF40 D0 03 04 F0 */ stfs f0, 0x4f0(r3) -/* 8048BF44 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8048BF48 EC 00 00 72 */ fmuls f0, f0, f1 -/* 8048BF4C D0 03 04 F4 */ stfs f0, 0x4f4(r3) -lbl_8048BF50: -/* 8048BF50 38 00 00 00 */ li r0, 0 -/* 8048BF54 B0 03 04 B4 */ sth r0, 0x4b4(r3) -/* 8048BF58 B0 03 04 B8 */ sth r0, 0x4b8(r3) -/* 8048BF5C 38 60 00 01 */ li r3, 1 -/* 8048BF60 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/isDelete__11daTag_Evt_cFv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/isDelete__11daTag_Evt_cFv.s deleted file mode 100644 index 170d553bf6d..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/isDelete__11daTag_Evt_cFv.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_8048BF64: -/* 8048BF64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048BF68 7C 08 02 A6 */ mflr r0 -/* 8048BF6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048BF70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048BF74 7C 7F 1B 78 */ mr r31, r3 -/* 8048BF78 A0 83 05 E0 */ lhz r4, 0x5e0(r3) -/* 8048BF7C 28 04 0F FF */ cmplwi r4, 0xfff -/* 8048BF80 40 82 00 10 */ bne lbl_8048BF90 -/* 8048BF84 A0 1F 05 E2 */ lhz r0, 0x5e2(r31) -/* 8048BF88 28 00 0F FF */ cmplwi r0, 0xfff -/* 8048BF8C 41 82 00 78 */ beq lbl_8048C004 -lbl_8048BF90: -/* 8048BF90 28 04 0F FF */ cmplwi r4, 0xfff -/* 8048BF94 41 82 00 30 */ beq lbl_8048BFC4 -/* 8048BF98 41 82 00 64 */ beq lbl_8048BFFC -/* 8048BF9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048BFA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048BFA4 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8048BFA8 54 80 0B FC */ rlwinm r0, r4, 1, 0xf, 0x1e -/* 8048BFAC 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8048BFB0 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8048BFB4 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8048BFB8 4B BA 8A 05 */ bl isEventBit__11dSv_event_cCFUs -/* 8048BFBC 2C 03 00 00 */ cmpwi r3, 0 -/* 8048BFC0 41 82 00 3C */ beq lbl_8048BFFC -lbl_8048BFC4: -/* 8048BFC4 A0 1F 05 E2 */ lhz r0, 0x5e2(r31) -/* 8048BFC8 28 00 0F FF */ cmplwi r0, 0xfff -/* 8048BFCC 41 82 00 28 */ beq lbl_8048BFF4 -/* 8048BFD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048BFD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048BFD8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8048BFDC 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8048BFE0 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 8048BFE4 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 8048BFE8 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8048BFEC 4B BA 89 D1 */ bl isEventBit__11dSv_event_cCFUs -/* 8048BFF0 48 00 00 8C */ b lbl_8048C07C -lbl_8048BFF4: -/* 8048BFF4 38 60 00 00 */ li r3, 0 -/* 8048BFF8 48 00 00 84 */ b lbl_8048C07C -lbl_8048BFFC: -/* 8048BFFC 38 60 00 01 */ li r3, 1 -/* 8048C000 48 00 00 7C */ b lbl_8048C07C -lbl_8048C004: -/* 8048C004 88 9F 05 DD */ lbz r4, 0x5dd(r31) -/* 8048C008 28 04 00 FF */ cmplwi r4, 0xff -/* 8048C00C 40 82 00 10 */ bne lbl_8048C01C -/* 8048C010 88 1F 05 DE */ lbz r0, 0x5de(r31) -/* 8048C014 28 00 00 FF */ cmplwi r0, 0xff -/* 8048C018 41 82 00 60 */ beq lbl_8048C078 -lbl_8048C01C: -/* 8048C01C 28 04 00 FF */ cmplwi r4, 0xff -/* 8048C020 41 82 00 24 */ beq lbl_8048C044 -/* 8048C024 41 82 00 4C */ beq lbl_8048C070 -/* 8048C028 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048C02C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048C030 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8048C034 7C 05 07 74 */ extsb r5, r0 -/* 8048C038 4B BA 93 29 */ bl isSwitch__10dSv_info_cCFii -/* 8048C03C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048C040 41 82 00 30 */ beq lbl_8048C070 -lbl_8048C044: -/* 8048C044 88 9F 05 DE */ lbz r4, 0x5de(r31) -/* 8048C048 2C 04 0F FF */ cmpwi r4, 0xfff -/* 8048C04C 41 82 00 1C */ beq lbl_8048C068 -/* 8048C050 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048C054 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048C058 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8048C05C 7C 05 07 74 */ extsb r5, r0 -/* 8048C060 4B BA 93 01 */ bl isSwitch__10dSv_info_cCFii -/* 8048C064 48 00 00 18 */ b lbl_8048C07C -lbl_8048C068: -/* 8048C068 38 60 00 00 */ li r3, 0 -/* 8048C06C 48 00 00 10 */ b lbl_8048C07C -lbl_8048C070: -/* 8048C070 38 60 00 01 */ li r3, 1 -/* 8048C074 48 00 00 08 */ b lbl_8048C07C -lbl_8048C078: -/* 8048C078 38 60 00 00 */ li r3, 0 -lbl_8048C07C: -/* 8048C07C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048C080 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048C084 7C 08 03 A6 */ mtlr r0 -/* 8048C088 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048C08C 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_static.h b/include/d/com/d_com_static.h index 1404ac468c3..a33927cf1d2 100644 --- a/include/d/com/d_com_static.h +++ b/include/d/com/d_com_static.h @@ -6,5 +6,6 @@ int daNpcKakashi_getSwdTutorialStep(); bool daNpcKakashi_getSwdTutorialResult(); int daNpcKakashi_getSuccessCount(); +int daNpcMsg_setEvtNum(u8 iEvtNum); #endif /* D_COM_D_COM_STATIC_H */ diff --git a/include/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.h b/include/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.h index c2bdeff7802..bd4a48eb559 100644 --- a/include/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.h +++ b/include/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.h @@ -1,6 +1,44 @@ #ifndef D_A_TAG_EVT_H #define D_A_TAG_EVT_H +#include "SSystem/SComponent/c_phase.h" +#include "d/msg/d_msg_flow.h" #include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +class daTag_Evt_c : public fopAc_ac_c { +public: + /* 8048B918 */ int create(); + /* 8048B9D8 */ int destroy(); + /* 8048BA0C */ int execute(); + /* 8048BE44 */ int draw(); + /* 8048BE4C */ int getParam(); + /* 8048BF64 */ int isDelete(); + /* 8048C090 */ int doEvtCutWait(int); + /* 8048C124 */ int doEvtCutTalk(int); + /* 8048C1C8 */ int doEvtCutNext(int); + + static char* mEvtCutList[3]; + + /* 0x568 */ char field_0x568[8]; + /* 0x570 */ u16 field_0x570; + /* 0x572 */ s16 field_0x572; + /* 0x574 */ int field_0x574; + /* 0x578 */ dMsgFlow_c mMsgFlow; + /* 0x5C4 */ request_of_phase_process_class mPhase; + /* 0x5CC */ int mTimer; + /* 0x5D0 */ int field_0x5D0; + /* 0x5D4 */ int field_0x5D4; + /* 0x5D8 */ int field_0x5D8; + /* 0x5DC */ u8 field_0x5DC; + /* 0x5DD */ u8 field_0x5DD; + /* 0x5DE */ u8 field_0x5DE; + /* 0x5E0 */ u16 field_0x5E0; + /* 0x5E2 */ u16 field_0x5E2; + /* 0x5E4 */ s8 field_0x5E4; + + /* 8048C304 */ virtual ~daTag_Evt_c(); +}; +STATIC_ASSERT(sizeof(daTag_Evt_c) == 0x5EC); #endif /* D_A_TAG_EVT_H */ diff --git a/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp b/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp index f011a54dd3a..ef921b79a7e 100644 --- a/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp +++ b/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp @@ -4,415 +4,272 @@ // #include "rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daTag_Evt_c { - /* 8048B918 */ void create(); - /* 8048B9D8 */ void destroy(); - /* 8048BA0C */ void execute(); - /* 8048BE44 */ bool draw(); - /* 8048BE4C */ void getParam(); - /* 8048BF64 */ void isDelete(); - /* 8048C090 */ void doEvtCutWait(int); - /* 8048C124 */ void doEvtCutTalk(int); - /* 8048C1C8 */ void doEvtCutNext(int); - /* 8048C304 */ ~daTag_Evt_c(); - - static void* mEvtCutList[3]; -}; - -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 dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A528 */ void getEventId(int*); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); -}; - -struct dEvent_manager_c { - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 8004817C */ void cutEnd(int); -}; - -struct dComIfG_play_c { - /* 8002C97C */ void getLayerNo(int); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -// -// Forward References: -// - -extern "C" void create__11daTag_Evt_cFv(); -extern "C" void destroy__11daTag_Evt_cFv(); -extern "C" void execute__11daTag_Evt_cFv(); -extern "C" bool draw__11daTag_Evt_cFv(); -extern "C" void getParam__11daTag_Evt_cFv(); -extern "C" void isDelete__11daTag_Evt_cFv(); -extern "C" void doEvtCutWait__11daTag_Evt_cFi(); -extern "C" void doEvtCutTalk__11daTag_Evt_cFi(); -extern "C" void doEvtCutNext__11daTag_Evt_cFi(); -extern "C" static void daTag_Evt_Create__FPv(); -extern "C" static void daTag_Evt_Delete__FPv(); -extern "C" static void daTag_Evt_Execute__FPv(); -extern "C" static void daTag_Evt_Draw__FPv(); -extern "C" static bool daTag_Evt_IsDelete__FPv(); -extern "C" void __dt__11daTag_Evt_cFv(); -extern "C" void func_8048C374(void* _this, int*); -extern "C" extern char const* const d_a_tag_evt__stringBase0; -extern "C" void* mEvtCutList__11daTag_Evt_c[3]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void dStage_changeScene__FifUlScsi(); -extern "C" void getLayerNo__14dComIfG_play_cFi(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void daNpcMsg_setEvtNum__FUc(); -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 getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void __ct__10dMsgFlow_cFv(); -extern "C" void __dt__10dMsgFlow_cFv(); -extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(); -extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(); -extern "C" void getEventId__10dMsgFlow_cFPi(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void __dl__FPv(); -extern "C" void PSVECSquareMag(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_29(); -extern "C" void strcpy(); -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 u32 __float_nan; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8048C3BC-8048C3BC 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8048C3BC = "JUMP_DEMOSTAGE"; -SECTION_DEAD static char const* const stringBase_8048C3CB = "TAGEVT"; -SECTION_DEAD static char const* const stringBase_8048C3D2 = "WAIT"; -SECTION_DEAD static char const* const stringBase_8048C3D7 = "TALK"; -SECTION_DEAD static char const* const stringBase_8048C3DC = "NEXT"; -SECTION_DEAD static char const* const stringBase_8048C3E1 = "TagEvt"; -#pragma pop +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/com/d_com_static.h" +#include "d/d_procname.h" +#include "d/save/d_save.h" +#include "f_op/f_op_actor_mng.h" /* 8048C3FC-8048C404 -00001 0008+00 1/1 0/0 0/0 .data l_evtNameList */ -SECTION_DATA static void* l_evtNameList[2] = { - (void*)NULL, - (void*)&d_a_tag_evt__stringBase0, +static char* l_evtNameList[] = { + NULL, + "JUMP_DEMOSTAGE", }; /* 8048C404-8048C408 -00001 0004+00 2/2 0/0 0/0 .data l_resFileName */ -SECTION_DATA static void* l_resFileName = (void*)(((char*)&d_a_tag_evt__stringBase0) + 0xF); +static char* l_resFileName = "TAGEVT"; /* 8048C408-8048C414 -00001 000C+00 1/1 0/0 0/0 .data mEvtCutList__11daTag_Evt_c */ -SECTION_DATA void* daTag_Evt_c::mEvtCutList[3] = { - (void*)(((char*)&d_a_tag_evt__stringBase0) + 0x16), - (void*)(((char*)&d_a_tag_evt__stringBase0) + 0x1B), - (void*)(((char*)&d_a_tag_evt__stringBase0) + 0x20), -}; - -/* 8048C414-8048C434 -00001 0020+00 1/0 0/0 0/0 .data daTag_Evt_MethodTable */ -SECTION_DATA static void* daTag_Evt_MethodTable[8] = { - (void*)daTag_Evt_Create__FPv, - (void*)daTag_Evt_Delete__FPv, - (void*)daTag_Evt_Execute__FPv, - (void*)daTag_Evt_IsDelete__FPv, - (void*)daTag_Evt_Draw__FPv, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8048C434-8048C464 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVT */ -SECTION_DATA extern void* g_profile_TAG_EVT[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02D20000, (void*)&g_fpcLf_Method, - (void*)0x000005EC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x011C0000, (void*)&daTag_Evt_MethodTable, - (void*)0x00040000, (void*)0x000E0000, -}; - -/* 8048C464-8048C470 000068 000C+00 2/2 0/0 0/0 .data __vt__11daTag_Evt_c */ -SECTION_DATA extern void* __vt__11daTag_Evt_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11daTag_Evt_cFv, +char* daTag_Evt_c::mEvtCutList[] = { + "WAIT", + "TALK", + "NEXT", }; /* 8048B918-8048B9D8 000078 00C0+00 1/1 0/0 0/0 .text create__11daTag_Evt_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Evt_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/create__11daTag_Evt_cFv.s" +int daTag_Evt_c::create() { + fopAcM_SetupActor(this, daTag_Evt_c); + cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, l_resFileName); + if (phase == cPhs_COMPLEATE_e) { + mEvtInfo.setArchiveName(l_resFileName); + strcpy(field_0x568, "TagEvt"); + getParam(); + field_0x572 = -1; + } + return phase; } -#pragma pop /* 8048B9D8-8048BA0C 000138 0034+00 1/1 0/0 0/0 .text destroy__11daTag_Evt_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Evt_c::destroy() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/destroy__11daTag_Evt_cFv.s" +int daTag_Evt_c::destroy() { + dComIfG_resDelete(&mPhase, l_resFileName); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8048C398-8048C39C 000000 0004+00 2/2 0/0 0/0 .rodata @3784 */ -SECTION_RODATA static f32 const lit_3784 = 100.0f; -COMPILER_STRIP_GATE(0x8048C398, &lit_3784); - -/* 8048C39C-8048C3A0 000004 0004+00 1/2 0/0 0/0 .rodata @3785 */ -SECTION_RODATA static u8 const lit_3785[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8048C39C, &lit_3785); - -/* 8048C3A0-8048C3A8 000008 0008+00 0/1 0/0 0/0 .rodata @3786 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3786[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8048C3A0, &lit_3786); -#pragma pop - -/* 8048C3A8-8048C3B0 000010 0008+00 0/1 0/0 0/0 .rodata @3787 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3787[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8048C3A8, &lit_3787); -#pragma pop - -/* 8048C3B0-8048C3B8 000018 0008+00 0/1 0/0 0/0 .rodata @3788 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3788[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8048C3B0, &lit_3788); -#pragma pop /* 8048BA0C-8048BE44 00016C 0438+00 1/1 0/0 0/0 .text execute__11daTag_Evt_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Evt_c::execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/execute__11daTag_Evt_cFv.s" +int daTag_Evt_c::execute() { + BOOL bVar = true; + mEyePos.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + mAttentionInfo.mPosition = mEyePos; + fopAcM_SetRoomNo(this, dComIfGp_roomControl_getStayNo()); + if (field_0x5E4 == 0 || field_0x5E4 == 1) { + dComIfG_inf_c* pGameInfo = &g_dComIfG_gameInfo; + if (i_dComIfGp_event_runCheck()) { + bVar = false; + int iVar1 = i_dComIfGp_evmng_getMyStaffId(field_0x568, 0, 0); + if (!mEvtInfo.checkCommandTalk()) { + if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (i_dComIfGp_getEventManager().endCheck(field_0x572)) { + i_dComIfGp_event_reset(); + field_0x570 = 0; + field_0x572 = -1; + bVar = true; + } else { + if (iVar1 != -1) { + int actIdx = i_dComIfGp_getEventManager().getMyActIdx( + iVar1, mEvtCutList, 3, 0, 0); + int iVar2 = 0; + switch (actIdx) { + case 0: + iVar2 = doEvtCutWait(iVar1); + break; + case 1: + iVar2 = doEvtCutTalk(iVar1); + break; + case 2: + iVar2 = doEvtCutNext(iVar1); + } + if (iVar2 != 0) { + i_dComIfGp_getEventManager().cutEnd(iVar1); + } + } + } + } + } else if (field_0x5DC != 0) { + if (mMsgFlow.doFlow(this, NULL, 0) != 0) { + i_dComIfGp_event_reset(); + u16 eventId = mMsgFlow.getEventId(NULL); + if (eventId != 0) { + daNpcMsg_setEvtNum(eventId); + field_0x570 = 1; + bVar = true; + } else { + fopAcM_delete(this); + } + } + } else { + mMsgFlow.init(this, field_0x574, 0, NULL); + field_0x5DC = 1; + } + } + if (!isDelete() && cLib_calcTimer(&field_0x5D0) == 0) { + cXyz var1 = daPy_getPlayerActorClass()->current.pos - current.pos; + if (var1.absXZ() < mScale.x && -mScale.y < var1.y && var1.y < mScale.y) { + field_0x570 = 1; + } + } + if (bVar != 0 && field_0x570 != 0) { + field_0x572 = + pGameInfo->play.getEvtManager().getEventIdx(this, l_evtNameList[field_0x570], -1); + fopAcM_orderOtherEventId(this, field_0x572, -1, -1, 0, 1); + } + } else if (field_0x5E4 == 2 && isDelete()) { + fopAcM_delete(this); + } + return 1; } -#pragma pop /* 8048BE44-8048BE4C 0005A4 0008+00 1/1 0/0 0/0 .text draw__11daTag_Evt_cFv */ -bool daTag_Evt_c::draw() { - return true; +int daTag_Evt_c::draw() { + return 1; } -/* ############################################################################################## */ -/* 8048C3B8-8048C3BC 000020 0004+00 1/1 0/0 0/0 .rodata @3815 */ -SECTION_RODATA static f32 const lit_3815 = 10.0f; -COMPILER_STRIP_GATE(0x8048C3B8, &lit_3815); - /* 8048BE4C-8048BF64 0005AC 0118+00 1/1 0/0 0/0 .text getParam__11daTag_Evt_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Evt_c::getParam() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/getParam__11daTag_Evt_cFv.s" +int daTag_Evt_c::getParam() { + field_0x5E0 = fopAcM_GetParam(this) & 0xFFF; + field_0x5E2 = (fopAcM_GetParam(this) >> 0xC) & 0xFFF; + if ((fopAcM_GetParam(this) & 0xF000000) != 0xF000000) { + field_0x5D8 = (fopAcM_GetParam(this) & 0xF000000) >> 0x18; + } else { + field_0x5D8 = -1; + } + + field_0x5E4 = fopAcM_GetParam(this) >> 0x1E; + field_0x5DD = orig.angle.x; + field_0x5DE = (u16)orig.angle.x >> 8; + field_0x5D4 = orig.angle.z & 0xFF; + if ((orig.angle.z & 0xFF00) != 0xFF00) { + field_0x5D0 = ((orig.angle.z & 0xFF00) >> 8) * 0x1E; + } else { + field_0x5D0 = 0; + } + field_0x574 = -1; + mScale.x *= 100.0f; + mScale.y *= 100.0f; + mScale.z *= 100.0f; + if (field_0x5E4 == 1) { + mScale.x *= 10.0f; + mScale.y *= 10.0f; + mScale.z *= 10.0f; + } + orig.angle.x = 0; + orig.angle.z = 0; + return 1; } -#pragma pop /* 8048BF64-8048C090 0006C4 012C+00 1/1 0/0 0/0 .text isDelete__11daTag_Evt_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Evt_c::isDelete() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/isDelete__11daTag_Evt_cFv.s" +int daTag_Evt_c::isDelete() { + if (field_0x5E0 != 0xFFF || field_0x5E2 != 0xFFF) { + if (field_0x5E0 == 0xFFF || + (field_0x5E0 != 0xFFF && + i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x5E0]) != 0)) + { + if (field_0x5E2 != 0xFFF) { + return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x5E2]); + } else { + return false; + } + } else { + return true; + } + } else if (field_0x5DD != 0xFF || field_0x5DE != 0xFF) { + if (field_0x5DD == 0xFF || + (field_0x5DD != 0xFF && dComIfGs_isSwitch(field_0x5DD, fopAcM_GetRoomNo(this)) != 0)) + { + if (field_0x5DE != 0xFFF) { + return dComIfGs_isSwitch(field_0x5DE, fopAcM_GetRoomNo(this)); + } else { + return false; + } + } else { + return true; + } + } else { + return false; + } } -#pragma pop - -/* ############################################################################################## */ -/* 8048C3BC-8048C3BC 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8048C3E8 = "timer"; -#pragma pop /* 8048C090-8048C124 0007F0 0094+00 1/1 0/0 0/0 .text doEvtCutWait__11daTag_Evt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Evt_c::doEvtCutWait(int param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutWait__11daTag_Evt_cFi.s" +int daTag_Evt_c::doEvtCutWait(int param_0) { + if (i_dComIfGp_getEventManager().getIsAddvance(param_0)) { + int* pTimer = dComIfGp_evmng_getMyIntegerP(param_0, "timer"); + mTimer = (pTimer == NULL ? 0 : *pTimer); + } + return cLib_calcTimer(&mTimer) == 0; } -#pragma pop - -/* ############################################################################################## */ -/* 8048C3BC-8048C3BC 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8048C3EE = "flowNodeNo"; -#pragma pop /* 8048C124-8048C1C8 000884 00A4+00 1/1 0/0 0/0 .text doEvtCutTalk__11daTag_Evt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Evt_c::doEvtCutTalk(int param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutTalk__11daTag_Evt_cFi.s" +int daTag_Evt_c::doEvtCutTalk(int param_0) { + if (i_dComIfGp_getEventManager().getIsAddvance(param_0)) { + mMsgFlow.init(this, *dComIfGp_evmng_getMyIntegerP(param_0, "flowNodeNo"), 0, NULL); + return 0; + } else { + return mMsgFlow.doFlow(this, NULL, 0); + } } -#pragma pop /* 8048C1C8-8048C27C 000928 00B4+00 1/1 0/0 0/0 .text doEvtCutNext__11daTag_Evt_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTag_Evt_c::doEvtCutNext(int param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/doEvtCutNext__11daTag_Evt_cFi.s" +int daTag_Evt_c::doEvtCutNext(int param_0) { + if (i_dComIfGp_getEventManager().getIsAddvance(param_0)) { + if ((field_0x5E4 == 0 || field_0x5E4 == 1) && field_0x5DE != 0xFF) { + dComIfGs_onSwitch(field_0x5DE, fopAcM_GetRoomNo(this)); + } + dStage_changeScene(field_0x5D4, 0.0f, 0, fopAcM_GetRoomNo(this), 0, + dComIfG_play_c::getLayerNo(0)); + } + return 0; } -#pragma pop /* 8048C27C-8048C29C 0009DC 0020+00 1/0 0/0 0/0 .text daTag_Evt_Create__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Evt_Create(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Create__FPv.s" +static int daTag_Evt_Create(void* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 8048C29C-8048C2BC 0009FC 0020+00 1/0 0/0 0/0 .text daTag_Evt_Delete__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Evt_Delete(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Delete__FPv.s" +static int daTag_Evt_Delete(void* i_this) { + return static_cast(i_this)->destroy(); } -#pragma pop /* 8048C2BC-8048C2DC 000A1C 0020+00 1/0 0/0 0/0 .text daTag_Evt_Execute__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Evt_Execute(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Execute__FPv.s" +static int daTag_Evt_Execute(void* i_this) { + return static_cast(i_this)->execute(); } -#pragma pop /* 8048C2DC-8048C2FC 000A3C 0020+00 1/0 0/0 0/0 .text daTag_Evt_Draw__FPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTag_Evt_Draw(void* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/daTag_Evt_Draw__FPv.s" +static int daTag_Evt_Draw(void* i_this) { + return static_cast(i_this)->draw(); } -#pragma pop /* 8048C2FC-8048C304 000A5C 0008+00 1/0 0/0 0/0 .text daTag_Evt_IsDelete__FPv */ -static bool daTag_Evt_IsDelete(void* param_0) { - return true; +static int daTag_Evt_IsDelete(void* i_this) { + return 1; } /* 8048C304-8048C374 000A64 0070+00 1/0 0/0 0/0 .text __dt__11daTag_Evt_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daTag_Evt_c::~daTag_Evt_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/__dt__11daTag_Evt_cFv.s" -} -#pragma pop +daTag_Evt_c::~daTag_Evt_c() {} -/* 8048C374-8048C390 000AD4 001C+00 2/2 0/0 0/0 .text cLib_calcTimer__FPi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void func_8048C374(void* _this, int* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/func_8048C374.s" -} -#pragma pop +/* 8048C414-8048C434 -00001 0020+00 1/0 0/0 0/0 .data daTag_Evt_MethodTable */ +static actor_method_class daTag_Evt_MethodTable = { + (process_method_func)daTag_Evt_Create, (process_method_func)daTag_Evt_Delete, + (process_method_func)daTag_Evt_Execute, (process_method_func)daTag_Evt_IsDelete, + (process_method_func)daTag_Evt_Draw, +}; -/* 8048C3BC-8048C3BC 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 8048C434-8048C464 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_EVT */ +extern actor_process_profile_definition g_profile_TAG_EVT = { + fpcLy_CURRENT_e, + 7, + fpcLy_CURRENT_e, + PROC_TAG_EVT, + &g_fpcLf_Method.mBase, + sizeof(daTag_Evt_c), + 0, + 0, + &g_fopAc_Method.base, + 0x011C, + &daTag_Evt_MethodTable, + 0x40000, + 0, + fopAc_CULLBOX_CUSTOM_e, +};