From 4a081109bdc7283d0e086a73f01b74f7addffc34 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Wed, 31 Jan 2024 10:05:04 -0800 Subject: [PATCH] d_a_no_chg_room / d_a_e_st_line done (#2056) * no_chg_room done * d_a_e_st_line done * remove asm * d_a_e_bi_leaf done * d_a_e_hb_leaf done --- Progress.md | 14 +- .../daNocrm_create__FP9daNocrm_c.s | 70 --- .../daNocrm_execute__FP9daNocrm_c.s | 9 - .../a/d_a_no_chg_room/execute__9daNocrm_cFv.s | 154 ------- .../d_a_no_chg_room/getRoomNo__9daNocrm_cFi.s | 44 -- asm/d/a/d_a_no_chg_room/isLoadRoom__Fi.s | 68 --- .../action__FP15e_bi_leaf_class.s | 72 --- .../daE_BI_LEAF_Create__FP10fopAc_ac_c.s | 51 --- .../daE_BI_LEAF_Delete__FP15e_bi_leaf_class.s | 13 - .../daE_BI_LEAF_Draw__FP15e_bi_leaf_class.s | 33 -- ...daE_BI_LEAF_Execute__FP15e_bi_leaf_class.s | 42 -- .../useHeapInit__FP10fopAc_ac_c.s | 36 -- .../daE_HB_LEAF_Create__FP10fopAc_ac_c.s | 50 -- .../daE_HB_LEAF_Delete__FP15e_hb_leaf_class.s | 13 - .../daE_HB_LEAF_Draw__FP15e_hb_leaf_class.s | 27 -- ...daE_HB_LEAF_Execute__FP15e_hb_leaf_class.s | 59 --- .../useHeapInit__FP10fopAc_ac_c.s | 69 --- .../d_a_e_st_line/__dt__4cXyzFv.s | 17 - .../daE_ST_LINE_Create__FP10fopAc_ac_c.s | 113 ----- .../daE_ST_LINE_Delete__FP15e_st_line_class.s | 25 - .../useHeapInit__FP10fopAc_ac_c.s | 33 -- include/d/a/d_a_no_chg_room.h | 17 +- include/d/d_stage.h | 1 + include/d/s/d_s_play.h | 104 ++--- include/f_op/f_op_actor.h | 4 +- include/f_pc/f_pc_leaf.h | 1 + include/m_Do/m_Do_ext.h | 18 +- .../rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.h | 12 +- .../rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.h | 11 +- .../rel/d/a/e/d_a_e_st_line/d_a_e_st_line.h | 20 +- rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp | 275 +++++------ rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp | 251 ++++------- rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp | 426 +++++------------- src/d/a/d_a_no_chg_room.cpp | 325 +++++++------ src/m_Do/m_Do_ext.cpp | 7 +- 35 files changed, 602 insertions(+), 1882 deletions(-) delete mode 100644 asm/d/a/d_a_no_chg_room/daNocrm_create__FP9daNocrm_c.s delete mode 100644 asm/d/a/d_a_no_chg_room/daNocrm_execute__FP9daNocrm_c.s delete mode 100644 asm/d/a/d_a_no_chg_room/execute__9daNocrm_cFv.s delete mode 100644 asm/d/a/d_a_no_chg_room/getRoomNo__9daNocrm_cFi.s delete mode 100644 asm/d/a/d_a_no_chg_room/isLoadRoom__Fi.s delete mode 100644 asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/action__FP15e_bi_leaf_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Delete__FP15e_bi_leaf_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Draw__FP15e_bi_leaf_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Execute__FP15e_bi_leaf_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Delete__FP15e_hb_leaf_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Draw__FP15e_hb_leaf_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Execute__FP15e_hb_leaf_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/useHeapInit__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/__dt__4cXyzFv.s delete mode 100644 asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/daE_ST_LINE_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/daE_ST_LINE_Delete__FP15e_st_line_class.s delete mode 100644 asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/useHeapInit__FP10fopAc_ac_c.s diff --git a/Progress.md b/Progress.md index f0c9223ebdb..d1b72df9ce0 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 45.220412% | 1626372 | 3596544 +.text | 45.279246% | 1628488 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 50.994162% | 2050308 | 4020672 +Total | 51.046790% | 2052424 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 50.994162% | 2050308 | 4020672 -RELs | 35.541016% | 4087332 | 11500324 -Total | 39.544112% | 6137640 | 15520996 +main.dol | 51.046790% | 2052424 | 4020672 +RELs | 35.546999% | 4088020 | 11500324 +Total | 39.562178% | 6140444 | 15520996 ## RELs @@ -154,7 +154,7 @@ d_a_e_sh | 30.953709% | 6660 | 21516 d_a_e_sm | 24.418880% | 8236 | 33728 d_a_e_sm2 | 30.097087% | 8184 | 27192 d_a_e_st | 26.260013% | 12588 | 47936 -d_a_e_st_line | 60.459770% | 1052 | 1740 +d_a_e_st_line | 100.000000% | 1740 | 1740 d_a_e_sw | 21.949266% | 9864 | 44940 d_a_e_th | 29.463680% | 6944 | 23568 d_a_e_th_ball | 29.462631% | 5724 | 19428 @@ -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 | 35.541016% | 4087332 | 11500324 +Total | 35.546999% | 4088020 | 11500324 diff --git a/asm/d/a/d_a_no_chg_room/daNocrm_create__FP9daNocrm_c.s b/asm/d/a/d_a_no_chg_room/daNocrm_create__FP9daNocrm_c.s deleted file mode 100644 index d6098fdda7a..00000000000 --- a/asm/d/a/d_a_no_chg_room/daNocrm_create__FP9daNocrm_c.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_801455A8: -/* 801455A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801455AC 7C 08 02 A6 */ mflr r0 -/* 801455B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801455B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801455B8 7C 7F 1B 78 */ mr r31, r3 -/* 801455BC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 801455C0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 801455C4 40 82 00 1C */ bne lbl_801455E0 -/* 801455C8 28 1F 00 00 */ cmplwi r31, 0 -/* 801455CC 41 82 00 08 */ beq lbl_801455D4 -/* 801455D0 4B ED 35 95 */ bl __ct__10fopAc_ac_cFv -lbl_801455D4: -/* 801455D4 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 801455D8 60 00 00 08 */ ori r0, r0, 8 -/* 801455DC 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_801455E0: -/* 801455E0 88 1F 04 99 */ lbz r0, 0x499(r31) -/* 801455E4 7C 00 07 75 */ extsb. r0, r0 -/* 801455E8 40 82 00 2C */ bne lbl_80145614 -/* 801455EC 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 801455F0 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 801455F4 7C 00 07 75 */ extsb. r0, r0 -/* 801455F8 40 80 00 1C */ bge lbl_80145614 -/* 801455FC 3C 60 80 39 */ lis r3, d_a_d_a_no_chg_room__stringBase0@ha /* 0x80392640@ha */ -/* 80145600 38 63 26 40 */ addi r3, r3, d_a_d_a_no_chg_room__stringBase0@l /* 0x80392640@l */ -/* 80145604 4C C6 31 82 */ crclr 6 -/* 80145608 4B EC 16 E5 */ bl OSReport_Warning -/* 8014560C 38 60 00 05 */ li r3, 5 -/* 80145610 48 00 00 80 */ b lbl_80145690 -lbl_80145614: -/* 80145614 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80145618 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8014561C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80145620 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80145624 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80145628 48 20 12 C1 */ bl PSMTXTrans -/* 8014562C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80145630 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80145634 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80145638 4B EC 6D FD */ bl mDoMtx_YrotM__FPA4_fs -/* 8014563C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80145640 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80145644 38 9F 05 68 */ addi r4, r31, 0x568 -/* 80145648 48 20 0E 69 */ bl PSMTXCopy -/* 8014564C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80145650 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80145654 38 9F 05 98 */ addi r4, r31, 0x598 -/* 80145658 48 20 0F 59 */ bl PSMTXInverse -/* 8014565C 38 7F 04 EC */ addi r3, r31, 0x4ec -/* 80145660 7C 64 1B 78 */ mr r4, r3 -/* 80145664 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80145668 54 00 C7 3F */ rlwinm. r0, r0, 0x18, 0x1c, 0x1f -/* 8014566C 41 82 00 0C */ beq lbl_80145678 -/* 80145670 C0 22 99 CC */ lfs f1, lit_3832(r2) -/* 80145674 48 00 00 08 */ b lbl_8014567C -lbl_80145678: -/* 80145678 C0 22 99 D0 */ lfs f1, lit_3833(r2) -lbl_8014567C: -/* 8014567C 48 20 1A 5D */ bl PSVECScale -/* 80145680 38 00 FF FF */ li r0, -1 -/* 80145684 98 1F 05 C8 */ stb r0, 0x5c8(r31) -/* 80145688 98 1F 05 C9 */ stb r0, 0x5c9(r31) -/* 8014568C 38 60 00 04 */ li r3, 4 -lbl_80145690: -/* 80145690 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80145694 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80145698 7C 08 03 A6 */ mtlr r0 -/* 8014569C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801456A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_no_chg_room/daNocrm_execute__FP9daNocrm_c.s b/asm/d/a/d_a_no_chg_room/daNocrm_execute__FP9daNocrm_c.s deleted file mode 100644 index 5e37c2ad591..00000000000 --- a/asm/d/a/d_a_no_chg_room/daNocrm_execute__FP9daNocrm_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801456AC: -/* 801456AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801456B0 7C 08 02 A6 */ mflr r0 -/* 801456B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801456B8 4B FF FC 25 */ bl execute__9daNocrm_cFv -/* 801456BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801456C0 7C 08 03 A6 */ mtlr r0 -/* 801456C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801456C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_no_chg_room/execute__9daNocrm_cFv.s b/asm/d/a/d_a_no_chg_room/execute__9daNocrm_cFv.s deleted file mode 100644 index fd1e392babc..00000000000 --- a/asm/d/a/d_a_no_chg_room/execute__9daNocrm_cFv.s +++ /dev/null @@ -1,154 +0,0 @@ -lbl_801452DC: -/* 801452DC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801452E0 7C 08 02 A6 */ mflr r0 -/* 801452E4 90 01 00 44 */ stw r0, 0x44(r1) -/* 801452E8 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 801452EC 93 C1 00 38 */ stw r30, 0x38(r1) -/* 801452F0 7C 7F 1B 78 */ mr r31, r3 -/* 801452F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801452F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801452FC 83 C3 5D AC */ lwz r30, 0x5dac(r3) -/* 80145300 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 80145304 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80145308 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8014530C D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80145310 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 80145314 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80145318 7F C3 F3 78 */ mr r3, r30 -/* 8014531C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80145320 81 8C 01 88 */ lwz r12, 0x188(r12) -/* 80145324 7D 89 03 A6 */ mtctr r12 -/* 80145328 4E 80 04 21 */ bctrl -/* 8014532C 28 03 00 00 */ cmplwi r3, 0 -/* 80145330 41 82 00 1C */ beq lbl_8014534C -/* 80145334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80145338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014533C 80 63 5D B8 */ lwz r3, 0x5db8(r3) -/* 80145340 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80145344 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80145348 48 00 00 44 */ b lbl_8014538C -lbl_8014534C: -/* 8014534C 7F C3 F3 78 */ mr r3, r30 -/* 80145350 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80145354 81 8C 01 98 */ lwz r12, 0x198(r12) -/* 80145358 7D 89 03 A6 */ mtctr r12 -/* 8014535C 4E 80 04 21 */ bctrl -/* 80145360 28 03 00 00 */ cmplwi r3, 0 -/* 80145364 41 82 00 28 */ beq lbl_8014538C -/* 80145368 7F C3 F3 78 */ mr r3, r30 -/* 8014536C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 80145370 81 8C 01 9C */ lwz r12, 0x19c(r12) -/* 80145374 7D 89 03 A6 */ mtctr r12 -/* 80145378 4E 80 04 21 */ bctrl -/* 8014537C 28 03 00 00 */ cmplwi r3, 0 -/* 80145380 41 82 00 0C */ beq lbl_8014538C -/* 80145384 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 80145388 D0 01 00 24 */ stfs f0, 0x24(r1) -lbl_8014538C: -/* 8014538C 38 7F 05 98 */ addi r3, r31, 0x598 -/* 80145390 38 81 00 20 */ addi r4, r1, 0x20 -/* 80145394 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80145398 48 20 19 D5 */ bl PSMTXMultVec -/* 8014539C C0 21 00 18 */ lfs f1, 0x18(r1) -/* 801453A0 C0 02 99 C8 */ lfs f0, lit_3762(r2) -/* 801453A4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801453A8 41 80 00 40 */ blt lbl_801453E8 -/* 801453AC C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 801453B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801453B4 41 81 00 34 */ bgt lbl_801453E8 -/* 801453B8 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 801453BC FC 00 02 10 */ fabs f0, f0 -/* 801453C0 FC 20 00 18 */ frsp f1, f0 -/* 801453C4 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 801453C8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801453CC 41 81 00 1C */ bgt lbl_801453E8 -/* 801453D0 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 801453D4 FC 00 02 10 */ fabs f0, f0 -/* 801453D8 FC 20 00 18 */ frsp f1, f0 -/* 801453DC C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 801453E0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801453E4 40 81 00 E4 */ ble lbl_801454C8 -lbl_801453E8: -/* 801453E8 88 1F 04 99 */ lbz r0, 0x499(r31) -/* 801453EC 7C 00 07 75 */ extsb. r0, r0 -/* 801453F0 41 82 00 34 */ beq lbl_80145424 -/* 801453F4 88 1F 05 CA */ lbz r0, 0x5ca(r31) -/* 801453F8 28 00 00 00 */ cmplwi r0, 0 -/* 801453FC 41 82 00 28 */ beq lbl_80145424 -/* 80145400 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80145404 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80145408 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8014540C 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 80145410 7D 89 03 A6 */ mtctr r12 -/* 80145414 4E 80 04 21 */ bctrl -/* 80145418 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8014541C 54 00 87 7F */ rlwinm. r0, r0, 0x10, 0x1d, 0x1f -/* 80145420 41 82 00 0C */ beq lbl_8014542C -lbl_80145424: -/* 80145424 38 60 00 01 */ li r3, 1 -/* 80145428 48 00 00 C8 */ b lbl_801454F0 -lbl_8014542C: -/* 8014542C C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80145430 C0 02 99 C8 */ lfs f0, lit_3762(r2) -/* 80145434 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80145438 40 80 00 0C */ bge lbl_80145444 -/* 8014543C 38 80 00 00 */ li r4, 0 -/* 80145440 48 00 00 08 */ b lbl_80145448 -lbl_80145444: -/* 80145444 38 80 00 01 */ li r4, 1 -lbl_80145448: -/* 80145448 7F E3 FB 78 */ mr r3, r31 -/* 8014544C 48 00 00 BD */ bl getRoomNo__9daNocrm_cFi -/* 80145450 4B FF FD 9D */ bl isLoadRoom__Fi -/* 80145454 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80145458 41 82 00 14 */ beq lbl_8014546C -/* 8014545C 38 00 00 00 */ li r0, 0 -/* 80145460 98 1F 05 CA */ stb r0, 0x5ca(r31) -/* 80145464 38 60 00 01 */ li r3, 1 -/* 80145468 48 00 00 88 */ b lbl_801454F0 -lbl_8014546C: -/* 8014546C C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80145470 C0 02 99 C8 */ lfs f0, lit_3762(r2) -/* 80145474 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80145478 40 80 00 10 */ bge lbl_80145488 -/* 8014547C C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80145480 FC 00 00 50 */ fneg f0, f0 -/* 80145484 48 00 00 08 */ b lbl_8014548C -lbl_80145488: -/* 80145488 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -lbl_8014548C: -/* 8014548C D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 80145490 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80145494 38 81 00 14 */ addi r4, r1, 0x14 -/* 80145498 38 A1 00 08 */ addi r5, r1, 8 -/* 8014549C 48 20 18 D1 */ bl PSMTXMultVec -/* 801454A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801454A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801454A8 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 801454AC 38 81 00 08 */ addi r4, r1, 8 -/* 801454B0 A8 BE 04 E6 */ lha r5, 0x4e6(r30) -/* 801454B4 38 C0 00 01 */ li r6, 1 -/* 801454B8 81 83 06 28 */ lwz r12, 0x628(r3) -/* 801454BC 81 8C 01 54 */ lwz r12, 0x154(r12) -/* 801454C0 7D 89 03 A6 */ mtctr r12 -/* 801454C4 4E 80 04 21 */ bctrl -lbl_801454C8: -/* 801454C8 88 1F 04 99 */ lbz r0, 0x499(r31) -/* 801454CC 7C 00 07 75 */ extsb. r0, r0 -/* 801454D0 40 82 00 10 */ bne lbl_801454E0 -/* 801454D4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 801454D8 98 0D 80 70 */ stb r0, data_804505F0(r13) -/* 801454DC 48 00 00 10 */ b lbl_801454EC -lbl_801454E0: -/* 801454E0 38 00 00 01 */ li r0, 1 -/* 801454E4 98 0D 87 E8 */ stb r0, mNoChangeRoom__20dStage_roomControl_c(r13) -/* 801454E8 98 1F 05 CA */ stb r0, 0x5ca(r31) -lbl_801454EC: -/* 801454EC 38 60 00 01 */ li r3, 1 -lbl_801454F0: -/* 801454F0 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 801454F4 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 801454F8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 801454FC 7C 08 03 A6 */ mtlr r0 -/* 80145500 38 21 00 40 */ addi r1, r1, 0x40 -/* 80145504 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_no_chg_room/getRoomNo__9daNocrm_cFi.s b/asm/d/a/d_a_no_chg_room/getRoomNo__9daNocrm_cFi.s deleted file mode 100644 index 697d8bc0efa..00000000000 --- a/asm/d/a/d_a_no_chg_room/getRoomNo__9daNocrm_cFi.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80145508: -/* 80145508 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8014550C 7C 08 02 A6 */ mflr r0 -/* 80145510 90 01 00 34 */ stw r0, 0x34(r1) -/* 80145514 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80145518 7F E3 22 14 */ add r31, r3, r4 -/* 8014551C 88 1F 05 C8 */ lbz r0, 0x5c8(r31) -/* 80145520 7C 00 07 75 */ extsb. r0, r0 -/* 80145524 40 80 00 68 */ bge lbl_8014558C -/* 80145528 2C 04 00 00 */ cmpwi r4, 0 -/* 8014552C 41 82 00 10 */ beq lbl_8014553C -/* 80145530 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80145534 FC 40 00 50 */ fneg f2, f0 -/* 80145538 48 00 00 08 */ b lbl_80145540 -lbl_8014553C: -/* 8014553C C0 43 04 F4 */ lfs f2, 0x4f4(r3) -lbl_80145540: -/* 80145540 C0 23 04 F0 */ lfs f1, 0x4f0(r3) -/* 80145544 C0 02 99 C8 */ lfs f0, lit_3762(r2) -/* 80145548 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 8014554C D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80145550 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80145554 38 63 05 68 */ addi r3, r3, 0x568 -/* 80145558 38 81 00 14 */ addi r4, r1, 0x14 -/* 8014555C 38 A1 00 08 */ addi r5, r1, 8 -/* 80145560 48 20 18 0D */ bl PSMTXMultVec -/* 80145564 38 61 00 08 */ addi r3, r1, 8 -/* 80145568 4B ED 87 55 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz -/* 8014556C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80145570 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80145574 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80145578 3C 80 80 3F */ lis r4, mGndCheck__11fopAcM_gc_c@ha /* 0x803F1CC4@ha */ -/* 8014557C 38 84 1C C4 */ addi r4, r4, mGndCheck__11fopAcM_gc_c@l /* 0x803F1CC4@l */ -/* 80145580 38 84 00 14 */ addi r4, r4, 0x14 -/* 80145584 4B F2 FB 7D */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo -/* 80145588 98 7F 05 C8 */ stb r3, 0x5c8(r31) -lbl_8014558C: -/* 8014558C 88 7F 05 C8 */ lbz r3, 0x5c8(r31) -/* 80145590 7C 63 07 74 */ extsb r3, r3 -/* 80145594 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80145598 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8014559C 7C 08 03 A6 */ mtlr r0 -/* 801455A0 38 21 00 30 */ addi r1, r1, 0x30 -/* 801455A4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_no_chg_room/isLoadRoom__Fi.s b/asm/d/a/d_a_no_chg_room/isLoadRoom__Fi.s deleted file mode 100644 index eaf87ab67ae..00000000000 --- a/asm/d/a/d_a_no_chg_room/isLoadRoom__Fi.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_801451EC: -/* 801451EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801451F0 7C 08 02 A6 */ mflr r0 -/* 801451F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801451F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801451FC 48 21 CF DD */ bl _savegpr_28 -/* 80145200 7C 7C 1B 78 */ mr r28, r3 -/* 80145204 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80145208 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014520C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 80145210 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80145214 7D 89 03 A6 */ mtctr r12 -/* 80145218 4E 80 04 21 */ bctrl -/* 8014521C 28 03 00 00 */ cmplwi r3, 0 -/* 80145220 41 82 00 A0 */ beq lbl_801452C0 -/* 80145224 80 03 00 00 */ lwz r0, 0(r3) -/* 80145228 7C 00 E0 00 */ cmpw r0, r28 -/* 8014522C 40 81 00 94 */ ble lbl_801452C0 -/* 80145230 80 63 00 04 */ lwz r3, 4(r3) -/* 80145234 57 80 10 3A */ slwi r0, r28, 2 -/* 80145238 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8014523C 8B A3 00 00 */ lbz r29, 0(r3) -/* 80145240 83 E3 00 04 */ lwz r31, 4(r3) -/* 80145244 3B 80 00 00 */ li r28, 0 -/* 80145248 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ -/* 8014524C 3B C3 60 94 */ addi r30, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 80145250 48 00 00 68 */ b lbl_801452B8 -lbl_80145254: -/* 80145254 88 1F 00 00 */ lbz r0, 0(r31) -/* 80145258 54 00 06 BE */ clrlwi r0, r0, 0x1a -/* 8014525C 1C 00 04 04 */ mulli r0, r0, 0x404 -/* 80145260 7C 9E 02 14 */ add r4, r30, r0 -/* 80145264 88 64 03 F4 */ lbz r3, 0x3f4(r4) -/* 80145268 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e -/* 8014526C 41 82 00 0C */ beq lbl_80145278 -/* 80145270 38 60 00 00 */ li r3, 0 -/* 80145274 48 00 00 50 */ b lbl_801452C4 -lbl_80145278: -/* 80145278 70 60 00 09 */ andi. r0, r3, 9 -/* 8014527C 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80145280 28 00 00 01 */ cmplwi r0, 1 -/* 80145284 40 82 00 2C */ bne lbl_801452B0 -/* 80145288 80 64 03 FC */ lwz r3, 0x3fc(r4) -/* 8014528C 4B ED 9A 25 */ bl fopScnM_SearchByID__FUi -/* 80145290 88 03 01 D4 */ lbz r0, 0x1d4(r3) -/* 80145294 7C 00 07 75 */ extsb. r0, r0 -/* 80145298 40 80 00 10 */ bge lbl_801452A8 -/* 8014529C 4B ED D3 C1 */ bl fpcNd_IsDeleteTiming__FP18process_node_class -/* 801452A0 2C 03 00 00 */ cmpwi r3, 0 -/* 801452A4 40 82 00 0C */ bne lbl_801452B0 -lbl_801452A8: -/* 801452A8 38 60 00 00 */ li r3, 0 -/* 801452AC 48 00 00 18 */ b lbl_801452C4 -lbl_801452B0: -/* 801452B0 3B 9C 00 01 */ addi r28, r28, 1 -/* 801452B4 3B FF 00 01 */ addi r31, r31, 1 -lbl_801452B8: -/* 801452B8 7C 1C E8 00 */ cmpw r28, r29 -/* 801452BC 41 80 FF 98 */ blt lbl_80145254 -lbl_801452C0: -/* 801452C0 38 60 00 01 */ li r3, 1 -lbl_801452C4: -/* 801452C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801452C8 48 21 CF 5D */ bl _restgpr_28 -/* 801452CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801452D0 7C 08 03 A6 */ mtlr r0 -/* 801452D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801452D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/action__FP15e_bi_leaf_class.s b/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/action__FP15e_bi_leaf_class.s deleted file mode 100644 index f3a7bf4dfc0..00000000000 --- a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/action__FP15e_bi_leaf_class.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_8068DCD0: -/* 8068DCD0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8068DCD4 7C 08 02 A6 */ mflr r0 -/* 8068DCD8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8068DCDC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8068DCE0 7C 7F 1B 78 */ mr r31, r3 -/* 8068DCE4 A8 03 05 BC */ lha r0, 0x5bc(r3) -/* 8068DCE8 2C 00 00 01 */ cmpwi r0, 1 -/* 8068DCEC 41 82 00 6C */ beq lbl_8068DD58 -/* 8068DCF0 40 80 00 CC */ bge lbl_8068DDBC -/* 8068DCF4 2C 00 00 00 */ cmpwi r0, 0 -/* 8068DCF8 40 80 00 08 */ bge lbl_8068DD00 -/* 8068DCFC 48 00 00 C0 */ b lbl_8068DDBC -lbl_8068DD00: -/* 8068DD00 A8 1F 05 BE */ lha r0, 0x5be(r31) -/* 8068DD04 2C 00 00 00 */ cmpwi r0, 0 -/* 8068DD08 40 82 00 B4 */ bne lbl_8068DDBC -/* 8068DD0C 80 1F 04 A4 */ lwz r0, 0x4a4(r31) -/* 8068DD10 90 01 00 10 */ stw r0, 0x10(r1) -/* 8068DD14 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 8068DD18 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 8068DD1C 38 81 00 10 */ addi r4, r1, 0x10 -/* 8068DD20 4B 98 BA D9 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 8068DD24 28 03 00 00 */ cmplwi r3, 0 -/* 8068DD28 40 82 00 94 */ bne lbl_8068DDBC -/* 8068DD2C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8068DD30 2C 00 00 32 */ cmpwi r0, 0x32 -/* 8068DD34 40 82 00 10 */ bne lbl_8068DD44 -/* 8068DD38 38 00 00 5A */ li r0, 0x5a -/* 8068DD3C B0 1F 05 BE */ sth r0, 0x5be(r31) -/* 8068DD40 48 00 00 0C */ b lbl_8068DD4C -lbl_8068DD44: -/* 8068DD44 38 00 00 3C */ li r0, 0x3c -/* 8068DD48 B0 1F 05 BE */ sth r0, 0x5be(r31) -lbl_8068DD4C: -/* 8068DD4C 38 00 00 01 */ li r0, 1 -/* 8068DD50 B0 1F 05 BC */ sth r0, 0x5bc(r31) -/* 8068DD54 48 00 00 68 */ b lbl_8068DDBC -lbl_8068DD58: -/* 8068DD58 A8 1F 05 BE */ lha r0, 0x5be(r31) -/* 8068DD5C 2C 00 00 00 */ cmpwi r0, 0 -/* 8068DD60 40 82 00 5C */ bne lbl_8068DDBC -/* 8068DD64 38 60 00 00 */ li r3, 0 -/* 8068DD68 B0 7F 05 BC */ sth r3, 0x5bc(r31) -/* 8068DD6C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8068DD70 7C 07 07 74 */ extsb r7, r0 -/* 8068DD74 90 61 00 08 */ stw r3, 8(r1) -/* 8068DD78 38 60 03 04 */ li r3, 0x304 -/* 8068DD7C 28 1F 00 00 */ cmplwi r31, 0 -/* 8068DD80 41 82 00 0C */ beq lbl_8068DD8C -/* 8068DD84 80 9F 00 04 */ lwz r4, 4(r31) -/* 8068DD88 48 00 00 08 */ b lbl_8068DD90 -lbl_8068DD8C: -/* 8068DD8C 38 80 FF FF */ li r4, -1 -lbl_8068DD90: -/* 8068DD90 88 1F 05 B4 */ lbz r0, 0x5b4(r31) -/* 8068DD94 54 00 40 2E */ slwi r0, r0, 8 -/* 8068DD98 60 05 00 01 */ ori r5, r0, 1 -/* 8068DD9C 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 8068DDA0 39 1F 04 DC */ addi r8, r31, 0x4dc -/* 8068DDA4 39 20 00 00 */ li r9, 0 -/* 8068DDA8 39 40 FF FF */ li r10, -1 -/* 8068DDAC 4B 98 C1 45 */ bl fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i -/* 8068DDB0 90 7F 04 A4 */ stw r3, 0x4a4(r31) -/* 8068DDB4 38 00 00 14 */ li r0, 0x14 -/* 8068DDB8 B0 1F 05 BE */ sth r0, 0x5be(r31) -lbl_8068DDBC: -/* 8068DDBC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8068DDC0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8068DDC4 7C 08 03 A6 */ mtlr r0 -/* 8068DDC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8068DDCC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 1257701e9b1..00000000000 --- a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8068DF24: -/* 8068DF24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8068DF28 7C 08 02 A6 */ mflr r0 -/* 8068DF2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8068DF30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8068DF34 93 C1 00 08 */ stw r30, 8(r1) -/* 8068DF38 7C 7F 1B 78 */ mr r31, r3 -/* 8068DF3C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8068DF40 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8068DF44 40 82 00 1C */ bne lbl_8068DF60 -/* 8068DF48 28 1F 00 00 */ cmplwi r31, 0 -/* 8068DF4C 41 82 00 08 */ beq lbl_8068DF54 -/* 8068DF50 4B 98 AC 15 */ bl __ct__10fopAc_ac_cFv -lbl_8068DF54: -/* 8068DF54 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8068DF58 60 00 00 08 */ ori r0, r0, 8 -/* 8068DF5C 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8068DF60: -/* 8068DF60 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 8068DF64 3C 80 80 69 */ lis r4, d_a_e_bi_leaf__stringBase0@ha /* 0x8068DFE0@ha */ -/* 8068DF68 38 84 DF E0 */ addi r4, r4, d_a_e_bi_leaf__stringBase0@l /* 0x8068DFE0@l */ -/* 8068DF6C 4B 99 EF 51 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 8068DF70 7C 7E 1B 78 */ mr r30, r3 -/* 8068DF74 2C 1E 00 04 */ cmpwi r30, 4 -/* 8068DF78 40 82 00 44 */ bne lbl_8068DFBC -/* 8068DF7C 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8068DF80 98 1F 05 B4 */ stb r0, 0x5b4(r31) -/* 8068DF84 7F E3 FB 78 */ mr r3, r31 -/* 8068DF88 3C 80 80 69 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x8068DEA0@ha */ -/* 8068DF8C 38 84 DE A0 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x8068DEA0@l */ -/* 8068DF90 38 A0 0A 00 */ li r5, 0xa00 -/* 8068DF94 4B 98 C5 1D */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 8068DF98 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8068DF9C 40 82 00 0C */ bne lbl_8068DFA8 -/* 8068DFA0 38 60 00 05 */ li r3, 5 -/* 8068DFA4 48 00 00 1C */ b lbl_8068DFC0 -lbl_8068DFA8: -/* 8068DFA8 80 7F 05 B8 */ lwz r3, 0x5b8(r31) -/* 8068DFAC 38 03 00 24 */ addi r0, r3, 0x24 -/* 8068DFB0 90 1F 05 04 */ stw r0, 0x504(r31) -/* 8068DFB4 7F E3 FB 78 */ mr r3, r31 -/* 8068DFB8 4B FF FE 19 */ bl daE_BI_LEAF_Execute__FP15e_bi_leaf_class -lbl_8068DFBC: -/* 8068DFBC 7F C3 F3 78 */ mr r3, r30 -lbl_8068DFC0: -/* 8068DFC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8068DFC4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8068DFC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8068DFCC 7C 08 03 A6 */ mtlr r0 -/* 8068DFD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8068DFD4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Delete__FP15e_bi_leaf_class.s b/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Delete__FP15e_bi_leaf_class.s deleted file mode 100644 index 38686c2a677..00000000000 --- a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Delete__FP15e_bi_leaf_class.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8068DE70: -/* 8068DE70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8068DE74 7C 08 02 A6 */ mflr r0 -/* 8068DE78 90 01 00 14 */ stw r0, 0x14(r1) -/* 8068DE7C 3C 80 80 69 */ lis r4, d_a_e_bi_leaf__stringBase0@ha /* 0x8068DFE0@ha */ -/* 8068DE80 38 84 DF E0 */ addi r4, r4, d_a_e_bi_leaf__stringBase0@l /* 0x8068DFE0@l */ -/* 8068DE84 38 63 05 AC */ addi r3, r3, 0x5ac -/* 8068DE88 4B 99 F1 81 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 8068DE8C 38 60 00 01 */ li r3, 1 -/* 8068DE90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8068DE94 7C 08 03 A6 */ mtlr r0 -/* 8068DE98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8068DE9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Draw__FP15e_bi_leaf_class.s b/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Draw__FP15e_bi_leaf_class.s deleted file mode 100644 index 4cfc16fcf06..00000000000 --- a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Draw__FP15e_bi_leaf_class.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8068DC58: -/* 8068DC58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8068DC5C 7C 08 02 A6 */ mflr r0 -/* 8068DC60 90 01 00 14 */ stw r0, 0x14(r1) -/* 8068DC64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8068DC68 7C 7F 1B 78 */ mr r31, r3 -/* 8068DC6C 88 03 05 B4 */ lbz r0, 0x5b4(r3) -/* 8068DC70 28 00 00 01 */ cmplwi r0, 1 -/* 8068DC74 40 82 00 0C */ bne lbl_8068DC80 -/* 8068DC78 38 60 00 01 */ li r3, 1 -/* 8068DC7C 48 00 00 40 */ b lbl_8068DCBC -lbl_8068DC80: -/* 8068DC80 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8068DC84 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8068DC88 38 80 00 00 */ li r4, 0 -/* 8068DC8C 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 8068DC90 38 DF 01 0C */ addi r6, r31, 0x10c -/* 8068DC94 4B B1 5B 31 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 8068DC98 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 8068DC9C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 8068DCA0 80 9F 05 B8 */ lwz r4, 0x5b8(r31) -/* 8068DCA4 80 84 00 04 */ lwz r4, 4(r4) -/* 8068DCA8 38 BF 01 0C */ addi r5, r31, 0x10c -/* 8068DCAC 4B B1 70 F5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 8068DCB0 80 7F 05 B8 */ lwz r3, 0x5b8(r31) -/* 8068DCB4 4B 98 00 11 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 8068DCB8 38 60 00 01 */ li r3, 1 -lbl_8068DCBC: -/* 8068DCBC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8068DCC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8068DCC4 7C 08 03 A6 */ mtlr r0 -/* 8068DCC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8068DCCC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Execute__FP15e_bi_leaf_class.s b/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Execute__FP15e_bi_leaf_class.s deleted file mode 100644 index 026d94604b1..00000000000 --- a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Execute__FP15e_bi_leaf_class.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8068DDD0: -/* 8068DDD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8068DDD4 7C 08 02 A6 */ mflr r0 -/* 8068DDD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8068DDDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8068DDE0 7C 7F 1B 78 */ mr r31, r3 -/* 8068DDE4 A8 63 05 BE */ lha r3, 0x5be(r3) -/* 8068DDE8 2C 03 00 00 */ cmpwi r3, 0 -/* 8068DDEC 41 82 00 0C */ beq lbl_8068DDF8 -/* 8068DDF0 38 03 FF FF */ addi r0, r3, -1 -/* 8068DDF4 B0 1F 05 BE */ sth r0, 0x5be(r31) -lbl_8068DDF8: -/* 8068DDF8 7F E3 FB 78 */ mr r3, r31 -/* 8068DDFC 4B FF FE D5 */ bl action__FP15e_bi_leaf_class -/* 8068DE00 88 1F 05 B4 */ lbz r0, 0x5b4(r31) -/* 8068DE04 28 00 00 01 */ cmplwi r0, 1 -/* 8068DE08 40 82 00 0C */ bne lbl_8068DE14 -/* 8068DE0C 38 60 00 01 */ li r3, 1 -/* 8068DE10 48 00 00 44 */ b lbl_8068DE54 -lbl_8068DE14: -/* 8068DE14 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8068DE18 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8068DE1C C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 8068DE20 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 8068DE24 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 8068DE28 4B CB 8A C1 */ bl PSMTXTrans -/* 8068DE2C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8068DE30 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8068DE34 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8068DE38 4B 97 E5 FD */ bl mDoMtx_YrotM__FPA4_fs -/* 8068DE3C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8068DE40 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8068DE44 80 9F 05 B8 */ lwz r4, 0x5b8(r31) -/* 8068DE48 38 84 00 24 */ addi r4, r4, 0x24 -/* 8068DE4C 4B CB 86 65 */ bl PSMTXCopy -/* 8068DE50 38 60 00 01 */ li r3, 1 -lbl_8068DE54: -/* 8068DE54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8068DE58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8068DE5C 7C 08 03 A6 */ mtlr r0 -/* 8068DE60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8068DE64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 0e3a254a946..00000000000 --- a/asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8068DEA0: -/* 8068DEA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8068DEA4 7C 08 02 A6 */ mflr r0 -/* 8068DEA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8068DEAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8068DEB0 7C 7F 1B 78 */ mr r31, r3 -/* 8068DEB4 88 03 05 B4 */ lbz r0, 0x5b4(r3) -/* 8068DEB8 28 00 00 01 */ cmplwi r0, 1 -/* 8068DEBC 41 82 00 50 */ beq lbl_8068DF0C -/* 8068DEC0 3C 60 80 69 */ lis r3, d_a_e_bi_leaf__stringBase0@ha /* 0x8068DFE0@ha */ -/* 8068DEC4 38 63 DF E0 */ addi r3, r3, d_a_e_bi_leaf__stringBase0@l /* 0x8068DFE0@l */ -/* 8068DEC8 38 80 00 0F */ li r4, 0xf -/* 8068DECC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8068DED0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8068DED4 3C A5 00 02 */ addis r5, r5, 2 -/* 8068DED8 38 C0 00 80 */ li r6, 0x80 -/* 8068DEDC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8068DEE0 4B 9A E4 0D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8068DEE4 3C 80 00 08 */ lis r4, 8 -/* 8068DEE8 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 8068DEEC 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 8068DEF0 4B 98 6D 65 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 8068DEF4 90 7F 05 B8 */ stw r3, 0x5b8(r31) -/* 8068DEF8 80 1F 05 B8 */ lwz r0, 0x5b8(r31) -/* 8068DEFC 28 00 00 00 */ cmplwi r0, 0 -/* 8068DF00 40 82 00 0C */ bne lbl_8068DF0C -/* 8068DF04 38 60 00 00 */ li r3, 0 -/* 8068DF08 48 00 00 08 */ b lbl_8068DF10 -lbl_8068DF0C: -/* 8068DF0C 38 60 00 01 */ li r3, 1 -lbl_8068DF10: -/* 8068DF10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8068DF14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8068DF18 7C 08 03 A6 */ mtlr r0 -/* 8068DF1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8068DF20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Create__FP10fopAc_ac_c.s deleted file mode 100644 index c1b723469c4..00000000000 --- a/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_806E01D8: -/* 806E01D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806E01DC 7C 08 02 A6 */ mflr r0 -/* 806E01E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 806E01E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806E01E8 93 C1 00 08 */ stw r30, 8(r1) -/* 806E01EC 7C 7F 1B 78 */ mr r31, r3 -/* 806E01F0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 806E01F4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 806E01F8 40 82 00 1C */ bne lbl_806E0214 -/* 806E01FC 28 1F 00 00 */ cmplwi r31, 0 -/* 806E0200 41 82 00 08 */ beq lbl_806E0208 -/* 806E0204 4B 93 89 61 */ bl __ct__10fopAc_ac_cFv -lbl_806E0208: -/* 806E0208 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 806E020C 60 00 00 08 */ ori r0, r0, 8 -/* 806E0210 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_806E0214: -/* 806E0214 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 806E0218 3C 80 80 6E */ lis r4, d_a_e_hb_leaf__stringBase0@ha /* 0x806E0294@ha */ -/* 806E021C 38 84 02 94 */ addi r4, r4, d_a_e_hb_leaf__stringBase0@l /* 0x806E0294@l */ -/* 806E0220 4B 94 CC 9D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 806E0224 7C 7E 1B 78 */ mr r30, r3 -/* 806E0228 2C 1E 00 04 */ cmpwi r30, 4 -/* 806E022C 40 82 00 40 */ bne lbl_806E026C -/* 806E0230 7F E3 FB 78 */ mr r3, r31 -/* 806E0234 3C 80 80 6E */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x806E00D8@ha */ -/* 806E0238 38 84 00 D8 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x806E00D8@l */ -/* 806E023C 38 A0 0B 00 */ li r5, 0xb00 -/* 806E0240 4B 93 A2 71 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 806E0244 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 806E0248 40 82 00 0C */ bne lbl_806E0254 -/* 806E024C 38 60 00 05 */ li r3, 5 -/* 806E0250 48 00 00 20 */ b lbl_806E0270 -lbl_806E0254: -/* 806E0254 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806E0258 80 63 00 04 */ lwz r3, 4(r3) -/* 806E025C 38 03 00 24 */ addi r0, r3, 0x24 -/* 806E0260 90 1F 05 04 */ stw r0, 0x504(r31) -/* 806E0264 7F E3 FB 78 */ mr r3, r31 -/* 806E0268 4B FF FD 59 */ bl daE_HB_LEAF_Execute__FP15e_hb_leaf_class -lbl_806E026C: -/* 806E026C 7F C3 F3 78 */ mr r3, r30 -lbl_806E0270: -/* 806E0270 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806E0274 83 C1 00 08 */ lwz r30, 8(r1) -/* 806E0278 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806E027C 7C 08 03 A6 */ mtlr r0 -/* 806E0280 38 21 00 10 */ addi r1, r1, 0x10 -/* 806E0284 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Delete__FP15e_hb_leaf_class.s b/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Delete__FP15e_hb_leaf_class.s deleted file mode 100644 index 0e5f0a204f6..00000000000 --- a/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Delete__FP15e_hb_leaf_class.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_806E00A8: -/* 806E00A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806E00AC 7C 08 02 A6 */ mflr r0 -/* 806E00B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 806E00B4 3C 80 80 6E */ lis r4, d_a_e_hb_leaf__stringBase0@ha /* 0x806E0294@ha */ -/* 806E00B8 38 84 02 94 */ addi r4, r4, d_a_e_hb_leaf__stringBase0@l /* 0x806E0294@l */ -/* 806E00BC 38 63 05 AC */ addi r3, r3, 0x5ac -/* 806E00C0 4B 94 CF 49 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 806E00C4 38 60 00 01 */ li r3, 1 -/* 806E00C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806E00CC 7C 08 03 A6 */ mtlr r0 -/* 806E00D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 806E00D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Draw__FP15e_hb_leaf_class.s b/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Draw__FP15e_hb_leaf_class.s deleted file mode 100644 index 8dd7d766657..00000000000 --- a/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Draw__FP15e_hb_leaf_class.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_806DFF58: -/* 806DFF58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806DFF5C 7C 08 02 A6 */ mflr r0 -/* 806DFF60 90 01 00 14 */ stw r0, 0x14(r1) -/* 806DFF64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806DFF68 7C 7F 1B 78 */ mr r31, r3 -/* 806DFF6C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806DFF70 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806DFF74 38 80 00 00 */ li r4, 0 -/* 806DFF78 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 806DFF7C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 806DFF80 4B AC 38 45 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 806DFF84 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806DFF88 80 83 00 04 */ lwz r4, 4(r3) -/* 806DFF8C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806DFF90 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806DFF94 80 84 00 04 */ lwz r4, 4(r4) -/* 806DFF98 38 BF 01 0C */ addi r5, r31, 0x10c -/* 806DFF9C 4B AC 4E 05 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 806DFFA0 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806DFFA4 4B 93 06 DD */ bl entryDL__14mDoExt_McaMorfFv -/* 806DFFA8 38 60 00 01 */ li r3, 1 -/* 806DFFAC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806DFFB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806DFFB4 7C 08 03 A6 */ mtlr r0 -/* 806DFFB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 806DFFBC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Execute__FP15e_hb_leaf_class.s b/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Execute__FP15e_hb_leaf_class.s deleted file mode 100644 index d37ddeb70f6..00000000000 --- a/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Execute__FP15e_hb_leaf_class.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_806DFFC0: -/* 806DFFC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 806DFFC4 7C 08 02 A6 */ mflr r0 -/* 806DFFC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 806DFFCC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 806DFFD0 7C 7F 1B 78 */ mr r31, r3 -/* 806DFFD4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 806DFFD8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 806DFFDC C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 806DFFE0 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 806DFFE4 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 806DFFE8 4B C6 69 01 */ bl PSMTXTrans -/* 806DFFEC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 806DFFF0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 806DFFF4 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 806DFFF8 4B 92 C4 3D */ bl mDoMtx_YrotM__FPA4_fs -/* 806DFFFC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 806E0000 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 806E0004 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 806E0008 4B 92 C3 95 */ bl mDoMtx_XrotM__FPA4_fs -/* 806E000C 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806E0010 80 83 00 04 */ lwz r4, 4(r3) -/* 806E0014 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 806E0018 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 806E001C 38 84 00 24 */ addi r4, r4, 0x24 -/* 806E0020 4B C6 64 91 */ bl PSMTXCopy -/* 806E0024 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806E0028 4B 93 06 85 */ bl modelCalc__14mDoExt_McaMorfFv -/* 806E002C 80 1F 05 BC */ lwz r0, 0x5bc(r31) -/* 806E0030 90 01 00 08 */ stw r0, 8(r1) -/* 806E0034 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha /* 0x80023590@ha */ -/* 806E0038 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 0x80023590@l */ -/* 806E003C 38 81 00 08 */ addi r4, r1, 8 -/* 806E0040 4B 93 97 B9 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 806E0044 88 9F 05 BA */ lbz r4, 0x5ba(r31) -/* 806E0048 7C 80 07 75 */ extsb. r0, r4 -/* 806E004C 40 82 00 18 */ bne lbl_806E0064 -/* 806E0050 28 03 00 00 */ cmplwi r3, 0 -/* 806E0054 41 82 00 34 */ beq lbl_806E0088 -/* 806E0058 38 04 00 01 */ addi r0, r4, 1 -/* 806E005C 98 1F 05 BA */ stb r0, 0x5ba(r31) -/* 806E0060 48 00 00 28 */ b lbl_806E0088 -lbl_806E0064: -/* 806E0064 7C 80 07 74 */ extsb r0, r4 -/* 806E0068 2C 00 00 01 */ cmpwi r0, 1 -/* 806E006C 40 82 00 1C */ bne lbl_806E0088 -/* 806E0070 28 03 00 00 */ cmplwi r3, 0 -/* 806E0074 40 82 00 14 */ bne lbl_806E0088 -/* 806E0078 38 04 00 01 */ addi r0, r4, 1 -/* 806E007C 98 1F 05 BA */ stb r0, 0x5ba(r31) -/* 806E0080 38 00 00 64 */ li r0, 0x64 -/* 806E0084 B0 1F 05 B8 */ sth r0, 0x5b8(r31) -lbl_806E0088: -/* 806E0088 38 60 00 01 */ li r3, 1 -/* 806E008C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 806E0090 80 01 00 24 */ lwz r0, 0x24(r1) -/* 806E0094 7C 08 03 A6 */ mtlr r0 -/* 806E0098 38 21 00 20 */ addi r1, r1, 0x20 -/* 806E009C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 18e34195e2e..00000000000 --- a/asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_806E00D8: -/* 806E00D8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 806E00DC 7C 08 02 A6 */ mflr r0 -/* 806E00E0 90 01 00 34 */ stw r0, 0x34(r1) -/* 806E00E4 39 61 00 30 */ addi r11, r1, 0x30 -/* 806E00E8 4B C8 20 F1 */ bl _savegpr_28 -/* 806E00EC 7C 7F 1B 78 */ mr r31, r3 -/* 806E00F0 38 60 00 54 */ li r3, 0x54 -/* 806E00F4 4B BE EB 59 */ bl __nw__FUl -/* 806E00F8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 806E00FC 41 82 00 9C */ beq lbl_806E0198 -/* 806E0100 3C 60 80 6E */ lis r3, d_a_e_hb_leaf__stringBase0@ha /* 0x806E0294@ha */ -/* 806E0104 38 63 02 94 */ addi r3, r3, d_a_e_hb_leaf__stringBase0@l /* 0x806E0294@l */ -/* 806E0108 38 80 00 13 */ li r4, 0x13 -/* 806E010C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806E0110 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806E0114 3F 85 00 02 */ addis r28, r5, 2 -/* 806E0118 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 806E011C 7F 85 E3 78 */ mr r5, r28 -/* 806E0120 38 C0 00 80 */ li r6, 0x80 -/* 806E0124 4B 95 C1 C9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 806E0128 7C 7D 1B 78 */ mr r29, r3 -/* 806E012C 3C 60 80 6E */ lis r3, d_a_e_hb_leaf__stringBase0@ha /* 0x806E0294@ha */ -/* 806E0130 38 63 02 94 */ addi r3, r3, d_a_e_hb_leaf__stringBase0@l /* 0x806E0294@l */ -/* 806E0134 38 80 00 18 */ li r4, 0x18 -/* 806E0138 7F 85 E3 78 */ mr r5, r28 -/* 806E013C 38 C0 00 80 */ li r6, 0x80 -/* 806E0140 4B 95 C1 AD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 806E0144 7C 64 1B 78 */ mr r4, r3 -/* 806E0148 38 00 00 01 */ li r0, 1 -/* 806E014C 90 01 00 08 */ stw r0, 8(r1) -/* 806E0150 38 00 00 00 */ li r0, 0 -/* 806E0154 90 01 00 0C */ stw r0, 0xc(r1) -/* 806E0158 3C 00 00 08 */ lis r0, 8 -/* 806E015C 90 01 00 10 */ stw r0, 0x10(r1) -/* 806E0160 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000084@ha */ -/* 806E0164 38 03 00 84 */ addi r0, r3, 0x0084 /* 0x11000084@l */ -/* 806E0168 90 01 00 14 */ stw r0, 0x14(r1) -/* 806E016C 7F C3 F3 78 */ mr r3, r30 -/* 806E0170 38 A0 00 00 */ li r5, 0 -/* 806E0174 38 C0 00 00 */ li r6, 0 -/* 806E0178 7F A7 EB 78 */ mr r7, r29 -/* 806E017C 39 00 00 02 */ li r8, 2 -/* 806E0180 3D 20 80 6E */ lis r9, lit_3690@ha /* 0x806E0290@ha */ -/* 806E0184 C0 29 02 90 */ lfs f1, lit_3690@l(r9) /* 0x806E0290@l */ -/* 806E0188 39 20 00 00 */ li r9, 0 -/* 806E018C 39 40 FF FF */ li r10, -1 -/* 806E0190 4B 92 FA BD */ bl __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl -/* 806E0194 7C 7E 1B 78 */ mr r30, r3 -lbl_806E0198: -/* 806E0198 93 DF 05 B4 */ stw r30, 0x5b4(r31) -/* 806E019C 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806E01A0 28 03 00 00 */ cmplwi r3, 0 -/* 806E01A4 41 82 00 10 */ beq lbl_806E01B4 -/* 806E01A8 80 03 00 04 */ lwz r0, 4(r3) -/* 806E01AC 28 00 00 00 */ cmplwi r0, 0 -/* 806E01B0 40 82 00 0C */ bne lbl_806E01BC -lbl_806E01B4: -/* 806E01B4 38 60 00 00 */ li r3, 0 -/* 806E01B8 48 00 00 08 */ b lbl_806E01C0 -lbl_806E01BC: -/* 806E01BC 38 60 00 01 */ li r3, 1 -lbl_806E01C0: -/* 806E01C0 39 61 00 30 */ addi r11, r1, 0x30 -/* 806E01C4 4B C8 20 61 */ bl _restgpr_28 -/* 806E01C8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 806E01CC 7C 08 03 A6 */ mtlr r0 -/* 806E01D0 38 21 00 30 */ addi r1, r1, 0x30 -/* 806E01D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/__dt__4cXyzFv.s b/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/__dt__4cXyzFv.s deleted file mode 100644 index e9d08bbfb94..00000000000 --- a/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/__dt__4cXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_807A6F60: -/* 807A6F60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807A6F64 7C 08 02 A6 */ mflr r0 -/* 807A6F68 90 01 00 14 */ stw r0, 0x14(r1) -/* 807A6F6C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807A6F70 7C 7F 1B 79 */ or. r31, r3, r3 -/* 807A6F74 41 82 00 10 */ beq lbl_807A6F84 -/* 807A6F78 7C 80 07 35 */ extsh. r0, r4 -/* 807A6F7C 40 81 00 08 */ ble lbl_807A6F84 -/* 807A6F80 4B B2 7D BD */ bl __dl__FPv -lbl_807A6F84: -/* 807A6F84 7F E3 FB 78 */ mr r3, r31 -/* 807A6F88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807A6F8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807A6F90 7C 08 03 A6 */ mtlr r0 -/* 807A6F94 38 21 00 10 */ addi r1, r1, 0x10 -/* 807A6F98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/daE_ST_LINE_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/daE_ST_LINE_Create__FP10fopAc_ac_c.s deleted file mode 100644 index c9bd2527455..00000000000 --- a/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/daE_ST_LINE_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_807A707C: -/* 807A707C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 807A7080 7C 08 02 A6 */ mflr r0 -/* 807A7084 90 01 00 24 */ stw r0, 0x24(r1) -/* 807A7088 39 61 00 20 */ addi r11, r1, 0x20 -/* 807A708C 4B BB B1 51 */ bl _savegpr_29 -/* 807A7090 7C 7E 1B 78 */ mr r30, r3 -/* 807A7094 3C 80 80 7A */ lis r4, lit_3704@ha /* 0x807A722C@ha */ -/* 807A7098 3B E4 72 2C */ addi r31, r4, lit_3704@l /* 0x807A722C@l */ -/* 807A709C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 807A70A0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 807A70A4 40 82 00 80 */ bne lbl_807A7124 -/* 807A70A8 7F C0 F3 79 */ or. r0, r30, r30 -/* 807A70AC 41 82 00 6C */ beq lbl_807A7118 -/* 807A70B0 7C 1D 03 78 */ mr r29, r0 -/* 807A70B4 4B 87 1A B1 */ bl __ct__10fopAc_ac_cFv -/* 807A70B8 3C 60 80 7A */ lis r3, __vt__18mDoExt_3DlineMat_c@ha /* 0x807A72F4@ha */ -/* 807A70BC 38 03 72 F4 */ addi r0, r3, __vt__18mDoExt_3DlineMat_c@l /* 0x807A72F4@l */ -/* 807A70C0 90 1D 05 B4 */ stw r0, 0x5b4(r29) -/* 807A70C4 3C 60 80 3A */ lis r3, __vt__19mDoExt_3DlineMat0_c@ha /* 0x803A325C@ha */ -/* 807A70C8 38 03 32 5C */ addi r0, r3, __vt__19mDoExt_3DlineMat0_c@l /* 0x803A325C@l */ -/* 807A70CC 90 1D 05 B4 */ stw r0, 0x5b4(r29) -/* 807A70D0 38 7D 05 DC */ addi r3, r29, 0x5dc -/* 807A70D4 3C 80 80 7A */ lis r4, __ct__4cXyzFv@ha /* 0x807A7220@ha */ -/* 807A70D8 38 84 72 20 */ addi r4, r4, __ct__4cXyzFv@l /* 0x807A7220@l */ -/* 807A70DC 3C A0 80 7A */ lis r5, __dt__4cXyzFv@ha /* 0x807A6F60@ha */ -/* 807A70E0 38 A5 6F 60 */ addi r5, r5, __dt__4cXyzFv@l /* 0x807A6F60@l */ -/* 807A70E4 38 C0 00 0C */ li r6, 0xc -/* 807A70E8 38 E0 00 40 */ li r7, 0x40 -/* 807A70EC 4B BB AC 75 */ bl __construct_array -/* 807A70F0 38 7D 08 DC */ addi r3, r29, 0x8dc -/* 807A70F4 3C 80 80 7A */ lis r4, __ct__4cXyzFv@ha /* 0x807A7220@ha */ -/* 807A70F8 38 84 72 20 */ addi r4, r4, __ct__4cXyzFv@l /* 0x807A7220@l */ -/* 807A70FC 3C A0 80 7A */ lis r5, __dt__4cXyzFv@ha /* 0x807A6F60@ha */ -/* 807A7100 38 A5 6F 60 */ addi r5, r5, __dt__4cXyzFv@l /* 0x807A6F60@l */ -/* 807A7104 38 C0 00 0C */ li r6, 0xc -/* 807A7108 38 E0 00 32 */ li r7, 0x32 -/* 807A710C 4B BB AC 55 */ bl __construct_array -/* 807A7110 38 7D 0C D4 */ addi r3, r29, 0xcd4 -/* 807A7114 4B B1 77 31 */ bl __ct__16Z2SoundObjSimpleFv -lbl_807A7118: -/* 807A7118 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 807A711C 60 00 00 08 */ ori r0, r0, 8 -/* 807A7120 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_807A7124: -/* 807A7124 38 7E 05 AC */ addi r3, r30, 0x5ac -/* 807A7128 3C 80 80 7A */ lis r4, d_a_e_st_line__stringBase0@ha /* 0x807A729C@ha */ -/* 807A712C 38 84 72 9C */ addi r4, r4, d_a_e_st_line__stringBase0@l /* 0x807A729C@l */ -/* 807A7130 4B 88 5D 8D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 807A7134 7C 7D 1B 78 */ mr r29, r3 -/* 807A7138 2C 1D 00 04 */ cmpwi r29, 4 -/* 807A713C 40 82 00 C8 */ bne lbl_807A7204 -/* 807A7140 7F C3 F3 78 */ mr r3, r30 -/* 807A7144 3C 80 80 7A */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x807A7008@ha */ -/* 807A7148 38 84 70 08 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x807A7008@l */ -/* 807A714C 38 A0 0F 40 */ li r5, 0xf40 -/* 807A7150 4B 87 33 61 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 807A7154 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 807A7158 40 82 00 0C */ bne lbl_807A7164 -/* 807A715C 38 60 00 05 */ li r3, 5 -/* 807A7160 48 00 00 A8 */ b lbl_807A7208 -lbl_807A7164: -/* 807A7164 C0 3F 00 68 */ lfs f1, 0x68(r31) -/* 807A7168 4B AC 07 ED */ bl cM_rndF__Ff -/* 807A716C FC 00 08 1E */ fctiwz f0, f1 -/* 807A7170 D8 01 00 08 */ stfd f0, 8(r1) -/* 807A7174 80 01 00 0C */ lwz r0, 0xc(r1) -/* 807A7178 B0 1E 05 D0 */ sth r0, 0x5d0(r30) -/* 807A717C 38 60 00 00 */ li r3, 0 -/* 807A7180 38 00 00 40 */ li r0, 0x40 -/* 807A7184 7C 09 03 A6 */ mtctr r0 -lbl_807A7188: -/* 807A7188 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 807A718C 7C 9E 1A 14 */ add r4, r30, r3 -/* 807A7190 D0 04 05 DC */ stfs f0, 0x5dc(r4) -/* 807A7194 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 807A7198 D0 04 05 E0 */ stfs f0, 0x5e0(r4) -/* 807A719C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 807A71A0 D0 04 05 E4 */ stfs f0, 0x5e4(r4) -/* 807A71A4 38 63 00 0C */ addi r3, r3, 0xc -/* 807A71A8 42 00 FF E0 */ bdnz lbl_807A7188 -/* 807A71AC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 807A71B0 98 1E 0C C4 */ stb r0, 0xcc4(r30) -/* 807A71B4 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 807A71B8 4B AC 07 D5 */ bl cM_rndFX__Ff -/* 807A71BC C0 1F 00 6C */ lfs f0, 0x6c(r31) -/* 807A71C0 EC 00 08 2A */ fadds f0, f0, f1 -/* 807A71C4 FC 00 00 1E */ fctiwz f0, f0 -/* 807A71C8 D8 01 00 08 */ stfd f0, 8(r1) -/* 807A71CC 80 01 00 0C */ lwz r0, 0xc(r1) -/* 807A71D0 98 1E 0C C6 */ stb r0, 0xcc6(r30) -/* 807A71D4 88 1E 0C C4 */ lbz r0, 0xcc4(r30) -/* 807A71D8 28 00 00 00 */ cmplwi r0, 0 -/* 807A71DC 40 82 00 20 */ bne lbl_807A71FC -/* 807A71E0 38 7E 0C D4 */ addi r3, r30, 0xcd4 -/* 807A71E4 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 807A71E8 38 A0 00 01 */ li r5, 1 -/* 807A71EC 81 9E 0C E4 */ lwz r12, 0xce4(r30) -/* 807A71F0 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 807A71F4 7D 89 03 A6 */ mtctr r12 -/* 807A71F8 4E 80 04 21 */ bctrl -lbl_807A71FC: -/* 807A71FC 7F C3 F3 78 */ mr r3, r30 -/* 807A7200 4B FF FD 9D */ bl daE_ST_LINE_Execute__FP15e_st_line_class -lbl_807A7204: -/* 807A7204 7F A3 EB 78 */ mr r3, r29 -lbl_807A7208: -/* 807A7208 39 61 00 20 */ addi r11, r1, 0x20 -/* 807A720C 4B BB B0 1D */ bl _restgpr_29 -/* 807A7210 80 01 00 24 */ lwz r0, 0x24(r1) -/* 807A7214 7C 08 03 A6 */ mtlr r0 -/* 807A7218 38 21 00 20 */ addi r1, r1, 0x20 -/* 807A721C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/daE_ST_LINE_Delete__FP15e_st_line_class.s b/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/daE_ST_LINE_Delete__FP15e_st_line_class.s deleted file mode 100644 index cc9acb828ef..00000000000 --- a/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/daE_ST_LINE_Delete__FP15e_st_line_class.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_807A6FAC: -/* 807A6FAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807A6FB0 7C 08 02 A6 */ mflr r0 -/* 807A6FB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 807A6FB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807A6FBC 7C 7F 1B 78 */ mr r31, r3 -/* 807A6FC0 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 807A6FC4 3C 80 80 7A */ lis r4, d_a_e_st_line__stringBase0@ha /* 0x807A729C@ha */ -/* 807A6FC8 38 84 72 9C */ addi r4, r4, d_a_e_st_line__stringBase0@l /* 0x807A729C@l */ -/* 807A6FCC 4B 88 60 3D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 807A6FD0 88 1F 0C C4 */ lbz r0, 0xcc4(r31) -/* 807A6FD4 28 00 00 00 */ cmplwi r0, 0 -/* 807A6FD8 40 82 00 18 */ bne lbl_807A6FF0 -/* 807A6FDC 80 1F 00 F0 */ lwz r0, 0xf0(r31) -/* 807A6FE0 28 00 00 00 */ cmplwi r0, 0 -/* 807A6FE4 41 82 00 0C */ beq lbl_807A6FF0 -/* 807A6FE8 38 7F 0C D4 */ addi r3, r31, 0xcd4 -/* 807A6FEC 4B B1 70 0D */ bl deleteObject__14Z2SoundObjBaseFv -lbl_807A6FF0: -/* 807A6FF0 38 60 00 01 */ li r3, 1 -/* 807A6FF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807A6FF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807A6FFC 7C 08 03 A6 */ mtlr r0 -/* 807A7000 38 21 00 10 */ addi r1, r1, 0x10 -/* 807A7004 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index 1738b9cbfe1..00000000000 --- a/asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_807A7008: -/* 807A7008 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 807A700C 7C 08 02 A6 */ mflr r0 -/* 807A7010 90 01 00 14 */ stw r0, 0x14(r1) -/* 807A7014 93 E1 00 0C */ stw r31, 0xc(r1) -/* 807A7018 7C 7F 1B 78 */ mr r31, r3 -/* 807A701C 38 7F 05 B4 */ addi r3, r31, 0x5b4 -/* 807A7020 38 80 00 01 */ li r4, 1 -/* 807A7024 38 A0 00 32 */ li r5, 0x32 -/* 807A7028 38 C0 00 01 */ li r6, 1 -/* 807A702C 4B 86 B5 B5 */ bl init__19mDoExt_3DlineMat0_cFUsUsi -/* 807A7030 2C 03 00 00 */ cmpwi r3, 0 -/* 807A7034 40 82 00 0C */ bne lbl_807A7040 -/* 807A7038 38 60 00 00 */ li r3, 0 -/* 807A703C 48 00 00 2C */ b lbl_807A7068 -lbl_807A7040: -/* 807A7040 80 7F 05 CC */ lwz r3, 0x5cc(r31) -/* 807A7044 80 83 00 04 */ lwz r4, 4(r3) -/* 807A7048 3C 60 80 7A */ lis r3, lit_4069@ha /* 0x807A7280@ha */ -/* 807A704C C0 03 72 80 */ lfs f0, lit_4069@l(r3) /* 0x807A7280@l */ -/* 807A7050 38 00 00 32 */ li r0, 0x32 -/* 807A7054 7C 09 03 A6 */ mtctr r0 -lbl_807A7058: -/* 807A7058 D0 04 00 00 */ stfs f0, 0(r4) -/* 807A705C 38 84 00 04 */ addi r4, r4, 4 -/* 807A7060 42 00 FF F8 */ bdnz lbl_807A7058 -/* 807A7064 38 60 00 01 */ li r3, 1 -lbl_807A7068: -/* 807A7068 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 807A706C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 807A7070 7C 08 03 A6 */ mtlr r0 -/* 807A7074 38 21 00 10 */ addi r1, r1, 0x10 -/* 807A7078 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_no_chg_room.h b/include/d/a/d_a_no_chg_room.h index f988647cd0b..b1287acfe52 100644 --- a/include/d/a/d_a_no_chg_room.h +++ b/include/d/a/d_a_no_chg_room.h @@ -1,6 +1,21 @@ #ifndef D_A_D_A_NO_CHG_ROOM_H #define D_A_D_A_NO_CHG_ROOM_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daNocrm_c : public fopAc_ac_c { +public: + /* 801452DC */ int execute(); + /* 80145508 */ int getRoomNo(int); + inline int create(); + + s8 getReadRoomId() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getScaleType() { return fopAcM_GetParamBit(this, 8, 4); } + + /* 0x568 */ Mtx mMtx; + /* 0x598 */ Mtx mInvMtx; + /* 0x5C8 */ s8 mRoomNo[2]; + /* 0x5CA */ bool mRoomLoading; +}; #endif /* D_A_D_A_NO_CHG_ROOM_H */ diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 3d128e15bac..55118163fa2 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -830,6 +830,7 @@ class dStage_roomControl_c { static void setRoomReadId(s8 id) { data_804505F0 = id; } static s8 getRoomReadId() { return data_804505F0; } static void offNoChangeRoom() { mNoChangeRoom = false; } + static void onNoChangeRoom() { mNoChangeRoom = true; } static void setProcID(u32 id) { mProcID = id; } static u32 getProcID() { return mProcID; } static void setStatusProcID(int i_roomNo, unsigned int i_id) { mStatus[i_roomNo].mProcID = i_id; } diff --git a/include/d/s/d_s_play.h b/include/d/s/d_s_play.h index ad40e0da749..39e1579fda8 100644 --- a/include/d/s/d_s_play.h +++ b/include/d/s/d_s_play.h @@ -207,108 +207,108 @@ extern dScnPly_reg_HIO_c g_regHIO; #define tREG_S(i) g_regHIO.mChildReg[25].mShortReg[i] #else // Morita -#define TREG_F(i) -#define TREG_S(i) +#define TREG_F(i) (0) +#define TREG_S(i) (0) // Matsutani -#define DREG_F(i) -#define DREG_S(i) +#define DREG_F(i) (0) +#define DREG_S(i) (0) // Iwawaki -#define IREG_F(i) -#define IREG_S(i) +#define IREG_F(i) (0) +#define IREG_S(i) (0) // Sasa -#define SREG_F(i) -#define SREG_S(i) +#define SREG_F(i) (0) +#define SREG_S(i) (0) // Umemiya -#define UREG_F(i) -#define UREG_S(i) +#define UREG_F(i) (0) +#define UREG_S(i) (0) // Ogawa -#define OREG_F(i) -#define OREG_S(i) +#define OREG_F(i) (0) +#define OREG_S(i) (0) // Sakaguchi -#define YREG_F(i) -#define YREG_S(i) +#define YREG_F(i) (0) +#define YREG_S(i) (0) // Sakai -#define KREG_F(i) -#define KREG_S(i) +#define KREG_F(i) (0) +#define KREG_S(i) (0) // Hara -#define BREG_F(i) -#define BREG_S(i) +#define BREG_F(i) (0) +#define BREG_S(i) (0) // Sumiyoshi -#define MREG_F(i) -#define MREG_S(i) +#define MREG_F(i) (0) +#define MREG_S(i) (0) // Takeshita -#define AREG_F(i) -#define AREG_S(i) +#define AREG_F(i) (0) +#define AREG_S(i) (0) // Yoshida -#define PREG_F(i) -#define PREG_S(i) +#define PREG_F(i) (0) +#define PREG_S(i) (0) // Noma -#define NREG_F(i) -#define NREG_S(i) +#define NREG_F(i) (0) +#define NREG_S(i) (0) // Nishiwaki -#define WREG_F(i) -#define WREG_S(i) +#define WREG_F(i) (0) +#define WREG_S(i) (0) // Masaro -#define JREG_F(i) -#define JREG_S(i) +#define JREG_F(i) (0) +#define JREG_S(i) (0) // Hayakawa -#define HREG_F(i) -#define HREG_S(i) +#define HREG_F(i) (0) +#define HREG_S(i) (0) // Sadamoto -#define VREG_F(i) -#define VREG_S(i) +#define VREG_F(i) (0) +#define VREG_S(i) (0) // Nishikawa -#define XREG_F(i) -#define XREG_S(i) +#define XREG_F(i) (0) +#define XREG_S(i) (0) // Suzuki -#define ZREG_F(i) -#define ZREG_S(i) +#define ZREG_F(i) (0) +#define ZREG_S(i) (0) // Nakanishi -#define nREG_F(i) -#define nREG_S(i) +#define nREG_F(i) (0) +#define nREG_S(i) (0) // Kuwajima -#define kREG_F(i) -#define kREG_S(i) +#define kREG_F(i) (0) +#define kREG_S(i) (0) // Okajima -#define oREG_F(i) -#define oREG_S(i) +#define oREG_F(i) (0) +#define oREG_S(i) (0) // Yamazaki -#define yREG_F(i) -#define yREG_S(i) +#define yREG_F(i) (0) +#define yREG_S(i) (0) // Ashida -#define aREG_F(i) -#define aREG_S(i) +#define aREG_F(i) (0) +#define aREG_S(i) (0) // Okada -#define hREG_F(i) -#define hREG_S(i) +#define hREG_F(i) (0) +#define hREG_S(i) (0) // Takahashi -#define tREG_F(i) -#define tREG_S(i) +#define tREG_F(i) (0) +#define tREG_S(i) (0) #endif #endif /* D_S_D_S_PLAY_H */ diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index dcb373996c1..a4ec75f2888 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -1,6 +1,7 @@ #ifndef F_OP_ACTOR_H_ #define F_OP_ACTOR_H_ +#include "JSystem/JKernel/JKRHeap.h" #include "d/kankyo/d_kankyo.h" #include "f_pc/f_pc_leaf.h" #include "global.h" @@ -40,6 +41,7 @@ enum fopAc_Group_e { /* 2 */ fopAc_ENEMY_e, /* 3 */ fopAc_ENV_e, // is this correct? /* 4 */ fopAc_NPC_e, + /* 5 */ fopAc_UNK_GROUP_5_e, }; enum fopAc_Condition_e { @@ -261,7 +263,7 @@ class fopEn_enemy_c : public fopAc_ac_c { void setThrowModeDash() { mThrowMode |= 4; } void setThrowModeThrowRight() { mThrowMode |= 0x10; } void setThrowModeThrowLeft() { mThrowMode |= 8; } - + /* 0x568 */ cXyz mDownPos; /* 0x574 */ cXyz mHeadLockPos; /* 0x580 */ J3DModel* mBallModel; diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h index 7bb93b88e5b..0cd8c1fe8b1 100644 --- a/include/f_pc/f_pc_leaf.h +++ b/include/f_pc/f_pc_leaf.h @@ -6,6 +6,7 @@ #include "f_pc/f_pc_draw_priority.h" #include "f_pc/f_pc_method.h" #include "f_pc/f_pc_profile.h" +#include "d/d_procname.h" typedef struct leafdraw_method_class { /* 0x00 */ process_method_class mBase; diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 16b5765d828..94627f2675b 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -463,7 +463,7 @@ class mDoExt_3Dline_c { /* 800126BC */ mDoExt_3Dline_c(); /* 0x00 */ cXyz* field_0x0; - /* 0x04 */ void* field_0x4; + /* 0x04 */ f32* field_0x4; /* 0x08 */ cXyz* field_0x8; /* 0x0C */ cXyz* field_0xc; /* 0x10 */ void* field_0x10; @@ -475,9 +475,9 @@ class mDoExt_3Dline_c { class mDoExt_3DlineMat_c { public: #ifndef NON_VIRTUAL_3DLINEMAT - virtual int getMaterialID(); - virtual void setMaterial(); - virtual void draw(); + virtual int getMaterialID() = 0; + virtual void setMaterial() = 0; + virtual void draw() = 0; #else /* 0x0 */ void* field_0x0; #endif @@ -523,14 +523,16 @@ class mDoExt_3DlineMat1_c : public mDoExt_3DlineMat_c { class mDoExt_3DlineMat0_c : public mDoExt_3DlineMat_c { public: - /* 800125E0 */ void init(u16, u16, int); - /* 800126C0 */ void setMaterial(); - /* 80012774 */ void draw(); + /* 800125E0 */ int init(u16, u16, int); /* 80012874 */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); - /* 80014E84 */ int getMaterialID(); + + /* 80014E84 */ virtual int getMaterialID(); + /* 800126C0 */ virtual void setMaterial(); + /* 80012774 */ virtual void draw(); cXyz* getPos(int param_0) { return field_0x18[param_0].field_0x0; } + f32* getSize(int param_0) { return field_0x18[param_0].field_0x4; } private: /* 0x08 */ GXColor field_0x8; diff --git a/include/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.h b/include/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.h index 7c2baaef6b8..4d3258b437d 100644 --- a/include/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.h +++ b/include/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.h @@ -1,6 +1,16 @@ #ifndef D_A_E_BI_LEAF_H #define D_A_E_BI_LEAF_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class e_bi_leaf_class : public fopEn_enemy_c { +public: + /* 0x5AC */ request_of_phase_process_class mPhase; + /* 0x5B4 */ u8 field_0x5b4; + /* 0x5B8 */ J3DModel* mpModel; + /* 0x5BC */ s16 mAction; + /* 0x5BE */ s16 mTimer; + /* 0x5C0 */ u8 field_0x5c0[0x5D0 - 0x5C0]; +}; #endif /* D_A_E_BI_LEAF_H */ diff --git a/include/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.h b/include/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.h index 369b26f8567..d5afb018b23 100644 --- a/include/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.h +++ b/include/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.h @@ -1,6 +1,15 @@ #ifndef D_A_E_HB_LEAF_H #define D_A_E_HB_LEAF_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class e_hb_leaf_class : public fopEn_enemy_c { +public: + /* 0x5AC */ request_of_phase_process_class mPhase; + /* 0x5B4 */ mDoExt_McaMorf* mpMorf; + /* 0x5B8 */ s16 field_0x5b8; + /* 0x5BA */ s8 field_0x5ba; + /* 0x5BC */ unsigned int field_0x5bc; +}; #endif /* D_A_E_HB_LEAF_H */ diff --git a/include/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.h b/include/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.h index 4420a8b2b02..bb231f85c34 100644 --- a/include/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.h +++ b/include/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.h @@ -1,6 +1,24 @@ #ifndef D_A_E_ST_LINE_H #define D_A_E_ST_LINE_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "Z2AudioLib/Z2SoundObject.h" + +class e_st_line_class : public fopEn_enemy_c { +public: + /* 0x5AC */ request_of_phase_process_class mPhase; + /* 0x5B4 */ mDoExt_3DlineMat0_c mLine; + /* 0x5D0 */ s16 field_0x5d0; + /* 0x5D2 */ u8 field_0x5D2[0x5DC - 0x5D2]; + /* 0x5DC */ cXyz field_0x5dc[64]; + /* 0x8DC */ cXyz field_0x8dc[50]; + /* 0xB34 */ u8 field_0xB34[0xCC4 - 0xB34]; + /* 0xCC4 */ u8 field_0xcc4; + /* 0xCC5 */ u8 field_0xCC5[0xCC6 - 0xCC5]; + /* 0xCC6 */ u8 field_0xcc6; + /* 0xCC7 */ u8 field_0xCC7[0xCD4 - 0xCC7]; + /* 0xCD4 */ Z2SoundObjSimple mSound; + /* 0xCF4 */ u8 field_0xcf4[0xCF8 - 0xCF4]; +}; #endif /* D_A_E_ST_LINE_H */ diff --git a/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp b/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp index 7ec526e3a18..66e650c96f7 100644 --- a/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp +++ b/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp @@ -1,187 +1,148 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_e_bi_leaf -// +/** + * d_a_e_bi_leaf.cpp + * + */ #include "rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct e_bi_leaf_class {}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct csXyz {}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" static void daE_BI_LEAF_Draw__FP15e_bi_leaf_class(); -extern "C" static void action__FP15e_bi_leaf_class(); -extern "C" static void daE_BI_LEAF_Execute__FP15e_bi_leaf_class(); -extern "C" static bool daE_BI_LEAF_IsDelete__FP15e_bi_leaf_class(); -extern "C" static void daE_BI_LEAF_Delete__FP15e_bi_leaf_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daE_BI_LEAF_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_e_bi_leaf__stringBase0; -extern "C" extern void* g_profile_E_BI_LEAF[12]; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; - -// -// Declarations: -// +#include "d/com/d_com_inf_game.h" /* 8068DC58-8068DCD0 000078 0078+00 1/0 0/0 0/0 .text daE_BI_LEAF_Draw__FP15e_bi_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_BI_LEAF_Draw(e_bi_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Draw__FP15e_bi_leaf_class.s" +static int daE_BI_LEAF_Draw(e_bi_leaf_class* i_this) { + if (i_this->field_0x5b4 == 1) { + return 1; + } + + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + mDoExt_modelUpdateDL(i_this->mpModel); + return 1; } -#pragma pop /* 8068DCD0-8068DDD0 0000F0 0100+00 1/1 0/0 0/0 .text action__FP15e_bi_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(e_bi_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/action__FP15e_bi_leaf_class.s" +static void action(e_bi_leaf_class* i_this) { + switch (i_this->mAction) { + case 0: + if (i_this->mTimer == 0) { + fopAc_ac_c* parent_p = fopAcM_SearchByID(i_this->mParentPcId); + if (parent_p == NULL) { + OS_REPORT("//////////////LEAF ID 2 %d\n", i_this->mParentPcId); + + if (fopAcM_GetRoomNo(i_this) == 50) { + i_this->mTimer = 90; + } else { + i_this->mTimer = 60; + } + + i_this->mAction = 1; + } + } + break; + case 1: + if (i_this->mTimer == 0) { + i_this->mAction = 0; + + i_this->mParentPcId = + fopAcM_createChild(PROC_E_BI, fopAcM_GetID(i_this), (i_this->field_0x5b4 << 8) | 1, + &i_this->current.pos, fopAcM_GetRoomNo(i_this), + &i_this->current.angle, NULL, -1, NULL); + i_this->mTimer = 20; + } + break; + } } -#pragma pop /* 8068DDD0-8068DE68 0001F0 0098+00 2/1 0/0 0/0 .text daE_BI_LEAF_Execute__FP15e_bi_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_BI_LEAF_Execute(e_bi_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Execute__FP15e_bi_leaf_class.s" +static int daE_BI_LEAF_Execute(e_bi_leaf_class* i_this) { + if (i_this->mTimer != 0) { + i_this->mTimer--; + } + + action(i_this); + + if (i_this->field_0x5b4 == 1) { + return 1; + } + + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + return 1; } -#pragma pop /* 8068DE68-8068DE70 000288 0008+00 1/0 0/0 0/0 .text daE_BI_LEAF_IsDelete__FP15e_bi_leaf_class */ -static bool daE_BI_LEAF_IsDelete(e_bi_leaf_class* param_0) { - return true; +static int daE_BI_LEAF_IsDelete(e_bi_leaf_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 8068DFE0-8068DFE0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8068DFE0 = "E_BI"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8068DFE5 = "\0\0"; -#pragma pop - /* 8068DE70-8068DEA0 000290 0030+00 1/0 0/0 0/0 .text daE_BI_LEAF_Delete__FP15e_bi_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_BI_LEAF_Delete(e_bi_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Delete__FP15e_bi_leaf_class.s" +static int daE_BI_LEAF_Delete(e_bi_leaf_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "E_BI"); + return 1; } -#pragma pop /* 8068DEA0-8068DF24 0002C0 0084+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + e_bi_leaf_class* a_this = static_cast(i_this); + + if (a_this->field_0x5b4 != 1) { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BI", 15); + JUT_ASSERT(modelData != 0); + + a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (a_this->mpModel == NULL) { + return 0; + } + } + + return 1; } -#pragma pop /* 8068DF24-8068DFD8 000344 00B4+00 1/0 0/0 0/0 .text daE_BI_LEAF_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_BI_LEAF_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf/daE_BI_LEAF_Create__FP10fopAc_ac_c.s" +static int daE_BI_LEAF_Create(fopAc_ac_c* i_this) { + e_bi_leaf_class* a_this = static_cast(i_this); + fopAcM_SetupActor(a_this, e_bi_leaf_class); + + int phase_state = dComIfG_resLoad(&a_this->mPhase, "E_BI"); + if (phase_state == cPhs_COMPLEATE_e) { + a_this->field_0x5b4 = fopAcM_GetParam(a_this) & 0xFF; + OS_REPORT("E_BI_LEAF//////////////E_BI_LEAF SET 1 !!\n"); + + if (!fopAcM_entrySolidHeap(a_this, useHeapInit, 0xA00)) { + OS_REPORT("//////////////E_BI_LEAF SET NON !!\n"); + return cPhs_ERROR_e; + } + + OS_REPORT("//////////////E_BI_LEAF SET 2 !!\n"); + + fopAcM_SetMtx(a_this, a_this->mpModel->getBaseTRMtx()); + daE_BI_LEAF_Execute(a_this); + } + + return phase_state; } -#pragma pop -/* ############################################################################################## */ /* 8068DFE8-8068E008 -00001 0020+00 1/0 0/0 0/0 .data l_daE_BI_LEAF_Method */ -SECTION_DATA static void* l_daE_BI_LEAF_Method[8] = { - (void*)daE_BI_LEAF_Create__FP10fopAc_ac_c, - (void*)daE_BI_LEAF_Delete__FP15e_bi_leaf_class, - (void*)daE_BI_LEAF_Execute__FP15e_bi_leaf_class, - (void*)daE_BI_LEAF_IsDelete__FP15e_bi_leaf_class, - (void*)daE_BI_LEAF_Draw__FP15e_bi_leaf_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daE_BI_LEAF_Method = { + (process_method_func)daE_BI_LEAF_Create, (process_method_func)daE_BI_LEAF_Delete, + (process_method_func)daE_BI_LEAF_Execute, (process_method_func)daE_BI_LEAF_IsDelete, + (process_method_func)daE_BI_LEAF_Draw, }; /* 8068E008-8068E038 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_BI_LEAF */ -SECTION_DATA extern void* g_profile_E_BI_LEAF[12] = { - (void*)0xFFFFFFFD, (void*)0x0009FFFD, - (void*)0x03050000, (void*)&g_fpcLf_Method, - (void*)0x000005D0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00940000, (void*)&l_daE_BI_LEAF_Method, - (void*)0x00040000, (void*)NULL, +extern actor_process_profile_definition g_profile_E_BI_LEAF = { + fpcLy_CURRENT_e, + 9, + fpcPi_CURRENT_e, + PROC_E_BI_LEAF, + &g_fpcLf_Method.mBase, + sizeof(e_bi_leaf_class), + 0, + 0, + &g_fopAc_Method.base, + 148, + &l_daE_BI_LEAF_Method, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; - -/* 8068DFE0-8068DFE0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp b/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp index fe86c8006b7..9d8474546ac 100644 --- a/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp +++ b/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp @@ -1,194 +1,111 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_e_hb_leaf -// +/** + * d_a_e_hb_leaf.cpp + * + */ #include "rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_McaMorf { - /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, - int, void*, u32, u32); - /* 80010680 */ void entryDL(); - /* 800106AC */ void modelCalc(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct e_hb_leaf_class {}; - -struct dKy_tevstr_c {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -// -// Forward References: -// - -extern "C" static void daE_HB_LEAF_Draw__FP15e_hb_leaf_class(); -extern "C" static void daE_HB_LEAF_Execute__FP15e_hb_leaf_class(); -extern "C" static bool daE_HB_LEAF_IsDelete__FP15e_hb_leaf_class(); -extern "C" static void daE_HB_LEAF_Delete__FP15e_hb_leaf_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daE_HB_LEAF_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_e_hb_leaf__stringBase0; -extern "C" extern void* g_profile_E_HB_LEAF[12]; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void -__ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl(); -extern "C" void entryDL__14mDoExt_McaMorfFv(); -extern "C" void modelCalc__14mDoExt_McaMorfFv(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void* __nw__FUl(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -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 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; - -// -// Declarations: -// +#include "d/com/d_com_inf_game.h" +#include "d/s/d_s_play.h" /* 806DFF58-806DFFC0 000078 0068+00 1/0 0/0 0/0 .text daE_HB_LEAF_Draw__FP15e_hb_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_HB_LEAF_Draw(e_hb_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Draw__FP15e_hb_leaf_class.s" +static int daE_HB_LEAF_Draw(e_hb_leaf_class* i_this) { + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(), &i_this->mTevStr); + i_this->mpMorf->entryDL(); + return 1; } -#pragma pop /* 806DFFC0-806E00A0 0000E0 00E0+00 2/1 0/0 0/0 .text daE_HB_LEAF_Execute__FP15e_hb_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_HB_LEAF_Execute(e_hb_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Execute__FP15e_hb_leaf_class.s" +static int daE_HB_LEAF_Execute(e_hb_leaf_class* i_this) { + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + mDoMtx_stack_c::XrotM(i_this->shape_angle.x); + i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpMorf->modelCalc(); + + fopAc_ac_c* actor = fopAcM_SearchByID(i_this->field_0x5bc); + if (i_this->field_0x5ba == 0) { + if (actor != NULL) { + i_this->field_0x5ba++; + } + } else if (i_this->field_0x5ba == 1 && actor == NULL) { + i_this->field_0x5ba++; + i_this->field_0x5b8 = TREG_S(8) + 100; + } + + return 1; } -#pragma pop /* 806E00A0-806E00A8 0001C0 0008+00 1/0 0/0 0/0 .text daE_HB_LEAF_IsDelete__FP15e_hb_leaf_class */ -static bool daE_HB_LEAF_IsDelete(e_hb_leaf_class* param_0) { - return true; +static int daE_HB_LEAF_IsDelete(e_hb_leaf_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 806E0294-806E0294 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_806E0294 = "E_HB"; -#pragma pop - /* 806E00A8-806E00D8 0001C8 0030+00 1/0 0/0 0/0 .text daE_HB_LEAF_Delete__FP15e_hb_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_HB_LEAF_Delete(e_hb_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Delete__FP15e_hb_leaf_class.s" +static int daE_HB_LEAF_Delete(e_hb_leaf_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "E_HB"); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 806E0290-806E0294 000000 0004+00 1/1 0/0 0/0 .rodata @3690 */ -SECTION_RODATA static f32 const lit_3690 = 1.0f; -COMPILER_STRIP_GATE(0x806E0290, &lit_3690); /* 806E00D8-806E01D8 0001F8 0100+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/useHeapInit__FP10fopAc_ac_c.s" +static int useHeapInit(fopAc_ac_c* i_this) { + e_hb_leaf_class* a_this = static_cast(i_this); + + a_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_HB", 0x18), NULL, + NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HB", 0x13), + 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); + if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { + return 0; + } + + return 1; } -#pragma pop /* 806E01D8-806E0288 0002F8 00B0+00 1/0 0/0 0/0 .text daE_HB_LEAF_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_HB_LEAF_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf/daE_HB_LEAF_Create__FP10fopAc_ac_c.s" +static int daE_HB_LEAF_Create(fopAc_ac_c* i_this) { + e_hb_leaf_class* a_this = static_cast(i_this); + fopAcM_SetupActor(a_this, e_hb_leaf_class); + + int phase_state = dComIfG_resLoad(&a_this->mPhase, "E_HB"); + if (phase_state == cPhs_COMPLEATE_e) { + OS_REPORT("E_HB_LEAF//////////////E_HB_LEAF SET 1 !!\n"); + + if (!fopAcM_entrySolidHeap(a_this, useHeapInit, 0xB00)) { + OS_REPORT("//////////////E_HB_LEAF SET NON !!\n"); + return cPhs_ERROR_e; + } + + OS_REPORT("//////////////E_HB_LEAF SET 2 !!\n"); + + fopAcM_SetMtx(a_this, a_this->mpMorf->getModel()->getBaseTRMtx()); + daE_HB_LEAF_Execute(a_this); + } + + return phase_state; } -#pragma pop -/* ############################################################################################## */ /* 806E029C-806E02BC -00001 0020+00 1/0 0/0 0/0 .data l_daE_HB_LEAF_Method */ -SECTION_DATA static void* l_daE_HB_LEAF_Method[8] = { - (void*)daE_HB_LEAF_Create__FP10fopAc_ac_c, - (void*)daE_HB_LEAF_Delete__FP15e_hb_leaf_class, - (void*)daE_HB_LEAF_Execute__FP15e_hb_leaf_class, - (void*)daE_HB_LEAF_IsDelete__FP15e_hb_leaf_class, - (void*)daE_HB_LEAF_Draw__FP15e_hb_leaf_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daE_HB_LEAF_Method = { + (process_method_func)daE_HB_LEAF_Create, (process_method_func)daE_HB_LEAF_Delete, + (process_method_func)daE_HB_LEAF_Execute, (process_method_func)daE_HB_LEAF_IsDelete, + (process_method_func)daE_HB_LEAF_Draw, }; /* 806E02BC-806E02EC -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_HB_LEAF */ -SECTION_DATA extern void* g_profile_E_HB_LEAF[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01CA0000, (void*)&g_fpcLf_Method, - (void*)0x000005C0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x008D0000, (void*)&l_daE_HB_LEAF_Method, - (void*)0x00040000, (void*)NULL, +extern actor_process_profile_definition g_profile_E_HB_LEAF = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_E_HB_LEAF, + &g_fpcLf_Method.mBase, + sizeof(e_hb_leaf_class), + 0, + 0, + &g_fopAc_Method.base, + 141, + &l_daE_HB_LEAF_Method, + 0x40000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, }; - -/* 806E0294-806E0294 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp b/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp index 942dd6cc5e0..5bf7e8d9d13 100644 --- a/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp +++ b/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp @@ -1,351 +1,147 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_e_st_line -// +/** + * d_a_e_st_line.cpp + * + */ #include "rel/d/a/e/d_a_e_st_line/d_a_e_st_line.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoExt_3DlineMat0_c { - /* 800125E0 */ void init(u16, u16, int); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct e_st_line_class {}; - -struct cXyz { - /* 807A6F60 */ ~cXyz(); - /* 807A7220 */ cXyz(); -}; - -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDFF8 */ void deleteObject(); -}; - -// -// Forward References: -// - -extern "C" static bool daE_ST_LINE_Draw__FP15e_st_line_class(); -extern "C" void __dt__4cXyzFv(); -extern "C" static bool daE_ST_LINE_Execute__FP15e_st_line_class(); -extern "C" static bool daE_ST_LINE_IsDelete__FP15e_st_line_class(); -extern "C" static void daE_ST_LINE_Delete__FP15e_st_line_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daE_ST_LINE_Create__FP10fopAc_ac_c(); -extern "C" void __ct__4cXyzFv(); -extern "C" extern char const* const d_a_e_st_line__stringBase0; - -// -// External References: -// - -extern "C" void init__19mDoExt_3DlineMat0_cFUsUsi(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM_rndFX__Ff(); -extern "C" void deleteObject__14Z2SoundObjBaseFv(); -extern "C" void __ct__16Z2SoundObjSimpleFv(); -extern "C" void __dl__FPv(); -extern "C" void __construct_array(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - -// -// Declarations: -// +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/s/d_s_play.h" /* 807A6F58-807A6F60 000078 0008+00 1/0 0/0 0/0 .text daE_ST_LINE_Draw__FP15e_st_line_class */ -static bool daE_ST_LINE_Draw(e_st_line_class* param_0) { - return true; -} - -/* 807A6F60-807A6F9C 000080 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cXyz::~cXyz() { - nofralloc -#include "asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/__dt__4cXyzFv.s" +static int daE_ST_LINE_Draw(e_st_line_class* i_this) { + cXyz unused; // necessary to generate weak cXyz dtor + return 1; } -#pragma pop /* 807A6F9C-807A6FA4 0000BC 0008+00 2/1 0/0 0/0 .text daE_ST_LINE_Execute__FP15e_st_line_class */ -static bool daE_ST_LINE_Execute(e_st_line_class* param_0) { - return true; +static int daE_ST_LINE_Execute(e_st_line_class* i_this) { + return 1; } /* 807A6FA4-807A6FAC 0000C4 0008+00 1/0 0/0 0/0 .text daE_ST_LINE_IsDelete__FP15e_st_line_class */ -static bool daE_ST_LINE_IsDelete(e_st_line_class* param_0) { - return true; +static int daE_ST_LINE_IsDelete(e_st_line_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 807A729C-807A729C 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_807A729C = "E_st"; -#pragma pop - /* 807A6FAC-807A7008 0000CC 005C+00 1/0 0/0 0/0 .text daE_ST_LINE_Delete__FP15e_st_line_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_ST_LINE_Delete(e_st_line_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/daE_ST_LINE_Delete__FP15e_st_line_class.s" -} -#pragma pop +static int daE_ST_LINE_Delete(e_st_line_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "E_st"); + if (i_this->field_0xcc4 == 0 && i_this->mHeap != NULL) { + i_this->mSound.deleteObject(); + } -/* ############################################################################################## */ -/* 807A722C-807A7230 000000 0004+00 1/1 0/0 0/0 .rodata @3704 */ -SECTION_RODATA static f32 const lit_3704 = 70.0f; -COMPILER_STRIP_GATE(0x807A722C, &lit_3704); - -/* 807A7230-807A7234 000004 0004+00 0/0 0/0 0/0 .rodata @3705 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3705[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x807A7230, &lit_3705); -#pragma pop - -/* 807A7234-807A7238 000008 0004+00 0/0 0/0 0/0 .rodata @3706 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3706 = 100.0f; -COMPILER_STRIP_GATE(0x807A7234, &lit_3706); -#pragma pop - -/* 807A7238-807A723C 00000C 0004+00 0/0 0/0 0/0 .rodata @3735 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3735 = 10.0f; -COMPILER_STRIP_GATE(0x807A7238, &lit_3735); -#pragma pop + return 1; +} -/* 807A723C-807A7244 000010 0004+04 0/0 0/0 0/0 .rodata @3759 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3759[1 + 1 /* padding */] = { - 1444.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x807A723C, &lit_3759); -#pragma pop +// fake functions to get float literal order. probably from some stripped HIO function? +f32 dummyLiteralOrder() { + f32 dummy = 70.0f; + f32 dummy2 = 0.0f; + dummy += dummy2; + dummy += 100.0f; + dummy += 10.0f; + dummy += 1444.0f; + dummy += 0.5; + dummy += 3.0; + + return dummy; +} -/* 807A7244-807A724C 000018 0008+00 0/0 0/0 0/0 .rodata @3938 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3938[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x807A7244, &lit_3938); -#pragma pop +f64 dummyLiteralOrder2() { + return 0.0; +} -/* 807A724C-807A7254 000020 0008+00 0/0 0/0 0/0 .rodata @3939 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3939[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x807A724C, &lit_3939); -#pragma pop +f32 dummyLiteralOrder3() { + f32 dummy = 20.0f; + dummy += 5.0f; + dummy += 4.0f; + dummy += 40.0f; + dummy += 50.0f; + dummy += 5000.0f; + dummy += 1.0f; + dummy += 0.015f; + dummy += 0.0049999999f; + + dummy += 0.3f; + dummy += 1000.0f; + dummy += 0.2f; + dummy += 60.0f; + dummy += 0.5f; + + return dummy; +} -/* 807A7254-807A725C 000028 0008+00 0/0 0/0 0/0 .rodata @3940 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3940[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x807A7254, &lit_3940); -#pragma pop +/* 807A7008-807A707C 000128 0074+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +static int useHeapInit(fopAc_ac_c* i_this) { + e_st_line_class* a_this = (e_st_line_class*)i_this; -/* 807A725C-807A7260 000030 0004+00 0/1 0/0 0/0 .rodata @3941 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3941 = 20.0f; -COMPILER_STRIP_GATE(0x807A725C, &lit_3941); -#pragma pop + if (!a_this->mLine.init(1, 50, 1)) { + return 0; + } -/* 807A7260-807A7264 000034 0004+00 0/0 0/0 0/0 .rodata @3942 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3942 = 5.0f; -COMPILER_STRIP_GATE(0x807A7260, &lit_3942); -#pragma pop + f32* size_p = a_this->mLine.getSize(0); + for (int i = 0; i < 50; i++) { + *size_p = (XREG_S(0) * 0.1) + 0.3f; + size_p++; + } -/* 807A7264-807A7268 000038 0004+00 0/0 0/0 0/0 .rodata @3943 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3943 = 4.0f; -COMPILER_STRIP_GATE(0x807A7264, &lit_3943); -#pragma pop + return 1; +} -/* 807A7268-807A726C 00003C 0004+00 0/0 0/0 0/0 .rodata @3944 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3944 = 40.0f; -COMPILER_STRIP_GATE(0x807A7268, &lit_3944); -#pragma pop +/* 807A707C-807A7220 00019C 01A4+00 1/0 0/0 0/0 .text daE_ST_LINE_Create__FP10fopAc_ac_c + */ +static int daE_ST_LINE_Create(fopAc_ac_c* i_this) { + fopAcM_SetupActor(i_this, e_st_line_class); + e_st_line_class* a_this = (e_st_line_class*)i_this; -/* 807A726C-807A7270 000040 0004+00 0/0 0/0 0/0 .rodata @3945 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3945 = 50.0f; -COMPILER_STRIP_GATE(0x807A726C, &lit_3945); -#pragma pop + int phase_state = dComIfG_resLoad(&a_this->mPhase, "E_st"); + if (phase_state == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(a_this, useHeapInit, 0xF40)) { + OS_REPORT("//////////////E_ST_LINE SET NON !!\n"); + return cPhs_ERROR_e; + } -/* 807A7270-807A7274 000044 0004+00 0/0 0/0 0/0 .rodata @3946 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3946 = 5000.0f; -COMPILER_STRIP_GATE(0x807A7270, &lit_3946); -#pragma pop + a_this->field_0x5d0 = cM_rndF(0xFFFF); -/* 807A7274-807A7278 000048 0004+00 0/0 0/0 0/0 .rodata @3947 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3947 = 1.0f; -COMPILER_STRIP_GATE(0x807A7274, &lit_3947); -#pragma pop + for (int i = 0; i < 64; i++) { + a_this->field_0x5dc[i] = a_this->current.pos; + } -/* 807A7278-807A727C 00004C 0004+00 0/0 0/0 0/0 .rodata @4003 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4003 = 0x3C75C28F; -COMPILER_STRIP_GATE(0x807A7278, &lit_4003); -#pragma pop + a_this->field_0xcc4 = fopAcM_GetParam(a_this) & 0xFF; + a_this->field_0xcc6 = cM_rndFX(BREG_F(9) + 20.0f) + (BREG_F(8) + 170.0f); -/* 807A727C-807A7280 000050 0004+00 0/0 0/0 0/0 .rodata @4004 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4004 = 0x3BA3D70A; -COMPILER_STRIP_GATE(0x807A727C, &lit_4004); -#pragma pop + if (a_this->field_0xcc4 == 0) { + a_this->mSound.init(&a_this->current.pos, 1); + } -/* 807A7280-807A7284 000054 0004+00 1/1 0/0 0/0 .rodata @4069 */ -SECTION_RODATA static f32 const lit_4069 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(0x807A7280, &lit_4069); + daE_ST_LINE_Execute(a_this); + } -/* 807A7008-807A707C 000128 0074+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/useHeapInit__FP10fopAc_ac_c.s" + return phase_state; } -#pragma pop - -/* ############################################################################################## */ -/* 807A7284-807A7288 000058 0004+00 0/0 0/0 0/0 .rodata @4070 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4070 = 1000.0f; -COMPILER_STRIP_GATE(0x807A7284, &lit_4070); -#pragma pop - -/* 807A7288-807A728C 00005C 0004+00 0/0 0/0 0/0 .rodata @4071 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4071 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x807A7288, &lit_4071); -#pragma pop - -/* 807A728C-807A7290 000060 0004+00 0/0 0/0 0/0 .rodata @4072 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4072 = 60.0f; -COMPILER_STRIP_GATE(0x807A728C, &lit_4072); -#pragma pop - -/* 807A7290-807A7294 000064 0004+00 0/0 0/0 0/0 .rodata @4073 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4073 = 0.5f; -COMPILER_STRIP_GATE(0x807A7290, &lit_4073); -#pragma pop - -/* 807A7294-807A7298 000068 0004+00 0/1 0/0 0/0 .rodata @4169 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4169 = 65535.0f; -COMPILER_STRIP_GATE(0x807A7294, &lit_4169); -#pragma pop - -/* 807A7298-807A729C 00006C 0004+00 0/1 0/0 0/0 .rodata @4170 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4170 = 170.0f; -COMPILER_STRIP_GATE(0x807A7298, &lit_4170); -#pragma pop /* 807A72A4-807A72C4 -00001 0020+00 1/0 0/0 0/0 .data l_daE_ST_LINE_Method */ -SECTION_DATA static void* l_daE_ST_LINE_Method[8] = { - (void*)daE_ST_LINE_Create__FP10fopAc_ac_c, - (void*)daE_ST_LINE_Delete__FP15e_st_line_class, - (void*)daE_ST_LINE_Execute__FP15e_st_line_class, - (void*)daE_ST_LINE_IsDelete__FP15e_st_line_class, - (void*)daE_ST_LINE_Draw__FP15e_st_line_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daE_ST_LINE_Method = { + (process_method_func)daE_ST_LINE_Create, (process_method_func)daE_ST_LINE_Delete, + (process_method_func)daE_ST_LINE_Execute, (process_method_func)daE_ST_LINE_IsDelete, + (process_method_func)daE_ST_LINE_Draw, }; /* 807A72C4-807A72F4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_ST_LINE */ -SECTION_DATA extern void* g_profile_E_ST_LINE[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01C00000, (void*)&g_fpcLf_Method, - (void*)0x00000CF8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00850000, (void*)&l_daE_ST_LINE_Method, - (void*)0x00044000, (void*)0x020E0000, +extern actor_process_profile_definition g_profile_E_ST_LINE = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_E_ST_LINE, + &g_fpcLf_Method.mBase, + sizeof(e_st_line_class), + 0, + 0, + &g_fopAc_Method.base, + 133, + &l_daE_ST_LINE_Method, + 0x44000, + fopAc_ENEMY_e, + fopAc_CULLBOX_CUSTOM_e, }; - -/* 807A72F4-807A7308 000050 0014+00 1/1 0/0 0/0 .data __vt__18mDoExt_3DlineMat_c */ -SECTION_DATA extern void* __vt__18mDoExt_3DlineMat_c[5] = { - (void*)NULL /* RTTI */, (void*)NULL, (void*)NULL, (void*)NULL, (void*)NULL, -}; - -/* 807A707C-807A7220 00019C 01A4+00 1/0 0/0 0/0 .text daE_ST_LINE_Create__FP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_ST_LINE_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_st_line/d_a_e_st_line/daE_ST_LINE_Create__FP10fopAc_ac_c.s" -} -#pragma pop - -/* 807A7220-807A7224 000340 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { - /* empty function */ -} - -/* 807A729C-807A729C 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/a/d_a_no_chg_room.cpp b/src/d/a/d_a_no_chg_room.cpp index 10b7315f964..164cbad4540 100644 --- a/src/d/a/d_a_no_chg_room.cpp +++ b/src/d/a/d_a_no_chg_room.cpp @@ -1,203 +1,188 @@ -// -// Generated By: dol2asm -// Translation Unit: d/a/d_a_no_chg_room -// +/** + * d_a_no_chg_room.cpp + * + */ #include "d/a/d_a_no_chg_room.h" -#include "dol2asm.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "d/s/d_s_room.h" +#include "rel/d/a/d_a_horse/d_a_horse.h" -// -// Types: -// - -struct process_node_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct cXyz {}; +/* 801451EC-801452DC 13FB2C 00F0+00 1/1 0/0 0/0 .text isLoadRoom__Fi */ +static bool isLoadRoom(int i_roomNo) { + roomRead_class* room = dComIfGp_getStageRoom(); + + if (room != NULL && room->field_0x0 > i_roomNo) { + int load_room_index; + int num; + u8* data; + + num = room->field_0x4[i_roomNo]->field_0x0; + data = room->field_0x4[i_roomNo]->field_0x4; + + for (int i = 0; i < num; i++) { + load_room_index = dStage_roomRead_dt_c_GetLoadRoomIndex(data[i]); + if (dComIfGp_roomControl_checkStatusFlag(load_room_index, 2)) { + // "Room <%d> loading!\n" + OS_REPORT("部屋<%d>読み込み中！\n", load_room_index); + return false; + } + + if (dComIfGp_roomControl_checkStatusFlag(load_room_index, 9) == (u32)TRUE) { + room_of_scene_class* roomScene = (room_of_scene_class*)fopScnM_SearchByID( + dStage_roomControl_c::getStatusProcID(load_room_index)); + JUT_ASSERT(roomScene != 0); + + if (roomScene->field_0x1d4 >= 0 || !fpcNd_IsDeleteTiming(&roomScene->mBase)) { + // "Room <%d> objects loading!\n" + OS_REPORT("部屋<%d>オブジェクト読み込み中！\n", load_room_index); + return false; + } + } + } + } -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); + return true; +} - static u8 mGndCheck[84]; -}; +/* 801452DC-80145508 13FC1C 022C+00 1/1 0/0 0/0 .text execute__9daNocrm_cFv */ +int daNocrm_c::execute() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + cXyz cur_player_pos(player_p->current.pos); + + if (player_p->checkHorseRide()) { + cur_player_pos.y = i_dComIfGp_getHorseActor()->current.pos.y; + } else if (player_p->checkSpinnerRide()) { + fopAc_ac_c* spinner_actor = player_p->getSpinnerActor(); + + if (spinner_actor != NULL) { + cur_player_pos.y = spinner_actor->current.pos.y; + } + } + + cXyz sp14; + mDoMtx_multVec(mInvMtx, &cur_player_pos, &sp14); + + if (sp14.y < 0.0f || sp14.y > mScale.y || fabsf(sp14.x) > mScale.x || fabsf(sp14.z) > mScale.z) + { + if (mSubtype == 0 || !mRoomLoading || + dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != 0) + { + return 1; + } + + if (isLoadRoom(getRoomNo(sp14.z < 0.0f ? 0 : 1))) { + mRoomLoading = false; + return 1; + } + + sp14.z = sp14.z < 0.0f ? -mScale.z : mScale.z; + + cXyz new_player_pos; + mDoMtx_multVec(mMtx, &sp14, &new_player_pos); + + daPy_getLinkPlayerActorClass()->setPlayerPosAndAngle(&new_player_pos, + player_p->shape_angle.y, 1); + } + + if (mSubtype == 0) { + dStage_roomControl_c::setRoomReadId(getReadRoomId()); + } else { + dStage_roomControl_c::onNoChangeRoom(); + mRoomLoading = true; + } + + return 1; +} -struct daNocrm_c { - /* 801452DC */ void execute(); - /* 80145508 */ void getRoomNo(int); -}; +inline int fopAcM_gc_c::getRoomId() { + return dComIfG_Bgsp().GetRoomId(*(dBgS_GndChk*)mGndCheck); +} -struct dStage_roomControl_c { - static u8 mStatus[65792]; -}; +/* 80145508-801455A8 13FE48 00A0+00 1/1 0/0 0/0 .text getRoomNo__9daNocrm_cFi */ +int daNocrm_c::getRoomNo(int param_0) { + if (mRoomNo[param_0] < 0) { + f32 z_offset = param_0 ? -mScale.z : mScale.z; -struct cBgS_PolyInfo {}; + cXyz offset(0.0f, mScale.y, z_offset); + cXyz check_pos; + mDoMtx_multVec(mMtx, &offset, &check_pos); -struct dBgS { - /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); -}; + bool groundHit = fopAcM_gc_c::gndCheck(&check_pos); + JUT_ASSERT(groundHit); -// -// Forward References: -// - -extern "C" static void isLoadRoom__Fi(); -extern "C" void execute__9daNocrm_cFv(); -extern "C" void getRoomNo__9daNocrm_cFi(); -extern "C" static void daNocrm_create__FP9daNocrm_c(); -extern "C" static bool daNocrm_Delete__FP9daNocrm_c(); -extern "C" static void daNocrm_execute__FP9daNocrm_c(); -extern "C" static bool daNocrm_draw__FP9daNocrm_c(); -extern "C" extern char const* const d_a_d_a_no_chg_room__stringBase0; -extern "C" extern void* g_profile_NO_CHG_ROOM[12]; - -// -// External References: -// - -extern "C" void OSReport_Warning(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void gndCheck__11fopAcM_gc_cFPC4cXyz(); -extern "C" void fopScnM_SearchByID__FUi(); -extern "C" void fpcNd_IsDeleteTiming__FP18process_node_class(); -extern "C" void GetRoomId__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECScale(); -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 now__14mDoMtx_stack_c[48]; -extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_804505F0[8]; -extern "C" extern u8 mNoChangeRoom__20dStage_roomControl_c[4]; - -// -// Declarations: -// + int roomNo = fopAcM_gc_c::getRoomId(); + JUT_ASSERT(0 <= roomNo && roomNo < 64); -/* 801451EC-801452DC 13FB2C 00F0+00 1/1 0/0 0/0 .text isLoadRoom__Fi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void isLoadRoom(int param_0) { - nofralloc -#include "asm/d/a/d_a_no_chg_room/isLoadRoom__Fi.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804533C8-804533CC 0019C8 0004+00 2/2 0/0 0/0 .sdata2 @3762 */ -SECTION_SDATA2 static u8 lit_3762[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; + mRoomNo[param_0] = roomNo; + } -/* 801452DC-80145508 13FC1C 022C+00 1/1 0/0 0/0 .text execute__9daNocrm_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNocrm_c::execute() { - nofralloc -#include "asm/d/a/d_a_no_chg_room/execute__9daNocrm_cFv.s" + return mRoomNo[param_0]; } -#pragma pop -/* 80145508-801455A8 13FE48 00A0+00 1/1 0/0 0/0 .text getRoomNo__9daNocrm_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daNocrm_c::getRoomNo(int param_0) { - nofralloc -#include "asm/d/a/d_a_no_chg_room/getRoomNo__9daNocrm_cFi.s" +int daNocrm_c::create() { + if (mSubtype == 0 && getReadRoomId() < 0) { + // "Room Load Rectangle: Load ID is -1, so destroy self!\n" + OSReport_Warning("部屋読み込み矩形：読み込みＩＤが−１ですので、自滅します！\n"); + return cPhs_ERROR_e; + } + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + cMtx_copy(mDoMtx_stack_c::get(), mMtx); + cMtx_inverse(mDoMtx_stack_c::get(), mInvMtx); + + mScale *= getScaleType() ? 1000.0f : 100.0f; + mRoomNo[0] = -1; + mRoomNo[1] = -1; + return cPhs_COMPLEATE_e; } -#pragma pop - -/* ############################################################################################## */ -/* 80392640-80392640 01ECA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80392640 = - "部屋読み込み矩形：読み込みＩＤが−１ですので、自滅します！\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039267C = "\0\0\0"; -#pragma pop - -/* 804533CC-804533D0 0019CC 0004+00 1/1 0/0 0/0 .sdata2 @3832 */ -SECTION_SDATA2 static f32 lit_3832 = 1000.0f; - -/* 804533D0-804533D8 0019D0 0004+04 1/1 0/0 0/0 .sdata2 @3833 */ -SECTION_SDATA2 static f32 lit_3833[1 + 1 /* padding */] = { - 100.0f, - /* padding */ - 0.0f, -}; /* 801455A8-801456A4 13FEE8 00FC+00 1/0 0/0 0/0 .text daNocrm_create__FP9daNocrm_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daNocrm_create(daNocrm_c* param_0) { - nofralloc -#include "asm/d/a/d_a_no_chg_room/daNocrm_create__FP9daNocrm_c.s" +static int daNocrm_create(daNocrm_c* i_this) { + fopAcM_SetupActor(i_this, daNocrm_c); + return i_this->create(); } -#pragma pop /* 801456A4-801456AC 13FFE4 0008+00 1/0 0/0 0/0 .text daNocrm_Delete__FP9daNocrm_c */ -static bool daNocrm_Delete(daNocrm_c* param_0) { - return true; +static int daNocrm_Delete(daNocrm_c* i_this) { + return 1; } /* 801456AC-801456CC 13FFEC 0020+00 1/0 0/0 0/0 .text daNocrm_execute__FP9daNocrm_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daNocrm_execute(daNocrm_c* param_0) { - nofralloc -#include "asm/d/a/d_a_no_chg_room/daNocrm_execute__FP9daNocrm_c.s" +static int daNocrm_execute(daNocrm_c* i_this) { + return i_this->execute(); } -#pragma pop /* 801456CC-801456D4 14000C 0008+00 1/0 0/0 0/0 .text daNocrm_draw__FP9daNocrm_c */ -static bool daNocrm_draw(daNocrm_c* param_0) { - return true; +static int daNocrm_draw(daNocrm_c* i_this) { + return 1; } -/* ############################################################################################## */ /* 803B3658-803B3678 -00001 0020+00 1/0 0/0 0/0 .data daNocrm_METHODS */ -SECTION_DATA static void* daNocrm_METHODS[8] = { - (void*)daNocrm_create__FP9daNocrm_c, - (void*)daNocrm_Delete__FP9daNocrm_c, - (void*)daNocrm_execute__FP9daNocrm_c, - (void*)NULL, - (void*)daNocrm_draw__FP9daNocrm_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class daNocrm_METHODS = { + (process_method_func)daNocrm_create, (process_method_func)daNocrm_Delete, + (process_method_func)daNocrm_execute, (process_method_func)NULL, + (process_method_func)daNocrm_draw, }; /* 803B3678-803B36A8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NO_CHG_ROOM */ -SECTION_DATA extern void* g_profile_NO_CHG_ROOM[12] = { - (void*)0xFFFFFFFD, (void*)0x0002FFFD, - (void*)0x001A0000, (void*)&g_fpcLf_Method, - (void*)0x000005CC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02FA0000, (void*)&daNocrm_METHODS, - (void*)0x00060000, (void*)0x05000000, +extern actor_process_profile_definition g_profile_NO_CHG_ROOM = { + fpcLy_CURRENT_e, + 2, + fpcPi_CURRENT_e, + PROC_NO_CHG_ROOM, + &g_fpcLf_Method.mBase, + sizeof(daNocrm_c), + 0, + 0, + &g_fopAc_Method.base, + 762, + &daNocrm_METHODS, + 0x60000, + fopAc_UNK_GROUP_5_e, + fopAc_CULLBOX_0_e, }; - -/* 80392640-80392640 01ECA0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 7cb89d93f2a..edeb2ee5e52 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -317,7 +317,7 @@ extern "C" void getCellWidth__7JUTFontCFv(); extern "C" void getCellHeight__7JUTFontCFv(); extern "C" void __dt__26mDoExt_3DlineMatSortPacketFv(); extern "C" bool getMaterialID__19mDoExt_3DlineMat1_cFv(); -extern "C" bool getMaterialID__19mDoExt_3DlineMat0_cFv(); +extern "C" int getMaterialID__19mDoExt_3DlineMat0_cFv(); extern "C" void setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform(); extern "C" void setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform(); extern "C" bool getAnmTransform__10J3DMtxCalcFUc(); @@ -3607,7 +3607,7 @@ extern "C" void __ct__4cXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoExt_3DlineMat0_c::init(u16 param_0, u16 param_1, int param_2) { +asm int mDoExt_3DlineMat0_c::init(u16 param_0, u16 param_1, int param_2) { nofralloc #include "asm/m_Do/m_Do_ext/init__19mDoExt_3DlineMat0_cFUsUsi.s" } @@ -4212,7 +4212,8 @@ int mDoExt_3DlineMat1_c::getMaterialID() { } /* 80014E84-80014E8C 00F7C4 0008+00 1/0 0/0 0/0 .text getMaterialID__19mDoExt_3DlineMat0_cFv */ -int mDoExt_3DlineMat0_c::getMaterialID() { +// int mDoExt_3DlineMat0_c::getMaterialID() { +extern "C" int getMaterialID__19mDoExt_3DlineMat0_cFv() { return 0; }