From 0bde0ac354f75422e420dd84fce23be71882889b Mon Sep 17 00:00:00 2001 From: hatal175 Date: Sun, 4 Feb 2024 02:54:01 +0200 Subject: [PATCH] d_a_obj_ystone OK (#2060) --- .../d_a_obj_ystone/__dt__12J3DFrameCtrlFv.s | 20 -- .../action__FP16obj_ystone_class.s | 307 ------------------ .../daObj_Ystone_Create__FP10fopAc_ac_c.s | 107 ------ .../useHeapInit__FP10fopAc_ac_c.s | 172 ---------- rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp | 227 +++---------- 5 files changed, 37 insertions(+), 796 deletions(-) delete mode 100644 asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/action__FP16obj_ystone_class.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/useHeapInit__FP10fopAc_ac_c.s diff --git a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 6075e1a6692..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80D3EA38: -/* 80D3EA38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D3EA3C 7C 08 02 A6 */ mflr r0 -/* 80D3EA40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D3EA44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D3EA48 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80D3EA4C 41 82 00 1C */ beq lbl_80D3EA68 -/* 80D3EA50 3C A0 80 D4 */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80D3ED7C@ha */ -/* 80D3EA54 38 05 ED 7C */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80D3ED7C@l */ -/* 80D3EA58 90 1F 00 00 */ stw r0, 0(r31) -/* 80D3EA5C 7C 80 07 35 */ extsh. r0, r4 -/* 80D3EA60 40 81 00 08 */ ble lbl_80D3EA68 -/* 80D3EA64 4B 59 02 D9 */ bl __dl__FPv -lbl_80D3EA68: -/* 80D3EA68 7F E3 FB 78 */ mr r3, r31 -/* 80D3EA6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D3EA70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D3EA74 7C 08 03 A6 */ mtlr r0 -/* 80D3EA78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D3EA7C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/action__FP16obj_ystone_class.s b/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/action__FP16obj_ystone_class.s deleted file mode 100644 index 76ba83e68c4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/action__FP16obj_ystone_class.s +++ /dev/null @@ -1,307 +0,0 @@ -lbl_80D3E25C: -/* 80D3E25C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80D3E260 7C 08 02 A6 */ mflr r0 -/* 80D3E264 90 01 00 54 */ stw r0, 0x54(r1) -/* 80D3E268 39 61 00 50 */ addi r11, r1, 0x50 -/* 80D3E26C 4B 62 3F 65 */ bl _savegpr_26 -/* 80D3E270 7C 7F 1B 78 */ mr r31, r3 -/* 80D3E274 3C 60 80 D4 */ lis r3, l_bmdIndex@ha /* 0x80D3EC0C@ha */ -/* 80D3E278 3B C3 EC 0C */ addi r30, r3, l_bmdIndex@l /* 0x80D3EC0C@l */ -/* 80D3E27C 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 80D3E280 28 00 00 03 */ cmplwi r0, 3 -/* 80D3E284 40 80 00 90 */ bge lbl_80D3E314 -/* 80D3E288 A8 1F 05 86 */ lha r0, 0x586(r31) -/* 80D3E28C 2C 00 00 00 */ cmpwi r0, 0 -/* 80D3E290 41 82 00 08 */ beq lbl_80D3E298 -/* 80D3E294 48 00 00 10 */ b lbl_80D3E2A4 -lbl_80D3E298: -/* 80D3E298 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 80D3E29C 38 03 01 00 */ addi r0, r3, 0x100 -/* 80D3E2A0 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -lbl_80D3E2A4: -/* 80D3E2A4 7F E3 FB 78 */ mr r3, r31 -/* 80D3E2A8 4B FF FE D9 */ bl setModelBaseMtx__FP16obj_ystone_class -/* 80D3E2AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D3E2B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D3E2B4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80D3E2B8 38 00 00 FF */ li r0, 0xff -/* 80D3E2BC 90 01 00 08 */ stw r0, 8(r1) -/* 80D3E2C0 38 80 00 00 */ li r4, 0 -/* 80D3E2C4 90 81 00 0C */ stw r4, 0xc(r1) -/* 80D3E2C8 38 00 FF FF */ li r0, -1 -/* 80D3E2CC 90 01 00 10 */ stw r0, 0x10(r1) -/* 80D3E2D0 90 81 00 14 */ stw r4, 0x14(r1) -/* 80D3E2D4 90 81 00 18 */ stw r4, 0x18(r1) -/* 80D3E2D8 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80D3E2DC 80 9F 05 94 */ lwz r4, 0x594(r31) -/* 80D3E2E0 38 A0 00 00 */ li r5, 0 -/* 80D3E2E4 3C C0 00 01 */ lis r6, 0x0001 /* 0x00008403@ha */ -/* 80D3E2E8 38 C6 84 03 */ addi r6, r6, 0x8403 /* 0x00008403@l */ -/* 80D3E2EC 38 FF 04 D0 */ addi r7, r31, 0x4d0 -/* 80D3E2F0 39 1F 01 0C */ addi r8, r31, 0x10c -/* 80D3E2F4 39 3F 04 E4 */ addi r9, r31, 0x4e4 -/* 80D3E2F8 39 40 00 00 */ li r10, 0 -/* 80D3E2FC C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 80D3E300 4B 30 F1 CD */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80D3E304 90 7F 05 94 */ stw r3, 0x594(r31) -/* 80D3E308 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80D3E30C 4B 2C F1 1D */ bl play__14mDoExt_baseAnmFv -/* 80D3E310 48 00 03 C4 */ b lbl_80D3E6D4 -lbl_80D3E314: -/* 80D3E314 80 7F 05 90 */ lwz r3, 0x590(r31) -/* 80D3E318 2C 03 00 00 */ cmpwi r3, 0 -/* 80D3E31C 41 82 00 0C */ beq lbl_80D3E328 -/* 80D3E320 38 03 FF FF */ addi r0, r3, -1 -/* 80D3E324 90 1F 05 90 */ stw r0, 0x590(r31) -lbl_80D3E328: -/* 80D3E328 80 1F 05 8C */ lwz r0, 0x58c(r31) -/* 80D3E32C 28 00 00 06 */ cmplwi r0, 6 -/* 80D3E330 41 81 03 64 */ bgt lbl_80D3E694 -/* 80D3E334 3C 60 80 D4 */ lis r3, lit_3970@ha /* 0x80D3ED10@ha */ -/* 80D3E338 38 63 ED 10 */ addi r3, r3, lit_3970@l /* 0x80D3ED10@l */ -/* 80D3E33C 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3E340 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80D3E344 7C 09 03 A6 */ mtctr r0 -/* 80D3E348 4E 80 04 20 */ bctr -lbl_80D3E34C: -/* 80D3E34C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80D3E350 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80D3E354 38 80 00 00 */ li r4, 0 -/* 80D3E358 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80D3E35C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80D3E360 4B 46 54 65 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80D3E364 3B 40 00 00 */ li r26, 0 -/* 80D3E368 3B A0 00 00 */ li r29, 0 -/* 80D3E36C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D3E370 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D3E374 3C 60 80 D4 */ lis r3, mirror_effect_id@ha /* 0x80D3ECFC@ha */ -/* 80D3E378 3B 83 EC FC */ addi r28, r3, mirror_effect_id@l /* 0x80D3ECFC@l */ -lbl_80D3E37C: -/* 80D3E37C 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 80D3E380 38 80 00 00 */ li r4, 0 -/* 80D3E384 90 81 00 08 */ stw r4, 8(r1) -/* 80D3E388 38 00 FF FF */ li r0, -1 -/* 80D3E38C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D3E390 90 81 00 10 */ stw r4, 0x10(r1) -/* 80D3E394 90 81 00 14 */ stw r4, 0x14(r1) -/* 80D3E398 90 81 00 18 */ stw r4, 0x18(r1) -/* 80D3E39C 38 80 00 00 */ li r4, 0 -/* 80D3E3A0 7C BC EA 2E */ lhzx r5, r28, r29 -/* 80D3E3A4 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 80D3E3A8 38 FF 01 0C */ addi r7, r31, 0x10c -/* 80D3E3AC 39 1F 04 E4 */ addi r8, r31, 0x4e4 -/* 80D3E3B0 39 20 00 00 */ li r9, 0 -/* 80D3E3B4 39 40 00 FF */ li r10, 0xff -/* 80D3E3B8 C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 80D3E3BC 4B 30 E6 D5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80D3E3C0 3B 5A 00 01 */ addi r26, r26, 1 -/* 80D3E3C4 2C 1A 00 0A */ cmpwi r26, 0xa -/* 80D3E3C8 3B BD 00 02 */ addi r29, r29, 2 -/* 80D3E3CC 41 80 FF B0 */ blt lbl_80D3E37C -/* 80D3E3D0 38 00 00 01 */ li r0, 1 -/* 80D3E3D4 90 1F 05 8C */ stw r0, 0x58c(r31) -/* 80D3E3D8 38 00 00 78 */ li r0, 0x78 -/* 80D3E3DC 90 1F 05 90 */ stw r0, 0x590(r31) -/* 80D3E3E0 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 80D3E3E4 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3E3E8 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D3ECBC@ha */ -/* 80D3E3EC 38 63 EC BC */ addi r3, r3, l_arcName@l /* 0x80D3ECBC@l */ -/* 80D3E3F0 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80D3E3F4 38 80 00 05 */ li r4, 5 -/* 80D3E3F8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D3E3FC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D3E400 3C A5 00 02 */ addis r5, r5, 2 -/* 80D3E404 38 C0 00 80 */ li r6, 0x80 -/* 80D3E408 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80D3E40C 4B 2F DE E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D3E410 7C 64 1B 78 */ mr r4, r3 -/* 80D3E414 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3E418 38 A0 00 00 */ li r5, 0 -/* 80D3E41C C0 3E 00 48 */ lfs f1, 0x48(r30) -/* 80D3E420 FC 40 08 90 */ fmr f2, f1 -/* 80D3E424 FC 60 08 90 */ fmr f3, f1 -/* 80D3E428 C0 9E 00 4C */ lfs f4, 0x4c(r30) -/* 80D3E42C 4B 2D 2A 45 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80D3E430 C0 1E 00 44 */ lfs f0, 0x44(r30) -/* 80D3E434 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3E438 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80D3E43C 48 00 02 58 */ b lbl_80D3E694 -lbl_80D3E440: -/* 80D3E440 80 1F 05 90 */ lwz r0, 0x590(r31) -/* 80D3E444 2C 00 00 00 */ cmpwi r0, 0 -/* 80D3E448 40 82 00 24 */ bne lbl_80D3E46C -/* 80D3E44C 38 00 00 02 */ li r0, 2 -/* 80D3E450 90 1F 05 8C */ stw r0, 0x58c(r31) -/* 80D3E454 C0 1E 00 44 */ lfs f0, 0x44(r30) -/* 80D3E458 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3E45C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80D3E460 C0 1E 00 48 */ lfs f0, 0x48(r30) -/* 80D3E464 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3E468 D0 03 00 1C */ stfs f0, 0x1c(r3) -lbl_80D3E46C: -/* 80D3E46C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D3E470 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D3E474 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80D3E478 38 00 00 FF */ li r0, 0xff -/* 80D3E47C 90 01 00 08 */ stw r0, 8(r1) -/* 80D3E480 38 80 00 00 */ li r4, 0 -/* 80D3E484 90 81 00 0C */ stw r4, 0xc(r1) -/* 80D3E488 38 00 FF FF */ li r0, -1 -/* 80D3E48C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80D3E490 90 81 00 14 */ stw r4, 0x14(r1) -/* 80D3E494 90 81 00 18 */ stw r4, 0x18(r1) -/* 80D3E498 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80D3E49C 80 9F 05 94 */ lwz r4, 0x594(r31) -/* 80D3E4A0 38 A0 00 00 */ li r5, 0 -/* 80D3E4A4 3C C0 00 01 */ lis r6, 0x0001 /* 0x000089A3@ha */ -/* 80D3E4A8 38 C6 89 A3 */ addi r6, r6, 0x89A3 /* 0x000089A3@l */ -/* 80D3E4AC 38 FF 04 D0 */ addi r7, r31, 0x4d0 -/* 80D3E4B0 39 1F 01 0C */ addi r8, r31, 0x10c -/* 80D3E4B4 39 3F 04 E4 */ addi r9, r31, 0x4e4 -/* 80D3E4B8 39 40 00 00 */ li r10, 0 -/* 80D3E4BC C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 80D3E4C0 4B 30 F0 0D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80D3E4C4 90 7F 05 94 */ stw r3, 0x594(r31) -/* 80D3E4C8 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 80D3E4CC 38 03 01 00 */ addi r0, r3, 0x100 -/* 80D3E4D0 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 80D3E4D4 48 00 01 C0 */ b lbl_80D3E694 -lbl_80D3E4D8: -/* 80D3E4D8 38 00 00 04 */ li r0, 4 -/* 80D3E4DC 90 1F 05 8C */ stw r0, 0x58c(r31) -/* 80D3E4E0 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 80D3E4E4 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3E4E8 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D3ECBC@ha */ -/* 80D3E4EC 38 63 EC BC */ addi r3, r3, l_arcName@l /* 0x80D3ECBC@l */ -/* 80D3E4F0 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80D3E4F4 38 80 00 06 */ li r4, 6 -/* 80D3E4F8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D3E4FC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D3E500 3F 65 00 02 */ addis r27, r5, 2 -/* 80D3E504 3B 7B C2 F8 */ addi r27, r27, -15624 -/* 80D3E508 7F 65 DB 78 */ mr r5, r27 -/* 80D3E50C 38 C0 00 80 */ li r6, 0x80 -/* 80D3E510 4B 2F DD DD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D3E514 7C 64 1B 78 */ mr r4, r3 -/* 80D3E518 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3E51C 38 A0 00 00 */ li r5, 0 -/* 80D3E520 C0 3E 00 48 */ lfs f1, 0x48(r30) -/* 80D3E524 C0 5E 00 44 */ lfs f2, 0x44(r30) -/* 80D3E528 FC 60 08 90 */ fmr f3, f1 -/* 80D3E52C C0 9E 00 4C */ lfs f4, 0x4c(r30) -/* 80D3E530 4B 2D 29 41 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -/* 80D3E534 38 00 00 01 */ li r0, 1 -/* 80D3E538 98 1F 05 9A */ stb r0, 0x59a(r31) -/* 80D3E53C 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 80D3E540 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3E544 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D3ECBC@ha */ -/* 80D3E548 38 63 EC BC */ addi r3, r3, l_arcName@l /* 0x80D3ECBC@l */ -/* 80D3E54C 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80D3E550 38 9E 00 28 */ addi r4, r30, 0x28 -/* 80D3E554 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80D3E558 7F 65 DB 78 */ mr r5, r27 -/* 80D3E55C 38 C0 00 80 */ li r6, 0x80 -/* 80D3E560 4B 2F DD 8D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D3E564 7C 65 1B 78 */ mr r5, r3 -/* 80D3E568 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3E56C 80 63 00 04 */ lwz r3, 4(r3) -/* 80D3E570 80 83 00 04 */ lwz r4, 4(r3) -/* 80D3E574 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80D3E578 38 84 00 58 */ addi r4, r4, 0x58 -/* 80D3E57C 38 C0 00 01 */ li r6, 1 -/* 80D3E580 38 E0 00 00 */ li r7, 0 -/* 80D3E584 C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 80D3E588 39 00 00 00 */ li r8, 0 -/* 80D3E58C 39 20 FF FF */ li r9, -1 -/* 80D3E590 4B 2C F0 AD */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -lbl_80D3E594: -/* 80D3E594 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 80D3E598 38 03 01 00 */ addi r0, r3, 0x100 -/* 80D3E59C B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 80D3E5A0 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3E5A4 80 63 00 04 */ lwz r3, 4(r3) -/* 80D3E5A8 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80D3E5AC 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80D3E5B0 3C 80 80 3E */ lis r4, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3E5B4 38 84 D4 70 */ addi r4, r4, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D3E5B8 4B 60 7E F9 */ bl PSMTXCopy -/* 80D3E5BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3E5C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D3E5C4 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80D3E5C8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80D3E5CC C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 80D3E5D0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80D3E5D4 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 80D3E5D8 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80D3E5DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D3E5E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D3E5E4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80D3E5E8 38 00 00 FF */ li r0, 0xff -/* 80D3E5EC 90 01 00 08 */ stw r0, 8(r1) -/* 80D3E5F0 38 80 00 00 */ li r4, 0 -/* 80D3E5F4 90 81 00 0C */ stw r4, 0xc(r1) -/* 80D3E5F8 38 00 FF FF */ li r0, -1 -/* 80D3E5FC 90 01 00 10 */ stw r0, 0x10(r1) -/* 80D3E600 90 81 00 14 */ stw r4, 0x14(r1) -/* 80D3E604 90 81 00 18 */ stw r4, 0x18(r1) -/* 80D3E608 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80D3E60C 80 9F 05 94 */ lwz r4, 0x594(r31) -/* 80D3E610 38 A0 00 00 */ li r5, 0 -/* 80D3E614 3C C0 00 01 */ lis r6, 0x0001 /* 0x000089A4@ha */ -/* 80D3E618 38 C6 89 A4 */ addi r6, r6, 0x89A4 /* 0x000089A4@l */ -/* 80D3E61C 38 E1 00 20 */ addi r7, r1, 0x20 -/* 80D3E620 39 1F 01 0C */ addi r8, r31, 0x10c -/* 80D3E624 39 3F 04 E4 */ addi r9, r31, 0x4e4 -/* 80D3E628 39 40 00 00 */ li r10, 0 -/* 80D3E62C C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 80D3E630 4B 30 EE 9D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80D3E634 90 7F 05 94 */ stw r3, 0x594(r31) -/* 80D3E638 48 00 00 5C */ b lbl_80D3E694 -lbl_80D3E63C: -/* 80D3E63C 38 00 00 06 */ li r0, 6 -/* 80D3E640 90 1F 05 8C */ stw r0, 0x58c(r31) -/* 80D3E644 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 80D3E648 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3E64C 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D3ECBC@ha */ -/* 80D3E650 38 63 EC BC */ addi r3, r3, l_arcName@l /* 0x80D3ECBC@l */ -/* 80D3E654 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80D3E658 38 80 00 06 */ li r4, 6 -/* 80D3E65C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D3E660 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D3E664 3C A5 00 02 */ addis r5, r5, 2 -/* 80D3E668 38 C0 00 80 */ li r6, 0x80 -/* 80D3E66C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80D3E670 4B 2F DC 7D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D3E674 7C 64 1B 78 */ mr r4, r3 -/* 80D3E678 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3E67C 38 A0 00 00 */ li r5, 0 -/* 80D3E680 C0 3E 00 48 */ lfs f1, 0x48(r30) -/* 80D3E684 FC 40 08 90 */ fmr f2, f1 -/* 80D3E688 FC 60 08 90 */ fmr f3, f1 -/* 80D3E68C C0 9E 00 4C */ lfs f4, 0x4c(r30) -/* 80D3E690 4B 2D 27 E1 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff -lbl_80D3E694: -/* 80D3E694 88 1F 05 9A */ lbz r0, 0x59a(r31) -/* 80D3E698 28 00 00 00 */ cmplwi r0, 0 -/* 80D3E69C 41 82 00 0C */ beq lbl_80D3E6A8 -/* 80D3E6A0 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80D3E6A4 4B 2C ED 85 */ bl play__14mDoExt_baseAnmFv -lbl_80D3E6A8: -/* 80D3E6A8 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80D3E6AC 7C 03 07 74 */ extsb r3, r0 -/* 80D3E6B0 4B 2E E9 BD */ bl dComIfGp_getReverb__Fi -/* 80D3E6B4 7C 65 1B 78 */ mr r5, r3 -/* 80D3E6B8 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3E6BC 38 80 00 00 */ li r4, 0 -/* 80D3E6C0 4B 2D 29 F1 */ bl play__16mDoExt_McaMorfSOFUlSc -/* 80D3E6C4 7F E3 FB 78 */ mr r3, r31 -/* 80D3E6C8 4B FF FA B9 */ bl setModelBaseMtx__FP16obj_ystone_class -/* 80D3E6CC 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3E6D0 4B 2D 2B 1D */ bl modelCalc__16mDoExt_McaMorfSOFv -lbl_80D3E6D4: -/* 80D3E6D4 39 61 00 50 */ addi r11, r1, 0x50 -/* 80D3E6D8 4B 62 3B 45 */ bl _restgpr_26 -/* 80D3E6DC 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80D3E6E0 7C 08 03 A6 */ mtlr r0 -/* 80D3E6E4 38 21 00 50 */ addi r1, r1, 0x50 -/* 80D3E6E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 4fdc63500d3..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,107 +0,0 @@ -lbl_80D3EA80: -/* 80D3EA80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80D3EA84 7C 08 02 A6 */ mflr r0 -/* 80D3EA88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80D3EA8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80D3EA90 93 C1 00 08 */ stw r30, 8(r1) -/* 80D3EA94 7C 7F 1B 78 */ mr r31, r3 -/* 80D3EA98 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80D3EA9C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80D3EAA0 40 82 00 1C */ bne lbl_80D3EABC -/* 80D3EAA4 28 1F 00 00 */ cmplwi r31, 0 -/* 80D3EAA8 41 82 00 08 */ beq lbl_80D3EAB0 -/* 80D3EAAC 4B 2D A0 B9 */ bl __ct__10fopAc_ac_cFv -lbl_80D3EAB0: -/* 80D3EAB0 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80D3EAB4 60 00 00 08 */ ori r0, r0, 8 -/* 80D3EAB8 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80D3EABC: -/* 80D3EABC 4B FF F5 5D */ bl getNowLevel__Fv -/* 80D3EAC0 38 03 FF FF */ addi r0, r3, -1 -/* 80D3EAC4 98 1F 05 99 */ stb r0, 0x599(r31) -/* 80D3EAC8 38 7F 05 68 */ addi r3, r31, 0x568 -/* 80D3EACC 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 80D3EAD0 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3EAD4 3C 80 80 D4 */ lis r4, l_arcName@ha /* 0x80D3ECBC@ha */ -/* 80D3EAD8 38 84 EC BC */ addi r4, r4, l_arcName@l /* 0x80D3ECBC@l */ -/* 80D3EADC 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80D3EAE0 4B 2E E3 DD */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80D3EAE4 7C 7E 1B 78 */ mr r30, r3 -/* 80D3EAE8 2C 1E 00 04 */ cmpwi r30, 4 -/* 80D3EAEC 40 82 00 FC */ bne lbl_80D3EBE8 -/* 80D3EAF0 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 80D3EAF4 28 00 00 03 */ cmplwi r0, 3 -/* 80D3EAF8 40 80 00 28 */ bge lbl_80D3EB20 -/* 80D3EAFC 7F E3 FB 78 */ mr r3, r31 -/* 80D3EB00 3C 80 80 D4 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80D3E7B8@ha */ -/* 80D3EB04 38 84 E7 B8 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80D3E7B8@l */ -/* 80D3EB08 38 A0 10 00 */ li r5, 0x1000 -/* 80D3EB0C 4B 2D B9 A5 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D3EB10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D3EB14 40 82 00 30 */ bne lbl_80D3EB44 -/* 80D3EB18 38 60 00 05 */ li r3, 5 -/* 80D3EB1C 48 00 00 D0 */ b lbl_80D3EBEC -lbl_80D3EB20: -/* 80D3EB20 7F E3 FB 78 */ mr r3, r31 -/* 80D3EB24 3C 80 80 D4 */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x80D3E7B8@ha */ -/* 80D3EB28 38 84 E7 B8 */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x80D3E7B8@l */ -/* 80D3EB2C 38 A0 33 A0 */ li r5, 0x33a0 -/* 80D3EB30 4B 2D B9 81 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80D3EB34 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80D3EB38 40 82 00 0C */ bne lbl_80D3EB44 -/* 80D3EB3C 38 60 00 05 */ li r3, 5 -/* 80D3EB40 48 00 00 AC */ b lbl_80D3EBEC -lbl_80D3EB44: -/* 80D3EB44 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 80D3EB48 28 00 00 03 */ cmplwi r0, 3 -/* 80D3EB4C 40 80 00 58 */ bge lbl_80D3EBA4 -/* 80D3EB50 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80D3EB54 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D3EB58 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80D3EB5C 88 1F 05 99 */ lbz r0, 0x599(r31) -/* 80D3EB60 28 00 00 03 */ cmplwi r0, 3 -/* 80D3EB64 40 80 00 0C */ bge lbl_80D3EB70 -/* 80D3EB68 38 00 00 01 */ li r0, 1 -/* 80D3EB6C 98 1F 05 9B */ stb r0, 0x59b(r31) -lbl_80D3EB70: -/* 80D3EB70 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3EB74 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D3EB78 3C 80 80 D4 */ lis r4, lit_3968@ha /* 0x80D3EC54@ha */ -/* 80D3EB7C C0 24 EC 54 */ lfs f1, lit_3968@l(r4) /* 0x80D3EC54@l */ -/* 80D3EB80 FC 40 08 90 */ fmr f2, f1 -/* 80D3EB84 FC 60 08 90 */ fmr f3, f1 -/* 80D3EB88 4B 60 7D E1 */ bl PSMTXScale -/* 80D3EB8C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80D3EB90 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80D3EB94 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80D3EB98 38 84 00 24 */ addi r4, r4, 0x24 -/* 80D3EB9C 4B 60 79 15 */ bl PSMTXCopy -/* 80D3EBA0 48 00 00 34 */ b lbl_80D3EBD4 -lbl_80D3EBA4: -/* 80D3EBA4 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 80D3EBA8 80 63 00 04 */ lwz r3, 4(r3) -/* 80D3EBAC 38 03 00 24 */ addi r0, r3, 0x24 -/* 80D3EBB0 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80D3EBB4 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 80D3EBB8 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80D3EBBC 90 1F 05 8C */ stw r0, 0x58c(r31) -/* 80D3EBC0 80 1F 05 8C */ lwz r0, 0x58c(r31) -/* 80D3EBC4 2C 00 00 07 */ cmpwi r0, 7 -/* 80D3EBC8 41 80 00 0C */ blt lbl_80D3EBD4 -/* 80D3EBCC 38 00 00 00 */ li r0, 0 -/* 80D3EBD0 90 1F 05 8C */ stw r0, 0x58c(r31) -lbl_80D3EBD4: -/* 80D3EBD4 3C 60 80 D4 */ lis r3, lit_3967@ha /* 0x80D3EC50@ha */ -/* 80D3EBD8 C0 03 EC 50 */ lfs f0, lit_3967@l(r3) /* 0x80D3EC50@l */ -/* 80D3EBDC D0 1F 05 80 */ stfs f0, 0x580(r31) -/* 80D3EBE0 7F E3 FB 78 */ mr r3, r31 -/* 80D3EBE4 4B FF FB 09 */ bl daObj_Ystone_Execute__FP16obj_ystone_class -lbl_80D3EBE8: -/* 80D3EBE8 7F C3 F3 78 */ mr r3, r30 -lbl_80D3EBEC: -/* 80D3EBEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80D3EBF0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80D3EBF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80D3EBF8 7C 08 03 A6 */ mtlr r0 -/* 80D3EBFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80D3EC00 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index f017a29ca67..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,172 +0,0 @@ -lbl_80D3E7B8: -/* 80D3E7B8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80D3E7BC 7C 08 02 A6 */ mflr r0 -/* 80D3E7C0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80D3E7C4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80D3E7C8 4B 62 3A 0D */ bl _savegpr_27 -/* 80D3E7CC 7C 7C 1B 78 */ mr r28, r3 -/* 80D3E7D0 3C 60 80 D4 */ lis r3, l_bmdIndex@ha /* 0x80D3EC0C@ha */ -/* 80D3E7D4 3B E3 EC 0C */ addi r31, r3, l_bmdIndex@l /* 0x80D3EC0C@l */ -/* 80D3E7D8 88 1C 05 99 */ lbz r0, 0x599(r28) -/* 80D3E7DC 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3E7E0 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D3ECBC@ha */ -/* 80D3E7E4 38 63 EC BC */ addi r3, r3, l_arcName@l /* 0x80D3ECBC@l */ -/* 80D3E7E8 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80D3E7EC 38 9F 00 00 */ addi r4, r31, 0 -/* 80D3E7F0 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80D3E7F4 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80D3E7F8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80D3E7FC 3F A5 00 02 */ addis r29, r5, 2 -/* 80D3E800 3B BD C2 F8 */ addi r29, r29, -15624 -/* 80D3E804 7F A5 EB 78 */ mr r5, r29 -/* 80D3E808 38 C0 00 80 */ li r6, 0x80 -/* 80D3E80C 4B 2F DA E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D3E810 7C 7E 1B 78 */ mr r30, r3 -/* 80D3E814 88 1C 05 99 */ lbz r0, 0x599(r28) -/* 80D3E818 28 00 00 03 */ cmplwi r0, 3 -/* 80D3E81C 40 80 00 C4 */ bge lbl_80D3E8E0 -/* 80D3E820 3C 80 00 08 */ lis r4, 8 -/* 80D3E824 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80D3E828 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80D3E82C 4B 2D 64 29 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80D3E830 90 7C 05 70 */ stw r3, 0x570(r28) -/* 80D3E834 80 1C 05 70 */ lwz r0, 0x570(r28) -/* 80D3E838 28 00 00 00 */ cmplwi r0, 0 -/* 80D3E83C 40 82 00 0C */ bne lbl_80D3E848 -/* 80D3E840 38 60 00 00 */ li r3, 0 -/* 80D3E844 48 00 01 DC */ b lbl_80D3EA20 -lbl_80D3E848: -/* 80D3E848 88 1C 05 99 */ lbz r0, 0x599(r28) -/* 80D3E84C 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3E850 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D3ECBC@ha */ -/* 80D3E854 38 63 EC BC */ addi r3, r3, l_arcName@l /* 0x80D3ECBC@l */ -/* 80D3E858 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80D3E85C 38 9F 00 1C */ addi r4, r31, 0x1c -/* 80D3E860 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80D3E864 7F A5 EB 78 */ mr r5, r29 -/* 80D3E868 38 C0 00 80 */ li r6, 0x80 -/* 80D3E86C 4B 2F DA 81 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D3E870 7C 7D 1B 78 */ mr r29, r3 -/* 80D3E874 38 60 00 18 */ li r3, 0x18 -/* 80D3E878 4B 59 03 D5 */ bl __nw__FUl -/* 80D3E87C 7C 7B 1B 79 */ or. r27, r3, r3 -/* 80D3E880 41 82 00 20 */ beq lbl_80D3E8A0 -/* 80D3E884 3C 80 80 D4 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80D3ED7C@ha */ -/* 80D3E888 38 04 ED 7C */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80D3ED7C@l */ -/* 80D3E88C 90 1B 00 00 */ stw r0, 0(r27) -/* 80D3E890 38 80 00 00 */ li r4, 0 -/* 80D3E894 4B 5E 9B 69 */ bl init__12J3DFrameCtrlFs -/* 80D3E898 38 00 00 00 */ li r0, 0 -/* 80D3E89C 90 1B 00 14 */ stw r0, 0x14(r27) -lbl_80D3E8A0: -/* 80D3E8A0 93 7C 05 74 */ stw r27, 0x574(r28) -/* 80D3E8A4 80 7C 05 74 */ lwz r3, 0x574(r28) -/* 80D3E8A8 28 03 00 00 */ cmplwi r3, 0 -/* 80D3E8AC 41 82 00 2C */ beq lbl_80D3E8D8 -/* 80D3E8B0 38 9E 00 58 */ addi r4, r30, 0x58 -/* 80D3E8B4 7F A5 EB 78 */ mr r5, r29 -/* 80D3E8B8 38 C0 00 01 */ li r6, 1 -/* 80D3E8BC 38 E0 00 02 */ li r7, 2 -/* 80D3E8C0 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 80D3E8C4 39 00 00 00 */ li r8, 0 -/* 80D3E8C8 39 20 FF FF */ li r9, -1 -/* 80D3E8CC 4B 2C EE 41 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss -/* 80D3E8D0 2C 03 00 00 */ cmpwi r3, 0 -/* 80D3E8D4 40 82 01 48 */ bne lbl_80D3EA1C -lbl_80D3E8D8: -/* 80D3E8D8 38 60 00 00 */ li r3, 0 -/* 80D3E8DC 48 00 01 44 */ b lbl_80D3EA20 -lbl_80D3E8E0: -/* 80D3E8E0 38 60 00 58 */ li r3, 0x58 -/* 80D3E8E4 4B 59 03 69 */ bl __nw__FUl -/* 80D3E8E8 7C 7B 1B 79 */ or. r27, r3, r3 -/* 80D3E8EC 41 82 00 6C */ beq lbl_80D3E958 -/* 80D3E8F0 88 1C 05 99 */ lbz r0, 0x599(r28) -/* 80D3E8F4 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3E8F8 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D3ECBC@ha */ -/* 80D3E8FC 38 63 EC BC */ addi r3, r3, l_arcName@l /* 0x80D3ECBC@l */ -/* 80D3E900 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80D3E904 38 80 00 05 */ li r4, 5 -/* 80D3E908 7F A5 EB 78 */ mr r5, r29 -/* 80D3E90C 38 C0 00 80 */ li r6, 0x80 -/* 80D3E910 4B 2F D9 DD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D3E914 7C 67 1B 78 */ mr r7, r3 -/* 80D3E918 38 00 00 00 */ li r0, 0 -/* 80D3E91C 90 01 00 08 */ stw r0, 8(r1) -/* 80D3E920 90 01 00 0C */ stw r0, 0xc(r1) -/* 80D3E924 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000284@ha */ -/* 80D3E928 38 03 02 84 */ addi r0, r3, 0x0284 /* 0x11000284@l */ -/* 80D3E92C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80D3E930 7F 63 DB 78 */ mr r3, r27 -/* 80D3E934 7F C4 F3 78 */ mr r4, r30 -/* 80D3E938 38 A0 00 00 */ li r5, 0 -/* 80D3E93C 38 C0 00 00 */ li r6, 0 -/* 80D3E940 39 00 00 00 */ li r8, 0 -/* 80D3E944 C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 80D3E948 39 20 00 00 */ li r9, 0 -/* 80D3E94C 39 40 FF FF */ li r10, -1 -/* 80D3E950 4B 2D 1E 81 */ bl __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl -/* 80D3E954 7C 7B 1B 78 */ mr r27, r3 -lbl_80D3E958: -/* 80D3E958 93 7C 05 7C */ stw r27, 0x57c(r28) -/* 80D3E95C 80 7C 05 7C */ lwz r3, 0x57c(r28) -/* 80D3E960 28 03 00 00 */ cmplwi r3, 0 -/* 80D3E964 41 82 00 10 */ beq lbl_80D3E974 -/* 80D3E968 80 03 00 04 */ lwz r0, 4(r3) -/* 80D3E96C 28 00 00 00 */ cmplwi r0, 0 -/* 80D3E970 40 82 00 0C */ bne lbl_80D3E97C -lbl_80D3E974: -/* 80D3E974 38 60 00 00 */ li r3, 0 -/* 80D3E978 48 00 00 A8 */ b lbl_80D3EA20 -lbl_80D3E97C: -/* 80D3E97C 38 60 00 18 */ li r3, 0x18 -/* 80D3E980 4B 59 02 CD */ bl __nw__FUl -/* 80D3E984 7C 7B 1B 79 */ or. r27, r3, r3 -/* 80D3E988 41 82 00 20 */ beq lbl_80D3E9A8 -/* 80D3E98C 3C 80 80 D4 */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80D3ED7C@ha */ -/* 80D3E990 38 04 ED 7C */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80D3ED7C@l */ -/* 80D3E994 90 1B 00 00 */ stw r0, 0(r27) -/* 80D3E998 38 80 00 00 */ li r4, 0 -/* 80D3E99C 4B 5E 9A 61 */ bl init__12J3DFrameCtrlFs -/* 80D3E9A0 38 00 00 00 */ li r0, 0 -/* 80D3E9A4 90 1B 00 14 */ stw r0, 0x14(r27) -lbl_80D3E9A8: -/* 80D3E9A8 93 7C 05 78 */ stw r27, 0x578(r28) -/* 80D3E9AC 80 1C 05 78 */ lwz r0, 0x578(r28) -/* 80D3E9B0 28 00 00 00 */ cmplwi r0, 0 -/* 80D3E9B4 40 82 00 0C */ bne lbl_80D3E9C0 -/* 80D3E9B8 38 60 00 00 */ li r3, 0 -/* 80D3E9BC 48 00 00 64 */ b lbl_80D3EA20 -lbl_80D3E9C0: -/* 80D3E9C0 88 1C 05 99 */ lbz r0, 0x599(r28) -/* 80D3E9C4 54 00 10 3A */ slwi r0, r0, 2 -/* 80D3E9C8 3C 60 80 D4 */ lis r3, l_arcName@ha /* 0x80D3ECBC@ha */ -/* 80D3E9CC 38 63 EC BC */ addi r3, r3, l_arcName@l /* 0x80D3ECBC@l */ -/* 80D3E9D0 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80D3E9D4 38 9F 00 28 */ addi r4, r31, 0x28 -/* 80D3E9D8 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80D3E9DC 7F A5 EB 78 */ mr r5, r29 -/* 80D3E9E0 38 C0 00 80 */ li r6, 0x80 -/* 80D3E9E4 4B 2F D9 09 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80D3E9E8 7C 65 1B 78 */ mr r5, r3 -/* 80D3E9EC 80 7C 05 78 */ lwz r3, 0x578(r28) -/* 80D3E9F0 38 9E 00 58 */ addi r4, r30, 0x58 -/* 80D3E9F4 38 C0 00 00 */ li r6, 0 -/* 80D3E9F8 38 E0 00 02 */ li r7, 2 -/* 80D3E9FC C0 3F 00 44 */ lfs f1, 0x44(r31) -/* 80D3EA00 39 00 00 00 */ li r8, 0 -/* 80D3EA04 39 20 FF FF */ li r9, -1 -/* 80D3EA08 4B 2C EC 35 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss -/* 80D3EA0C 2C 03 00 00 */ cmpwi r3, 0 -/* 80D3EA10 40 82 00 0C */ bne lbl_80D3EA1C -/* 80D3EA14 38 60 00 00 */ li r3, 0 -/* 80D3EA18 48 00 00 08 */ b lbl_80D3EA20 -lbl_80D3EA1C: -/* 80D3EA1C 38 60 00 01 */ li r3, 1 -lbl_80D3EA20: -/* 80D3EA20 39 61 00 30 */ addi r11, r1, 0x30 -/* 80D3EA24 4B 62 37 FD */ bl _restgpr_27 -/* 80D3EA28 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80D3EA2C 7C 08 03 A6 */ mtlr r0 -/* 80D3EA30 38 21 00 30 */ addi r1, r1, 0x30 -/* 80D3EA34 4E 80 00 20 */ blr diff --git a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp index e7bec8e30d6..5d78bd57d86 100644 --- a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp +++ b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp @@ -8,71 +8,6 @@ #include "f_op/f_op_actor_mng.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" static void getNowLevel__Fv(); -extern "C" static void daObj_Ystone_Draw__FP16obj_ystone_class(); -extern "C" static void setModelBaseMtx__FP16obj_ystone_class(); -extern "C" static void action__FP16obj_ystone_class(); -extern "C" static void daObj_Ystone_Execute__FP16obj_ystone_class(); -extern "C" static bool daObj_Ystone_IsDelete__FP16obj_ystone_class(); -extern "C" static void daObj_Ystone_Delete__FP16obj_ystone_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daObj_Ystone_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_obj_ystone__stringBase0; -static cPhs__Step daObj_Ystone_Create(fopAc_ac_c*); - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void -__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); -extern "C" void setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff(); -extern "C" void play__16mDoExt_McaMorfSOFUlSc(); -extern "C" void entryDL__16mDoExt_McaMorfSOFv(); -extern "C" void modelCalc__16mDoExt_McaMorfSOFv(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(); -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 getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -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 __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" u8 now__14mDoMtx_stack_c[48]; - -// -// Declarations: -// /* 80D3ECBC-80D3ECD8 -00001 001C+00 4/4 0/0 0/0 .data l_arcName */ static char const* l_arcName[7] = { @@ -102,16 +37,10 @@ static char const* l_stageName[9] = { static int const l_bmdIndex[7] = {4, 4, 4, 9, 9, 10, 11}; /* 80D3EC28-80D3EC34 00001C 000C+00 0/1 0/0 0/0 .rodata l_brkIndex */ -#pragma push -#pragma force_active on static int const l_brkIndex[3] = {7, 7, 7}; -#pragma pop /* 80D3EC34-80D3EC50 000028 001C+00 0/1 0/0 0/0 .rodata l_btkIndex */ -#pragma push -#pragma force_active on static int const l_btkIndex[7] = {14, 14, 14, 14, 14, 15, 16}; -#pragma pop /* 80D3E018-80D3E090 000078 0078+00 1/1 0/0 0/0 .text getNowLevel__Fv */ static int getNowLevel() { @@ -164,49 +93,17 @@ static void setModelBaseMtx(obj_ystone_class* i_this) { } } -/* 80D3EC50-80D3EC54 000044 0004+00 1/3 0/0 0/0 .rodata @3967 */ -SECTION_RODATA static f32 const lit_3967 = 1.0f; -COMPILER_STRIP_GATE(0x80D3EC50, &lit_3967); - -/* 80D3EC54-80D3EC58 000048 0004+00 1/2 0/0 0/0 .rodata @3968 */ -SECTION_RODATA static u8 const lit_3968[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D3EC54, &lit_3968); - -/* 80D3EC58-80D3EC5C 00004C 0004+00 0/1 0/0 0/0 .rodata @3969 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3969 = -1.0f; -COMPILER_STRIP_GATE(0x80D3EC58, &lit_3969); -#pragma pop - static u16 mirror_effect_id[10] = { 0x89A0, 0x89A1, 0x89A2, 0x89A5, 0x89A6, 0x89A7, 0x89A8, 0x89A9, 0x89AA, 0x89AB }; -/* 80D3ED10-80D3ED2C -00001 001C+00 1/1 0/0 0/0 .data @3970 */ -SECTION_DATA static void* lit_3970[7] = { - (void*)(((char*)action__FP16obj_ystone_class) + 0xF0), - (void*)(((char*)action__FP16obj_ystone_class) + 0x1E4), - (void*)(((char*)action__FP16obj_ystone_class) + 0x210), - (void*)(((char*)action__FP16obj_ystone_class) + 0x27C), - (void*)(((char*)action__FP16obj_ystone_class) + 0x338), - (void*)(((char*)action__FP16obj_ystone_class) + 0x3E0), - (void*)(((char*)action__FP16obj_ystone_class) + 0x438), -}; - /* 80D3E25C-80D3E6EC 0002BC 0490+00 2/1 0/0 0/0 .text action__FP16obj_ystone_class */ -#ifdef NONMATCHING -// matches with literals static void action(obj_ystone_class* i_this) { if (i_this->mLevel < 3) { switch (i_this->mShadowMode) { case 0: i_this->shape_angle.y += 0x100; + break; } setModelBaseMtx(i_this); @@ -266,7 +163,7 @@ static void action(obj_ystone_class* i_this) { btk_anm, 1, 0, 1.0f, 0, -1); // no break - case 4: + case 4: { i_this->shape_angle.y += 0x100; mDoMtx_stack_c::copy(i_this->mpMorf->getModel()->i_getAnmMtx(0)); cXyz particle_pos; @@ -275,6 +172,7 @@ static void action(obj_ystone_class* i_this) { dComIfGp_particle_set(i_this->mParticleKey, 0x89a4, &particle_pos, &i_this->mTevStr, &i_this->shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL); break; + } case 5: i_this->mMirrorMode = 6; @@ -294,16 +192,6 @@ static void action(obj_ystone_class* i_this) { i_this->mpMorf->modelCalc(); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void action(obj_ystone_class* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/action__FP16obj_ystone_class.s" -} -#pragma pop -#endif /* 80D3E6EC-80D3E770 00074C 0084+00 2/1 0/0 0/0 .text daObj_Ystone_Execute__FP16obj_ystone_class */ @@ -330,50 +218,14 @@ static int daObj_Ystone_Delete(obj_ystone_class* i_this) { return 1; } -/* 80D3ED2C-80D3ED4C -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Ystone_Method */ -static actor_method_class l_daObj_Ystone_Method = { - (process_method_func)daObj_Ystone_Create, - (process_method_func)daObj_Ystone_Delete, - (process_method_func)daObj_Ystone_Execute, - (process_method_func)daObj_Ystone_IsDelete, - (process_method_func)daObj_Ystone_Draw, -}; - -/* 80D3ED4C-80D3ED7C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_YSTONE */ -extern actor_process_profile_definition g_profile_OBJ_YSTONE = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_OBJ_YSTONE, - &g_fpcLf_Method.mBase, - sizeof(obj_ystone_class), - 0, - 0, - &g_fopAc_Method.base, - 0x259, - &l_daObj_Ystone_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, -}; - -/* 80D3ED7C-80D3ED88 0000C0 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - /* 80D3E7B8-80D3EA38 000818 0280+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#ifdef NONMATCHING -// regalloc static int useHeapInit(fopAc_ac_c* i_this) { obj_ystone_class* _this = static_cast(i_this); - J3DModelData* model_data = - (J3DModelData*)dComIfG_getObjectRes(l_arcName[_this->mLevel], l_bmdIndex[_this->mLevel]); + void* model_data = + dComIfG_getObjectRes(l_arcName[_this->mLevel], l_bmdIndex[_this->mLevel]); if (_this->mLevel < 3) { - _this->mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + _this->mpModel = mDoExt_J3DModel__create((J3DModelData*)model_data, 0x80000, 0x11000084); if (_this->mpModel == NULL) { return 0; } @@ -383,12 +235,12 @@ static int useHeapInit(fopAc_ac_c* i_this) { l_brkIndex[_this->mLevel]); _this->mpBrkAnm = new mDoExt_brkAnm(); if (_this->mpBrkAnm == NULL || - !_this->mpBrkAnm->init(model_data, brk_anm, 1, 2, 1.0f, 0, -1)) + !_this->mpBrkAnm->init((J3DModelData*)model_data, brk_anm, 1, 2, 1.0f, 0, -1)) { return 0; } } else { - _this->mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + _this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[_this->mLevel], 5), 0, 1.0f, 0, -1, NULL, 0, 0x11000284); if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { @@ -402,38 +254,15 @@ static int useHeapInit(fopAc_ac_c* i_this) { J3DAnmTextureSRTKey* btk_anm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[_this->mLevel], l_btkIndex[_this->mLevel]); - if (!_this->mpBtkAnm->init(model_data, btk_anm, 0, 2, 1.0f, 0, -1)) { + if (!_this->mpBtkAnm->init((J3DModelData*)model_data, btk_anm, 0, 2, 1.0f, 0, -1)) { return 0; } } return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/useHeapInit__FP10fopAc_ac_c.s" -} -#pragma pop -#endif - -/* 80D3EA38-80D3EA80 000A98 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" asm void __dt__12J3DFrameCtrlFv() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop /* 80D3EA80-80D3EC04 000AE0 0184+00 1/0 0/0 0/0 .text daObj_Ystone_Create__FP10fopAc_ac_c */ -#ifdef NONMATCHING -// matches with literals static cPhs__Step daObj_Ystone_Create(fopAc_ac_c* i_this) { obj_ystone_class* _this = static_cast(i_this); fopAcM_SetupActor(_this, obj_ystone_class); @@ -471,13 +300,31 @@ static cPhs__Step daObj_Ystone_Create(fopAc_ac_c* i_this) { } return step; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm cPhs__Step daObj_Ystone_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone/daObj_Ystone_Create__FP10fopAc_ac_c.s" -} -#pragma pop -#endif + + +/* 80D3ED2C-80D3ED4C -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Ystone_Method */ +static actor_method_class l_daObj_Ystone_Method = { + (process_method_func)daObj_Ystone_Create, + (process_method_func)daObj_Ystone_Delete, + (process_method_func)daObj_Ystone_Execute, + (process_method_func)daObj_Ystone_IsDelete, + (process_method_func)daObj_Ystone_Draw, +}; + +/* 80D3ED4C-80D3ED7C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_YSTONE */ +extern actor_process_profile_definition g_profile_OBJ_YSTONE = { + fpcLy_CURRENT_e, + 8, + fpcPi_CURRENT_e, + PROC_OBJ_YSTONE, + &g_fpcLf_Method.mBase, + sizeof(obj_ystone_class), + 0, + 0, + &g_fopAc_Method.base, + 0x259, + &l_daObj_Ystone_Method, + 0x44100, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, +};