diff --git a/Progress.md b/Progress.md index b9eeaf0e28..78d97d7779 100644 --- a/Progress.md +++ b/Progress.md @@ -21,8 +21,8 @@ Total | 53.029643% | 2132148 | 4020672 Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- main.dol | 53.029643% | 2132148 | 4020672 -RELs | 36.718409% | 4222736 | 11500324 -Total | 40.943790% | 6354884 | 15520996 +RELs | 36.734826% | 4224624 | 11500324 +Total | 40.955954% | 6356772 | 15520996 ## RELs @@ -585,7 +585,7 @@ d_a_obj_roten | 41.613588% | 1568 | 3768 d_a_obj_rstair | 37.354086% | 2688 | 7196 d_a_obj_rw | 41.210834% | 3104 | 7532 d_a_obj_sWallShutter | 41.268759% | 2420 | 5864 -d_a_obj_saidan | 50.210970% | 1904 | 3792 +d_a_obj_saidan | 100.000000% | 3792 | 3792 d_a_obj_sakuita | 43.573382% | 1912 | 4388 d_a_obj_sakuita_rope | 30.817009% | 2580 | 8372 d_a_obj_scannon | 35.209799% | 5404 | 15348 @@ -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 | 36.718409% | 4222736 | 11500324 +Total | 36.734826% | 4224624 | 11500324 diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/CreateHeap__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/CreateHeap__10daSaidan_cFv.s deleted file mode 100644 index b439e1c970..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/CreateHeap__10daSaidan_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80CC3EB0: -/* 80CC3EB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC3EB4 7C 08 02 A6 */ mflr r0 -/* 80CC3EB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC3EBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CC3EC0 7C 7F 1B 78 */ mr r31, r3 -/* 80CC3EC4 3C 60 80 CC */ lis r3, d_a_obj_saidan__stringBase0@ha /* 0x80CC4540@ha */ -/* 80CC3EC8 38 63 45 40 */ addi r3, r3, d_a_obj_saidan__stringBase0@l /* 0x80CC4540@l */ -/* 80CC3ECC 38 80 00 04 */ li r4, 4 -/* 80CC3ED0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CC3ED4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CC3ED8 3C A5 00 02 */ addis r5, r5, 2 -/* 80CC3EDC 38 C0 00 80 */ li r6, 0x80 -/* 80CC3EE0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80CC3EE4 4B 37 84 09 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80CC3EE8 3C 80 00 08 */ lis r4, 8 -/* 80CC3EEC 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80CC3EF0 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80CC3EF4 4B 35 0D 61 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80CC3EF8 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80CC3EFC 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CC3F00 30 03 FF FF */ addic r0, r3, -1 -/* 80CC3F04 7C 60 19 10 */ subfe r3, r0, r3 -/* 80CC3F08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CC3F0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC3F10 7C 08 03 A6 */ mtlr r0 -/* 80CC3F14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC3F18 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Delete__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Delete__10daSaidan_cFv.s deleted file mode 100644 index bd3cd47921..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Delete__10daSaidan_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80CC43BC: -/* 80CC43BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC43C0 7C 08 02 A6 */ mflr r0 -/* 80CC43C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC43C8 3C 80 80 CC */ lis r4, d_a_obj_saidan__stringBase0@ha /* 0x80CC4540@ha */ -/* 80CC43CC 38 84 45 40 */ addi r4, r4, d_a_obj_saidan__stringBase0@l /* 0x80CC4540@l */ -/* 80CC43D0 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80CC43D4 4B 36 8C 35 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80CC43D8 38 60 00 01 */ li r3, 1 -/* 80CC43DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC43E0 7C 08 03 A6 */ mtlr r0 -/* 80CC43E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC43E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Draw__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Draw__10daSaidan_cFv.s deleted file mode 100644 index 4eabe2ce77..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Draw__10daSaidan_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80CC4318: -/* 80CC4318 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC431C 7C 08 02 A6 */ mflr r0 -/* 80CC4320 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC4324 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CC4328 93 C1 00 08 */ stw r30, 8(r1) -/* 80CC432C 7C 7E 1B 78 */ mr r30, r3 -/* 80CC4330 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CC4334 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CC4338 38 80 00 10 */ li r4, 0x10 -/* 80CC433C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CC4340 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80CC4344 4B 4D F4 81 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80CC4348 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80CC434C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80CC4350 80 9E 05 A8 */ lwz r4, 0x5a8(r30) -/* 80CC4354 80 84 00 04 */ lwz r4, 4(r4) -/* 80CC4358 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80CC435C 4B 4E 0A 45 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80CC4360 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CC4364 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CC4368 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80CC436C 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80CC4370 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80CC4374 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CC4378 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80CC437C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CC4380 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80CC4384 4B 34 99 41 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80CC4388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CC438C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CC4390 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80CC4394 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80CC4398 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80CC439C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80CC43A0 38 60 00 01 */ li r3, 1 -/* 80CC43A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CC43A8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CC43AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC43B0 7C 08 03 A6 */ mtlr r0 -/* 80CC43B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC43B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Execute__10daSaidan_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Execute__10daSaidan_cFPPA3_A4_f.s deleted file mode 100644 index cccc2f01b4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Execute__10daSaidan_cFPPA3_A4_f.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80CC4054: -/* 80CC4054 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC4058 7C 08 02 A6 */ mflr r0 -/* 80CC405C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC4060 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CC4064 93 C1 00 08 */ stw r30, 8(r1) -/* 80CC4068 7C 7E 1B 78 */ mr r30, r3 -/* 80CC406C 7C 9F 23 78 */ mr r31, r4 -/* 80CC4070 48 00 00 35 */ bl moveProc__10daSaidan_cFv -/* 80CC4074 80 7E 05 A8 */ lwz r3, 0x5a8(r30) -/* 80CC4078 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CC407C 90 1F 00 00 */ stw r0, 0(r31) -/* 80CC4080 7F C3 F3 78 */ mr r3, r30 -/* 80CC4084 4B FF FD A5 */ bl setBaseMtx__10daSaidan_cFv -/* 80CC4088 38 60 00 01 */ li r3, 1 -/* 80CC408C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CC4090 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CC4094 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC4098 7C 08 03 A6 */ mtlr r0 -/* 80CC409C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC40A0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__ct__14daSaidan_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__ct__14daSaidan_HIO_cFv.s deleted file mode 100644 index 6d1c5a6944..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__ct__14daSaidan_HIO_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80CC3DAC: -/* 80CC3DAC 3C 80 80 CC */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80CC4638@ha */ -/* 80CC3DB0 38 04 46 38 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80CC4638@l */ -/* 80CC3DB4 90 03 00 00 */ stw r0, 0(r3) -/* 80CC3DB8 3C 80 80 CC */ lis r4, __vt__14daSaidan_HIO_c@ha /* 0x80CC462C@ha */ -/* 80CC3DBC 38 04 46 2C */ addi r0, r4, __vt__14daSaidan_HIO_c@l /* 0x80CC462C@l */ -/* 80CC3DC0 90 03 00 00 */ stw r0, 0(r3) -/* 80CC3DC4 3C 80 80 CC */ lis r4, lit_3625@ha /* 0x80CC4524@ha */ -/* 80CC3DC8 C0 04 45 24 */ lfs f0, lit_3625@l(r4) /* 0x80CC4524@l */ -/* 80CC3DCC D0 03 00 04 */ stfs f0, 4(r3) -/* 80CC3DD0 3C 80 80 CC */ lis r4, lit_3626@ha /* 0x80CC4528@ha */ -/* 80CC3DD4 C0 04 45 28 */ lfs f0, lit_3626@l(r4) /* 0x80CC4528@l */ -/* 80CC3DD8 D0 03 00 08 */ stfs f0, 8(r3) -/* 80CC3DDC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__dt__14daSaidan_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__dt__14daSaidan_HIO_cFv.s deleted file mode 100644 index 334248e82f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__dt__14daSaidan_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CC4478: -/* 80CC4478 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC447C 7C 08 02 A6 */ mflr r0 -/* 80CC4480 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC4484 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CC4488 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CC448C 41 82 00 30 */ beq lbl_80CC44BC -/* 80CC4490 3C 60 80 CC */ lis r3, __vt__14daSaidan_HIO_c@ha /* 0x80CC462C@ha */ -/* 80CC4494 38 03 46 2C */ addi r0, r3, __vt__14daSaidan_HIO_c@l /* 0x80CC462C@l */ -/* 80CC4498 90 1F 00 00 */ stw r0, 0(r31) -/* 80CC449C 41 82 00 10 */ beq lbl_80CC44AC -/* 80CC44A0 3C 60 80 CC */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80CC4638@ha */ -/* 80CC44A4 38 03 46 38 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80CC4638@l */ -/* 80CC44A8 90 1F 00 00 */ stw r0, 0(r31) -lbl_80CC44AC: -/* 80CC44AC 7C 80 07 35 */ extsh. r0, r4 -/* 80CC44B0 40 81 00 0C */ ble lbl_80CC44BC -/* 80CC44B4 7F E3 FB 78 */ mr r3, r31 -/* 80CC44B8 4B 60 A8 85 */ bl __dl__FPv -lbl_80CC44BC: -/* 80CC44BC 7F E3 FB 78 */ mr r3, r31 -/* 80CC44C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CC44C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC44C8 7C 08 03 A6 */ mtlr r0 -/* 80CC44CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC44D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 9c5729f112..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CC3DE0: -/* 80CC3DE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC3DE4 7C 08 02 A6 */ mflr r0 -/* 80CC3DE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC3DEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CC3DF0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CC3DF4 41 82 00 1C */ beq lbl_80CC3E10 -/* 80CC3DF8 3C A0 80 CC */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80CC4638@ha */ -/* 80CC3DFC 38 05 46 38 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80CC4638@l */ -/* 80CC3E00 90 1F 00 00 */ stw r0, 0(r31) -/* 80CC3E04 7C 80 07 35 */ extsh. r0, r4 -/* 80CC3E08 40 81 00 08 */ ble lbl_80CC3E10 -/* 80CC3E0C 4B 60 AF 31 */ bl __dl__FPv -lbl_80CC3E10: -/* 80CC3E10 7F E3 FB 78 */ mr r3, r31 -/* 80CC3E14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CC3E18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC3E1C 7C 08 03 A6 */ mtlr r0 -/* 80CC3E20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC3E24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__sinit_d_a_obj_saidan_cpp.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__sinit_d_a_obj_saidan_cpp.s deleted file mode 100644 index 2faf68f29f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__sinit_d_a_obj_saidan_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80CC44D4: -/* 80CC44D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC44D8 7C 08 02 A6 */ mflr r0 -/* 80CC44DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC44E0 3C 60 80 CC */ lis r3, l_HIO@ha /* 0x80CC465C@ha */ -/* 80CC44E4 38 63 46 5C */ addi r3, r3, l_HIO@l /* 0x80CC465C@l */ -/* 80CC44E8 4B FF F8 C5 */ bl __ct__14daSaidan_HIO_cFv -/* 80CC44EC 3C 80 80 CC */ lis r4, __dt__14daSaidan_HIO_cFv@ha /* 0x80CC4478@ha */ -/* 80CC44F0 38 84 44 78 */ addi r4, r4, __dt__14daSaidan_HIO_cFv@l /* 0x80CC4478@l */ -/* 80CC44F4 3C A0 80 CC */ lis r5, lit_3619@ha /* 0x80CC4650@ha */ -/* 80CC44F8 38 A5 46 50 */ addi r5, r5, lit_3619@l /* 0x80CC4650@l */ -/* 80CC44FC 4B FF F8 3D */ bl __register_global_object -/* 80CC4500 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC4504 7C 08 03 A6 */ mtlr r0 -/* 80CC4508 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC450C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/create__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/create__10daSaidan_cFv.s deleted file mode 100644 index 36ffb242d3..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/create__10daSaidan_cFv.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_80CC3F1C: -/* 80CC3F1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC3F20 7C 08 02 A6 */ mflr r0 -/* 80CC3F24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC3F28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CC3F2C 93 C1 00 08 */ stw r30, 8(r1) -/* 80CC3F30 7C 7F 1B 78 */ mr r31, r3 -/* 80CC3F34 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CC3F38 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CC3F3C 40 82 00 28 */ bne lbl_80CC3F64 -/* 80CC3F40 28 1F 00 00 */ cmplwi r31, 0 -/* 80CC3F44 41 82 00 14 */ beq lbl_80CC3F58 -/* 80CC3F48 4B 3B 46 DD */ bl __ct__16dBgS_MoveBgActorFv -/* 80CC3F4C 3C 60 80 CC */ lis r3, __vt__10daSaidan_c@ha /* 0x80CC4604@ha */ -/* 80CC3F50 38 03 46 04 */ addi r0, r3, __vt__10daSaidan_c@l /* 0x80CC4604@l */ -/* 80CC3F54 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80CC3F58: -/* 80CC3F58 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80CC3F5C 60 00 00 08 */ ori r0, r0, 8 -/* 80CC3F60 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80CC3F64: -/* 80CC3F64 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80CC3F68 3C 80 80 CC */ lis r4, d_a_obj_saidan__stringBase0@ha /* 0x80CC4540@ha */ -/* 80CC3F6C 38 84 45 40 */ addi r4, r4, d_a_obj_saidan__stringBase0@l /* 0x80CC4540@l */ -/* 80CC3F70 4B 36 8F 4D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80CC3F74 7C 7E 1B 78 */ mr r30, r3 -/* 80CC3F78 2C 1E 00 04 */ cmpwi r30, 4 -/* 80CC3F7C 40 82 00 BC */ bne lbl_80CC4038 -/* 80CC3F80 7F E3 FB 78 */ mr r3, r31 -/* 80CC3F84 3C 80 80 CC */ lis r4, d_a_obj_saidan__stringBase0@ha /* 0x80CC4540@ha */ -/* 80CC3F88 38 84 45 40 */ addi r4, r4, d_a_obj_saidan__stringBase0@l /* 0x80CC4540@l */ -/* 80CC3F8C 38 A0 00 07 */ li r5, 7 -/* 80CC3F90 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80CC3F94 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80CC3F98 38 E0 21 B0 */ li r7, 0x21b0 -/* 80CC3F9C 39 00 00 00 */ li r8, 0 -/* 80CC3FA0 4B 3B 48 1D */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80CC3FA4 2C 03 00 05 */ cmpwi r3, 5 -/* 80CC3FA8 40 82 00 0C */ bne lbl_80CC3FB4 -/* 80CC3FAC 38 60 00 05 */ li r3, 5 -/* 80CC3FB0 48 00 00 8C */ b lbl_80CC403C -lbl_80CC3FB4: -/* 80CC3FB4 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CC3FB8 38 03 00 24 */ addi r0, r3, 0x24 -/* 80CC3FBC 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80CC3FC0 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CC3FC4 80 83 00 04 */ lwz r4, 4(r3) -/* 80CC3FC8 7F E3 FB 78 */ mr r3, r31 -/* 80CC3FCC 4B 35 65 AD */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80CC3FD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CC3FD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CC3FD8 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CC3FDC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80CC3FE0 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CC3FE4 7C 05 07 74 */ extsb r5, r0 -/* 80CC3FE8 4B 37 13 79 */ bl isSwitch__10dSv_info_cCFii -/* 80CC3FEC 98 7F 05 AD */ stb r3, 0x5ad(r31) -/* 80CC3FF0 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 80CC3FF4 D0 1F 05 B0 */ stfs f0, 0x5b0(r31) -/* 80CC3FF8 88 1F 05 AD */ lbz r0, 0x5ad(r31) -/* 80CC3FFC 28 00 00 00 */ cmplwi r0, 0 -/* 80CC4000 41 82 00 28 */ beq lbl_80CC4028 -/* 80CC4004 C0 3F 05 B0 */ lfs f1, 0x5b0(r31) -/* 80CC4008 3C 60 80 CC */ lis r3, l_HIO@ha /* 0x80CC465C@ha */ -/* 80CC400C 38 63 46 5C */ addi r3, r3, l_HIO@l /* 0x80CC465C@l */ -/* 80CC4010 C0 03 00 08 */ lfs f0, 8(r3) -/* 80CC4014 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80CC4018 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80CC401C 7F E3 FB 78 */ mr r3, r31 -/* 80CC4020 48 00 02 71 */ bl init_modeMoveEnd__10daSaidan_cFv -/* 80CC4024 48 00 00 0C */ b lbl_80CC4030 -lbl_80CC4028: -/* 80CC4028 7F E3 FB 78 */ mr r3, r31 -/* 80CC402C 48 00 01 1D */ bl init_modeWait__10daSaidan_cFv -lbl_80CC4030: -/* 80CC4030 7F E3 FB 78 */ mr r3, r31 -/* 80CC4034 4B FF FD F5 */ bl setBaseMtx__10daSaidan_cFv -lbl_80CC4038: -/* 80CC4038 7F C3 F3 78 */ mr r3, r30 -lbl_80CC403C: -/* 80CC403C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CC4040 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CC4044 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC4048 7C 08 03 A6 */ mtlr r0 -/* 80CC404C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC4050 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 934897cd4d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CC4458: -/* 80CC4458 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC445C 7C 08 02 A6 */ mflr r0 -/* 80CC4460 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC4464 4B FF FA B9 */ bl create__10daSaidan_cFv -/* 80CC4468 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC446C 7C 08 03 A6 */ mtlr r0 -/* 80CC4470 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC4474 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Delete__FP10daSaidan_c.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Delete__FP10daSaidan_c.s deleted file mode 100644 index 1b80b5e64d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Delete__FP10daSaidan_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CC4438: -/* 80CC4438 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC443C 7C 08 02 A6 */ mflr r0 -/* 80CC4440 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC4444 4B 3B 44 99 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80CC4448 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC444C 7C 08 03 A6 */ mtlr r0 -/* 80CC4450 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC4454 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Draw__FP10daSaidan_c.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Draw__FP10daSaidan_c.s deleted file mode 100644 index d806d17b83..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Draw__FP10daSaidan_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80CC43EC: -/* 80CC43EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC43F0 7C 08 02 A6 */ mflr r0 -/* 80CC43F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC43F8 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80CC43FC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80CC4400 7D 89 03 A6 */ mtctr r12 -/* 80CC4404 4E 80 04 21 */ bctrl -/* 80CC4408 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC440C 7C 08 03 A6 */ mtlr r0 -/* 80CC4410 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC4414 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Execute__FP10daSaidan_c.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Execute__FP10daSaidan_c.s deleted file mode 100644 index f2bb6516d4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Execute__FP10daSaidan_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CC4418: -/* 80CC4418 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC441C 7C 08 02 A6 */ mflr r0 -/* 80CC4420 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC4424 4B 3B 45 2D */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80CC4428 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC442C 7C 08 03 A6 */ mtlr r0 -/* 80CC4430 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC4434 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeMoveEnd__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeMoveEnd__10daSaidan_cFv.s deleted file mode 100644 index 0dd3444b27..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeMoveEnd__10daSaidan_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80CC4290: -/* 80CC4290 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80CC4294 7C 08 02 A6 */ mflr r0 -/* 80CC4298 90 01 00 24 */ stw r0, 0x24(r1) -/* 80CC429C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CC42A0 7C 7F 1B 78 */ mr r31, r3 -/* 80CC42A4 88 03 04 E2 */ lbz r0, 0x4e2(r3) -/* 80CC42A8 7C 03 07 74 */ extsb r3, r0 -/* 80CC42AC 4B 36 8D C1 */ bl dComIfGp_getReverb__Fi -/* 80CC42B0 7C 67 1B 78 */ mr r7, r3 -/* 80CC42B4 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008010E@ha */ -/* 80CC42B8 38 03 01 0E */ addi r0, r3, 0x010E /* 0x0008010E@l */ -/* 80CC42BC 90 01 00 08 */ stw r0, 8(r1) -/* 80CC42C0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CC42C4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CC42C8 80 63 00 00 */ lwz r3, 0(r3) -/* 80CC42CC 38 81 00 08 */ addi r4, r1, 8 -/* 80CC42D0 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80CC42D4 38 C0 00 00 */ li r6, 0 -/* 80CC42D8 3D 00 80 CC */ lis r8, lit_3760@ha /* 0x80CC4534@ha */ -/* 80CC42DC C0 28 45 34 */ lfs f1, lit_3760@l(r8) /* 0x80CC4534@l */ -/* 80CC42E0 FC 40 08 90 */ fmr f2, f1 -/* 80CC42E4 3D 00 80 CC */ lis r8, lit_3761@ha /* 0x80CC4538@ha */ -/* 80CC42E8 C0 68 45 38 */ lfs f3, lit_3761@l(r8) /* 0x80CC4538@l */ -/* 80CC42EC FC 80 18 90 */ fmr f4, f3 -/* 80CC42F0 39 00 00 00 */ li r8, 0 -/* 80CC42F4 4B 5E 76 91 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CC42F8 38 00 00 02 */ li r0, 2 -/* 80CC42FC 98 1F 05 AC */ stb r0, 0x5ac(r31) -/* 80CC4300 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CC4304 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80CC4308 7C 08 03 A6 */ mtlr r0 -/* 80CC430C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80CC4310 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeMove__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeMove__10daSaidan_cFv.s deleted file mode 100644 index dbf39cd05e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeMove__10daSaidan_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80CC41B0: -/* 80CC41B0 38 00 00 01 */ li r0, 1 -/* 80CC41B4 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80CC41B8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeWait__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeWait__10daSaidan_cFv.s deleted file mode 100644 index 007a5e3a0e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeWait__10daSaidan_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80CC4148: -/* 80CC4148 38 00 00 00 */ li r0, 0 -/* 80CC414C 98 03 05 AC */ stb r0, 0x5ac(r3) -/* 80CC4150 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/modeMove__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/modeMove__10daSaidan_cFv.s deleted file mode 100644 index 2458e05b73..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/modeMove__10daSaidan_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80CC41BC: -/* 80CC41BC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80CC41C0 7C 08 02 A6 */ mflr r0 -/* 80CC41C4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80CC41C8 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80CC41CC F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80CC41D0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80CC41D4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80CC41D8 7C 7E 1B 78 */ mr r30, r3 -/* 80CC41DC 3C 60 80 CC */ lis r3, lit_3625@ha /* 0x80CC4524@ha */ -/* 80CC41E0 3B E3 45 24 */ addi r31, r3, lit_3625@l /* 0x80CC4524@l */ -/* 80CC41E4 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80CC41E8 C0 3E 05 B0 */ lfs f1, 0x5b0(r30) -/* 80CC41EC 3C 80 80 CC */ lis r4, l_HIO@ha /* 0x80CC465C@ha */ -/* 80CC41F0 38 84 46 5C */ addi r4, r4, l_HIO@l /* 0x80CC465C@l */ -/* 80CC41F4 C0 04 00 08 */ lfs f0, 8(r4) -/* 80CC41F8 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80CC41FC C0 5F 00 08 */ lfs f2, 8(r31) -/* 80CC4200 C0 64 00 04 */ lfs f3, 4(r4) -/* 80CC4204 C0 9F 00 0C */ lfs f4, 0xc(r31) -/* 80CC4208 4B 5A B7 75 */ bl cLib_addCalc__FPfffff -/* 80CC420C FF E0 08 90 */ fmr f31, f1 -/* 80CC4210 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 80CC4214 7C 03 07 74 */ extsb r3, r0 -/* 80CC4218 4B 36 8E 55 */ bl dComIfGp_getReverb__Fi -/* 80CC421C 7C 67 1B 78 */ mr r7, r3 -/* 80CC4220 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008010D@ha */ -/* 80CC4224 38 03 01 0D */ addi r0, r3, 0x010D /* 0x0008010D@l */ -/* 80CC4228 90 01 00 08 */ stw r0, 8(r1) -/* 80CC422C 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CC4230 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CC4234 80 63 00 00 */ lwz r3, 0(r3) -/* 80CC4238 38 81 00 08 */ addi r4, r1, 8 -/* 80CC423C 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80CC4240 38 C0 00 00 */ li r6, 0 -/* 80CC4244 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 80CC4248 FC 40 08 90 */ fmr f2, f1 -/* 80CC424C C0 7F 00 14 */ lfs f3, 0x14(r31) -/* 80CC4250 FC 80 18 90 */ fmr f4, f3 -/* 80CC4254 39 00 00 00 */ li r8, 0 -/* 80CC4258 4B 5E 82 B5 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CC425C C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80CC4260 FC 00 F8 00 */ fcmpu cr0, f0, f31 -/* 80CC4264 40 82 00 0C */ bne lbl_80CC4270 -/* 80CC4268 7F C3 F3 78 */ mr r3, r30 -/* 80CC426C 48 00 00 25 */ bl init_modeMoveEnd__10daSaidan_cFv -lbl_80CC4270: -/* 80CC4270 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80CC4274 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80CC4278 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80CC427C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80CC4280 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80CC4284 7C 08 03 A6 */ mtlr r0 -/* 80CC4288 38 21 00 30 */ addi r1, r1, 0x30 -/* 80CC428C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/modeWait__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/modeWait__10daSaidan_cFv.s deleted file mode 100644 index 791cc83d0d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/modeWait__10daSaidan_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80CC4154: -/* 80CC4154 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC4158 7C 08 02 A6 */ mflr r0 -/* 80CC415C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC4160 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CC4164 7C 7F 1B 78 */ mr r31, r3 -/* 80CC4168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CC416C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CC4170 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80CC4174 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80CC4178 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 80CC417C 7C 05 07 74 */ extsb r5, r0 -/* 80CC4180 4B 37 11 E1 */ bl isSwitch__10dSv_info_cCFii -/* 80CC4184 98 7F 05 AD */ stb r3, 0x5ad(r31) -/* 80CC4188 88 1F 05 AD */ lbz r0, 0x5ad(r31) -/* 80CC418C 28 00 00 00 */ cmplwi r0, 0 -/* 80CC4190 41 82 00 0C */ beq lbl_80CC419C -/* 80CC4194 7F E3 FB 78 */ mr r3, r31 -/* 80CC4198 48 00 00 19 */ bl init_modeMove__10daSaidan_cFv -lbl_80CC419C: -/* 80CC419C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CC41A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC41A4 7C 08 03 A6 */ mtlr r0 -/* 80CC41A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC41AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/moveProc__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/moveProc__10daSaidan_cFv.s deleted file mode 100644 index dfaa22e378..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/moveProc__10daSaidan_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80CC40A4: -/* 80CC40A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC40A8 7C 08 02 A6 */ mflr r0 -/* 80CC40AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC40B0 3C 80 80 CC */ lis r4, cNullVec__6Z2Calc@ha /* 0x80CC454C@ha */ -/* 80CC40B4 38 E4 45 4C */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x80CC454C@l */ -/* 80CC40B8 3C 80 80 CC */ lis r4, data_80CC4668@ha /* 0x80CC4668@ha */ -/* 80CC40BC 38 C4 46 68 */ addi r6, r4, data_80CC4668@l /* 0x80CC4668@l */ -/* 80CC40C0 88 06 00 00 */ lbz r0, 0(r6) -/* 80CC40C4 7C 00 07 75 */ extsb. r0, r0 -/* 80CC40C8 40 82 00 58 */ bne lbl_80CC4120 -/* 80CC40CC 80 87 00 20 */ lwz r4, 0x20(r7) -/* 80CC40D0 80 07 00 24 */ lwz r0, 0x24(r7) -/* 80CC40D4 90 87 00 44 */ stw r4, 0x44(r7) -/* 80CC40D8 90 07 00 48 */ stw r0, 0x48(r7) -/* 80CC40DC 80 07 00 28 */ lwz r0, 0x28(r7) -/* 80CC40E0 90 07 00 4C */ stw r0, 0x4c(r7) -/* 80CC40E4 38 A7 00 44 */ addi r5, r7, 0x44 -/* 80CC40E8 80 87 00 2C */ lwz r4, 0x2c(r7) -/* 80CC40EC 80 07 00 30 */ lwz r0, 0x30(r7) -/* 80CC40F0 90 85 00 0C */ stw r4, 0xc(r5) -/* 80CC40F4 90 05 00 10 */ stw r0, 0x10(r5) -/* 80CC40F8 80 07 00 34 */ lwz r0, 0x34(r7) -/* 80CC40FC 90 05 00 14 */ stw r0, 0x14(r5) -/* 80CC4100 80 87 00 38 */ lwz r4, 0x38(r7) -/* 80CC4104 80 07 00 3C */ lwz r0, 0x3c(r7) -/* 80CC4108 90 85 00 18 */ stw r4, 0x18(r5) -/* 80CC410C 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80CC4110 80 07 00 40 */ lwz r0, 0x40(r7) -/* 80CC4114 90 05 00 20 */ stw r0, 0x20(r5) -/* 80CC4118 38 00 00 01 */ li r0, 1 -/* 80CC411C 98 06 00 00 */ stb r0, 0(r6) -lbl_80CC4120: -/* 80CC4120 88 03 05 AC */ lbz r0, 0x5ac(r3) -/* 80CC4124 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80CC4128 39 87 00 44 */ addi r12, r7, 0x44 -/* 80CC412C 7D 8C 02 14 */ add r12, r12, r0 -/* 80CC4130 4B 69 DF 55 */ bl __ptmf_scall -/* 80CC4134 60 00 00 00 */ nop -/* 80CC4138 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC413C 7C 08 03 A6 */ mtlr r0 -/* 80CC4140 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC4144 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/setBaseMtx__10daSaidan_cFv.s b/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/setBaseMtx__10daSaidan_cFv.s deleted file mode 100644 index 5829c51537..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/setBaseMtx__10daSaidan_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80CC3E28: -/* 80CC3E28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CC3E2C 7C 08 02 A6 */ mflr r0 -/* 80CC3E30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CC3E34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CC3E38 7C 7F 1B 78 */ mr r31, r3 -/* 80CC3E3C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CC3E40 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CC3E44 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CC3E48 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CC3E4C C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CC3E50 4B 68 2A 99 */ bl PSMTXTrans -/* 80CC3E54 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CC3E58 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CC3E5C A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80CC3E60 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80CC3E64 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80CC3E68 4B 34 84 39 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80CC3E6C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80CC3E70 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80CC3E74 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80CC3E78 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80CC3E7C D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80CC3E80 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80CC3E84 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80CC3E88 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CC3E8C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CC3E90 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80CC3E94 38 84 00 24 */ addi r4, r4, 0x24 -/* 80CC3E98 4B 68 26 19 */ bl PSMTXCopy -/* 80CC3E9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CC3EA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CC3EA4 7C 08 03 A6 */ mtlr r0 -/* 80CC3EA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CC3EAC 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.h b/include/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.h index 2d082d850c..d326f1673f 100644 --- a/include/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.h +++ b/include/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.h @@ -1,6 +1,48 @@ #ifndef D_A_OBJ_SAIDAN_H #define D_A_OBJ_SAIDAN_H -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "m_Do/m_Do_hostIO.h" + +class daSaidan_c : public dBgS_MoveBgActor { +public: + enum Mode_e { + /* 0 */ MODE_WAIT_e, + /* 1 */ MODE_MOVE_e, + /* 2 */ MODE_MOVE_END_e, + }; + + /* 80CC3E28 */ void setBaseMtx(); + /* 80CC3EB0 */ virtual int CreateHeap(); + /* 80CC3F1C */ cPhs__Step create(); + /* 80CC4054 */ virtual int Execute(Mtx**); + /* 80CC40A4 */ void moveProc(); + /* 80CC4148 */ void init_modeWait(); + /* 80CC4154 */ void modeWait(); + /* 80CC41B0 */ void init_modeMove(); + /* 80CC41BC */ void modeMove(); + /* 80CC4290 */ void init_modeMoveEnd(); + /* 80CC4314 */ void modeMoveEnd(); + /* 80CC4318 */ virtual int Draw(); + /* 80CC43BC */ virtual int Delete(); + + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpModel; + /* 0x5AC */ u8 mMode; + /* 0x5AD */ u8 mIsSwitch; + /* 0x5B0 */ f32 mOriginalPosX; +}; // Size: 0x5B4 + +STATIC_ASSERT(sizeof(daSaidan_c) == 0x5B4); + +struct daSaidan_HIO_c : public mDoHIO_entry_c { + /* 80CC3DAC */ daSaidan_HIO_c(); + /* 80CC4478 */ virtual ~daSaidan_HIO_c() {} + + /* 0x00 vtable */ + /* 0x04 */ f32 mMaxStep; + /* 0x08 */ f32 mTargetPosX; +}; #endif /* D_A_OBJ_SAIDAN_H */ diff --git a/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp b/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp index 6b4d48ba52..7026981abf 100644 --- a/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp +++ b/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp @@ -1,194 +1,27 @@ // -// Generated By: dol2asm -// Translation Unit: d_a_obj_saidan +// d_a_obj_saidan.cpp +// Object - Altar // #include "rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.h" -#include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CC3DE0 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daSaidan_c { - /* 80CC3E28 */ void setBaseMtx(); - /* 80CC3EB0 */ void CreateHeap(); - /* 80CC3F1C */ void create(); - /* 80CC4054 */ void Execute(f32 (**)[3][4]); - /* 80CC40A4 */ void moveProc(); - /* 80CC4148 */ void init_modeWait(); - /* 80CC4154 */ void modeWait(); - /* 80CC41B0 */ void init_modeMove(); - /* 80CC41BC */ void modeMove(); - /* 80CC4290 */ void init_modeMoveEnd(); - /* 80CC4314 */ void modeMoveEnd(); - /* 80CC4318 */ void Draw(); - /* 80CC43BC */ void Delete(); -}; - -struct daSaidan_HIO_c { - /* 80CC3DAC */ daSaidan_HIO_c(); - /* 80CC4478 */ ~daSaidan_HIO_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -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 dBgW {}; - -struct cBgS_PolyInfo {}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078690 */ bool Create(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__14daSaidan_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__10daSaidan_cFv(); -extern "C" void CreateHeap__10daSaidan_cFv(); -extern "C" void create__10daSaidan_cFv(); -extern "C" void Execute__10daSaidan_cFPPA3_A4_f(); -extern "C" void moveProc__10daSaidan_cFv(); -extern "C" void init_modeWait__10daSaidan_cFv(); -extern "C" void modeWait__10daSaidan_cFv(); -extern "C" void init_modeMove__10daSaidan_cFv(); -extern "C" void modeMove__10daSaidan_cFv(); -extern "C" void init_modeMoveEnd__10daSaidan_cFv(); -extern "C" void modeMoveEnd__10daSaidan_cFv(); -extern "C" void Draw__10daSaidan_cFv(); -extern "C" void Delete__10daSaidan_cFv(); -extern "C" static void daSaidan_Draw__FP10daSaidan_c(); -extern "C" static void daSaidan_Execute__FP10daSaidan_c(); -extern "C" static void daSaidan_Delete__FP10daSaidan_c(); -extern "C" static void daSaidan_Create__FP10fopAc_ac_c(); -extern "C" void __dt__14daSaidan_HIO_cFv(); -extern "C" void __sinit_d_a_obj_saidan_cpp(); -extern "C" extern char const* const d_a_obj_saidan__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void __ptmf_scall(); -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]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); +#include "d/com/d_com_inf_game.h" // // Declarations: // -/* ############################################################################################## */ -/* 80CC4524-80CC4528 000000 0004+00 2/2 0/0 0/0 .rodata @3625 */ -SECTION_RODATA static f32 const lit_3625 = 2.0f; -COMPILER_STRIP_GATE(0x80CC4524, &lit_3625); - -/* 80CC4528-80CC452C 000004 0004+00 1/1 0/0 0/0 .rodata @3626 */ -SECTION_RODATA static f32 const lit_3626 = 250.0f; -COMPILER_STRIP_GATE(0x80CC4528, &lit_3626); +static daSaidan_HIO_c l_HIO; /* 80CC454C-80CC4558 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80CC4558-80CC456C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -198,268 +31,117 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80CC456C-80CC4578 -00001 000C+00 0/1 0/0 0/0 .data @3718 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3718[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__10daSaidan_cFv, -}; -#pragma pop - -/* 80CC4578-80CC4584 -00001 000C+00 0/1 0/0 0/0 .data @3719 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3719[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeMove__10daSaidan_cFv, -}; -#pragma pop - -/* 80CC4584-80CC4590 -00001 000C+00 0/1 0/0 0/0 .data @3720 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3720[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeMoveEnd__10daSaidan_cFv, -}; -#pragma pop - -/* 80CC4590-80CC45B4 000044 0024+00 0/1 0/0 0/0 .data mode_proc$3717 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[36] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80CC45B4-80CC45D4 -00001 0020+00 1/0 0/0 0/0 .data l_daSaidan_Method */ -SECTION_DATA static void* l_daSaidan_Method[8] = { - (void*)daSaidan_Create__FP10fopAc_ac_c, - (void*)daSaidan_Delete__FP10daSaidan_c, - (void*)daSaidan_Execute__FP10daSaidan_c, - (void*)NULL, - (void*)daSaidan_Draw__FP10daSaidan_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80CC45D4-80CC4604 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Saidan */ -SECTION_DATA extern void* g_profile_Obj_Saidan[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00400000, (void*)&g_fpcLf_Method, - (void*)0x000005B4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01FC0000, (void*)&l_daSaidan_Method, - (void*)0x00040000, (void*)0x000E0000, -}; - -/* 80CC4604-80CC462C 0000B8 0028+00 1/1 0/0 0/0 .data __vt__10daSaidan_c */ -SECTION_DATA extern void* __vt__10daSaidan_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__10daSaidan_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__10daSaidan_cFPPA3_A4_f, - (void*)Draw__10daSaidan_cFv, - (void*)Delete__10daSaidan_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80CC462C-80CC4638 0000E0 000C+00 2/2 0/0 0/0 .data __vt__14daSaidan_HIO_c */ -SECTION_DATA extern void* __vt__14daSaidan_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14daSaidan_HIO_cFv, -}; - -/* 80CC4638-80CC4644 0000EC 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; - /* 80CC3DAC-80CC3DE0 0000EC 0034+00 1/1 0/0 0/0 .text __ct__14daSaidan_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daSaidan_HIO_c::daSaidan_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__ct__14daSaidan_HIO_cFv.s" +daSaidan_HIO_c::daSaidan_HIO_c() { + mMaxStep = 2.0f; + mTargetPosX = 250.0f; } -#pragma pop - -/* 80CC3DE0-80CC3E28 000120 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm mDoHIO_entry_c::~mDoHIO_entry_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop /* 80CC3E28-80CC3EB0 000168 0088+00 2/2 0/0 0/0 .text setBaseMtx__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/setBaseMtx__10daSaidan_cFv.s" +void daSaidan_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mpModel->setBaseScale(scale); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop - -/* ############################################################################################## */ -/* 80CC4540-80CC4540 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CC4540 = "H_Saidan"; -#pragma pop /* 80CC3EB0-80CC3F1C 0001F0 006C+00 1/0 0/0 0/0 .text CreateHeap__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/CreateHeap__10daSaidan_cFv.s" +int daSaidan_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("H_Saidan", 4); + mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + + if (mpModel == NULL) { + return FALSE; + } + + return TRUE; } -#pragma pop - -/* ############################################################################################## */ -/* 80CC4650-80CC465C 000008 000C+00 1/1 0/0 0/0 .bss @3619 */ -static u8 lit_3619[12]; - -/* 80CC465C-80CC4668 000014 000C+00 3/3 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[12]; /* 80CC3F1C-80CC4054 00025C 0138+00 1/1 0/0 0/0 .text create__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/create__10daSaidan_cFv.s" +cPhs__Step daSaidan_c::create() { + fopAcM_SetupActor(this, daSaidan_c); + + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "H_Saidan"); + if (step == cPhs_COMPLEATE_e) { + if (MoveBGCreate("H_Saidan", 7, dBgS_MoveBGProc_TypicalRotY, 0x21b0, NULL) == cPhs_ERROR_e) + { + return cPhs_ERROR_e; + } else { + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + mIsSwitch = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); + mOriginalPosX = current.pos.x; + + if (mIsSwitch != 0) { + current.pos.x = mOriginalPosX - l_HIO.mTargetPosX; + init_modeMoveEnd(); + } else { + init_modeWait(); + } + setBaseMtx(); + } + } + + return step; } -#pragma pop /* 80CC4054-80CC40A4 000394 0050+00 1/0 0/0 0/0 .text Execute__10daSaidan_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Execute__10daSaidan_cFPPA3_A4_f.s" -} -#pragma pop +int daSaidan_c::Execute(Mtx** i_mtx) { + moveProc(); + *i_mtx = &mpModel->getBaseTRMtx(); + setBaseMtx(); -/* ############################################################################################## */ -/* 80CC4668-80CC466C 000020 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80CC4668[4]; + return TRUE; +} /* 80CC40A4-80CC4148 0003E4 00A4+00 1/1 0/0 0/0 .text moveProc__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::moveProc() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/moveProc__10daSaidan_cFv.s" +void daSaidan_c::moveProc() { + typedef void (daSaidan_c::*proc_func)(); + static proc_func mode_proc[] = { + &daSaidan_c::modeWait, + &daSaidan_c::modeMove, + &daSaidan_c::modeMoveEnd, + }; + + (this->*mode_proc[mMode])(); } -#pragma pop /* 80CC4148-80CC4154 000488 000C+00 1/1 0/0 0/0 .text init_modeWait__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::init_modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeWait__10daSaidan_cFv.s" +void daSaidan_c::init_modeWait() { + mMode = MODE_WAIT_e; } -#pragma pop /* 80CC4154-80CC41B0 000494 005C+00 1/0 0/0 0/0 .text modeWait__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::modeWait() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/modeWait__10daSaidan_cFv.s" +void daSaidan_c::modeWait() { + mIsSwitch = fopAcM_isSwitch(this, (u8)fopAcM_GetParam(this)); + if (mIsSwitch != 0) { + init_modeMove(); + } } -#pragma pop /* 80CC41B0-80CC41BC 0004F0 000C+00 1/1 0/0 0/0 .text init_modeMove__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::init_modeMove() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeMove__10daSaidan_cFv.s" +void daSaidan_c::init_modeMove() { + mMode = MODE_MOVE_e; } -#pragma pop - -/* ############################################################################################## */ -/* 80CC452C-80CC4530 000008 0004+00 0/1 0/0 0/0 .rodata @3758 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3758 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80CC452C, &lit_3758); -#pragma pop - -/* 80CC4530-80CC4534 00000C 0004+00 0/1 0/0 0/0 .rodata @3759 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3759 = 0.5f; -COMPILER_STRIP_GATE(0x80CC4530, &lit_3759); -#pragma pop - -/* 80CC4534-80CC4538 000010 0004+00 1/2 0/0 0/0 .rodata @3760 */ -SECTION_RODATA static f32 const lit_3760 = 1.0f; -COMPILER_STRIP_GATE(0x80CC4534, &lit_3760); - -/* 80CC4538-80CC453C 000014 0004+00 1/2 0/0 0/0 .rodata @3761 */ -SECTION_RODATA static f32 const lit_3761 = -1.0f; -COMPILER_STRIP_GATE(0x80CC4538, &lit_3761); - -/* 80CC453C-80CC4540 000018 0004+00 0/1 0/0 0/0 .rodata @3762 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3762[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CC453C, &lit_3762); -#pragma pop /* 80CC41BC-80CC4290 0004FC 00D4+00 1/0 0/0 0/0 .text modeMove__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::modeMove() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/modeMove__10daSaidan_cFv.s" +void daSaidan_c::modeMove() { + f32 currX = + cLib_addCalc(¤t.pos.x, mOriginalPosX - l_HIO.mTargetPosX, 0.2f, l_HIO.mMaxStep, 0.5f); + + fopAcM_seStartCurrentLevel(this, Z2SE_OBJ_CHURCH_ALTER_MOVE, 0); + + if (currX == 0.0f) { + init_modeMoveEnd(); + } } -#pragma pop /* 80CC4290-80CC4314 0005D0 0084+00 2/2 0/0 0/0 .text init_modeMoveEnd__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::init_modeMoveEnd() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/init_modeMoveEnd__10daSaidan_cFv.s" +void daSaidan_c::init_modeMoveEnd() { + fopAcM_seStartCurrent(this, Z2SE_OBJ_CHURCH_ALTER_STOP, 0); + + mMode = MODE_MOVE_END_e; } -#pragma pop /* 80CC4314-80CC4318 000654 0004+00 1/0 0/0 0/0 .text modeMoveEnd__10daSaidan_cFv */ void daSaidan_c::modeMoveEnd() { @@ -467,88 +149,64 @@ void daSaidan_c::modeMoveEnd() { } /* 80CC4318-80CC43BC 000658 00A4+00 1/0 0/0 0/0 .text Draw__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Draw__10daSaidan_cFv.s" +int daSaidan_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + + return TRUE; } -#pragma pop /* 80CC43BC-80CC43EC 0006FC 0030+00 1/0 0/0 0/0 .text Delete__10daSaidan_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSaidan_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/Delete__10daSaidan_cFv.s" +int daSaidan_c::Delete() { + dComIfG_resDelete(&mPhaseReq, "H_Saidan"); + return TRUE; } -#pragma pop /* 80CC43EC-80CC4418 00072C 002C+00 1/0 0/0 0/0 .text daSaidan_Draw__FP10daSaidan_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSaidan_Draw(daSaidan_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Draw__FP10daSaidan_c.s" +static int daSaidan_Draw(daSaidan_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* 80CC4418-80CC4438 000758 0020+00 1/0 0/0 0/0 .text daSaidan_Execute__FP10daSaidan_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSaidan_Execute(daSaidan_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Execute__FP10daSaidan_c.s" +static int daSaidan_Execute(daSaidan_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80CC4438-80CC4458 000778 0020+00 1/0 0/0 0/0 .text daSaidan_Delete__FP10daSaidan_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSaidan_Delete(daSaidan_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Delete__FP10daSaidan_c.s" +static int daSaidan_Delete(daSaidan_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80CC4458-80CC4478 000798 0020+00 1/0 0/0 0/0 .text daSaidan_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSaidan_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/daSaidan_Create__FP10fopAc_ac_c.s" +static int daSaidan_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop -/* 80CC4478-80CC44D4 0007B8 005C+00 2/1 0/0 0/0 .text __dt__14daSaidan_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daSaidan_HIO_c::~daSaidan_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__dt__14daSaidan_HIO_cFv.s" -} -#pragma pop +/* 80CC45B4-80CC45D4 -00001 0020+00 1/0 0/0 0/0 .data l_daSaidan_Method */ +static actor_method_class l_daSaidan_Method = { + (process_method_func)daSaidan_Create, (process_method_func)daSaidan_Delete, + (process_method_func)daSaidan_Execute, NULL, + (process_method_func)daSaidan_Draw, +}; -/* 80CC44D4-80CC4510 000814 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_saidan_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_saidan_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan/__sinit_d_a_obj_saidan_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80CC44D4, __sinit_d_a_obj_saidan_cpp); -#pragma pop - -/* 80CC4540-80CC4540 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80CC45D4-80CC4604 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Saidan */ +extern actor_process_profile_definition g_profile_Obj_Saidan = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Saidan, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daSaidan_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 508, // mPriority + &l_daSaidan_Method, // sub_method + 0x40000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +};