diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 09a8bd37df..0000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,67 +0,0 @@ -lbl_804A9364: -/* 804A9364 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 804A9368 7C 08 02 A6 */ mflr r0 -/* 804A936C 90 01 00 34 */ stw r0, 0x34(r1) -/* 804A9370 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 804A9374 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 804A9378 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 804A937C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 804A9380 7C 7E 1B 78 */ mr r30, r3 -/* 804A9384 3C 80 80 4B */ lis r4, lit_3704@ha /* 0x804A9460@ha */ -/* 804A9388 3B E4 94 60 */ addi r31, r4, lit_3704@l /* 0x804A9460@l */ -/* 804A938C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 804A9390 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 804A9394 40 82 00 1C */ bne lbl_804A93B0 -/* 804A9398 28 1E 00 00 */ cmplwi r30, 0 -/* 804A939C 41 82 00 08 */ beq lbl_804A93A4 -/* 804A93A0 4B B6 F7 C5 */ bl __ct__10fopAc_ac_cFv -lbl_804A93A4: -/* 804A93A4 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 804A93A8 60 00 00 08 */ ori r0, r0, 8 -/* 804A93AC 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_804A93B0: -/* 804A93B0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 804A93B4 98 1E 05 67 */ stb r0, 0x567(r30) -/* 804A93B8 80 7E 00 B0 */ lwz r3, 0xb0(r30) -/* 804A93BC 54 60 C6 3E */ rlwinm r0, r3, 0x18, 0x18, 0x1f -/* 804A93C0 C8 3F 00 18 */ lfd f1, 0x18(r31) -/* 804A93C4 90 01 00 0C */ stw r0, 0xc(r1) -/* 804A93C8 3C 00 43 30 */ lis r0, 0x4330 -/* 804A93CC 90 01 00 08 */ stw r0, 8(r1) -/* 804A93D0 C8 01 00 08 */ lfd f0, 8(r1) -/* 804A93D4 EF E0 08 28 */ fsubs f31, f0, f1 -/* 804A93D8 C0 1F 00 14 */ lfs f0, 0x14(r31) -/* 804A93DC FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 804A93E0 4C 41 13 82 */ cror 2, 1, 2 -/* 804A93E4 40 82 00 10 */ bne lbl_804A93F4 -/* 804A93E8 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 804A93EC EF FF 00 32 */ fmuls f31, f31, f0 -/* 804A93F0 48 00 00 0C */ b lbl_804A93FC -lbl_804A93F4: -/* 804A93F4 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 804A93F8 EF FF 00 32 */ fmuls f31, f31, f0 -lbl_804A93FC: -/* 804A93FC 54 63 86 3E */ rlwinm r3, r3, 0x10, 0x18, 0x1f -/* 804A9400 28 03 00 FF */ cmplwi r3, 0xff -/* 804A9404 41 82 00 24 */ beq lbl_804A9428 -/* 804A9408 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 804A940C 38 A0 FF FF */ li r5, -1 -/* 804A9410 38 C0 FF FF */ li r6, -1 -/* 804A9414 38 E0 00 00 */ li r7, 0 -/* 804A9418 39 00 00 00 */ li r8, 0 -/* 804A941C 39 20 00 00 */ li r9, 0 -/* 804A9420 39 40 00 00 */ li r10, 0 -/* 804A9424 4B B7 29 F1 */ bl fopAcM_createItemFromEnemyID__FUcPC4cXyziiPC5csXyzPC4cXyzPfPf -lbl_804A9428: -/* 804A9428 7F C3 F3 78 */ mr r3, r30 -/* 804A942C FC 20 F8 90 */ fmr f1, f31 -/* 804A9430 4B FF FD 01 */ bl set_disappear__FP15disappear_classf -/* 804A9434 38 60 00 04 */ li r3, 4 -/* 804A9438 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 804A943C CB E1 00 20 */ lfd f31, 0x20(r1) -/* 804A9440 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 804A9444 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 804A9448 80 01 00 34 */ lwz r0, 0x34(r1) -/* 804A944C 7C 08 03 A6 */ mtlr r0 -/* 804A9450 38 21 00 30 */ addi r1, r1, 0x30 -/* 804A9454 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Execute__FP15disappear_class.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Execute__FP15disappear_class.s deleted file mode 100644 index d719062231..0000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Execute__FP15disappear_class.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_804A8F6C: -/* 804A8F6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804A8F70 7C 08 02 A6 */ mflr r0 -/* 804A8F74 90 01 00 14 */ stw r0, 0x14(r1) -/* 804A8F78 A8 83 05 74 */ lha r4, 0x574(r3) -/* 804A8F7C 2C 04 00 00 */ cmpwi r4, 0 -/* 804A8F80 41 82 00 10 */ beq lbl_804A8F90 -/* 804A8F84 38 04 FF FF */ addi r0, r4, -1 -/* 804A8F88 B0 03 05 74 */ sth r0, 0x574(r3) -/* 804A8F8C 48 00 00 08 */ b lbl_804A8F94 -lbl_804A8F90: -/* 804A8F90 4B B7 0C ED */ bl fopAcM_delete__FP10fopAc_ac_c -lbl_804A8F94: -/* 804A8F94 38 60 00 01 */ li r3, 1 -/* 804A8F98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804A8F9C 7C 08 03 A6 */ mtlr r0 -/* 804A8FA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 804A8FA4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/ghost_disappear__FP15disappear_classf.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/ghost_disappear__FP15disappear_classf.s deleted file mode 100644 index bba3309a7d..0000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/ghost_disappear__FP15disappear_classf.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_804A9080: -/* 804A9080 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 804A9084 7C 08 02 A6 */ mflr r0 -/* 804A9088 90 01 00 54 */ stw r0, 0x54(r1) -/* 804A908C 39 61 00 50 */ addi r11, r1, 0x50 -/* 804A9090 4B EB 91 41 */ bl _savegpr_26 -/* 804A9094 7C 7A 1B 78 */ mr r26, r3 -/* 804A9098 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 804A909C D0 21 00 24 */ stfs f1, 0x24(r1) -/* 804A90A0 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 804A90A4 3B 60 00 00 */ li r27, 0 -/* 804A90A8 3B E0 00 00 */ li r31, 0 -/* 804A90AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804A90B0 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804A90B4 3C 60 80 4B */ lis r3, da_name_3710@ha /* 0x804A9488@ha */ -/* 804A90B8 3B A3 94 88 */ addi r29, r3, da_name_3710@l /* 0x804A9488@l */ -/* 804A90BC 3C 60 80 4B */ lis r3, lit_3704@ha /* 0x804A9460@ha */ -/* 804A90C0 3B C3 94 60 */ addi r30, r3, lit_3704@l /* 0x804A9460@l */ -lbl_804A90C4: -/* 804A90C4 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 804A90C8 38 80 00 00 */ li r4, 0 -/* 804A90CC 90 81 00 08 */ stw r4, 8(r1) -/* 804A90D0 38 00 FF FF */ li r0, -1 -/* 804A90D4 90 01 00 0C */ stw r0, 0xc(r1) -/* 804A90D8 90 81 00 10 */ stw r4, 0x10(r1) -/* 804A90DC 90 81 00 14 */ stw r4, 0x14(r1) -/* 804A90E0 90 81 00 18 */ stw r4, 0x18(r1) -/* 804A90E4 38 80 00 00 */ li r4, 0 -/* 804A90E8 7C BD FA 2E */ lhzx r5, r29, r31 -/* 804A90EC 38 DA 04 D0 */ addi r6, r26, 0x4d0 -/* 804A90F0 38 E0 00 00 */ li r7, 0 -/* 804A90F4 39 00 00 00 */ li r8, 0 -/* 804A90F8 39 21 00 20 */ addi r9, r1, 0x20 -/* 804A90FC 39 40 00 FF */ li r10, 0xff -/* 804A9100 C0 3E 00 00 */ lfs f1, 0(r30) -/* 804A9104 4B BA 39 8D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804A9108 3B 7B 00 01 */ addi r27, r27, 1 -/* 804A910C 2C 1B 00 05 */ cmpwi r27, 5 -/* 804A9110 3B FF 00 02 */ addi r31, r31, 2 -/* 804A9114 41 80 FF B0 */ blt lbl_804A90C4 -/* 804A9118 39 61 00 50 */ addi r11, r1, 0x50 -/* 804A911C 4B EB 91 01 */ bl _restgpr_26 -/* 804A9120 80 01 00 54 */ lwz r0, 0x54(r1) -/* 804A9124 7C 08 03 A6 */ mtlr r0 -/* 804A9128 38 21 00 50 */ addi r1, r1, 0x50 -/* 804A912C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/s_ks_sub__FPvPv.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/s_ks_sub__FPvPv.s deleted file mode 100644 index fe59ed43a6..0000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/s_ks_sub__FPvPv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_804A8F20: -/* 804A8F20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804A8F24 7C 08 02 A6 */ mflr r0 -/* 804A8F28 90 01 00 14 */ stw r0, 0x14(r1) -/* 804A8F2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804A8F30 7C 7F 1B 78 */ mr r31, r3 -/* 804A8F34 4B B6 FD AD */ bl fopAc_IsActor__FPv -/* 804A8F38 2C 03 00 00 */ cmpwi r3, 0 -/* 804A8F3C 41 82 00 18 */ beq lbl_804A8F54 -/* 804A8F40 A8 1F 00 08 */ lha r0, 8(r31) -/* 804A8F44 2C 00 00 60 */ cmpwi r0, 0x60 -/* 804A8F48 40 82 00 0C */ bne lbl_804A8F54 -/* 804A8F4C 38 00 00 01 */ li r0, 1 -/* 804A8F50 B0 1F 05 62 */ sth r0, 0x562(r31) -lbl_804A8F54: -/* 804A8F54 38 60 00 00 */ li r3, 0 -/* 804A8F58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804A8F5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804A8F60 7C 08 03 A6 */ mtlr r0 -/* 804A8F64 38 21 00 10 */ addi r1, r1, 0x10 -/* 804A8F68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/set_disappear__FP15disappear_classf.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/set_disappear__FP15disappear_classf.s deleted file mode 100644 index 0b55972859..0000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/set_disappear__FP15disappear_classf.s +++ /dev/null @@ -1,148 +0,0 @@ -lbl_804A9130: -/* 804A9130 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 804A9134 7C 08 02 A6 */ mflr r0 -/* 804A9138 90 01 00 74 */ stw r0, 0x74(r1) -/* 804A913C DB E1 00 60 */ stfd f31, 0x60(r1) -/* 804A9140 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 804A9144 39 61 00 60 */ addi r11, r1, 0x60 -/* 804A9148 4B EB 90 89 */ bl _savegpr_26 -/* 804A914C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 804A9150 FF E0 08 90 */ fmr f31, f1 -/* 804A9154 3C 60 80 4B */ lis r3, lit_3704@ha /* 0x804A9460@ha */ -/* 804A9158 3B E3 94 60 */ addi r31, r3, lit_3704@l /* 0x804A9460@l */ -/* 804A915C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 804A9160 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 804A9164 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 804A9168 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 804A916C C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 804A9170 D0 01 00 34 */ stfs f0, 0x34(r1) -/* 804A9174 38 61 00 2C */ addi r3, r1, 0x2c -/* 804A9178 38 80 00 78 */ li r4, 0x78 -/* 804A917C 41 82 00 0C */ beq lbl_804A9188 -/* 804A9180 80 BE 00 04 */ lwz r5, 4(r30) -/* 804A9184 48 00 00 08 */ b lbl_804A918C -lbl_804A9188: -/* 804A9188 38 A0 FF FF */ li r5, -1 -lbl_804A918C: -/* 804A918C 38 C0 00 0A */ li r6, 0xa -/* 804A9190 4B CF F0 31 */ bl dKy_Sound_set__F4cXyziUii -/* 804A9194 3C 60 80 4B */ lis r3, s_ks_sub__FPvPv@ha /* 0x804A8F20@ha */ -/* 804A9198 38 63 8F 20 */ addi r3, r3, s_ks_sub__FPvPv@l /* 0x804A8F20@l */ -/* 804A919C 7F C4 F3 78 */ mr r4, r30 -/* 804A91A0 4B B7 81 99 */ bl fpcEx_Search__FPFPvPv_PvPv -/* 804A91A4 88 1E 05 67 */ lbz r0, 0x567(r30) -/* 804A91A8 7C 00 07 74 */ extsb r0, r0 -/* 804A91AC 2C 00 00 03 */ cmpwi r0, 3 -/* 804A91B0 40 82 00 60 */ bne lbl_804A9210 -/* 804A91B4 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804A91B8 7C 03 07 74 */ extsb r3, r0 -/* 804A91BC 4B B8 3E B1 */ bl dComIfGp_getReverb__Fi -/* 804A91C0 7C 67 1B 78 */ mr r7, r3 -/* 804A91C4 3C 60 00 06 */ lis r3, 0x0006 /* 0x0006000A@ha */ -/* 804A91C8 38 03 00 0A */ addi r0, r3, 0x000A /* 0x0006000A@l */ -/* 804A91CC 90 01 00 28 */ stw r0, 0x28(r1) -/* 804A91D0 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804A91D4 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804A91D8 80 63 00 00 */ lwz r3, 0(r3) -/* 804A91DC 38 81 00 28 */ addi r4, r1, 0x28 -/* 804A91E0 38 BE 05 38 */ addi r5, r30, 0x538 -/* 804A91E4 38 C0 00 00 */ li r6, 0 -/* 804A91E8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 804A91EC FC 40 08 90 */ fmr f2, f1 -/* 804A91F0 C0 7F 00 04 */ lfs f3, 4(r31) -/* 804A91F4 FC 80 18 90 */ fmr f4, f3 -/* 804A91F8 39 00 00 00 */ li r8, 0 -/* 804A91FC 4B E0 27 89 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804A9200 7F C3 F3 78 */ mr r3, r30 -/* 804A9204 FC 20 F8 90 */ fmr f1, f31 -/* 804A9208 4B FF FE 79 */ bl ghost_disappear__FP15disappear_classf -/* 804A920C 48 00 01 38 */ b lbl_804A9344 -lbl_804A9210: -/* 804A9210 2C 00 00 01 */ cmpwi r0, 1 -/* 804A9214 41 80 00 64 */ blt lbl_804A9278 -/* 804A9218 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804A921C 7C 03 07 74 */ extsb r3, r0 -/* 804A9220 4B B8 3E 4D */ bl dComIfGp_getReverb__Fi -/* 804A9224 7C 67 1B 78 */ mr r7, r3 -/* 804A9228 3C 60 00 06 */ lis r3, 0x0006 /* 0x00060028@ha */ -/* 804A922C 38 03 00 28 */ addi r0, r3, 0x0028 /* 0x00060028@l */ -/* 804A9230 90 01 00 24 */ stw r0, 0x24(r1) -/* 804A9234 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804A9238 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804A923C 80 63 00 00 */ lwz r3, 0(r3) -/* 804A9240 38 81 00 24 */ addi r4, r1, 0x24 -/* 804A9244 38 BE 05 38 */ addi r5, r30, 0x538 -/* 804A9248 38 C0 00 00 */ li r6, 0 -/* 804A924C C0 3F 00 00 */ lfs f1, 0(r31) -/* 804A9250 FC 40 08 90 */ fmr f2, f1 -/* 804A9254 C0 7F 00 04 */ lfs f3, 4(r31) -/* 804A9258 FC 80 18 90 */ fmr f4, f3 -/* 804A925C 39 00 00 00 */ li r8, 0 -/* 804A9260 4B E0 27 25 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804A9264 7F C3 F3 78 */ mr r3, r30 -/* 804A9268 C0 1F 00 08 */ lfs f0, 8(r31) -/* 804A926C EC 20 07 F2 */ fmuls f1, f0, f31 -/* 804A9270 4B FF FD 49 */ bl yami_disappear__FP15disappear_classf -/* 804A9274 48 00 00 D0 */ b lbl_804A9344 -lbl_804A9278: -/* 804A9278 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 804A927C 7C 03 07 74 */ extsb r3, r0 -/* 804A9280 4B B8 3D ED */ bl dComIfGp_getReverb__Fi -/* 804A9284 7C 67 1B 78 */ mr r7, r3 -/* 804A9288 3C 60 00 06 */ lis r3, 0x0006 /* 0x0006000A@ha */ -/* 804A928C 38 03 00 0A */ addi r0, r3, 0x000A /* 0x0006000A@l */ -/* 804A9290 90 01 00 20 */ stw r0, 0x20(r1) -/* 804A9294 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804A9298 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804A929C 80 63 00 00 */ lwz r3, 0(r3) -/* 804A92A0 38 81 00 20 */ addi r4, r1, 0x20 -/* 804A92A4 38 BE 05 38 */ addi r5, r30, 0x538 -/* 804A92A8 38 C0 00 00 */ li r6, 0 -/* 804A92AC C0 3F 00 00 */ lfs f1, 0(r31) -/* 804A92B0 FC 40 08 90 */ fmr f2, f1 -/* 804A92B4 C0 7F 00 04 */ lfs f3, 4(r31) -/* 804A92B8 FC 80 18 90 */ fmr f4, f3 -/* 804A92BC 39 00 00 00 */ li r8, 0 -/* 804A92C0 4B E0 26 C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 804A92C4 D3 E1 00 38 */ stfs f31, 0x38(r1) -/* 804A92C8 D3 E1 00 3C */ stfs f31, 0x3c(r1) -/* 804A92CC D3 E1 00 40 */ stfs f31, 0x40(r1) -/* 804A92D0 38 00 00 3A */ li r0, 0x3a -/* 804A92D4 B0 1E 05 74 */ sth r0, 0x574(r30) -/* 804A92D8 3B 40 00 00 */ li r26, 0 -/* 804A92DC 3B A0 00 00 */ li r29, 0 -/* 804A92E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804A92E4 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804A92E8 3C 60 80 4B */ lis r3, da_name_3736@ha /* 0x804A9494@ha */ -/* 804A92EC 3B 83 94 94 */ addi r28, r3, da_name_3736@l /* 0x804A9494@l */ -lbl_804A92F0: -/* 804A92F0 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) -/* 804A92F4 38 80 00 00 */ li r4, 0 -/* 804A92F8 90 81 00 08 */ stw r4, 8(r1) -/* 804A92FC 38 00 FF FF */ li r0, -1 -/* 804A9300 90 01 00 0C */ stw r0, 0xc(r1) -/* 804A9304 90 81 00 10 */ stw r4, 0x10(r1) -/* 804A9308 90 81 00 14 */ stw r4, 0x14(r1) -/* 804A930C 90 81 00 18 */ stw r4, 0x18(r1) -/* 804A9310 38 80 00 00 */ li r4, 0 -/* 804A9314 7C BC EA 2E */ lhzx r5, r28, r29 -/* 804A9318 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 804A931C 38 E0 00 00 */ li r7, 0 -/* 804A9320 39 00 00 00 */ li r8, 0 -/* 804A9324 39 21 00 38 */ addi r9, r1, 0x38 -/* 804A9328 39 40 00 FF */ li r10, 0xff -/* 804A932C C0 3F 00 00 */ lfs f1, 0(r31) -/* 804A9330 4B BA 37 61 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804A9334 3B 5A 00 01 */ addi r26, r26, 1 -/* 804A9338 2C 1A 00 07 */ cmpwi r26, 7 -/* 804A933C 3B BD 00 02 */ addi r29, r29, 2 -/* 804A9340 41 80 FF B0 */ blt lbl_804A92F0 -lbl_804A9344: -/* 804A9344 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 804A9348 CB E1 00 60 */ lfd f31, 0x60(r1) -/* 804A934C 39 61 00 60 */ addi r11, r1, 0x60 -/* 804A9350 4B EB 8E CD */ bl _restgpr_26 -/* 804A9354 80 01 00 74 */ lwz r0, 0x74(r1) -/* 804A9358 7C 08 03 A6 */ mtlr r0 -/* 804A935C 38 21 00 70 */ addi r1, r1, 0x70 -/* 804A9360 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_disappear/d_a_disappear/yami_disappear__FP15disappear_classf.s b/asm/rel/d/a/d_a_disappear/d_a_disappear/yami_disappear__FP15disappear_classf.s deleted file mode 100644 index 8565421d30..0000000000 --- a/asm/rel/d/a/d_a_disappear/d_a_disappear/yami_disappear__FP15disappear_classf.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_804A8FB8: -/* 804A8FB8 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 804A8FBC 7C 08 02 A6 */ mflr r0 -/* 804A8FC0 90 01 00 54 */ stw r0, 0x54(r1) -/* 804A8FC4 39 61 00 50 */ addi r11, r1, 0x50 -/* 804A8FC8 4B EB 92 05 */ bl _savegpr_25 -/* 804A8FCC 7C 79 1B 78 */ mr r25, r3 -/* 804A8FD0 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 804A8FD4 D0 21 00 24 */ stfs f1, 0x24(r1) -/* 804A8FD8 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 804A8FDC 3B 60 00 03 */ li r27, 3 -/* 804A8FE0 88 03 05 67 */ lbz r0, 0x567(r3) -/* 804A8FE4 2C 00 00 02 */ cmpwi r0, 2 -/* 804A8FE8 40 82 00 08 */ bne lbl_804A8FF0 -/* 804A8FEC 3B 60 00 04 */ li r27, 4 -lbl_804A8FF0: -/* 804A8FF0 3B 40 00 00 */ li r26, 0 -/* 804A8FF4 3B E0 00 00 */ li r31, 0 -/* 804A8FF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804A8FFC 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804A9000 3C 60 80 4B */ lis r3, da_name_3684@ha /* 0x804A9480@ha */ -/* 804A9004 3B A3 94 80 */ addi r29, r3, da_name_3684@l /* 0x804A9480@l */ -/* 804A9008 3C 60 80 4B */ lis r3, lit_3704@ha /* 0x804A9460@ha */ -/* 804A900C 3B C3 94 60 */ addi r30, r3, lit_3704@l /* 0x804A9460@l */ -/* 804A9010 48 00 00 50 */ b lbl_804A9060 -lbl_804A9014: -/* 804A9014 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 804A9018 38 80 00 00 */ li r4, 0 -/* 804A901C 90 81 00 08 */ stw r4, 8(r1) -/* 804A9020 38 00 FF FF */ li r0, -1 -/* 804A9024 90 01 00 0C */ stw r0, 0xc(r1) -/* 804A9028 90 81 00 10 */ stw r4, 0x10(r1) -/* 804A902C 90 81 00 14 */ stw r4, 0x14(r1) -/* 804A9030 90 81 00 18 */ stw r4, 0x18(r1) -/* 804A9034 38 80 00 00 */ li r4, 0 -/* 804A9038 7C BD FA 2E */ lhzx r5, r29, r31 -/* 804A903C 38 D9 04 D0 */ addi r6, r25, 0x4d0 -/* 804A9040 38 E0 00 00 */ li r7, 0 -/* 804A9044 39 00 00 00 */ li r8, 0 -/* 804A9048 39 21 00 20 */ addi r9, r1, 0x20 -/* 804A904C 39 40 00 FF */ li r10, 0xff -/* 804A9050 C0 3E 00 00 */ lfs f1, 0(r30) -/* 804A9054 4B BA 3A 3D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 804A9058 3B 5A 00 01 */ addi r26, r26, 1 -/* 804A905C 3B FF 00 02 */ addi r31, r31, 2 -lbl_804A9060: -/* 804A9060 7C 1A D8 00 */ cmpw r26, r27 -/* 804A9064 41 80 FF B0 */ blt lbl_804A9014 -/* 804A9068 39 61 00 50 */ addi r11, r1, 0x50 -/* 804A906C 4B EB 91 AD */ bl _restgpr_25 -/* 804A9070 80 01 00 54 */ lwz r0, 0x54(r1) -/* 804A9074 7C 08 03 A6 */ mtlr r0 -/* 804A9078 38 21 00 50 */ addi r1, r1, 0x50 -/* 804A907C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 74da3b636d..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,172 +0,0 @@ -lbl_80860EAC: -/* 80860EAC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80860EB0 7C 08 02 A6 */ mflr r0 -/* 80860EB4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80860EB8 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80860EBC 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80860EC0 7C 7E 1B 78 */ mr r30, r3 -/* 80860EC4 3C 80 80 86 */ lis r4, lit_3839@ha /* 0x80861134@ha */ -/* 80860EC8 3B E4 11 34 */ addi r31, r4, lit_3839@l /* 0x80861134@l */ -/* 80860ECC 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80860ED0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80860ED4 40 82 00 1C */ bne lbl_80860EF0 -/* 80860ED8 28 1E 00 00 */ cmplwi r30, 0 -/* 80860EDC 41 82 00 08 */ beq lbl_80860EE4 -/* 80860EE0 4B 7B 7C 85 */ bl __ct__10fopAc_ac_cFv -lbl_80860EE4: -/* 80860EE4 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80860EE8 60 00 00 08 */ ori r0, r0, 8 -/* 80860EEC 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80860EF0: -/* 80860EF0 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80860EF4 98 1E 05 73 */ stb r0, 0x573(r30) -/* 80860EF8 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80860EFC 54 00 B6 BE */ rlwinm r0, r0, 0x16, 0x1a, 0x1f -/* 80860F00 98 1E 05 6C */ stb r0, 0x56c(r30) -/* 80860F04 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80860F08 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 80860F0C 98 1E 05 6D */ stb r0, 0x56d(r30) -/* 80860F10 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80860F14 54 00 86 3E */ rlwinm r0, r0, 0x10, 0x18, 0x1f -/* 80860F18 98 1E 05 6E */ stb r0, 0x56e(r30) -/* 80860F1C 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80860F20 54 00 46 3E */ srwi r0, r0, 0x18 -/* 80860F24 98 1E 05 6F */ stb r0, 0x56f(r30) -/* 80860F28 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80860F2C 54 00 06 FE */ clrlwi r0, r0, 0x1b -/* 80860F30 98 1E 05 71 */ stb r0, 0x571(r30) -/* 80860F34 A8 1E 04 E0 */ lha r0, 0x4e0(r30) -/* 80860F38 54 00 DE FE */ rlwinm r0, r0, 0x1b, 0x1b, 0x1f -/* 80860F3C 98 1E 05 72 */ stb r0, 0x572(r30) -/* 80860F40 C0 7F 00 2C */ lfs f3, 0x2c(r31) -/* 80860F44 A8 1E 04 E4 */ lha r0, 0x4e4(r30) -/* 80860F48 C8 5F 00 58 */ lfd f2, 0x58(r31) -/* 80860F4C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80860F50 90 01 00 0C */ stw r0, 0xc(r1) -/* 80860F54 3C 60 43 30 */ lis r3, 0x4330 -/* 80860F58 90 61 00 08 */ stw r3, 8(r1) -/* 80860F5C C8 01 00 08 */ lfd f0, 8(r1) -/* 80860F60 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80860F64 C0 3F 00 30 */ lfs f1, 0x30(r31) -/* 80860F68 EC 00 08 24 */ fdivs f0, f0, f1 -/* 80860F6C EC 03 00 32 */ fmuls f0, f3, f0 -/* 80860F70 D0 1E 05 78 */ stfs f0, 0x578(r30) -/* 80860F74 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 80860F78 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80860F7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80860F80 90 61 00 10 */ stw r3, 0x10(r1) -/* 80860F84 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80860F88 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80860F8C EC 00 08 24 */ fdivs f0, f0, f1 -/* 80860F90 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80860F94 D0 1E 05 7C */ stfs f0, 0x57c(r30) -/* 80860F98 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80860F9C 4B A0 69 F1 */ bl cM_rndFX__Ff -/* 80860FA0 FC 00 08 1E */ fctiwz f0, f1 -/* 80860FA4 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80860FA8 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80860FAC B0 1E 05 88 */ sth r0, 0x588(r30) -/* 80860FB0 C0 3F 00 34 */ lfs f1, 0x34(r31) -/* 80860FB4 4B A0 69 D9 */ bl cM_rndFX__Ff -/* 80860FB8 FC 00 08 1E */ fctiwz f0, f1 -/* 80860FBC D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80860FC0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80860FC4 B0 1E 05 8A */ sth r0, 0x58a(r30) -/* 80860FC8 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80860FCC D0 3E 05 84 */ stfs f1, 0x584(r30) -/* 80860FD0 C0 1F 00 00 */ lfs f0, 0(r31) -/* 80860FD4 D0 1E 05 68 */ stfs f0, 0x568(r30) -/* 80860FD8 88 1E 05 6C */ lbz r0, 0x56c(r30) -/* 80860FDC 28 00 00 07 */ cmplwi r0, 7 -/* 80860FE0 41 81 01 30 */ bgt lbl_80861110 -/* 80860FE4 3C 60 80 86 */ lis r3, lit_3917@ha /* 0x8086119C@ha */ -/* 80860FE8 38 63 11 9C */ addi r3, r3, lit_3917@l /* 0x8086119C@l */ -/* 80860FEC 54 00 10 3A */ slwi r0, r0, 2 -/* 80860FF0 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80860FF4 7C 09 03 A6 */ mtctr r0 -/* 80860FF8 4E 80 04 20 */ bctr -lbl_80860FFC: -/* 80860FFC C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80861000 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 80861004 D0 3E 05 74 */ stfs f1, 0x574(r30) -/* 80861008 38 00 00 00 */ li r0, 0 -/* 8086100C 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 80861010 38 00 00 03 */ li r0, 3 -/* 80861014 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 80861018 48 00 00 F8 */ b lbl_80861110 -lbl_8086101C: -/* 8086101C C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80861020 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 80861024 C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80861028 D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 8086102C 38 00 00 00 */ li r0, 0 -/* 80861030 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 80861034 38 00 00 03 */ li r0, 3 -/* 80861038 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 8086103C 48 00 00 D4 */ b lbl_80861110 -lbl_80861040: -/* 80861040 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80861044 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 80861048 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 8086104C D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 80861050 38 00 00 00 */ li r0, 0 -/* 80861054 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 80861058 38 00 00 03 */ li r0, 3 -/* 8086105C 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 80861060 48 00 00 B0 */ b lbl_80861110 -lbl_80861064: -/* 80861064 C0 1F 00 44 */ lfs f0, 0x44(r31) -/* 80861068 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 8086106C D0 3E 05 74 */ stfs f1, 0x574(r30) -/* 80861070 38 00 00 02 */ li r0, 2 -/* 80861074 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 80861078 38 00 00 03 */ li r0, 3 -/* 8086107C 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 80861080 48 00 00 90 */ b lbl_80861110 -lbl_80861084: -/* 80861084 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 80861088 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 8086108C C0 1F 00 3C */ lfs f0, 0x3c(r31) -/* 80861090 D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 80861094 38 00 00 02 */ li r0, 2 -/* 80861098 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 8086109C 38 00 00 03 */ li r0, 3 -/* 808610A0 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 808610A4 48 00 00 6C */ b lbl_80861110 -lbl_808610A8: -/* 808610A8 C0 1F 00 48 */ lfs f0, 0x48(r31) -/* 808610AC D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 808610B0 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 808610B4 D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 808610B8 38 00 00 02 */ li r0, 2 -/* 808610BC 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 808610C0 38 00 00 03 */ li r0, 3 -/* 808610C4 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 808610C8 48 00 00 48 */ b lbl_80861110 -lbl_808610CC: -/* 808610CC C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 808610D0 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 808610D4 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 808610D8 D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 808610DC 38 00 00 02 */ li r0, 2 -/* 808610E0 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 808610E4 38 00 00 01 */ li r0, 1 -/* 808610E8 98 1E 05 8D */ stb r0, 0x58d(r30) -/* 808610EC 48 00 00 24 */ b lbl_80861110 -lbl_808610F0: -/* 808610F0 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 808610F4 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 808610F8 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 808610FC D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 80861100 38 00 00 02 */ li r0, 2 -/* 80861104 98 1E 05 8C */ stb r0, 0x58c(r30) -/* 80861108 38 00 00 01 */ li r0, 1 -/* 8086110C 98 1E 05 8D */ stb r0, 0x58d(r30) -lbl_80861110: -/* 80861110 38 60 00 04 */ li r3, 4 -/* 80861114 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80861118 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 8086111C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80861120 7C 08 03 A6 */ mtlr r0 -/* 80861124 38 21 00 30 */ addi r1, r1, 0x30 -/* 80861128 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s b/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s deleted file mode 100644 index dc287e88b3..0000000000 --- a/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s +++ /dev/null @@ -1,154 +0,0 @@ -lbl_80860C60: -/* 80860C60 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80860C64 7C 08 02 A6 */ mflr r0 -/* 80860C68 90 01 00 44 */ stw r0, 0x44(r1) -/* 80860C6C DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80860C70 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80860C74 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 80860C78 F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 80860C7C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80860C80 4B B0 15 5D */ bl _savegpr_29 -/* 80860C84 7C 7E 1B 78 */ mr r30, r3 -/* 80860C88 3C 60 80 86 */ lis r3, lit_3839@ha /* 0x80861134@ha */ -/* 80860C8C 3B E3 11 34 */ addi r31, r3, lit_3839@l /* 0x80861134@l */ -/* 80860C90 3B A0 00 00 */ li r29, 0 -/* 80860C94 C3 FF 00 00 */ lfs f31, 0(r31) -/* 80860C98 FF C0 F8 90 */ fmr f30, f31 -/* 80860C9C 88 7E 05 71 */ lbz r3, 0x571(r30) -/* 80860CA0 28 03 00 1F */ cmplwi r3, 0x1f -/* 80860CA4 40 80 00 60 */ bge lbl_80860D04 -/* 80860CA8 88 1E 05 72 */ lbz r0, 0x572(r30) -/* 80860CAC 7C 03 00 40 */ cmplw r3, r0 -/* 80860CB0 40 81 00 2C */ ble lbl_80860CDC -/* 80860CB4 4B 93 ED 5D */ bl dKy_getdaytime_hour__Fv -/* 80860CB8 88 1E 05 71 */ lbz r0, 0x571(r30) -/* 80860CBC 7C 03 00 00 */ cmpw r3, r0 -/* 80860CC0 40 80 00 14 */ bge lbl_80860CD4 -/* 80860CC4 4B 93 ED 4D */ bl dKy_getdaytime_hour__Fv -/* 80860CC8 88 1E 05 72 */ lbz r0, 0x572(r30) -/* 80860CCC 7C 03 00 00 */ cmpw r3, r0 -/* 80860CD0 41 81 00 38 */ bgt lbl_80860D08 -lbl_80860CD4: -/* 80860CD4 3B A0 00 01 */ li r29, 1 -/* 80860CD8 48 00 00 30 */ b lbl_80860D08 -lbl_80860CDC: -/* 80860CDC 4B 93 ED 35 */ bl dKy_getdaytime_hour__Fv -/* 80860CE0 88 1E 05 71 */ lbz r0, 0x571(r30) -/* 80860CE4 7C 03 00 00 */ cmpw r3, r0 -/* 80860CE8 41 80 00 20 */ blt lbl_80860D08 -/* 80860CEC 4B 93 ED 25 */ bl dKy_getdaytime_hour__Fv -/* 80860CF0 88 1E 05 72 */ lbz r0, 0x572(r30) -/* 80860CF4 7C 03 00 00 */ cmpw r3, r0 -/* 80860CF8 41 81 00 10 */ bgt lbl_80860D08 -/* 80860CFC 3B A0 00 01 */ li r29, 1 -/* 80860D00 48 00 00 08 */ b lbl_80860D08 -lbl_80860D04: -/* 80860D04 3B A0 00 01 */ li r29, 1 -lbl_80860D08: -/* 80860D08 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80860D0C 41 82 00 40 */ beq lbl_80860D4C -/* 80860D10 3B A0 00 00 */ li r29, 0 -/* 80860D14 88 9E 05 73 */ lbz r4, 0x573(r30) -/* 80860D18 28 04 00 FF */ cmplwi r4, 0xff -/* 80860D1C 41 82 00 2C */ beq lbl_80860D48 -/* 80860D20 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 80860D24 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 80860D28 7C A5 07 74 */ extsb r5, r5 -/* 80860D2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80860D30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80860D34 4B 7D 46 2D */ bl isSwitch__10dSv_info_cCFii -/* 80860D38 2C 03 00 00 */ cmpwi r3, 0 -/* 80860D3C 41 82 00 10 */ beq lbl_80860D4C -/* 80860D40 3B A0 00 01 */ li r29, 1 -/* 80860D44 48 00 00 08 */ b lbl_80860D4C -lbl_80860D48: -/* 80860D48 3B A0 00 01 */ li r29, 1 -lbl_80860D4C: -/* 80860D4C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 80860D50 41 82 00 B8 */ beq lbl_80860E08 -/* 80860D54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80860D58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80860D5C 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 80860D60 3C 80 80 86 */ lis r4, d_a_kytag16__stringBase0@ha /* 0x80861194@ha */ -/* 80860D64 38 84 11 94 */ addi r4, r4, d_a_kytag16__stringBase0@l /* 0x80861194@l */ -/* 80860D68 4B B0 7C 2D */ bl strcmp -/* 80860D6C 2C 03 00 00 */ cmpwi r3, 0 -/* 80860D70 41 82 00 20 */ beq lbl_80860D90 -/* 80860D74 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80860D78 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80860D7C C0 5F 00 08 */ lfs f2, 8(r31) -/* 80860D80 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 80860D84 C0 9F 00 10 */ lfs f4, 0x10(r31) -/* 80860D88 4B A0 EB F5 */ bl cLib_addCalc__FPfffff -/* 80860D8C 48 00 00 94 */ b lbl_80860E20 -lbl_80860D90: -/* 80860D90 A8 BE 05 88 */ lha r5, 0x588(r30) -/* 80860D94 54 A0 04 38 */ rlwinm r0, r5, 0, 0x10, 0x1c -/* 80860D98 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80860D9C 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80860DA0 7F E4 04 2E */ lfsx f31, r4, r0 -/* 80860DA4 A8 1E 05 8A */ lha r0, 0x58a(r30) -/* 80860DA8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80860DAC 7C 64 02 14 */ add r3, r4, r0 -/* 80860DB0 C3 C3 00 04 */ lfs f30, 4(r3) -/* 80860DB4 38 05 05 00 */ addi r0, r5, 0x500 -/* 80860DB8 B0 1E 05 88 */ sth r0, 0x588(r30) -/* 80860DBC A8 7E 05 8A */ lha r3, 0x58a(r30) -/* 80860DC0 38 03 03 20 */ addi r0, r3, 0x320 -/* 80860DC4 B0 1E 05 8A */ sth r0, 0x58a(r30) -/* 80860DC8 3C 60 80 43 */ lis r3, g_Counter@ha /* 0x80430CD8@ha */ -/* 80860DCC 80 03 0C D8 */ lwz r0, g_Counter@l(r3) /* 0x80430CD8@l */ -/* 80860DD0 1C 00 05 00 */ mulli r0, r0, 0x500 -/* 80860DD4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 80860DD8 7C 04 04 2E */ lfsx f0, r4, r0 -/* 80860DDC 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80860DE0 C0 3F 00 14 */ lfs f1, 0x14(r31) -/* 80860DE4 C0 7F 00 0C */ lfs f3, 0xc(r31) -/* 80860DE8 EC 03 00 32 */ fmuls f0, f3, f0 -/* 80860DEC EC 21 00 2A */ fadds f1, f1, f0 -/* 80860DF0 C0 5F 00 08 */ lfs f2, 8(r31) -/* 80860DF4 C0 9F 00 10 */ lfs f4, 0x10(r31) -/* 80860DF8 4B A0 EB 85 */ bl cLib_addCalc__FPfffff -/* 80860DFC C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 80860E00 D0 1E 05 80 */ stfs f0, 0x580(r30) -/* 80860E04 48 00 00 1C */ b lbl_80860E20 -lbl_80860E08: -/* 80860E08 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80860E0C C0 3F 00 00 */ lfs f1, 0(r31) -/* 80860E10 C0 5F 00 08 */ lfs f2, 8(r31) -/* 80860E14 C0 7F 00 1C */ lfs f3, 0x1c(r31) -/* 80860E18 C0 9F 00 10 */ lfs f4, 0x10(r31) -/* 80860E1C 4B A0 EB 61 */ bl cLib_addCalc__FPfffff -lbl_80860E20: -/* 80860E20 C0 9E 05 68 */ lfs f4, 0x568(r30) -/* 80860E24 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80860E28 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 80860E2C 40 81 00 44 */ ble lbl_80860E70 -/* 80860E30 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80860E34 C0 3E 05 78 */ lfs f1, 0x578(r30) -/* 80860E38 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80860E3C EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80860E40 EC 21 00 2A */ fadds f1, f1, f0 -/* 80860E44 C0 5E 05 7C */ lfs f2, 0x57c(r30) -/* 80860E48 C0 1F 00 28 */ lfs f0, 0x28(r31) -/* 80860E4C EC 00 07 B2 */ fmuls f0, f0, f30 -/* 80860E50 EC 42 00 2A */ fadds f2, f2, f0 -/* 80860E54 C0 7E 05 80 */ lfs f3, 0x580(r30) -/* 80860E58 38 9E 05 6D */ addi r4, r30, 0x56d -/* 80860E5C C0 1E 05 74 */ lfs f0, 0x574(r30) -/* 80860E60 EC 80 01 32 */ fmuls f4, f0, f4 -/* 80860E64 88 BE 05 8C */ lbz r5, 0x58c(r30) -/* 80860E68 88 DE 05 8D */ lbz r6, 0x58d(r30) -/* 80860E6C 4B 94 97 F9 */ bl dKy_BossSpotLight_set__FP4cXyzfffP8_GXColorfUcUc -lbl_80860E70: -/* 80860E70 38 60 00 01 */ li r3, 1 -/* 80860E74 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 80860E78 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80860E7C E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 80860E80 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 80860E84 39 61 00 20 */ addi r11, r1, 0x20 -/* 80860E88 4B B0 13 A1 */ bl _restgpr_29 -/* 80860E8C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80860E90 7C 08 03 A6 */ mtlr r0 -/* 80860E94 38 21 00 40 */ addi r1, r1, 0x40 -/* 80860E98 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/CheckCreateHeap__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/CheckCreateHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 63d15acfce..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/CheckCreateHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BD6398: -/* 80BD6398 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BD639C 7C 08 02 A6 */ mflr r0 -/* 80BD63A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BD63A4 48 00 02 0D */ bl CreateHeap__14daObjCrystal_cFv -/* 80BD63A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BD63AC 7C 08 03 A6 */ mtlr r0 -/* 80BD63B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BD63B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/CreateHeap__14daObjCrystal_cFv.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/CreateHeap__14daObjCrystal_cFv.s deleted file mode 100644 index ea22b227e7..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/CreateHeap__14daObjCrystal_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80BD65B0: -/* 80BD65B0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80BD65B4 7C 08 02 A6 */ mflr r0 -/* 80BD65B8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80BD65BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BD65C0 4B 78 BC 09 */ bl _savegpr_24 -/* 80BD65C4 7C 78 1B 78 */ mr r24, r3 -/* 80BD65C8 3C 60 80 BD */ lis r3, lit_3693@ha /* 0x80BD68BC@ha */ -/* 80BD65CC 38 83 68 BC */ addi r4, r3, lit_3693@l /* 0x80BD68BC@l */ -/* 80BD65D0 3B 20 00 00 */ li r25, 0 -/* 80BD65D4 3B E0 00 00 */ li r31, 0 -/* 80BD65D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BD65DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BD65E0 3F 43 00 02 */ addis r26, r3, 2 -/* 80BD65E4 3C 60 80 BD */ lis r3, l_arcName@ha /* 0x80BD68F0@ha */ -/* 80BD65E8 3B 63 68 F0 */ addi r27, r3, l_arcName@l /* 0x80BD68F0@l */ -/* 80BD65EC 3B 84 00 04 */ addi r28, r4, 4 -/* 80BD65F0 3B A4 00 0C */ addi r29, r4, 0xc -/* 80BD65F4 3B C4 00 14 */ addi r30, r4, 0x14 -/* 80BD65F8 3B 5A C2 F8 */ addi r26, r26, -15624 -lbl_80BD65FC: -/* 80BD65FC 80 7B 00 00 */ lwz r3, 0(r27) -/* 80BD6600 7C 9C F8 2E */ lwzx r4, r28, r31 -/* 80BD6604 7F 45 D3 78 */ mr r5, r26 -/* 80BD6608 38 C0 00 80 */ li r6, 0x80 -/* 80BD660C 4B 46 5C E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80BD6610 7C 9D F8 2E */ lwzx r4, r29, r31 -/* 80BD6614 7C BE F8 2E */ lwzx r5, r30, r31 -/* 80BD6618 4B 43 E6 3D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80BD661C 38 1F 05 70 */ addi r0, r31, 0x570 -/* 80BD6620 7C 78 01 2E */ stwx r3, r24, r0 -/* 80BD6624 7C 18 00 2E */ lwzx r0, r24, r0 -/* 80BD6628 28 00 00 00 */ cmplwi r0, 0 -/* 80BD662C 40 82 00 0C */ bne lbl_80BD6638 -/* 80BD6630 38 60 00 00 */ li r3, 0 -/* 80BD6634 48 00 00 18 */ b lbl_80BD664C -lbl_80BD6638: -/* 80BD6638 3B 39 00 01 */ addi r25, r25, 1 -/* 80BD663C 2C 19 00 02 */ cmpwi r25, 2 -/* 80BD6640 3B FF 00 04 */ addi r31, r31, 4 -/* 80BD6644 41 80 FF B8 */ blt lbl_80BD65FC -/* 80BD6648 38 60 00 01 */ li r3, 1 -lbl_80BD664C: -/* 80BD664C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BD6650 4B 78 BB C5 */ bl _restgpr_24 -/* 80BD6654 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BD6658 7C 08 03 A6 */ mtlr r0 -/* 80BD665C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80BD6660 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/Create__14daObjCrystal_cFv.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/Create__14daObjCrystal_cFv.s deleted file mode 100644 index 23d746c98a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/Create__14daObjCrystal_cFv.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_80BD6470: -/* 80BD6470 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80BD6474 7C 08 02 A6 */ mflr r0 -/* 80BD6478 90 01 00 34 */ stw r0, 0x34(r1) -/* 80BD647C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BD6480 4B 78 BD 59 */ bl _savegpr_28 -/* 80BD6484 7C 7F 1B 78 */ mr r31, r3 -/* 80BD6488 4B FF FF 31 */ bl initBaseMtx__14daObjCrystal_cFv -/* 80BD648C 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80BD6490 38 03 00 24 */ addi r0, r3, 0x24 -/* 80BD6494 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80BD6498 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80BD649C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80BD64A0 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80BD64A4 38 80 00 00 */ li r4, 0 -/* 80BD64A8 90 81 00 08 */ stw r4, 8(r1) -/* 80BD64AC 38 00 FF FF */ li r0, -1 -/* 80BD64B0 90 01 00 0C */ stw r0, 0xc(r1) -/* 80BD64B4 90 81 00 10 */ stw r4, 0x10(r1) -/* 80BD64B8 90 81 00 14 */ stw r4, 0x14(r1) -/* 80BD64BC 90 81 00 18 */ stw r4, 0x18(r1) -/* 80BD64C0 38 80 00 00 */ li r4, 0 -/* 80BD64C4 3C A0 00 01 */ lis r5, 0x0001 /* 0x00008BED@ha */ -/* 80BD64C8 38 A5 8B ED */ addi r5, r5, 0x8BED /* 0x00008BED@l */ -/* 80BD64CC 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 80BD64D0 38 E0 00 00 */ li r7, 0 -/* 80BD64D4 39 1F 04 B4 */ addi r8, r31, 0x4b4 -/* 80BD64D8 39 3F 04 EC */ addi r9, r31, 0x4ec -/* 80BD64DC 39 40 00 FF */ li r10, 0xff -/* 80BD64E0 3D 60 80 BD */ lis r11, lit_3693@ha /* 0x80BD68BC@ha */ -/* 80BD64E4 C0 2B 68 BC */ lfs f1, lit_3693@l(r11) /* 0x80BD68BC@l */ -/* 80BD64E8 4B 47 65 A9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80BD64EC 90 7F 05 78 */ stw r3, 0x578(r31) -/* 80BD64F0 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 80BD64F4 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 80BD64F8 B0 1F 05 7C */ sth r0, 0x57c(r31) -/* 80BD64FC 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80BD6500 80 63 00 04 */ lwz r3, 4(r3) -/* 80BD6504 83 A3 00 54 */ lwz r29, 0x54(r3) -/* 80BD6508 3B 80 00 00 */ li r28, 0 -/* 80BD650C 3C 60 80 BD */ lis r3, d_a_obj_crystal__stringBase0@ha /* 0x80BD68D8@ha */ -/* 80BD6510 3B C3 68 D8 */ addi r30, r3, d_a_obj_crystal__stringBase0@l /* 0x80BD68D8@l */ -/* 80BD6514 48 00 00 28 */ b lbl_80BD653C -lbl_80BD6518: -/* 80BD6518 7F A3 EB 78 */ mr r3, r29 -/* 80BD651C 7F 84 E3 78 */ mr r4, r28 -/* 80BD6520 4B 70 85 D9 */ bl getName__10JUTNameTabCFUs -/* 80BD6524 38 9E 00 09 */ addi r4, r30, 9 -/* 80BD6528 4B 79 24 6D */ bl strcmp -/* 80BD652C 2C 03 00 00 */ cmpwi r3, 0 -/* 80BD6530 40 82 00 08 */ bne lbl_80BD6538 -/* 80BD6534 B3 9F 05 7C */ sth r28, 0x57c(r31) -lbl_80BD6538: -/* 80BD6538 3B 9C 00 01 */ addi r28, r28, 1 -lbl_80BD653C: -/* 80BD653C 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80BD6540 80 83 00 04 */ lwz r4, 4(r3) -/* 80BD6544 A0 84 00 2C */ lhz r4, 0x2c(r4) -/* 80BD6548 57 80 04 3E */ clrlwi r0, r28, 0x10 -/* 80BD654C 7C 00 20 40 */ cmplw r0, r4 -/* 80BD6550 41 80 FF C8 */ blt lbl_80BD6518 -/* 80BD6554 81 83 00 00 */ lwz r12, 0(r3) -/* 80BD6558 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80BD655C 7D 89 03 A6 */ mtctr r12 -/* 80BD6560 4E 80 04 21 */ bctrl -/* 80BD6564 80 BF 05 78 */ lwz r5, 0x578(r31) -/* 80BD6568 28 05 00 00 */ cmplwi r5, 0 -/* 80BD656C 41 82 00 28 */ beq lbl_80BD6594 -/* 80BD6570 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 80BD6574 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80BD6578 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80BD657C A0 1F 05 7C */ lhz r0, 0x57c(r31) -/* 80BD6580 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 80BD6584 7C 63 02 14 */ add r3, r3, r0 -/* 80BD6588 38 85 00 68 */ addi r4, r5, 0x68 -/* 80BD658C 38 A5 00 A4 */ addi r5, r5, 0xa4 -/* 80BD6590 4B 6A A2 51 */ bl func_802807E0 -lbl_80BD6594: -/* 80BD6594 38 60 00 01 */ li r3, 1 -/* 80BD6598 39 61 00 30 */ addi r11, r1, 0x30 -/* 80BD659C 4B 78 BC 89 */ bl _restgpr_28 -/* 80BD65A0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80BD65A4 7C 08 03 A6 */ mtlr r0 -/* 80BD65A8 38 21 00 30 */ addi r1, r1, 0x30 -/* 80BD65AC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/_delete__14daObjCrystal_cFv.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/_delete__14daObjCrystal_cFv.s deleted file mode 100644 index 1b88d936b9..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/_delete__14daObjCrystal_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80BD67C8: -/* 80BD67C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BD67CC 7C 08 02 A6 */ mflr r0 -/* 80BD67D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BD67D4 80 83 05 78 */ lwz r4, 0x578(r3) -/* 80BD67D8 28 04 00 00 */ cmplwi r4, 0 -/* 80BD67DC 41 82 00 30 */ beq lbl_80BD680C -/* 80BD67E0 80 04 00 F4 */ lwz r0, 0xf4(r4) -/* 80BD67E4 60 00 00 01 */ ori r0, r0, 1 -/* 80BD67E8 90 04 00 F4 */ stw r0, 0xf4(r4) -/* 80BD67EC 38 00 00 01 */ li r0, 1 -/* 80BD67F0 90 04 00 24 */ stw r0, 0x24(r4) -/* 80BD67F4 80 83 05 78 */ lwz r4, 0x578(r3) -/* 80BD67F8 80 04 00 F4 */ lwz r0, 0xf4(r4) -/* 80BD67FC 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 80BD6800 90 04 00 F4 */ stw r0, 0xf4(r4) -/* 80BD6804 38 00 00 00 */ li r0, 0 -/* 80BD6808 90 03 05 78 */ stw r0, 0x578(r3) -lbl_80BD680C: -/* 80BD680C 38 63 05 68 */ addi r3, r3, 0x568 -/* 80BD6810 3C 80 80 BD */ lis r4, l_arcName@ha /* 0x80BD68F0@ha */ -/* 80BD6814 38 84 68 F0 */ addi r4, r4, l_arcName@l /* 0x80BD68F0@l */ -/* 80BD6818 80 84 00 00 */ lwz r4, 0(r4) -/* 80BD681C 4B 45 67 ED */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80BD6820 38 60 00 01 */ li r3, 1 -/* 80BD6824 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BD6828 7C 08 03 A6 */ mtlr r0 -/* 80BD682C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BD6830 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Create__FP14daObjCrystal_c.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Create__FP14daObjCrystal_c.s deleted file mode 100644 index e39e13a358..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Create__FP14daObjCrystal_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BD6894: -/* 80BD6894 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BD6898 7C 08 02 A6 */ mflr r0 -/* 80BD689C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BD68A0 4B FF FD C5 */ bl create__14daObjCrystal_cFv -/* 80BD68A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BD68A8 7C 08 03 A6 */ mtlr r0 -/* 80BD68AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BD68B0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Delete__FP14daObjCrystal_c.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Delete__FP14daObjCrystal_c.s deleted file mode 100644 index 77478d6dd8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Delete__FP14daObjCrystal_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BD6874: -/* 80BD6874 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BD6878 7C 08 02 A6 */ mflr r0 -/* 80BD687C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BD6880 4B FF FF 49 */ bl _delete__14daObjCrystal_cFv -/* 80BD6884 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BD6888 7C 08 03 A6 */ mtlr r0 -/* 80BD688C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BD6890 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Draw__FP14daObjCrystal_c.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Draw__FP14daObjCrystal_c.s deleted file mode 100644 index 1038aa6dc8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Draw__FP14daObjCrystal_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BD6834: -/* 80BD6834 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BD6838 7C 08 02 A6 */ mflr r0 -/* 80BD683C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BD6840 4B FF FE FD */ bl draw__14daObjCrystal_cFv -/* 80BD6844 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BD6848 7C 08 03 A6 */ mtlr r0 -/* 80BD684C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BD6850 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Execute__FP14daObjCrystal_c.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Execute__FP14daObjCrystal_c.s deleted file mode 100644 index adeaf027fc..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Execute__FP14daObjCrystal_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80BD6854: -/* 80BD6854 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BD6858 7C 08 02 A6 */ mflr r0 -/* 80BD685C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BD6860 4B FF FE B9 */ bl execute__14daObjCrystal_cFv -/* 80BD6864 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BD6868 7C 08 03 A6 */ mtlr r0 -/* 80BD686C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BD6870 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/draw__14daObjCrystal_cFv.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/draw__14daObjCrystal_cFv.s deleted file mode 100644 index 673b985e4d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/draw__14daObjCrystal_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80BD673C: -/* 80BD673C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80BD6740 7C 08 02 A6 */ mflr r0 -/* 80BD6744 90 01 00 24 */ stw r0, 0x24(r1) -/* 80BD6748 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BD674C 4B 78 BA 89 */ bl _savegpr_27 -/* 80BD6750 7C 7B 1B 78 */ mr r27, r3 -/* 80BD6754 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BD6758 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80BD675C 38 80 00 10 */ li r4, 0x10 -/* 80BD6760 38 BB 04 D0 */ addi r5, r27, 0x4d0 -/* 80BD6764 38 DB 01 0C */ addi r6, r27, 0x10c -/* 80BD6768 4B 5C D0 5D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80BD676C 3B 80 00 00 */ li r28, 0 -/* 80BD6770 3B E0 00 00 */ li r31, 0 -/* 80BD6774 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80BD6778 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */ -lbl_80BD677C: -/* 80BD677C 7F C3 F3 78 */ mr r3, r30 -/* 80BD6780 3B BF 05 70 */ addi r29, r31, 0x570 -/* 80BD6784 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 80BD6788 80 84 00 04 */ lwz r4, 4(r4) -/* 80BD678C 38 BB 01 0C */ addi r5, r27, 0x10c -/* 80BD6790 4B 5C E6 11 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80BD6794 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80BD6798 4B 43 75 2D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80BD679C 3B 9C 00 01 */ addi r28, r28, 1 -/* 80BD67A0 2C 1C 00 02 */ cmpwi r28, 2 -/* 80BD67A4 3B FF 00 04 */ addi r31, r31, 4 -/* 80BD67A8 41 80 FF D4 */ blt lbl_80BD677C -/* 80BD67AC 38 60 00 01 */ li r3, 1 -/* 80BD67B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80BD67B4 4B 78 BA 6D */ bl _restgpr_27 -/* 80BD67B8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80BD67BC 7C 08 03 A6 */ mtlr r0 -/* 80BD67C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80BD67C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/execute__14daObjCrystal_cFv.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/execute__14daObjCrystal_cFv.s deleted file mode 100644 index b9bbc67b81..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/execute__14daObjCrystal_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80BD6718: -/* 80BD6718 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BD671C 7C 08 02 A6 */ mflr r0 -/* 80BD6720 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BD6724 4B FF FC ED */ bl setBaseMtx__14daObjCrystal_cFv -/* 80BD6728 38 60 00 01 */ li r3, 1 -/* 80BD672C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BD6730 7C 08 03 A6 */ mtlr r0 -/* 80BD6734 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BD6738 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/func_80BD6664.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/func_80BD6664.s deleted file mode 100644 index 7c7669c1f0..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/func_80BD6664.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_80BD6664: -/* 80BD6664 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BD6668 7C 08 02 A6 */ mflr r0 -/* 80BD666C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BD6670 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BD6674 93 C1 00 08 */ stw r30, 8(r1) -/* 80BD6678 7C 7E 1B 78 */ mr r30, r3 -/* 80BD667C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80BD6680 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80BD6684 40 82 00 1C */ bne lbl_80BD66A0 -/* 80BD6688 28 1E 00 00 */ cmplwi r30, 0 -/* 80BD668C 41 82 00 08 */ beq lbl_80BD6694 -/* 80BD6690 4B 44 24 D5 */ bl __ct__10fopAc_ac_cFv -lbl_80BD6694: -/* 80BD6694 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80BD6698 60 00 00 08 */ ori r0, r0, 8 -/* 80BD669C 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80BD66A0: -/* 80BD66A0 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80BD66A4 3C 80 80 BD */ lis r4, l_arcName@ha /* 0x80BD68F0@ha */ -/* 80BD66A8 38 84 68 F0 */ addi r4, r4, l_arcName@l /* 0x80BD68F0@l */ -/* 80BD66AC 80 84 00 00 */ lwz r4, 0(r4) -/* 80BD66B0 4B 45 68 0D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80BD66B4 7C 7F 1B 78 */ mr r31, r3 -/* 80BD66B8 2C 1F 00 04 */ cmpwi r31, 4 -/* 80BD66BC 40 82 00 40 */ bne lbl_80BD66FC -/* 80BD66C0 7F C3 F3 78 */ mr r3, r30 -/* 80BD66C4 3C 80 80 BD */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha /* 0x80BD6398@ha */ -/* 80BD66C8 38 84 63 98 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 0x80BD6398@l */ -/* 80BD66CC 38 A0 40 00 */ li r5, 0x4000 -/* 80BD66D0 4B 44 3D E1 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 80BD66D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80BD66D8 40 82 00 0C */ bne lbl_80BD66E4 -/* 80BD66DC 38 60 00 05 */ li r3, 5 -/* 80BD66E0 48 00 00 20 */ b lbl_80BD6700 -lbl_80BD66E4: -/* 80BD66E4 7F C3 F3 78 */ mr r3, r30 -/* 80BD66E8 4B FF FD 89 */ bl Create__14daObjCrystal_cFv -/* 80BD66EC 2C 03 00 00 */ cmpwi r3, 0 -/* 80BD66F0 40 82 00 0C */ bne lbl_80BD66FC -/* 80BD66F4 38 60 00 05 */ li r3, 5 -/* 80BD66F8 48 00 00 08 */ b lbl_80BD6700 -lbl_80BD66FC: -/* 80BD66FC 7F E3 FB 78 */ mr r3, r31 -lbl_80BD6700: -/* 80BD6700 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BD6704 83 C1 00 08 */ lwz r30, 8(r1) -/* 80BD6708 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BD670C 7C 08 03 A6 */ mtlr r0 -/* 80BD6710 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BD6714 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/initBaseMtx__14daObjCrystal_cFv.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/initBaseMtx__14daObjCrystal_cFv.s deleted file mode 100644 index 7f5fb8bdf8..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/initBaseMtx__14daObjCrystal_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80BD63B8: -/* 80BD63B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BD63BC 7C 08 02 A6 */ mflr r0 -/* 80BD63C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BD63C4 80 83 05 70 */ lwz r4, 0x570(r3) -/* 80BD63C8 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80BD63CC D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80BD63D0 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80BD63D4 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80BD63D8 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80BD63DC D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80BD63E0 80 83 05 74 */ lwz r4, 0x574(r3) -/* 80BD63E4 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80BD63E8 D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80BD63EC C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80BD63F0 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80BD63F4 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80BD63F8 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80BD63FC 48 00 00 15 */ bl setBaseMtx__14daObjCrystal_cFv -/* 80BD6400 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BD6404 7C 08 03 A6 */ mtlr r0 -/* 80BD6408 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BD640C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/setBaseMtx__14daObjCrystal_cFv.s b/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/setBaseMtx__14daObjCrystal_cFv.s deleted file mode 100644 index 1146dae633..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/setBaseMtx__14daObjCrystal_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80BD6410: -/* 80BD6410 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80BD6414 7C 08 02 A6 */ mflr r0 -/* 80BD6418 90 01 00 14 */ stw r0, 0x14(r1) -/* 80BD641C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80BD6420 7C 7F 1B 78 */ mr r31, r3 -/* 80BD6424 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80BD6428 4B 43 69 3D */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80BD642C 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80BD6430 4B 43 6B 15 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz -/* 80BD6434 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BD6438 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BD643C 80 9F 05 70 */ lwz r4, 0x570(r31) -/* 80BD6440 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BD6444 4B 77 00 6D */ bl PSMTXCopy -/* 80BD6448 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80BD644C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80BD6450 80 9F 05 74 */ lwz r4, 0x574(r31) -/* 80BD6454 38 84 00 24 */ addi r4, r4, 0x24 -/* 80BD6458 4B 77 00 59 */ bl PSMTXCopy -/* 80BD645C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80BD6460 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80BD6464 7C 08 03 A6 */ mtlr r0 -/* 80BD6468 38 21 00 10 */ addi r1, r1, 0x10 -/* 80BD646C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/Create__15daObjWaterEff_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/Create__15daObjWaterEff_cFv.s deleted file mode 100644 index d7e9cd4ae4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/Create__15daObjWaterEff_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_80C5C4F8: -/* 80C5C4F8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80C5C4FC 7C 08 02 A6 */ mflr r0 -/* 80C5C500 90 01 00 44 */ stw r0, 0x44(r1) -/* 80C5C504 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C5C508 4B 70 5C C5 */ bl _savegpr_25 -/* 80C5C50C 7C 79 1B 78 */ mr r25, r3 -/* 80C5C510 3C 60 80 C6 */ lis r3, l_eff_id@ha /* 0x80C5C878@ha */ -/* 80C5C514 3B 63 C8 78 */ addi r27, r3, l_eff_id@l /* 0x80C5C878@l */ -/* 80C5C518 3B 40 00 00 */ li r26, 0 -/* 80C5C51C 3B E0 00 00 */ li r31, 0 -/* 80C5C520 3B C0 00 00 */ li r30, 0 -/* 80C5C524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5C528 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5C52C 3B BB 00 00 */ addi r29, r27, 0 -lbl_80C5C530: -/* 80C5C530 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 80C5C534 38 80 00 00 */ li r4, 0 -/* 80C5C538 90 81 00 08 */ stw r4, 8(r1) -/* 80C5C53C 38 00 FF FF */ li r0, -1 -/* 80C5C540 90 01 00 0C */ stw r0, 0xc(r1) -/* 80C5C544 90 81 00 10 */ stw r4, 0x10(r1) -/* 80C5C548 90 81 00 14 */ stw r4, 0x14(r1) -/* 80C5C54C 90 81 00 18 */ stw r4, 0x18(r1) -/* 80C5C550 38 80 00 00 */ li r4, 0 -/* 80C5C554 7C BD F2 2E */ lhzx r5, r29, r30 -/* 80C5C558 38 D9 04 D0 */ addi r6, r25, 0x4d0 -/* 80C5C55C 38 E0 00 00 */ li r7, 0 -/* 80C5C560 39 00 00 00 */ li r8, 0 -/* 80C5C564 39 20 00 00 */ li r9, 0 -/* 80C5C568 39 40 00 FF */ li r10, 0xff -/* 80C5C56C C0 3B 00 08 */ lfs f1, 8(r27) -/* 80C5C570 4B 3F 05 21 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80C5C574 38 1F 05 80 */ addi r0, r31, 0x580 -/* 80C5C578 7C 79 01 2E */ stwx r3, r25, r0 -/* 80C5C57C 3B 5A 00 01 */ addi r26, r26, 1 -/* 80C5C580 2C 1A 00 04 */ cmpwi r26, 4 -/* 80C5C584 3B FF 00 04 */ addi r31, r31, 4 -/* 80C5C588 3B DE 00 02 */ addi r30, r30, 2 -/* 80C5C58C 41 80 FF A4 */ blt lbl_80C5C530 -/* 80C5C590 C0 1B 00 0C */ lfs f0, 0xc(r27) -/* 80C5C594 D0 19 05 68 */ stfs f0, 0x568(r25) -/* 80C5C598 C0 1B 00 10 */ lfs f0, 0x10(r27) -/* 80C5C59C D0 19 05 6C */ stfs f0, 0x56c(r25) -/* 80C5C5A0 C0 1B 00 14 */ lfs f0, 0x14(r27) -/* 80C5C5A4 D0 19 05 70 */ stfs f0, 0x570(r25) -/* 80C5C5A8 C0 1B 00 18 */ lfs f0, 0x18(r27) -/* 80C5C5AC D0 19 05 74 */ stfs f0, 0x574(r25) -/* 80C5C5B0 C0 1B 00 1C */ lfs f0, 0x1c(r27) -/* 80C5C5B4 D0 19 05 78 */ stfs f0, 0x578(r25) -/* 80C5C5B8 C0 1B 00 20 */ lfs f0, 0x20(r27) -/* 80C5C5BC D0 19 05 7C */ stfs f0, 0x57c(r25) -/* 80C5C5C0 38 60 00 01 */ li r3, 1 -/* 80C5C5C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80C5C5C8 4B 70 5C 51 */ bl _restgpr_25 -/* 80C5C5CC 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80C5C5D0 7C 08 03 A6 */ mtlr r0 -/* 80C5C5D4 38 21 00 40 */ addi r1, r1, 0x40 -/* 80C5C5D8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/__dt__4cXyzFv.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/__dt__4cXyzFv.s deleted file mode 100644 index bf9236bda4..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/__dt__4cXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80C5C670: -/* 80C5C670 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C674 7C 08 02 A6 */ mflr r0 -/* 80C5C678 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C67C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5C680 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5C684 41 82 00 10 */ beq lbl_80C5C694 -/* 80C5C688 7C 80 07 35 */ extsh. r0, r4 -/* 80C5C68C 40 81 00 08 */ ble lbl_80C5C694 -/* 80C5C690 4B 67 26 AD */ bl __dl__FPv -lbl_80C5C694: -/* 80C5C694 7F E3 FB 78 */ mr r3, r31 -/* 80C5C698 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C69C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C6A0 7C 08 03 A6 */ mtlr r0 -/* 80C5C6A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C6A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/_delete__15daObjWaterEff_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/_delete__15daObjWaterEff_cFv.s deleted file mode 100644 index 024d70e867..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/_delete__15daObjWaterEff_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80C5C7B8: -/* 80C5C7B8 38 80 00 00 */ li r4, 0 -/* 80C5C7BC 38 E0 00 01 */ li r7, 1 -/* 80C5C7C0 7C 85 23 78 */ mr r5, r4 -/* 80C5C7C4 38 00 00 04 */ li r0, 4 -/* 80C5C7C8 7C 09 03 A6 */ mtctr r0 -lbl_80C5C7CC: -/* 80C5C7CC 39 04 05 80 */ addi r8, r4, 0x580 -/* 80C5C7D0 7C C3 40 2E */ lwzx r6, r3, r8 -/* 80C5C7D4 28 06 00 00 */ cmplwi r6, 0 -/* 80C5C7D8 41 82 00 28 */ beq lbl_80C5C800 -/* 80C5C7DC 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 80C5C7E0 60 00 00 01 */ ori r0, r0, 1 -/* 80C5C7E4 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 80C5C7E8 90 E6 00 24 */ stw r7, 0x24(r6) -/* 80C5C7EC 7C C3 40 2E */ lwzx r6, r3, r8 -/* 80C5C7F0 80 06 00 F4 */ lwz r0, 0xf4(r6) -/* 80C5C7F4 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 -/* 80C5C7F8 90 06 00 F4 */ stw r0, 0xf4(r6) -/* 80C5C7FC 7C A3 41 2E */ stwx r5, r3, r8 -lbl_80C5C800: -/* 80C5C800 38 84 00 04 */ addi r4, r4, 4 -/* 80C5C804 42 00 FF C8 */ bdnz lbl_80C5C7CC -/* 80C5C808 38 60 00 01 */ li r3, 1 -/* 80C5C80C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Create__FP10fopAc_ac_c.s deleted file mode 100644 index a0848ed9a2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5C850: -/* 80C5C850 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C854 7C 08 02 A6 */ mflr r0 -/* 80C5C858 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C85C 4B FF FD 81 */ bl create__15daObjWaterEff_cFv -/* 80C5C860 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C864 7C 08 03 A6 */ mtlr r0 -/* 80C5C868 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C86C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Delete__FP15daObjWaterEff_c.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Delete__FP15daObjWaterEff_c.s deleted file mode 100644 index 40986d0503..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Delete__FP15daObjWaterEff_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5C830: -/* 80C5C830 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C834 7C 08 02 A6 */ mflr r0 -/* 80C5C838 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C83C 4B FF FF 7D */ bl _delete__15daObjWaterEff_cFv -/* 80C5C840 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C844 7C 08 03 A6 */ mtlr r0 -/* 80C5C848 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C84C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Execute__FP15daObjWaterEff_c.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Execute__FP15daObjWaterEff_c.s deleted file mode 100644 index c1f57ea6ad..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Execute__FP15daObjWaterEff_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5C810: -/* 80C5C810 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C814 7C 08 02 A6 */ mflr r0 -/* 80C5C818 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C81C 4B FF FE 95 */ bl execute__15daObjWaterEff_cFv -/* 80C5C820 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C824 7C 08 03 A6 */ mtlr r0 -/* 80C5C828 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C82C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/execute__15daObjWaterEff_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/execute__15daObjWaterEff_cFv.s deleted file mode 100644 index b5fddfc27f..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/execute__15daObjWaterEff_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_80C5C6B0: -/* 80C5C6B0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80C5C6B4 7C 08 02 A6 */ mflr r0 -/* 80C5C6B8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80C5C6BC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C5C6C0 4B 70 5B 0D */ bl _savegpr_25 -/* 80C5C6C4 7C 7F 1B 78 */ mr r31, r3 -/* 80C5C6C8 4B 54 EB B9 */ bl dKy_camera_water_in_status_check__Fv -/* 80C5C6CC 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5C6D0 41 82 00 34 */ beq lbl_80C5C704 -/* 80C5C6D4 38 60 00 00 */ li r3, 0 -/* 80C5C6D8 38 80 00 FF */ li r4, 0xff -/* 80C5C6DC 38 00 00 04 */ li r0, 4 -/* 80C5C6E0 7C 09 03 A6 */ mtctr r0 -lbl_80C5C6E4: -/* 80C5C6E4 38 03 05 80 */ addi r0, r3, 0x580 -/* 80C5C6E8 7C BF 00 2E */ lwzx r5, r31, r0 -/* 80C5C6EC 28 05 00 00 */ cmplwi r5, 0 -/* 80C5C6F0 41 82 00 08 */ beq lbl_80C5C6F8 -/* 80C5C6F4 98 85 00 BB */ stb r4, 0xbb(r5) -lbl_80C5C6F8: -/* 80C5C6F8 38 63 00 04 */ addi r3, r3, 4 -/* 80C5C6FC 42 00 FF E8 */ bdnz lbl_80C5C6E4 -/* 80C5C700 48 00 00 30 */ b lbl_80C5C730 -lbl_80C5C704: -/* 80C5C704 38 60 00 00 */ li r3, 0 -/* 80C5C708 38 80 00 80 */ li r4, 0x80 -/* 80C5C70C 38 00 00 04 */ li r0, 4 -/* 80C5C710 7C 09 03 A6 */ mtctr r0 -lbl_80C5C714: -/* 80C5C714 38 03 05 80 */ addi r0, r3, 0x580 -/* 80C5C718 7C BF 00 2E */ lwzx r5, r31, r0 -/* 80C5C71C 28 05 00 00 */ cmplwi r5, 0 -/* 80C5C720 41 82 00 08 */ beq lbl_80C5C728 -/* 80C5C724 98 85 00 BB */ stb r4, 0xbb(r5) -lbl_80C5C728: -/* 80C5C728 38 63 00 04 */ addi r3, r3, 4 -/* 80C5C72C 42 00 FF E8 */ bdnz lbl_80C5C714 -lbl_80C5C730: -/* 80C5C730 3B 20 00 00 */ li r25, 0 -/* 80C5C734 3B C0 00 00 */ li r30, 0 -/* 80C5C738 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080299@ha */ -/* 80C5C73C 3B 43 02 99 */ addi r26, r3, 0x0299 /* 0x00080299@l */ -/* 80C5C740 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80C5C744 3B 63 13 68 */ addi r27, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80C5C748 3C 60 80 C6 */ lis r3, lit_3637@ha /* 0x80C5C880@ha */ -/* 80C5C74C 3B 83 C8 80 */ addi r28, r3, lit_3637@l /* 0x80C5C880@l */ -/* 80C5C750 3C 60 80 C6 */ lis r3, lit_3710@ha /* 0x80C5C89C@ha */ -/* 80C5C754 3B A3 C8 9C */ addi r29, r3, lit_3710@l /* 0x80C5C89C@l */ -lbl_80C5C758: -/* 80C5C758 93 41 00 08 */ stw r26, 8(r1) -/* 80C5C75C 80 7B 00 00 */ lwz r3, 0(r27) -/* 80C5C760 38 81 00 08 */ addi r4, r1, 8 -/* 80C5C764 38 BE 05 68 */ addi r5, r30, 0x568 -/* 80C5C768 7C BF 2A 14 */ add r5, r31, r5 -/* 80C5C76C 38 C0 00 00 */ li r6, 0 -/* 80C5C770 38 E0 00 00 */ li r7, 0 -/* 80C5C774 C0 3C 00 00 */ lfs f1, 0(r28) -/* 80C5C778 FC 40 08 90 */ fmr f2, f1 -/* 80C5C77C C0 7D 00 00 */ lfs f3, 0(r29) -/* 80C5C780 FC 80 18 90 */ fmr f4, f3 -/* 80C5C784 39 00 00 00 */ li r8, 0 -/* 80C5C788 4B 64 FD 85 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80C5C78C 3B 39 00 01 */ addi r25, r25, 1 -/* 80C5C790 2C 19 00 02 */ cmpwi r25, 2 -/* 80C5C794 3B DE 00 0C */ addi r30, r30, 0xc -/* 80C5C798 41 80 FF C0 */ blt lbl_80C5C758 -/* 80C5C79C 38 60 00 01 */ li r3, 1 -/* 80C5C7A0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80C5C7A4 4B 70 5A 75 */ bl _restgpr_25 -/* 80C5C7A8 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80C5C7AC 7C 08 03 A6 */ mtlr r0 -/* 80C5C7B0 38 21 00 30 */ addi r1, r1, 0x30 -/* 80C5C7B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/func_80C5C5DC.s b/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/func_80C5C5DC.s deleted file mode 100644 index abe5aa7f49..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/func_80C5C5DC.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80C5C5DC: -/* 80C5C5DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5C5E0 7C 08 02 A6 */ mflr r0 -/* 80C5C5E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5C5E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5C5EC 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5C5F0 7C 7F 1B 78 */ mr r31, r3 -/* 80C5C5F4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C5C5F8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C5C5FC 40 82 00 40 */ bne lbl_80C5C63C -/* 80C5C600 7F E0 FB 79 */ or. r0, r31, r31 -/* 80C5C604 41 82 00 2C */ beq lbl_80C5C630 -/* 80C5C608 7C 1E 03 78 */ mr r30, r0 -/* 80C5C60C 4B 3B C5 59 */ bl __ct__10fopAc_ac_cFv -/* 80C5C610 38 7E 05 68 */ addi r3, r30, 0x568 -/* 80C5C614 3C 80 80 C6 */ lis r4, __ct__4cXyzFv@ha /* 0x80C5C6AC@ha */ -/* 80C5C618 38 84 C6 AC */ addi r4, r4, __ct__4cXyzFv@l /* 0x80C5C6AC@l */ -/* 80C5C61C 3C A0 80 C6 */ lis r5, __dt__4cXyzFv@ha /* 0x80C5C670@ha */ -/* 80C5C620 38 A5 C6 70 */ addi r5, r5, __dt__4cXyzFv@l /* 0x80C5C670@l */ -/* 80C5C624 38 C0 00 0C */ li r6, 0xc -/* 80C5C628 38 E0 00 02 */ li r7, 2 -/* 80C5C62C 4B 70 57 35 */ bl __construct_array -lbl_80C5C630: -/* 80C5C630 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C5C634 60 00 00 08 */ ori r0, r0, 8 -/* 80C5C638 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C5C63C: -/* 80C5C63C 7F E3 FB 78 */ mr r3, r31 -/* 80C5C640 4B FF FE B9 */ bl Create__15daObjWaterEff_cFv -/* 80C5C644 2C 03 00 00 */ cmpwi r3, 0 -/* 80C5C648 40 82 00 0C */ bne lbl_80C5C654 -/* 80C5C64C 38 60 00 05 */ li r3, 5 -/* 80C5C650 48 00 00 08 */ b lbl_80C5C658 -lbl_80C5C654: -/* 80C5C654 38 60 00 04 */ li r3, 4 -lbl_80C5C658: -/* 80C5C658 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5C65C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5C660 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5C664 7C 08 03 A6 */ mtlr r0 -/* 80C5C668 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5C66C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/CreateHeap__15daLv4HsTarget_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/CreateHeap__15daLv4HsTarget_cFv.s deleted file mode 100644 index 47eae93eaa..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/CreateHeap__15daLv4HsTarget_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80C5F718: -/* 80C5F718 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F71C 7C 08 02 A6 */ mflr r0 -/* 80C5F720 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F724 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5F728 7C 7F 1B 78 */ mr r31, r3 -/* 80C5F72C 3C 60 80 C6 */ lis r3, d_a_obj_lv4HsTarget__stringBase0@ha /* 0x80C5FA3C@ha */ -/* 80C5F730 38 63 FA 3C */ addi r3, r3, d_a_obj_lv4HsTarget__stringBase0@l /* 0x80C5FA3C@l */ -/* 80C5F734 38 80 00 04 */ li r4, 4 -/* 80C5F738 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80C5F73C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80C5F740 3C A5 00 02 */ addis r5, r5, 2 -/* 80C5F744 38 C0 00 80 */ li r6, 0x80 -/* 80C5F748 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80C5F74C 4B 3D CB A1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80C5F750 3C 80 00 08 */ lis r4, 8 -/* 80C5F754 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80C5F758 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80C5F75C 4B 3B 54 F9 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80C5F760 90 7F 05 A8 */ stw r3, 0x5a8(r31) -/* 80C5F764 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5F768 30 03 FF FF */ addic r0, r3, -1 -/* 80C5F76C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80C5F770 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5F774 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F778 7C 08 03 A6 */ mtlr r0 -/* 80C5F77C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F780 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Delete__15daLv4HsTarget_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Delete__15daLv4HsTarget_cFv.s deleted file mode 100644 index 850d5643c2..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Delete__15daLv4HsTarget_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80C5F8D4: -/* 80C5F8D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F8D8 7C 08 02 A6 */ mflr r0 -/* 80C5F8DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F8E0 3C 80 80 C6 */ lis r4, d_a_obj_lv4HsTarget__stringBase0@ha /* 0x80C5FA3C@ha */ -/* 80C5F8E4 38 84 FA 3C */ addi r4, r4, d_a_obj_lv4HsTarget__stringBase0@l /* 0x80C5FA3C@l */ -/* 80C5F8E8 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80C5F8EC 4B 3C D7 1D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80C5F8F0 38 60 00 01 */ li r3, 1 -/* 80C5F8F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F8F8 7C 08 03 A6 */ mtlr r0 -/* 80C5F8FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F900 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Draw__15daLv4HsTarget_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Draw__15daLv4HsTarget_cFv.s deleted file mode 100644 index 4d105bfa8d..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Draw__15daLv4HsTarget_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C5F870: -/* 80C5F870 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F874 7C 08 02 A6 */ mflr r0 -/* 80C5F878 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F87C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5F880 7C 7F 1B 78 */ mr r31, r3 -/* 80C5F884 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C5F888 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C5F88C 38 80 00 40 */ li r4, 0x40 -/* 80C5F890 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80C5F894 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80C5F898 4B 54 3F 2D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80C5F89C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80C5F8A0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80C5F8A4 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C5F8A8 80 84 00 04 */ lwz r4, 4(r4) -/* 80C5F8AC 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80C5F8B0 4B 54 54 F1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80C5F8B4 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5F8B8 4B 3A E4 0D */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80C5F8BC 38 60 00 01 */ li r3, 1 -/* 80C5F8C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5F8C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F8C8 7C 08 03 A6 */ mtlr r0 -/* 80C5F8CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F8D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Execute__15daLv4HsTarget_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Execute__15daLv4HsTarget_cFPPA3_A4_f.s deleted file mode 100644 index d1e0e67f4e..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Execute__15daLv4HsTarget_cFPPA3_A4_f.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80C5F85C: -/* 80C5F85C 80 63 05 A8 */ lwz r3, 0x5a8(r3) -/* 80C5F860 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C5F864 90 04 00 00 */ stw r0, 0(r4) -/* 80C5F868 38 60 00 01 */ li r3, 1 -/* 80C5F86C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__ct__19daLv4HsTarget_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__ct__19daLv4HsTarget_HIO_cFv.s deleted file mode 100644 index 1316f38f74..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__ct__19daLv4HsTarget_HIO_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80C5F62C: -/* 80C5F62C 3C 80 80 C6 */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80C5FACC@ha */ -/* 80C5F630 38 04 FA CC */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80C5FACC@l */ -/* 80C5F634 90 03 00 00 */ stw r0, 0(r3) -/* 80C5F638 3C 80 80 C6 */ lis r4, __vt__19daLv4HsTarget_HIO_c@ha /* 0x80C5FAC0@ha */ -/* 80C5F63C 38 04 FA C0 */ addi r0, r4, __vt__19daLv4HsTarget_HIO_c@l /* 0x80C5FAC0@l */ -/* 80C5F640 90 03 00 00 */ stw r0, 0(r3) -/* 80C5F644 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 63d8632a29..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80C5F648: -/* 80C5F648 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F64C 7C 08 02 A6 */ mflr r0 -/* 80C5F650 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F654 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5F658 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5F65C 41 82 00 1C */ beq lbl_80C5F678 -/* 80C5F660 3C A0 80 C6 */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80C5FACC@ha */ -/* 80C5F664 38 05 FA CC */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80C5FACC@l */ -/* 80C5F668 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5F66C 7C 80 07 35 */ extsh. r0, r4 -/* 80C5F670 40 81 00 08 */ ble lbl_80C5F678 -/* 80C5F674 4B 66 F6 C9 */ bl __dl__FPv -lbl_80C5F678: -/* 80C5F678 7F E3 FB 78 */ mr r3, r31 -/* 80C5F67C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5F680 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F684 7C 08 03 A6 */ mtlr r0 -/* 80C5F688 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F68C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__dt__19daLv4HsTarget_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__dt__19daLv4HsTarget_HIO_cFv.s deleted file mode 100644 index a6645ba9b1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__dt__19daLv4HsTarget_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80C5F990: -/* 80C5F990 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F994 7C 08 02 A6 */ mflr r0 -/* 80C5F998 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F99C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5F9A0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80C5F9A4 41 82 00 30 */ beq lbl_80C5F9D4 -/* 80C5F9A8 3C 60 80 C6 */ lis r3, __vt__19daLv4HsTarget_HIO_c@ha /* 0x80C5FAC0@ha */ -/* 80C5F9AC 38 03 FA C0 */ addi r0, r3, __vt__19daLv4HsTarget_HIO_c@l /* 0x80C5FAC0@l */ -/* 80C5F9B0 90 1F 00 00 */ stw r0, 0(r31) -/* 80C5F9B4 41 82 00 10 */ beq lbl_80C5F9C4 -/* 80C5F9B8 3C 60 80 C6 */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80C5FACC@ha */ -/* 80C5F9BC 38 03 FA CC */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80C5FACC@l */ -/* 80C5F9C0 90 1F 00 00 */ stw r0, 0(r31) -lbl_80C5F9C4: -/* 80C5F9C4 7C 80 07 35 */ extsh. r0, r4 -/* 80C5F9C8 40 81 00 0C */ ble lbl_80C5F9D4 -/* 80C5F9CC 7F E3 FB 78 */ mr r3, r31 -/* 80C5F9D0 4B 66 F3 6D */ bl __dl__FPv -lbl_80C5F9D4: -/* 80C5F9D4 7F E3 FB 78 */ mr r3, r31 -/* 80C5F9D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5F9DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F9E0 7C 08 03 A6 */ mtlr r0 -/* 80C5F9E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F9E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__sinit_d_a_obj_lv4HsTarget_cpp.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__sinit_d_a_obj_lv4HsTarget_cpp.s deleted file mode 100644 index db256fa3fb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__sinit_d_a_obj_lv4HsTarget_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80C5F9EC: -/* 80C5F9EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F9F0 7C 08 02 A6 */ mflr r0 -/* 80C5F9F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F9F8 3C 60 80 C6 */ lis r3, l_HIO@ha /* 0x80C5FAEC@ha */ -/* 80C5F9FC 38 63 FA EC */ addi r3, r3, l_HIO@l /* 0x80C5FAEC@l */ -/* 80C5FA00 4B FF FC 2D */ bl __ct__19daLv4HsTarget_HIO_cFv -/* 80C5FA04 3C 80 80 C6 */ lis r4, __dt__19daLv4HsTarget_HIO_cFv@ha /* 0x80C5F990@ha */ -/* 80C5FA08 38 84 F9 90 */ addi r4, r4, __dt__19daLv4HsTarget_HIO_cFv@l /* 0x80C5F990@l */ -/* 80C5FA0C 3C A0 80 C6 */ lis r5, lit_3618@ha /* 0x80C5FAE0@ha */ -/* 80C5FA10 38 A5 FA E0 */ addi r5, r5, lit_3618@l /* 0x80C5FAE0@l */ -/* 80C5FA14 4B FF FB A5 */ bl __register_global_object -/* 80C5FA18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5FA1C 7C 08 03 A6 */ mtlr r0 -/* 80C5FA20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5FA24 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/create__15daLv4HsTarget_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/create__15daLv4HsTarget_cFv.s deleted file mode 100644 index ab1a4d01cb..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/create__15daLv4HsTarget_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_80C5F784: -/* 80C5F784 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F788 7C 08 02 A6 */ mflr r0 -/* 80C5F78C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F790 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5F794 93 C1 00 08 */ stw r30, 8(r1) -/* 80C5F798 7C 7F 1B 78 */ mr r31, r3 -/* 80C5F79C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80C5F7A0 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80C5F7A4 40 82 00 28 */ bne lbl_80C5F7CC -/* 80C5F7A8 28 1F 00 00 */ cmplwi r31, 0 -/* 80C5F7AC 41 82 00 14 */ beq lbl_80C5F7C0 -/* 80C5F7B0 4B 41 8E 75 */ bl __ct__16dBgS_MoveBgActorFv -/* 80C5F7B4 3C 60 80 C6 */ lis r3, __vt__15daLv4HsTarget_c@ha /* 0x80C5FA98@ha */ -/* 80C5F7B8 38 03 FA 98 */ addi r0, r3, __vt__15daLv4HsTarget_c@l /* 0x80C5FA98@l */ -/* 80C5F7BC 90 1F 05 9C */ stw r0, 0x59c(r31) -lbl_80C5F7C0: -/* 80C5F7C0 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 80C5F7C4 60 00 00 08 */ ori r0, r0, 8 -/* 80C5F7C8 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_80C5F7CC: -/* 80C5F7CC 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 80C5F7D0 3C 80 80 C6 */ lis r4, d_a_obj_lv4HsTarget__stringBase0@ha /* 0x80C5FA3C@ha */ -/* 80C5F7D4 38 84 FA 3C */ addi r4, r4, d_a_obj_lv4HsTarget__stringBase0@l /* 0x80C5FA3C@l */ -/* 80C5F7D8 4B 3C D6 E5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80C5F7DC 7C 7E 1B 78 */ mr r30, r3 -/* 80C5F7E0 2C 1E 00 04 */ cmpwi r30, 4 -/* 80C5F7E4 40 82 00 5C */ bne lbl_80C5F840 -/* 80C5F7E8 7F E3 FB 78 */ mr r3, r31 -/* 80C5F7EC 3C 80 80 C6 */ lis r4, d_a_obj_lv4HsTarget__stringBase0@ha /* 0x80C5FA3C@ha */ -/* 80C5F7F0 38 84 FA 3C */ addi r4, r4, d_a_obj_lv4HsTarget__stringBase0@l /* 0x80C5FA3C@l */ -/* 80C5F7F4 38 A0 00 07 */ li r5, 7 -/* 80C5F7F8 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80C5F7FC 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80C5F800 38 E0 12 00 */ li r7, 0x1200 -/* 80C5F804 39 00 00 00 */ li r8, 0 -/* 80C5F808 4B 41 8F B5 */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80C5F80C 2C 03 00 05 */ cmpwi r3, 5 -/* 80C5F810 40 82 00 0C */ bne lbl_80C5F81C -/* 80C5F814 38 60 00 05 */ li r3, 5 -/* 80C5F818 48 00 00 2C */ b lbl_80C5F844 -lbl_80C5F81C: -/* 80C5F81C 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5F820 38 03 00 24 */ addi r0, r3, 0x24 -/* 80C5F824 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80C5F828 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5F82C 80 83 00 04 */ lwz r4, 4(r3) -/* 80C5F830 7F E3 FB 78 */ mr r3, r31 -/* 80C5F834 4B 3B AD 45 */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80C5F838 7F E3 FB 78 */ mr r3, r31 -/* 80C5F83C 4B FF FE 55 */ bl setBaseMtx__15daLv4HsTarget_cFv -lbl_80C5F840: -/* 80C5F840 7F C3 F3 78 */ mr r3, r30 -lbl_80C5F844: -/* 80C5F844 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5F848 83 C1 00 08 */ lwz r30, 8(r1) -/* 80C5F84C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F850 7C 08 03 A6 */ mtlr r0 -/* 80C5F854 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F858 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 2a791322de..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5F970: -/* 80C5F970 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F974 7C 08 02 A6 */ mflr r0 -/* 80C5F978 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F97C 4B FF FE 09 */ bl create__15daLv4HsTarget_cFv -/* 80C5F980 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F984 7C 08 03 A6 */ mtlr r0 -/* 80C5F988 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F98C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Delete__FP15daLv4HsTarget_c.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Delete__FP15daLv4HsTarget_c.s deleted file mode 100644 index 394336b514..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Delete__FP15daLv4HsTarget_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5F950: -/* 80C5F950 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F954 7C 08 02 A6 */ mflr r0 -/* 80C5F958 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F95C 4B 41 8F 81 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 80C5F960 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F964 7C 08 03 A6 */ mtlr r0 -/* 80C5F968 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F96C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Draw__FP15daLv4HsTarget_c.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Draw__FP15daLv4HsTarget_c.s deleted file mode 100644 index 13680fbbd1..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Draw__FP15daLv4HsTarget_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80C5F904: -/* 80C5F904 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F908 7C 08 02 A6 */ mflr r0 -/* 80C5F90C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F910 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 80C5F914 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80C5F918 7D 89 03 A6 */ mtctr r12 -/* 80C5F91C 4E 80 04 21 */ bctrl -/* 80C5F920 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F924 7C 08 03 A6 */ mtlr r0 -/* 80C5F928 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F92C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Execute__FP15daLv4HsTarget_c.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Execute__FP15daLv4HsTarget_c.s deleted file mode 100644 index 40033c3a1a..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Execute__FP15daLv4HsTarget_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80C5F930: -/* 80C5F930 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F934 7C 08 02 A6 */ mflr r0 -/* 80C5F938 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F93C 4B 41 90 15 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 80C5F940 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F944 7C 08 03 A6 */ mtlr r0 -/* 80C5F948 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F94C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/setBaseMtx__15daLv4HsTarget_cFv.s b/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/setBaseMtx__15daLv4HsTarget_cFv.s deleted file mode 100644 index 9b34c27665..0000000000 --- a/asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/setBaseMtx__15daLv4HsTarget_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80C5F690: -/* 80C5F690 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80C5F694 7C 08 02 A6 */ mflr r0 -/* 80C5F698 90 01 00 14 */ stw r0, 0x14(r1) -/* 80C5F69C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80C5F6A0 7C 7F 1B 78 */ mr r31, r3 -/* 80C5F6A4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5F6A8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5F6AC C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80C5F6B0 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80C5F6B4 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80C5F6B8 4B 6E 72 31 */ bl PSMTXTrans -/* 80C5F6BC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5F6C0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5F6C4 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80C5F6C8 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80C5F6CC A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80C5F6D0 4B 3A CB D1 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80C5F6D4 80 7F 05 A8 */ lwz r3, 0x5a8(r31) -/* 80C5F6D8 C0 1F 04 EC */ lfs f0, 0x4ec(r31) -/* 80C5F6DC D0 03 00 18 */ stfs f0, 0x18(r3) -/* 80C5F6E0 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80C5F6E4 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 80C5F6E8 C0 1F 04 F4 */ lfs f0, 0x4f4(r31) -/* 80C5F6EC D0 03 00 20 */ stfs f0, 0x20(r3) -/* 80C5F6F0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80C5F6F4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80C5F6F8 80 9F 05 A8 */ lwz r4, 0x5a8(r31) -/* 80C5F6FC 38 84 00 24 */ addi r4, r4, 0x24 -/* 80C5F700 4B 6E 6D B1 */ bl PSMTXCopy -/* 80C5F704 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80C5F708 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80C5F70C 7C 08 03 A6 */ mtlr r0 -/* 80C5F710 38 21 00 10 */ addi r1, r1, 0x10 -/* 80C5F714 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/Create__11daTagMist_cFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/Create__11daTagMist_cFv.s deleted file mode 100644 index 4c51652614..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/Create__11daTagMist_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_8048F370: -/* 8048F370 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F374 7C 08 02 A6 */ mflr r0 -/* 8048F378 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F37C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048F380 7C 7F 1B 78 */ mr r31, r3 -/* 8048F384 3C 80 80 49 */ lis r4, lit_3678@ha /* 0x8048F700@ha */ -/* 8048F388 38 84 F7 00 */ addi r4, r4, lit_3678@l /* 0x8048F700@l */ -/* 8048F38C C0 44 00 00 */ lfs f2, 0(r4) -/* 8048F390 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8048F394 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8048F398 D0 03 05 70 */ stfs f0, 0x570(r3) -/* 8048F39C C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8048F3A0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8048F3A4 D0 03 05 78 */ stfs f0, 0x578(r3) -/* 8048F3A8 C0 24 00 04 */ lfs f1, 4(r4) -/* 8048F3AC C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8048F3B0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8048F3B4 D0 03 05 7C */ stfs f0, 0x57c(r3) -/* 8048F3B8 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8048F3BC EC 02 00 32 */ fmuls f0, f2, f0 -/* 8048F3C0 D0 03 05 84 */ stfs f0, 0x584(r3) -/* 8048F3C4 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8048F3C8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8048F3CC D0 03 05 88 */ stfs f0, 0x588(r3) -/* 8048F3D0 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8048F3D4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8048F3D8 D0 03 05 90 */ stfs f0, 0x590(r3) -/* 8048F3DC C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 8048F3E0 EC 02 00 32 */ fmuls f0, f2, f0 -/* 8048F3E4 D0 03 05 94 */ stfs f0, 0x594(r3) -/* 8048F3E8 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 8048F3EC EC 01 00 32 */ fmuls f0, f1, f0 -/* 8048F3F0 D0 03 05 9C */ stfs f0, 0x59c(r3) -/* 8048F3F4 C0 04 00 08 */ lfs f0, 8(r4) -/* 8048F3F8 D0 03 05 98 */ stfs f0, 0x598(r3) -/* 8048F3FC D0 03 05 8C */ stfs f0, 0x58c(r3) -/* 8048F400 D0 03 05 80 */ stfs f0, 0x580(r3) -/* 8048F404 D0 03 05 74 */ stfs f0, 0x574(r3) -/* 8048F408 4B FF FF 09 */ bl isMySw__11daTagMist_cFv -/* 8048F40C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048F410 41 82 00 14 */ beq lbl_8048F424 -/* 8048F414 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8048F418 54 00 46 BE */ rlwinm r0, r0, 8, 0x1a, 0x1f -/* 8048F41C 3C 60 80 45 */ lis r3, mPlayerNo__11daTagMist_c+0x0@ha /* 0x80450DC0@ha */ -/* 8048F420 98 03 0D C0 */ stb r0, mPlayerNo__11daTagMist_c+0x0@l(r3) /* 0x80450DC0@l */ -lbl_8048F424: -/* 8048F424 38 00 00 00 */ li r0, 0 -/* 8048F428 98 1F 05 A0 */ stb r0, 0x5a0(r31) -/* 8048F42C 38 60 00 01 */ li r3, 1 -/* 8048F430 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048F434 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F438 7C 08 03 A6 */ mtlr r0 -/* 8048F43C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F440 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/__dt__4cXyzFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/__dt__4cXyzFv.s deleted file mode 100644 index 11909032eb..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/__dt__4cXyzFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8048F518: -/* 8048F518 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F51C 7C 08 02 A6 */ mflr r0 -/* 8048F520 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F524 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048F528 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8048F52C 41 82 00 10 */ beq lbl_8048F53C -/* 8048F530 7C 80 07 35 */ extsh. r0, r4 -/* 8048F534 40 81 00 08 */ ble lbl_8048F53C -/* 8048F538 4B E3 F8 05 */ bl __dl__FPv -lbl_8048F53C: -/* 8048F53C 7F E3 FB 78 */ mr r3, r31 -/* 8048F540 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048F544 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F548 7C 08 03 A6 */ mtlr r0 -/* 8048F54C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F550 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Create__FP10fopAc_ac_c.s deleted file mode 100644 index aad8f156a1..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048F6D8: -/* 8048F6D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F6DC 7C 08 02 A6 */ mflr r0 -/* 8048F6E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F6E4 4B FF FD 61 */ bl create__11daTagMist_cFv -/* 8048F6E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F6EC 7C 08 03 A6 */ mtlr r0 -/* 8048F6F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F6F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Delete__FP11daTagMist_c.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Delete__FP11daTagMist_c.s deleted file mode 100644 index 109ee8cc8d..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Delete__FP11daTagMist_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048F6B8: -/* 8048F6B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F6BC 7C 08 02 A6 */ mflr r0 -/* 8048F6C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F6C4 4B FF FF CD */ bl _delete__11daTagMist_cFv -/* 8048F6C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F6CC 7C 08 03 A6 */ mtlr r0 -/* 8048F6D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F6D4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Execute__FP11daTagMist_c.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Execute__FP11daTagMist_c.s deleted file mode 100644 index 88e80d1b58..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Execute__FP11daTagMist_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8048F698: -/* 8048F698 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F69C 7C 08 02 A6 */ mflr r0 -/* 8048F6A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F6A4 4B FF FE B5 */ bl execute__11daTagMist_cFv -/* 8048F6A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F6AC 7C 08 03 A6 */ mtlr r0 -/* 8048F6B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F6B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/execute__11daTagMist_cFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/execute__11daTagMist_cFv.s deleted file mode 100644 index f7259cf39b..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/execute__11daTagMist_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_8048F558: -/* 8048F558 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048F55C 7C 08 02 A6 */ mflr r0 -/* 8048F560 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048F564 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8048F568 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8048F56C 7C 7F 1B 78 */ mr r31, r3 -/* 8048F570 A0 03 05 A2 */ lhz r0, 0x5a2(r3) -/* 8048F574 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8048F578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048F57C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048F580 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8048F584 7C 05 07 74 */ extsb r5, r0 -/* 8048F588 4B BA 5D D9 */ bl isSwitch__10dSv_info_cCFii -/* 8048F58C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048F590 41 82 00 0C */ beq lbl_8048F59C -/* 8048F594 38 60 00 01 */ li r3, 1 -/* 8048F598 48 00 00 E0 */ b lbl_8048F678 -lbl_8048F59C: -/* 8048F59C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048F5A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048F5A4 80 63 5D AC */ lwz r3, 0x5dac(r3) -/* 8048F5A8 C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 8048F5AC D0 01 00 08 */ stfs f0, 8(r1) -/* 8048F5B0 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 8048F5B4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8048F5B8 C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 8048F5BC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8048F5C0 38 61 00 08 */ addi r3, r1, 8 -/* 8048F5C4 38 9F 04 A8 */ addi r4, r31, 0x4a8 -/* 8048F5C8 7C 65 1B 78 */ mr r5, r3 -/* 8048F5CC 4B EB 7A E9 */ bl PSVECSubtract -/* 8048F5D0 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8048F5D4 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8048F5D8 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 8048F5DC 7C 00 00 D0 */ neg r0, r0 -/* 8048F5E0 7C 04 07 34 */ extsh r4, r0 -/* 8048F5E4 4B B7 CD F9 */ bl mDoMtx_YrotS__FPA4_fs -/* 8048F5E8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8048F5EC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8048F5F0 38 81 00 08 */ addi r4, r1, 8 -/* 8048F5F4 7C 85 23 78 */ mr r5, r4 -/* 8048F5F8 4B EB 77 75 */ bl PSMTXMultVec -/* 8048F5FC 38 00 00 00 */ li r0, 0 -/* 8048F600 C0 1F 05 70 */ lfs f0, 0x570(r31) -/* 8048F604 C0 41 00 08 */ lfs f2, 8(r1) -/* 8048F608 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 8048F60C 40 80 00 30 */ bge lbl_8048F63C -/* 8048F610 C0 1F 05 78 */ lfs f0, 0x578(r31) -/* 8048F614 C0 21 00 10 */ lfs f1, 0x10(r1) -/* 8048F618 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8048F61C 40 80 00 20 */ bge lbl_8048F63C -/* 8048F620 C0 1F 05 88 */ lfs f0, 0x588(r31) -/* 8048F624 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 8048F628 40 81 00 14 */ ble lbl_8048F63C -/* 8048F62C C0 1F 05 90 */ lfs f0, 0x590(r31) -/* 8048F630 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8048F634 40 81 00 08 */ ble lbl_8048F63C -/* 8048F638 38 00 00 01 */ li r0, 1 -lbl_8048F63C: -/* 8048F63C 54 1E 06 3F */ clrlwi. r30, r0, 0x18 -/* 8048F640 41 82 00 30 */ beq lbl_8048F670 -/* 8048F644 88 1F 05 A0 */ lbz r0, 0x5a0(r31) -/* 8048F648 28 00 00 00 */ cmplwi r0, 0 -/* 8048F64C 40 82 00 24 */ bne lbl_8048F670 -/* 8048F650 7F E3 FB 78 */ mr r3, r31 -/* 8048F654 4B FF FC 05 */ bl offSw__11daTagMist_cFv -/* 8048F658 7F E3 FB 78 */ mr r3, r31 -/* 8048F65C 4B FF FC 69 */ bl onMySw__11daTagMist_cFv -/* 8048F660 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 8048F664 54 00 46 BE */ rlwinm r0, r0, 8, 0x1a, 0x1f -/* 8048F668 3C 60 80 45 */ lis r3, mPlayerNo__11daTagMist_c+0x0@ha /* 0x80450DC0@ha */ -/* 8048F66C 98 03 0D C0 */ stb r0, mPlayerNo__11daTagMist_c+0x0@l(r3) /* 0x80450DC0@l */ -lbl_8048F670: -/* 8048F670 9B DF 05 A0 */ stb r30, 0x5a0(r31) -/* 8048F674 38 60 00 01 */ li r3, 1 -lbl_8048F678: -/* 8048F678 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8048F67C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8048F680 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048F684 7C 08 03 A6 */ mtlr r0 -/* 8048F688 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048F68C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/func_8048F444.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/func_8048F444.s deleted file mode 100644 index 54c7b503cb..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/func_8048F444.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8048F444: -/* 8048F444 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F448 7C 08 02 A6 */ mflr r0 -/* 8048F44C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F450 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8048F454 93 C1 00 08 */ stw r30, 8(r1) -/* 8048F458 7C 7F 1B 78 */ mr r31, r3 -/* 8048F45C 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8048F460 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8048F464 40 82 00 40 */ bne lbl_8048F4A4 -/* 8048F468 7F E0 FB 79 */ or. r0, r31, r31 -/* 8048F46C 41 82 00 2C */ beq lbl_8048F498 -/* 8048F470 7C 1E 03 78 */ mr r30, r0 -/* 8048F474 4B B8 96 F1 */ bl __ct__10fopAc_ac_cFv -/* 8048F478 38 7E 05 70 */ addi r3, r30, 0x570 -/* 8048F47C 3C 80 80 49 */ lis r4, __ct__4cXyzFv@ha /* 0x8048F554@ha */ -/* 8048F480 38 84 F5 54 */ addi r4, r4, __ct__4cXyzFv@l /* 0x8048F554@l */ -/* 8048F484 3C A0 80 49 */ lis r5, __dt__4cXyzFv@ha /* 0x8048F518@ha */ -/* 8048F488 38 A5 F5 18 */ addi r5, r5, __dt__4cXyzFv@l /* 0x8048F518@l */ -/* 8048F48C 38 C0 00 0C */ li r6, 0xc -/* 8048F490 38 E0 00 04 */ li r7, 4 -/* 8048F494 4B ED 28 CD */ bl __construct_array -lbl_8048F498: -/* 8048F498 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 8048F49C 60 00 00 08 */ ori r0, r0, 8 -/* 8048F4A0 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_8048F4A4: -/* 8048F4A4 88 1F 05 A1 */ lbz r0, 0x5a1(r31) -/* 8048F4A8 28 00 00 00 */ cmplwi r0, 0 -/* 8048F4AC 40 82 00 38 */ bne lbl_8048F4E4 -/* 8048F4B0 38 00 00 01 */ li r0, 1 -/* 8048F4B4 98 1F 05 A1 */ stb r0, 0x5a1(r31) -/* 8048F4B8 A8 1F 04 B4 */ lha r0, 0x4b4(r31) -/* 8048F4BC B0 1F 05 A2 */ sth r0, 0x5a2(r31) -/* 8048F4C0 A8 1F 04 B8 */ lha r0, 0x4b8(r31) -/* 8048F4C4 B0 1F 05 A4 */ sth r0, 0x5a4(r31) -/* 8048F4C8 38 00 00 00 */ li r0, 0 -/* 8048F4CC B0 1F 04 B8 */ sth r0, 0x4b8(r31) -/* 8048F4D0 B0 1F 04 B4 */ sth r0, 0x4b4(r31) -/* 8048F4D4 B0 1F 04 E0 */ sth r0, 0x4e0(r31) -/* 8048F4D8 B0 1F 04 DC */ sth r0, 0x4dc(r31) -/* 8048F4DC B0 1F 04 E8 */ sth r0, 0x4e8(r31) -/* 8048F4E0 B0 1F 04 E4 */ sth r0, 0x4e4(r31) -lbl_8048F4E4: -/* 8048F4E4 7F E3 FB 78 */ mr r3, r31 -/* 8048F4E8 4B FF FE 89 */ bl Create__11daTagMist_cFv -/* 8048F4EC 2C 03 00 00 */ cmpwi r3, 0 -/* 8048F4F0 40 82 00 0C */ bne lbl_8048F4FC -/* 8048F4F4 38 60 00 05 */ li r3, 5 -/* 8048F4F8 48 00 00 08 */ b lbl_8048F500 -lbl_8048F4FC: -/* 8048F4FC 38 60 00 04 */ li r3, 4 -lbl_8048F500: -/* 8048F500 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8048F504 83 C1 00 08 */ lwz r30, 8(r1) -/* 8048F508 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F50C 7C 08 03 A6 */ mtlr r0 -/* 8048F510 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F514 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/isMySw__11daTagMist_cFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/isMySw__11daTagMist_cFv.s deleted file mode 100644 index a7c60a4b19..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/isMySw__11daTagMist_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8048F310: -/* 8048F310 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F314 7C 08 02 A6 */ mflr r0 -/* 8048F318 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F31C 7C 65 1B 78 */ mr r5, r3 -/* 8048F320 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048F324 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8048F328 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8048F32C 28 00 00 FF */ cmplwi r0, 0xff -/* 8048F330 41 82 00 2C */ beq lbl_8048F35C -/* 8048F334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048F338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048F33C 7C 84 02 14 */ add r4, r4, r0 -/* 8048F340 88 05 04 BA */ lbz r0, 0x4ba(r5) -/* 8048F344 7C 05 07 74 */ extsb r5, r0 -/* 8048F348 4B BA 60 19 */ bl isSwitch__10dSv_info_cCFii -/* 8048F34C 2C 03 00 00 */ cmpwi r3, 0 -/* 8048F350 41 82 00 0C */ beq lbl_8048F35C -/* 8048F354 38 60 00 01 */ li r3, 1 -/* 8048F358 48 00 00 08 */ b lbl_8048F360 -lbl_8048F35C: -/* 8048F35C 38 60 00 00 */ li r3, 0 -lbl_8048F360: -/* 8048F360 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F364 7C 08 03 A6 */ mtlr r0 -/* 8048F368 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F36C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/offSw__11daTagMist_cFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/offSw__11daTagMist_cFv.s deleted file mode 100644 index ecdc4442cd..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/offSw__11daTagMist_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8048F258: -/* 8048F258 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8048F25C 7C 08 02 A6 */ mflr r0 -/* 8048F260 90 01 00 24 */ stw r0, 0x24(r1) -/* 8048F264 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048F268 4B ED 2F 6D */ bl _savegpr_27 -/* 8048F26C 7C 7B 1B 78 */ mr r27, r3 -/* 8048F270 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048F274 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 8048F278 54 1D 86 3E */ rlwinm r29, r0, 0x10, 0x18, 0x1f -/* 8048F27C 3B 80 00 00 */ li r28, 0 -/* 8048F280 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048F284 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048F288 48 00 00 1C */ b lbl_8048F2A4 -lbl_8048F28C: -/* 8048F28C 7F E3 FB 78 */ mr r3, r31 -/* 8048F290 7C 9E E2 14 */ add r4, r30, r28 -/* 8048F294 88 1B 04 BA */ lbz r0, 0x4ba(r27) -/* 8048F298 7C 05 07 74 */ extsb r5, r0 -/* 8048F29C 4B BA 60 15 */ bl offSwitch__10dSv_info_cFii -/* 8048F2A0 3B 9C 00 01 */ addi r28, r28, 1 -lbl_8048F2A4: -/* 8048F2A4 7C 1C E8 00 */ cmpw r28, r29 -/* 8048F2A8 41 80 FF E4 */ blt lbl_8048F28C -/* 8048F2AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8048F2B0 4B ED 2F 71 */ bl _restgpr_27 -/* 8048F2B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8048F2B8 7C 08 03 A6 */ mtlr r0 -/* 8048F2BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8048F2C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/onMySw__11daTagMist_cFv.s b/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/onMySw__11daTagMist_cFv.s deleted file mode 100644 index b0b780f313..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/onMySw__11daTagMist_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8048F2C4: -/* 8048F2C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8048F2C8 7C 08 02 A6 */ mflr r0 -/* 8048F2CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8048F2D0 7C 65 1B 78 */ mr r5, r3 -/* 8048F2D4 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 8048F2D8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8048F2DC 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 8048F2E0 28 00 00 FF */ cmplwi r0, 0xff -/* 8048F2E4 41 82 00 1C */ beq lbl_8048F300 -/* 8048F2E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8048F2EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8048F2F0 7C 84 02 14 */ add r4, r4, r0 -/* 8048F2F4 88 05 04 BA */ lbz r0, 0x4ba(r5) -/* 8048F2F8 7C 05 07 74 */ extsb r5, r0 -/* 8048F2FC 4B BA 5F 05 */ bl onSwitch__10dSv_info_cFii -lbl_8048F300: -/* 8048F300 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8048F304 7C 08 03 A6 */ mtlr r0 -/* 8048F308 38 21 00 10 */ addi r1, r1, 0x10 -/* 8048F30C 4E 80 00 20 */ blr diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 4e466c922b..0466277171 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -452,9 +452,7 @@ public: mMesgCamInfoActor9 = param_9; mMesgCamInfoActor10 = param_10; } - int getMesgCamInfo() { - return mMesgCamInfoBasicID; - } + int getMesgCamInfo() { return mMesgCamInfoBasicID; } void setFontArchive(JKRArchive* arc) { mFontArchive = arc; } void setRubyArchive(JKRArchive* arc) { mRubyArchive = arc; } void setMain2DArchive(JKRArchive* arc) { mMain2DArchive = arc; } @@ -494,9 +492,7 @@ public: f32 getCameraZoomForcus(int i_no) { return mCameraInfo[i_no].mCameraZoomForcus; } - void setMesgCamInfoID(int param_0) { - mMesgCamInfo = param_0; - } + void setMesgCamInfoID(int param_0) { mMesgCamInfo = param_0; } void setStatus(u16 status) { mStatus = status; } s32 checkStatus(u16 flags) { return flags & mStatus; } @@ -914,8 +910,8 @@ s16 dComIfGs_getWarpPlayerAngleY(); s8 dComIfGs_getWarpRoomNo(); BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo); BOOL dComIfGs_isOneZoneItem(int i_swBit, int i_roomNo); -BOOL dComIfGs_isZoneSwitch(int,int); -BOOL dComIfGs_isZoneItem(int,int); +BOOL dComIfGs_isZoneSwitch(int, int); +BOOL dComIfGs_isZoneItem(int, int); void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 roomNo, u8, u8); u16 dComIfGs_getMaxLifeGauge(); void dComIfGs_setWarpMarkFlag(u8); @@ -1023,8 +1019,8 @@ inline void dComIfGs_setCollectClothes(u8 i_clothesNo) { g_dComIfG_gameInfo.info.getPlayer().getCollect().setCollect(COLLECT_CLOTHING, i_clothesNo); } -inline void dComIfGs_setCardToMemory(char* card_ptr,int dataNum) { - g_dComIfG_gameInfo.info.card_to_memory(card_ptr,dataNum); +inline void dComIfGs_setCardToMemory(char* card_ptr, int dataNum) { + g_dComIfG_gameInfo.info.card_to_memory(card_ptr, dataNum); } inline void dComIfGs_setRodTypeLevelUp() { @@ -1098,7 +1094,6 @@ inline void dComIfGs_offSwitch(int i_no, int i_roomNo) { g_dComIfG_gameInfo.info.offSwitch(i_no, i_roomNo); } - inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo) { return g_dComIfG_gameInfo.info.isSwitch(i_no, i_roomNo); } @@ -1575,7 +1570,7 @@ inline BOOL dComIfGs_isActor(int i_no, int i_roomNo) { } inline void dComIfGs_offActor(int i_no, int i_roomNo) { - g_dComIfG_gameInfo.info.offActor(i_no,i_roomNo); + g_dComIfG_gameInfo.info.offActor(i_no, i_roomNo); } inline void dComIfGs_putSave(int i_stageNo) { @@ -1752,7 +1747,6 @@ static dAttCatch_c* dComIfGp_att_getCatghTarget(); static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1); bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle); - inline void dComIfGp_itemDataInit() { g_dComIfG_gameInfo.play.itemInit(); } @@ -3179,37 +3173,37 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, 0, 0); } -inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, - const dKy_tevstr_c* param_3, const csXyz* param_4, - const cXyz* param_5, u8 param_6, - dPa_levelEcallBack* param_7, s8 param_8, - const GXColor* param_9, const GXColor* param_10, - const cXyz* param_11) { - return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, param_3, param_4, - param_5, param_6, param_7, param_8, - param_9, param_10, param_11, 1.0f); +inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos, + const dKy_tevstr_c* param_3, const csXyz* i_rotation, + const cXyz* i_scale, u8 i_alpha, + dPa_levelEcallBack* i_callback, s8 param_8, + const GXColor* i_prmColor, const GXColor* i_envColor, + const cXyz* i_particleScale) { + return g_dComIfG_gameInfo.play.getParticle()->setNormal( + i_resID, i_pos, param_3, i_rotation, i_scale, i_alpha, i_callback, param_8, i_prmColor, + i_envColor, i_particleScale, 1.0f); } -inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const csXyz* param_3, - const cXyz* param_4, u8 param_5, - dPa_levelEcallBack* param_6, s8 param_7, - const GXColor* param_8, const GXColor* param_9, - const cXyz* param_10) { - return g_dComIfG_gameInfo.play.getParticle()->setNormal(param_1, param_2, NULL, param_3, - param_4, param_5, param_6, param_7, - param_8, param_9, param_10, 1.0f); +inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos, + const csXyz* i_rotation, const cXyz* i_scale, + u8 i_alpha, dPa_levelEcallBack* i_callback, s8 param_7, + const GXColor* i_prmColor, const GXColor* i_envColor, + const cXyz* i_particleScale) { + return g_dComIfG_gameInfo.play.getParticle()->setNormal( + i_resID, i_pos, NULL, i_rotation, i_scale, i_alpha, i_callback, param_7, i_prmColor, + i_envColor, i_particleScale, 1.0f); } -inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csXyz* param_2, - const cXyz* param_3) { - return dComIfGp_particle_set(param_0, param_1, NULL, param_2, param_3, 0xFF, NULL, -1, NULL, +inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos, + const csXyz* i_rotation, const cXyz* i_scale) { + return dComIfGp_particle_set(i_resID, i_pos, NULL, i_rotation, i_scale, 255, NULL, -1, NULL, NULL, NULL); } -inline JPABaseEmitter* dComIfGp_particle_set(u16 param_0, const cXyz* param_1, - const dKy_tevstr_c* param_2, const csXyz* param_3, - const cXyz* param_4) { - return dComIfGp_particle_set(param_0, param_1, param_2, param_3, param_4, 0xFF, NULL, -1, NULL, +inline JPABaseEmitter* dComIfGp_particle_set(u16 i_resID, const cXyz* i_pos, + const dKy_tevstr_c* param_2, const csXyz* i_rotation, + const cXyz* i_scale) { + return dComIfGp_particle_set(i_resID, i_pos, param_2, i_rotation, i_scale, 255, NULL, -1, NULL, NULL, NULL); } @@ -3249,11 +3243,10 @@ inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* param NULL, NULL, NULL, -1, NULL); } -inline void dComIfGp_particle_setSimple(u16 param_0,cXyz* param_1, - u8 param_2, _GXColor& param_3, - _GXColor& param_4, int param_5, - float param_6) { - g_dComIfG_gameInfo.play.getParticle()->setSimple(param_0,param_1,0,param_2,param_3,param_4,param_5,param_6); +inline void dComIfGp_particle_setSimple(u16 param_0, cXyz* param_1, u8 param_2, _GXColor& param_3, + _GXColor& param_4, int param_5, float param_6) { + g_dComIfG_gameInfo.play.getParticle()->setSimple(param_0, param_1, 0, param_2, param_3, param_4, + param_5, param_6); } inline void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) { @@ -3265,12 +3258,13 @@ inline JPABaseEmitter* dComIfGp_particle_getEmitter(u32 param_0) { } inline u32 dComIfGp_particle_setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param_2, - cXyz const* param_3, dKy_tevstr_c const* param_4, int param_5, - csXyz const* param_6, cXyz const* param_7, - dPa_levelEcallBack* param_8, s8 param_9, - cXyz const* param_10) { - return g_dComIfG_gameInfo.play.getParticle()->setSimpleFoot(param_0, param_1, param_2, param_3, param_4, param_5, - param_6, param_7, param_8, param_9, param_10); + cXyz const* param_3, dKy_tevstr_c const* param_4, + int param_5, csXyz const* param_6, cXyz const* param_7, + dPa_levelEcallBack* param_8, s8 param_9, + cXyz const* param_10) { + return g_dComIfG_gameInfo.play.getParticle()->setSimpleFoot(param_0, param_1, param_2, param_3, + param_4, param_5, param_6, param_7, + param_8, param_9, param_10); } inline u32 dComIfGp_particle_setPolyColor(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2, diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h index 80efa1f995..9a8841750c 100644 --- a/include/d/d_gameover.h +++ b/include/d/d_gameover.h @@ -13,6 +13,7 @@ public: /* 8019AFE0 */ dGov_HIO_c(); /* 8019C06C */ virtual ~dGov_HIO_c(); + /* 0x04 */ u8 unk_0x4; /* 0x08 */ f32 mScale; /* 0x0C */ f32 mAlpha; /* 0x10 */ f32 mAnimSpeed; diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 6daa055ab8..f8d93aab24 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -35,13 +35,15 @@ void dKy_GxFog_set(); static void GxFog_set(); static void GxXFog_set(); u8 dKy_pol_argument_get(cBgS_PolyInfo const* i_poly); -void dKy_Sound_set(cXyz param_0, int param_1, unsigned int param_2, int param_3); +void dKy_Sound_set(cXyz i_pos, int param_1, unsigned int i_actorID, int param_3); void dKy_bg_MAxx_proc(void* param_0); void dKy_change_colpat(u8 colpat); void dKy_BossLight_set(cXyz* param_0, _GXColor* param_1, f32 param_2, u8 param_3); void dKy_custom_colset(u8 prevGather, u8 curGather, f32 blend); void dKy_setLight(); cXyz dKy_plight_near_pos(); +void dKy_BossSpotLight_set(cXyz* param_0, f32 param_1, f32 param_2, f32 param_3, _GXColor* param_4, + f32 param_5, u8 param_6, u8 param_7); struct LIGHT_INFLUENCE { /* 800CFC7C */ ~LIGHT_INFLUENCE() {} @@ -168,12 +170,12 @@ struct LightStatus { /* 0x4C */ f32 mRefDist; /* 0x50 */ f32 mRefBrightness; /* 0x54 */ GXDistAttnFn mDistFn; - /* 0x58 */ u32 field_0x58[2][6]; //? + /* 0x58 */ u32 field_0x58[2][6]; //? /* 0x88 */ f32 field_0x88; /* 0x8C */ f32 field_0x8c; /* 0x90 */ f32 field_0x90; /* 0x94 */ f32 field_0x94; - /* 0x98 */ u32 field_0x98[2][8]; //? + /* 0x98 */ u32 field_0x98[2][8]; //? /* 0xD8 */ f32 field_0xd8; /* 0xDC */ f32 field_0xdc; /* 0xE0 */ f32 field_0xe0; diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 512c55baa8..05cb74ad5d 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -144,7 +144,10 @@ public: /* 0x544 */ actor_attention_types mAttentionInfo; /* 0x560 */ s16 field_0x560; /* 0x562 */ s16 mHealth; - /* 0x564 */ u8 field_0x564[0x4]; + /* 0x564 */ u8 field_0x564; + /* 0x565 */ u8 field_0x565; + /* 0x566 */ u8 field_0x566; + /* 0x567 */ s8 field_0x567; fopAc_ac_c(); ~fopAc_ac_c(); diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index abf715f55d..a6f72935e0 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -6,7 +6,6 @@ class mDoHIO_entry_c { public: virtual ~mDoHIO_entry_c() {} - u8 unk_0x4; }; #endif /* M_DO_M_DO_HOSTIO_H */ diff --git a/include/rel/d/a/d_a_disappear/d_a_disappear.h b/include/rel/d/a/d_a_disappear/d_a_disappear.h index 3021b23f15..007f5b6c32 100644 --- a/include/rel/d/a/d_a_disappear/d_a_disappear.h +++ b/include/rel/d/a/d_a_disappear/d_a_disappear.h @@ -1,6 +1,13 @@ #ifndef D_A_DISAPPEAR_H #define D_A_DISAPPEAR_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class disappear_class : public fopAc_ac_c { +public: + /* 0x568 */ u8 field_0x568[0x574 - 0x568]; + /* 0x574 */ s16 mDeleteTimer; + /* 0x576 */ u8 field_0x576[0x578 - 0x576]; +}; #endif /* D_A_DISAPPEAR_H */ diff --git a/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h b/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h index 8aced5f54f..57bf6472eb 100644 --- a/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h +++ b/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h @@ -1,6 +1,25 @@ #ifndef D_A_KYTAG16_H #define D_A_KYTAG16_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class kytag16_class : public fopAc_ac_c { +public: + /* 0x568 */ f32 field_0x568; + /* 0x56C */ u8 field_0x56c; + /* 0x56D */ GXColor field_0x56d; + /* 0x571 */ u8 field_0x571; + /* 0x572 */ u8 field_0x572; + /* 0x573 */ u8 field_0x573; + /* 0x574 */ f32 field_0x574; + /* 0x578 */ f32 field_0x578; + /* 0x57C */ f32 field_0x57c; + /* 0x580 */ f32 field_0x580; + /* 0x584 */ f32 field_0x584; + /* 0x588 */ s16 field_0x588; + /* 0x58A */ s16 field_0x58a; + /* 0x58C */ u8 field_0x58c; + /* 0x58D */ u8 field_0x58d; +}; #endif /* D_A_KYTAG16_H */ diff --git a/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h b/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h index cef101df22..ec42e9c70a 100644 --- a/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h +++ b/include/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h @@ -1,6 +1,23 @@ #ifndef D_A_OBJ_CRYSTAL_H #define D_A_OBJ_CRYSTAL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daObjCrystal_c : public fopAc_ac_c { +public: + /* 80BD63B8 */ void initBaseMtx(); + /* 80BD6410 */ void setBaseMtx(); + /* 80BD6470 */ int Create(); + /* 80BD65B0 */ int CreateHeap(); + /* 80BD6664 */ int create(); + /* 80BD6718 */ int execute(); + /* 80BD673C */ int draw(); + /* 80BD67C8 */ int _delete(); + + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ J3DModel* mpModel[2]; + /* 0x578 */ JPABaseEmitter* mpEmitter; + /* 0x57C */ u16 mJointID; +}; #endif /* D_A_OBJ_CRYSTAL_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h b/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h index 1dc777bd76..e8064a8889 100644 --- a/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h +++ b/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h @@ -1,6 +1,18 @@ #ifndef D_A_OBJ_LV3WATEREFF_H #define D_A_OBJ_LV3WATEREFF_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daObjWaterEff_c : public fopAc_ac_c { +public: + /* 80C5C4F8 */ int Create(); + /* 80C5C5DC */ int create(); + /* 80C5C6B0 */ int execute(); + /* 80C5C7B8 */ int _delete(); + + /* 0x568 */ cXyz mSePositions[2]; + /* 0x580 */ JPABaseEmitter* mParticles[4]; + /* 0x590 */ u8 unused_0x590[0x594 - 0x590]; +}; #endif /* D_A_OBJ_LV3WATEREFF_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h b/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h index 0efc31e785..ff4f82776f 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h +++ b/include/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h @@ -1,6 +1,28 @@ #ifndef D_A_OBJ_LV4HSTARGET_H #define D_A_OBJ_LV4HSTARGET_H -#include "dolphin/types.h" +#include "d/bg/d_bg_s_movebg_actor.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_hostIO.h" + +class daLv4HsTarget_c : public dBgS_MoveBgActor { +public: + /* 80C5F690 */ void setBaseMtx(); + /* 80C5F784 */ int create(); + + /* 80C5F718 */ virtual int CreateHeap(); + /* 80C5F85C */ virtual int Execute(Mtx**); + /* 80C5F870 */ virtual int Draw(); + /* 80C5F8D4 */ virtual int Delete(); + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mpModel; +}; + +class daLv4HsTarget_HIO_c : public mDoHIO_entry_c { +public: + /* 80C5F62C */ daLv4HsTarget_HIO_c(); + /* 80C5F990 */ virtual ~daLv4HsTarget_HIO_c() {} +}; #endif /* D_A_OBJ_LV4HSTARGET_H */ diff --git a/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h b/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h index ae36097347..05301d93a4 100644 --- a/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h +++ b/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h @@ -27,6 +27,8 @@ class daTagCstaSw_HIO_c : public mDoHIO_entry_c { public: /* 805A202C */ daTagCstaSw_HIO_c(); /* 805A2480 */ virtual ~daTagCstaSw_HIO_c(); + + u8 unk_0x4; }; #endif /* D_A_TAG_CSTASW_H */ diff --git a/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h b/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h index feadc9bc72..58718bd602 100644 --- a/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h +++ b/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h @@ -13,13 +13,13 @@ public: /* 8048EF6C */ int Draw(); /* 8048EF74 */ void initialize(); - /* 0x568 */ dMsgFlow_c field_0x568; - /* 0x5B4 */ cBgS_GndChk field_0x5b4; + /* 0x568 */ dMsgFlow_c mMsgFlow; + /* 0x5B4 */ cBgS_GndChk mGndChk; /* 0x5F0 */ u32 field_0x5f0; - /* 0x5F4 */ f32 field_0x5f4; + /* 0x5F4 */ f32 mGroundCross; /* 0x5F8 */ s32 field_0x5f8; /* 0x5FC */ u32 field_0x5fc; - /* 0x600 */ s32 field_0x600; + /* 0x600 */ int mFlowIndex; /* 0x604 */ u8 field_0x604; /* 8048ECAC */ virtual ~daTag_Lantern_c(); diff --git a/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h b/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h index 620595d744..4164d72d65 100644 --- a/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h +++ b/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h @@ -27,6 +27,7 @@ public: /* 80D5B2EC */ daLv6CstaSw_HIO_c(); /* 80D5B740 */ virtual ~daLv6CstaSw_HIO_c(); + u8 unk_0x4; }; #endif /* D_A_TAG_LV6CSTASW_H */ diff --git a/include/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h b/include/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h index a89312ecd4..b924b54996 100644 --- a/include/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h +++ b/include/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h @@ -1,6 +1,47 @@ #ifndef D_A_TAG_MIST_H #define D_A_TAG_MIST_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daTagMist_c : public fopAc_ac_c { +public: + /* 8048F258 */ void offSw(); + /* 8048F2C4 */ void onMySw(); + /* 8048F310 */ BOOL isMySw(); + /* 8048F370 */ int Create(); + /* 8048F444 */ int create(); + /* 8048F558 */ int execute(); + /* 8048F690 */ int _delete(); + + /* 80031CF0 */ static u8 getPlayerNo(); + static void setPlayerNo(u8 i_playerNo) { mPlayerNo = i_playerNo; } + + static u8 mPlayerNo; + + /* 0x568 */ u8 unused_0x568[0x570 - 0x568]; + /* 0x570 */ cXyz mVertices[4]; + /* 0x5A0 */ u8 mPlayerTouched; + /* 0x5A1 */ u8 mInitParams; + /* 0x5A2 */ u16 field_0x5a2; + /* 0x5A4 */ u16 field_0x5a4; +}; // Size: 0x5A8 + +namespace daTagMist_prm { +inline u8 getSwNoNum(daTagMist_c* i_this) { + return fopAcM_GetParam(i_this) >> 0x10; +} +inline u8 getMySwNo(daTagMist_c* i_this) { + return fopAcM_GetParam(i_this) >> 0x8; +} +inline u8 getTopSwNo(daTagMist_c* i_this) { + return fopAcM_GetParam(i_this); +} +inline u8 getExitNo(daTagMist_c* i_this) { + return (fopAcM_GetParam(i_this) >> 0x18) & 0x3F; +} +inline int getSwNo2(daTagMist_c* i_this) { + return i_this->field_0x5a2 & 0xFF; +} +} // namespace daTagMist_prm #endif /* D_A_TAG_MIST_H */ diff --git a/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h b/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h index 308919d430..9edc61ab1d 100644 --- a/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h +++ b/include/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h @@ -22,6 +22,8 @@ class daTagPoFire_HIO_c : public mDoHIO_entry_c { public: /* 80D5DACC */ daTagPoFire_HIO_c(); /* 80D5DCB0 */ virtual ~daTagPoFire_HIO_c(); + + u8 unk_0x4; }; #endif /* D_A_TAG_POFIRE_H */ diff --git a/rel/d/a/d_a_disappear/d_a_disappear.cpp b/rel/d/a/d_a_disappear/d_a_disappear.cpp index 39a8c82a1d..bb4922808b 100644 --- a/rel/d/a/d_a_disappear/d_a_disappear.cpp +++ b/rel/d/a/d_a_disappear/d_a_disappear.cpp @@ -1,283 +1,156 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_disappear -// +/** + * d_a_disappear.cpp + * Disappear death effect when an enemy is defeated + */ #include "rel/d/a/d_a_disappear/d_a_disappear.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct disappear_class {}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct cXyz {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -// -// Forward References: -// - -extern "C" static bool daDisappear_Draw__FP15disappear_class(); -extern "C" static void s_ks_sub__FPvPv(); -extern "C" static void daDisappear_Execute__FP15disappear_class(); -extern "C" static bool daDisappear_IsDelete__FP15disappear_class(); -extern "C" static bool daDisappear_Delete__FP15disappear_class(); -extern "C" static void yami_disappear__FP15disappear_classf(); -extern "C" static void ghost_disappear__FP15disappear_classf(); -extern "C" static void set_disappear__FP15disappear_classf(); -extern "C" static void daDisappear_Create__FP10fopAc_ac_c(); -extern "C" extern void* g_profile_DISAPPEAR[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_createItemFromEnemyID__FUcPC4cXyziiPC5csXyzPC4cXyzPfPf(); -extern "C" void fpcEx_Search__FPFPvPv_PvPv(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dKy_Sound_set__F4cXyziUii(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 804A8F18-804A8F20 000078 0008+00 1/0 0/0 0/0 .text daDisappear_Draw__FP15disappear_class */ -static bool daDisappear_Draw(disappear_class* param_0) { - return true; +static int daDisappear_Draw(disappear_class* i_this) { + return 1; } /* 804A8F20-804A8F6C 000080 004C+00 1/1 0/0 0/0 .text s_ks_sub__FPvPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void s_ks_sub(void* param_0, void* param_1) { - nofralloc -#include "asm/rel/d/a/d_a_disappear/d_a_disappear/s_ks_sub__FPvPv.s" +static void* s_ks_sub(void* i_actor, void*) { + fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor; + + if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == PROC_NPC_KS) { + actor_p->mHealth = 1; + } + + return NULL; } -#pragma pop /* 804A8F6C-804A8FA8 0000CC 003C+00 1/0 0/0 0/0 .text daDisappear_Execute__FP15disappear_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDisappear_Execute(disappear_class* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Execute__FP15disappear_class.s" +static int daDisappear_Execute(disappear_class* i_this) { + if (i_this->mDeleteTimer != 0) { + i_this->mDeleteTimer--; + } else { + fopAcM_delete(i_this); + } + + return 1; } -#pragma pop /* 804A8FA8-804A8FB0 000108 0008+00 1/0 0/0 0/0 .text daDisappear_IsDelete__FP15disappear_class */ -static bool daDisappear_IsDelete(disappear_class* param_0) { - return true; +static int daDisappear_IsDelete(disappear_class* i_this) { + return 1; } /* 804A8FB0-804A8FB8 000110 0008+00 1/0 0/0 0/0 .text daDisappear_Delete__FP15disappear_class */ -static bool daDisappear_Delete(disappear_class* param_0) { - return true; +static int daDisappear_Delete(disappear_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 804A9460-804A9464 000000 0004+00 4/4 0/0 0/0 .rodata @3704 */ -SECTION_RODATA static f32 const lit_3704 = 1.0f; -COMPILER_STRIP_GATE(0x804A9460, &lit_3704); - -/* 804A9480-804A9488 000000 0008+00 1/1 0/0 0/0 .data da_name$3684 */ -SECTION_DATA static u8 da_name_3684[8] = { - 0x82, 0x6C, 0x82, 0x6D, 0x82, 0x6E, 0x82, 0x6B, -}; - /* 804A8FB8-804A9080 000118 00C8+00 1/1 0/0 0/0 .text yami_disappear__FP15disappear_classf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void yami_disappear(disappear_class* param_0, f32 param_1) { - nofralloc -#include "asm/rel/d/a/d_a_disappear/d_a_disappear/yami_disappear__FP15disappear_classf.s" -} -#pragma pop +static void yami_disappear(disappear_class* i_this, f32 i_scale) { + static u16 da_name[] = {0x826C, 0x826D, 0x826E, 0x826B}; -/* ############################################################################################## */ -/* 804A9488-804A9494 000008 000A+02 1/1 0/0 0/0 .data da_name$3710 */ -SECTION_DATA static u8 da_name_3710[10 + 2 /* padding */] = { - 0x86, - 0xA7, - 0x86, - 0xA8, - 0x86, - 0xA9, - 0x86, - 0xAA, - 0x86, - 0xAB, - /* padding */ - 0x00, - 0x00, -}; + cXyz scale; + scale.set(i_scale, i_scale, i_scale); + + int n = 3; + if (i_this->field_0x567 == 2) { + n = 4; + } + + for (int i = 0; i < n; i++) { + dComIfGp_particle_set(da_name[i], &i_this->current.pos, NULL, &scale); + } +} /* 804A9080-804A9130 0001E0 00B0+00 1/1 0/0 0/0 .text ghost_disappear__FP15disappear_classf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void ghost_disappear(disappear_class* param_0, f32 param_1) { - nofralloc -#include "asm/rel/d/a/d_a_disappear/d_a_disappear/ghost_disappear__FP15disappear_classf.s" +static void ghost_disappear(disappear_class* i_this, f32 i_scale) { + static u16 da_name[] = {0x86A7, 0x86A8, 0x86A9, 0x86AA, 0x86AB}; + + cXyz scale; + scale.set(i_scale, i_scale, i_scale); + + for (int i = 0; i < 5; i++) { + dComIfGp_particle_set(da_name[i], &i_this->current.pos, NULL, &scale); + } } -#pragma pop - -/* ############################################################################################## */ -/* 804A9464-804A9468 000004 0004+00 0/1 0/0 0/0 .rodata @3787 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3787 = -1.0f; -COMPILER_STRIP_GATE(0x804A9464, &lit_3787); -#pragma pop - -/* 804A9468-804A946C 000008 0004+00 0/1 0/0 0/0 .rodata @3788 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3788 = 0x3FD53F7D; -COMPILER_STRIP_GATE(0x804A9468, &lit_3788); -#pragma pop - -/* 804A9494-804A94A4 000014 000E+02 1/1 0/0 0/0 .data da_name$3736 */ -SECTION_DATA static u8 da_name_3736[14 + 2 /* padding */] = { - 0x01, - 0x08, - 0x01, - 0x09, - 0x01, - 0x0A, - 0x01, - 0x0B, - 0x01, - 0x0C, - 0x01, - 0x54, - 0x01, - 0x55, - /* padding */ - 0x00, - 0x00, -}; /* 804A9130-804A9364 000290 0234+00 1/1 0/0 0/0 .text set_disappear__FP15disappear_classf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void set_disappear(disappear_class* param_0, f32 param_1) { - nofralloc -#include "asm/rel/d/a/d_a_disappear/d_a_disappear/set_disappear__FP15disappear_classf.s" +static void set_disappear(disappear_class* i_this, f32 i_scale) { + static u16 da_name[] = {0x0108, 0x0109, 0x010A, 0x010B, 0x010C, 0x0154, 0x0155}; + + dKy_Sound_set(i_this->current.pos, 120, fopAcM_GetID(i_this), 10); + + i_fpcM_Search(s_ks_sub, i_this); + + if (i_this->field_0x567 == 3) { + fopAcM_seStart(i_this, JA_SE_CM_MONS_EXPLODE, 0); + ghost_disappear(i_this, i_scale); + } else if (i_this->field_0x567 >= 1) { + fopAcM_seStart(i_this, Z2SE_DARK_VANISH, 0); + yami_disappear(i_this, i_scale * 1.666f); + } else { + fopAcM_seStart(i_this, JA_SE_CM_MONS_EXPLODE, 0); + + cXyz scale; + scale.set(i_scale, i_scale, i_scale); + + i_this->mDeleteTimer = 58; + for (int i = 0; i < 7; i++) { + dComIfGp_particle_set(da_name[i], &i_this->current.pos, NULL, &scale); + } + } } -#pragma pop - -/* ############################################################################################## */ -/* 804A946C-804A9470 00000C 0004+00 0/1 0/0 0/0 .rodata @3825 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3825 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x804A946C, &lit_3825); -#pragma pop - -/* 804A9470-804A9474 000010 0004+00 0/1 0/0 0/0 .rodata @3826 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3826 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x804A9470, &lit_3826); -#pragma pop - -/* 804A9474-804A9478 000014 0004+00 0/1 0/0 0/0 .rodata @3827 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3827 = 50.0f; -COMPILER_STRIP_GATE(0x804A9474, &lit_3827); -#pragma pop - -/* 804A9478-804A9480 000018 0008+00 0/1 0/0 0/0 .rodata @3829 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3829[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x804A9478, &lit_3829); -#pragma pop /* 804A9364-804A9458 0004C4 00F4+00 1/0 0/0 0/0 .text daDisappear_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDisappear_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_disappear/d_a_disappear/daDisappear_Create__FP10fopAc_ac_c.s" +static int daDisappear_Create(fopAc_ac_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) disappear_class(); + fopAcM_OnCondition(i_this, 8); + } + disappear_class* this_ = (disappear_class*)i_this; + + this_->field_0x567 = fopAcM_GetParam(this_); + + f32 particle_scale = (fopAcM_GetParam(this_) >> 0x8) & 0xFF; + if (particle_scale >= 50.0f) { + particle_scale *= 0.01f; + } else { + particle_scale *= 0.1f; + } + + u8 enemy_id = fopAcM_GetParam(this_) >> 0x10; + if (enemy_id != 0xFF) { + fopAcM_createItemFromEnemyID(enemy_id, &this_->current.pos, -1, -1, NULL, NULL, NULL, NULL); + } + + set_disappear(this_, particle_scale); + return cPhs_COMPLEATE_e; } -#pragma pop /* ############################################################################################## */ /* 804A94A4-804A94C4 -00001 0020+00 1/0 0/0 0/0 .data l_daDisappear_Method */ -SECTION_DATA static void* l_daDisappear_Method[8] = { - (void*)daDisappear_Create__FP10fopAc_ac_c, - (void*)daDisappear_Delete__FP15disappear_class, - (void*)daDisappear_Execute__FP15disappear_class, - (void*)daDisappear_IsDelete__FP15disappear_class, - (void*)daDisappear_Draw__FP15disappear_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daDisappear_Method = { + (process_method_func)daDisappear_Create, (process_method_func)daDisappear_Delete, + (process_method_func)daDisappear_Execute, (process_method_func)daDisappear_IsDelete, + (process_method_func)daDisappear_Draw, }; /* 804A94C4-804A94F4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_DISAPPEAR */ -SECTION_DATA extern void* g_profile_DISAPPEAR[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01390000, (void*)&g_fpcLf_Method, - (void*)0x00000578, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02D50000, (void*)&l_daDisappear_Method, - (void*)0x00044000, (void*)NULL, +extern actor_process_profile_definition g_profile_DISAPPEAR = { + -3, + 7, + -3, + PROC_DISAPPEAR, + &g_fpcLf_Method.mBase, + sizeof(disappear_class), + 0, + 0, + &g_fopAc_Method.base, + 725, + &l_daDisappear_Method, + 0x44000, + 0, + 0, }; diff --git a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp index db890c3bd5..5c838df038 100644 --- a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp +++ b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp @@ -1,310 +1,197 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_kytag16 -// +/** + * d_a_kytag16.cpp + * + */ #include "rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct kytag16_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct cXyz {}; - -struct _GXColor {}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -// -// Forward References: -// - -extern "C" static bool daKytag16_Draw__FP13kytag16_class(); -extern "C" static void daKytag16_Execute__FP13kytag16_class(); -extern "C" static bool daKytag16_IsDelete__FP13kytag16_class(); -extern "C" static bool daKytag16_Delete__FP13kytag16_class(); -extern "C" static void daKytag16_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_kytag16__stringBase0; -extern "C" extern void* g_profile_KYTAG16[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void dKy_getdaytime_hour__Fv(); -extern "C" void dKy_BossSpotLight_set__FP4cXyzfffP8_GXColorfUcUc(); -extern "C" void cM_rndFX__Ff(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "SSystem/SComponent/c_counter.h" +#include "SSystem/SComponent/c_math.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 80860C58-80860C60 000078 0008+00 1/0 0/0 0/0 .text daKytag16_Draw__FP13kytag16_class */ -static bool daKytag16_Draw(kytag16_class* param_0) { - return true; +static int daKytag16_Draw(kytag16_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80861134-80861138 000000 0004+00 2/2 0/0 0/0 .rodata @3839 */ -SECTION_RODATA static u8 const lit_3839[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80861134, &lit_3839); - -/* 80861138-8086113C 000004 0004+00 0/2 0/0 0/0 .rodata @3840 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3840 = 1.0f; -COMPILER_STRIP_GATE(0x80861138, &lit_3840); -#pragma pop - -/* 8086113C-80861140 000008 0004+00 0/1 0/0 0/0 .rodata @3841 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3841 = 0.5f; -COMPILER_STRIP_GATE(0x8086113C, &lit_3841); -#pragma pop - -/* 80861140-80861144 00000C 0004+00 0/1 0/0 0/0 .rodata @3842 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3842 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80861140, &lit_3842); -#pragma pop - -/* 80861144-80861148 000010 0004+00 0/1 0/0 0/0 .rodata @3843 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3843 = 0x38D1B717; -COMPILER_STRIP_GATE(0x80861144, &lit_3843); -#pragma pop - -/* 80861148-8086114C 000014 0004+00 0/1 0/0 0/0 .rodata @3844 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3844 = 9.0f / 10.0f; -COMPILER_STRIP_GATE(0x80861148, &lit_3844); -#pragma pop - -/* 8086114C-80861150 000018 0004+00 0/1 0/0 0/0 .rodata @3845 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3845 = 40.0f; -COMPILER_STRIP_GATE(0x8086114C, &lit_3845); -#pragma pop - -/* 80861150-80861154 00001C 0004+00 0/1 0/0 0/0 .rodata @3846 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3846 = 1.0f / 20.0f; -COMPILER_STRIP_GATE(0x80861150, &lit_3846); -#pragma pop - -/* 80861154-80861158 000020 0004+00 0/1 0/0 0/0 .rodata @3847 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_3847 = 0x3A83126F; -COMPILER_STRIP_GATE(0x80861154, &lit_3847); -#pragma pop - -/* 80861158-8086115C 000024 0004+00 0/1 0/0 0/0 .rodata @3848 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3848 = 12.0f; -COMPILER_STRIP_GATE(0x80861158, &lit_3848); -#pragma pop - -/* 8086115C-80861160 000028 0004+00 0/1 0/0 0/0 .rodata @3849 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3849 = 50.0f; -COMPILER_STRIP_GATE(0x8086115C, &lit_3849); -#pragma pop - -/* 80861194-80861194 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80861194 = "F_SP117"; -#pragma pop - /* 80860C60-80860E9C 000080 023C+00 1/0 0/0 0/0 .text daKytag16_Execute__FP13kytag16_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag16_Execute(kytag16_class* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s" +static int daKytag16_Execute(kytag16_class* i_this) { + bool var_r29 = false; + f32 var_f31 = 0.0f; + f32 var_f30 = 0.0f; + + if (i_this->field_0x571 < 31) { + if (i_this->field_0x571 > i_this->field_0x572) { + if (dKy_getdaytime_hour() >= i_this->field_0x571 || + dKy_getdaytime_hour() <= i_this->field_0x572) + { + var_r29 = true; + } + } else if (dKy_getdaytime_hour() >= i_this->field_0x571 && + dKy_getdaytime_hour() <= i_this->field_0x572) + { + var_r29 = true; + } + } else { + var_r29 = true; + } + + if (var_r29) { + var_r29 = false; + + if (i_this->field_0x573 != 0xFF) { + s32 room_no = dComIfGp_roomControl_getStayNo(); + + if (dComIfGs_isSwitch(i_this->field_0x573, room_no)) { + var_r29 = true; + } + } else { + var_r29 = true; + } + } + + if (var_r29) { + if (strcmp(dComIfGp_getStartStageName(), "F_SP117") != 0) { + cLib_addCalc(&i_this->field_0x568, 1.0f, 0.5f, 0.1f, 0.0001f); + } else { + var_f31 = cM_ssin(i_this->field_0x588); + var_f30 = cM_scos(i_this->field_0x58a); + + i_this->field_0x588 += 0x500; + i_this->field_0x58a += 800; + + cLib_addCalc(&i_this->field_0x568, 0.9f + (0.1f * cM_ssin(g_Counter.mCounter0 * 0x500)), + 0.5f, 0.1f, 0.0001f); + i_this->field_0x580 = 40.0f; + } + } else { + cLib_addCalc(&i_this->field_0x568, 0.0f, 0.5f, 0.05f, 0.0001f); + } + + if (i_this->field_0x568 > 0.001f) { + dKy_BossSpotLight_set(&i_this->current.pos, i_this->field_0x578 + (12.0f * var_f31), + i_this->field_0x57c + (50.0f * var_f30), i_this->field_0x580, + &i_this->field_0x56d, i_this->field_0x574 * i_this->field_0x568, + i_this->field_0x58c, i_this->field_0x58d); + } + + return 1; } -#pragma pop /* 80860E9C-80860EA4 0002BC 0008+00 1/0 0/0 0/0 .text daKytag16_IsDelete__FP13kytag16_class */ -static bool daKytag16_IsDelete(kytag16_class* param_0) { - return true; +static int daKytag16_IsDelete(kytag16_class* i_this) { + return 1; } /* 80860EA4-80860EAC 0002C4 0008+00 1/0 0/0 0/0 .text daKytag16_Delete__FP13kytag16_class */ -static bool daKytag16_Delete(kytag16_class* param_0) { - return true; +static int daKytag16_Delete(kytag16_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 80861160-80861164 00002C 0004+00 0/1 0/0 0/0 .rodata @3902 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3902 = 180.0f; -COMPILER_STRIP_GATE(0x80861160, &lit_3902); -#pragma pop - -/* 80861164-80861168 000030 0004+00 0/1 0/0 0/0 .rodata @3903 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3903 = 32767.0f; -COMPILER_STRIP_GATE(0x80861164, &lit_3903); -#pragma pop - -/* 80861168-8086116C 000034 0004+00 0/1 0/0 0/0 .rodata @3904 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3904 = 65535.0f; -COMPILER_STRIP_GATE(0x80861168, &lit_3904); -#pragma pop - -/* 8086116C-80861170 000038 0004+00 0/1 0/0 0/0 .rodata @3905 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3905 = 45.0f; -COMPILER_STRIP_GATE(0x8086116C, &lit_3905); -#pragma pop - -/* 80861170-80861174 00003C 0004+00 0/0 0/0 0/0 .rodata @3906 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3906 = 5.0f; -COMPILER_STRIP_GATE(0x80861170, &lit_3906); -#pragma pop - -/* 80861174-80861178 000040 0004+00 0/0 0/0 0/0 .rodata @3907 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3907 = 10.0f; -COMPILER_STRIP_GATE(0x80861174, &lit_3907); -#pragma pop - -/* 80861178-8086117C 000044 0004+00 0/0 0/0 0/0 .rodata @3908 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3908 = 25.0f; -COMPILER_STRIP_GATE(0x80861178, &lit_3908); -#pragma pop - -/* 8086117C-80861180 000048 0004+00 0/0 0/0 0/0 .rodata @3909 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3909 = 70.0f; -COMPILER_STRIP_GATE(0x8086117C, &lit_3909); -#pragma pop - -/* 80861180-80861184 00004C 0004+00 0/0 0/0 0/0 .rodata @3910 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3910 = 60.0f; -COMPILER_STRIP_GATE(0x80861180, &lit_3910); -#pragma pop - -/* 80861184-8086118C 000050 0004+04 0/0 0/0 0/0 .rodata @3911 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3911[1 + 1 /* padding */] = { - 1.0f / 100.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80861184, &lit_3911); -#pragma pop - -/* 8086118C-80861194 000058 0008+00 0/1 0/0 0/0 .rodata @3913 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3913[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8086118C, &lit_3913); -#pragma pop - -/* 8086119C-808611BC -00001 0020+00 1/1 0/0 0/0 .data @3917 */ -SECTION_DATA static void* lit_3917[8] = { - (void*)(((char*)daKytag16_Create__FP10fopAc_ac_c) + 0x150), - (void*)(((char*)daKytag16_Create__FP10fopAc_ac_c) + 0x170), - (void*)(((char*)daKytag16_Create__FP10fopAc_ac_c) + 0x194), - (void*)(((char*)daKytag16_Create__FP10fopAc_ac_c) + 0x1B8), - (void*)(((char*)daKytag16_Create__FP10fopAc_ac_c) + 0x1D8), - (void*)(((char*)daKytag16_Create__FP10fopAc_ac_c) + 0x1FC), - (void*)(((char*)daKytag16_Create__FP10fopAc_ac_c) + 0x220), - (void*)(((char*)daKytag16_Create__FP10fopAc_ac_c) + 0x244), -}; - /* 80860EAC-8086112C 0002CC 0280+00 2/0 0/0 0/0 .text daKytag16_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daKytag16_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Create__FP10fopAc_ac_c.s" +static int daKytag16_Create(fopAc_ac_c* i_this) { + if (!fopAcM_CheckCondition(i_this, 8)) { + new (i_this) kytag16_class(); + fopAcM_OnCondition(i_this, 8); + } + kytag16_class* this_ = (kytag16_class*)i_this; + + this_->field_0x573 = fopAcM_GetParam(this_) & 0xFF; + this_->field_0x56c = (this_->current.angle.z >> 10) & 0x3F; + + this_->field_0x56d.r = fopAcM_GetParam(this_) >> 0x8; + this_->field_0x56d.g = fopAcM_GetParam(this_) >> 0x10; + this_->field_0x56d.b = fopAcM_GetParam(this_) >> 0x18; + + this_->field_0x571 = this_->current.angle.z & 0x1F; + this_->field_0x572 = (this_->current.angle.z >> 5) & 0x1F; + this_->field_0x578 = (this_->shape_angle.x / 32767.0f) * 180.0f; + this_->field_0x57c = (this_->shape_angle.y / 32767.0f) * 180.0f; + + this_->field_0x588 = cM_rndFX(65535.0f); + this_->field_0x58a = cM_rndFX(65535.0f); + this_->field_0x584 = 1.0f; + this_->field_0x568 = 0.0f; + + switch (this_->field_0x56c) { + case 0: + this_->field_0x580 = 45.0f; + this_->field_0x574 = 1.0f; + this_->field_0x58c = 0; + this_->field_0x58d = 3; + break; + case 1: + this_->field_0x580 = 45.0f; + this_->field_0x574 = 5.0f; + this_->field_0x58c = 0; + this_->field_0x58d = 3; + break; + case 2: + this_->field_0x580 = 45.0f; + this_->field_0x574 = 10.0f; + this_->field_0x58c = 0; + this_->field_0x58d = 3; + break; + case 3: + this_->field_0x580 = 25.0f; + this_->field_0x574 = 1.0f; + this_->field_0x58c = 2; + this_->field_0x58d = 3; + break; + case 4: + this_->field_0x580 = 45.0f; + this_->field_0x574 = 5.0f; + this_->field_0x58c = 2; + this_->field_0x58d = 3; + break; + case 5: + this_->field_0x580 = 70.0f; + this_->field_0x574 = 10.0f; + this_->field_0x58c = 2; + this_->field_0x58d = 3; + break; + case 6: + this_->field_0x580 = 60.0f; + this_->field_0x574 = 0.01f; + this_->field_0x58c = 2; + this_->field_0x58d = 1; + break; + case 7: + this_->field_0x580 = 50.0f; + this_->field_0x574 = 0.01f; + this_->field_0x58c = 2; + this_->field_0x58d = 1; + break; + } + + return cPhs_COMPLEATE_e; } -#pragma pop /* ############################################################################################## */ /* 808611BC-808611DC -00001 0020+00 1/0 0/0 0/0 .data l_daKytag16_Method */ -SECTION_DATA static void* l_daKytag16_Method[8] = { - (void*)daKytag16_Create__FP10fopAc_ac_c, - (void*)daKytag16_Delete__FP13kytag16_class, - (void*)daKytag16_Execute__FP13kytag16_class, - (void*)daKytag16_IsDelete__FP13kytag16_class, - (void*)daKytag16_Draw__FP13kytag16_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daKytag16_Method = { + (process_method_func)daKytag16_Create, (process_method_func)daKytag16_Delete, + (process_method_func)daKytag16_Execute, (process_method_func)daKytag16_IsDelete, + (process_method_func)daKytag16_Draw, }; /* 808611DC-8086120C -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG16 */ -SECTION_DATA extern void* g_profile_KYTAG16[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02BA0000, (void*)&g_fpcLf_Method, - (void*)0x00000590, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x006E0000, (void*)&l_daKytag16_Method, - (void*)0x00060000, (void*)NULL, +extern actor_process_profile_definition g_profile_KYTAG16 = { + -3, + 7, + -3, + PROC_KYTAG16, + &g_fpcLf_Method.mBase, + sizeof(kytag16_class), + 0, + 0, + &g_fopAc_Method.base, + 110, + &l_daKytag16_Method, + 0x60000, + 0, + 0, }; - -/* 80861194-80861194 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp index b8354cabaa..dffc11f020 100644 --- a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp +++ b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp @@ -1,333 +1,173 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_crystal -// +/** + * d_a_obj_crystal.cpp + * + */ #include "rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz {}; - -struct cXyz {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjCrystal_c { - /* 80BD63B8 */ void initBaseMtx(); - /* 80BD6410 */ void setBaseMtx(); - /* 80BD6470 */ void Create(); - /* 80BD65B0 */ void CreateHeap(); - /* 80BD6664 */ void create(); - /* 80BD6718 */ void execute(); - /* 80BD673C */ void draw(); - /* 80BD67C8 */ void _delete(); -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -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 dPa_levelEcallBack {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct J3DModel {}; - -// -// Forward References: -// - -extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); -extern "C" void initBaseMtx__14daObjCrystal_cFv(); -extern "C" void setBaseMtx__14daObjCrystal_cFv(); -extern "C" void Create__14daObjCrystal_cFv(); -extern "C" void CreateHeap__14daObjCrystal_cFv(); -extern "C" void create__14daObjCrystal_cFv(); -extern "C" void execute__14daObjCrystal_cFv(); -extern "C" void draw__14daObjCrystal_cFv(); -extern "C" void _delete__14daObjCrystal_cFv(); -extern "C" static void daObjCrystal_Draw__FP14daObjCrystal_c(); -extern "C" static void daObjCrystal_Execute__FP14daObjCrystal_c(); -extern "C" static void daObjCrystal_Delete__FP14daObjCrystal_c(); -extern "C" static void daObjCrystal_Create__FP14daObjCrystal_c(); -extern "C" extern char const* const d_a_obj_crystal__stringBase0; -extern "C" extern void* g_profile_Obj_Crystal[12]; - -// -// External References: -// - -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -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 dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_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 func_802807E0(); -extern "C" void getName__10JUTNameTabCFUs(); -extern "C" void PSMTXCopy(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void strcmp(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 80BD6398-80BD63B8 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void CheckCreateHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/CheckCreateHeap__FP10fopAc_ac_c.s" +static int CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast(i_this)->CreateHeap(); } -#pragma pop /* 80BD63B8-80BD6410 000098 0058+00 1/1 0/0 0/0 .text initBaseMtx__14daObjCrystal_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCrystal_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/initBaseMtx__14daObjCrystal_cFv.s" +void daObjCrystal_c::initBaseMtx() { + mpModel[0]->setBaseScale(mScale); + mpModel[1]->setBaseScale(mScale); + setBaseMtx(); } -#pragma pop /* 80BD6410-80BD6470 0000F0 0060+00 2/2 0/0 0/0 .text setBaseMtx__14daObjCrystal_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCrystal_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/setBaseMtx__14daObjCrystal_cFv.s" +void daObjCrystal_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::ZXYrotM(shape_angle); + + mpModel[0]->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel[1]->i_setBaseTRMtx(mDoMtx_stack_c::get()); } -#pragma pop - -/* ############################################################################################## */ -/* 80BD68BC-80BD68C0 000000 0004+00 2/2 0/0 0/0 .rodata @3693 */ -SECTION_RODATA static f32 const lit_3693 = 1.0f; -COMPILER_STRIP_GATE(0x80BD68BC, &lit_3693); - -/* 80BD68D8-80BD68D8 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80BD68D8 = "H_Suisho"; -SECTION_DEAD static char const* const stringBase_80BD68E1 = "polySurface1"; -#pragma pop - -/* 80BD6470-80BD65B0 000150 0140+00 1/1 0/0 0/0 .text Create__14daObjCrystal_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCrystal_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/Create__14daObjCrystal_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80BD68C0-80BD68C8 000004 0008+00 0/1 0/0 0/0 .rodata l_bmd$3697 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_bmd[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x07, -}; -COMPILER_STRIP_GATE(0x80BD68C0, &l_bmd); -#pragma pop - -/* 80BD68C8-80BD68D0 00000C 0008+00 0/1 0/0 0/0 .rodata l_diff_flag$3698 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_diff_flag[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BD68C8, &l_diff_flag); -#pragma pop - -/* 80BD68D0-80BD68D8 000014 0008+00 0/1 0/0 0/0 .rodata l_flag$3699 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_flag[8] = { - 0x19, 0x00, 0x00, 0x84, 0x11, 0x00, 0x00, 0x84, -}; -COMPILER_STRIP_GATE(0x80BD68D0, &l_flag); -#pragma pop /* 80BD68F0-80BD68F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_crystal__stringBase0; +static char* l_arcName = "H_Suisho"; + +/* 80BD6470-80BD65B0 000150 0140+00 1/1 0/0 0/0 .text Create__14daObjCrystal_cFv */ +int daObjCrystal_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, mpModel[0]->getBaseTRMtx()); + + mpEmitter = dComIfGp_particle_set(0x8BED, ¤t.pos, &orig.angle, &mScale, 255, NULL, -1, + NULL, NULL, NULL); + mJointID = 0xFFFF; + + JUTNameTab* joint_name = mpModel[0]->getModelData()->getJointTree().getJointName(); + for (u16 i = 0; i < mpModel[0]->getModelData()->getJointNum(); i++) { + if (strcmp(joint_name->getName(i), "polySurface1") == 0) { + mJointID = i; + } + } + + mpModel[0]->calc(); + + if (mpEmitter != NULL) { + mpEmitter->setGlobalRTMatrix(mpModel[0]->i_getAnmMtx(mJointID)); + } + + return 1; +} /* 80BD65B0-80BD6664 000290 00B4+00 1/1 0/0 0/0 .text CreateHeap__14daObjCrystal_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCrystal_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/CreateHeap__14daObjCrystal_cFv.s" +int daObjCrystal_c::CreateHeap() { + static int const l_bmd[] = {4, 7}; + static u32 const l_diff_flag[] = {0, 0x80000}; + static u32 const l_flag[] = {0x19000084, 0x11000084}; + + for (int i = 0; i < 2; i++) { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[i]); + + mpModel[i] = mDoExt_J3DModel__create(modelData, l_diff_flag[i], l_flag[i]); + if (mpModel[i] == NULL) { + return 0; + } + } + + return 1; } -#pragma pop /* 80BD6664-80BD6718 000344 00B4+00 1/1 0/0 0/0 .text create__14daObjCrystal_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCrystal_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/func_80BD6664.s" +int daObjCrystal_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daObjCrystal_c(); + fopAcM_OnCondition(this, 8); + } + + int phase = dComIfG_resLoad(&mPhase, l_arcName); + if (phase == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x4000)) { + return cPhs_ERROR_e; + } + + if (!Create()) { + return cPhs_ERROR_e; + } + } + + return phase; } -#pragma pop /* 80BD6718-80BD673C 0003F8 0024+00 1/1 0/0 0/0 .text execute__14daObjCrystal_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCrystal_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/execute__14daObjCrystal_cFv.s" +int daObjCrystal_c::execute() { + setBaseMtx(); + return 1; } -#pragma pop /* 80BD673C-80BD67C8 00041C 008C+00 1/1 0/0 0/0 .text draw__14daObjCrystal_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCrystal_c::draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/draw__14daObjCrystal_cFv.s" +int daObjCrystal_c::draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + + for (int i = 0; i < 2; i++) { + g_env_light.setLightTevColorType_MAJI(mpModel[i], &mTevStr); + mDoExt_modelUpdateDL(mpModel[i]); + } + + return 1; } -#pragma pop /* 80BD67C8-80BD6834 0004A8 006C+00 1/1 0/0 0/0 .text _delete__14daObjCrystal_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjCrystal_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/_delete__14daObjCrystal_cFv.s" +int daObjCrystal_c::_delete() { + if (mpEmitter != NULL) { + mpEmitter->becomeInvalidEmitter(); + mpEmitter->quitImmortalEmitter(); + mpEmitter = NULL; + } + + dComIfG_resDelete(&mPhase, l_arcName); + return 1; } -#pragma pop /* 80BD6834-80BD6854 000514 0020+00 1/0 0/0 0/0 .text daObjCrystal_Draw__FP14daObjCrystal_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjCrystal_Draw(daObjCrystal_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Draw__FP14daObjCrystal_c.s" +static int daObjCrystal_Draw(daObjCrystal_c* i_this) { + return i_this->draw(); } -#pragma pop /* 80BD6854-80BD6874 000534 0020+00 1/0 0/0 0/0 .text daObjCrystal_Execute__FP14daObjCrystal_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjCrystal_Execute(daObjCrystal_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Execute__FP14daObjCrystal_c.s" +static int daObjCrystal_Execute(daObjCrystal_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80BD6874-80BD6894 000554 0020+00 1/0 0/0 0/0 .text daObjCrystal_Delete__FP14daObjCrystal_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjCrystal_Delete(daObjCrystal_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Delete__FP14daObjCrystal_c.s" +static int daObjCrystal_Delete(daObjCrystal_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80BD6894-80BD68B4 000574 0020+00 1/0 0/0 0/0 .text daObjCrystal_Create__FP14daObjCrystal_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjCrystal_Create(daObjCrystal_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal/daObjCrystal_Create__FP14daObjCrystal_c.s" +static int daObjCrystal_Create(daObjCrystal_c* i_this) { + return i_this->create(); } -#pragma pop /* ############################################################################################## */ /* 80BD68F4-80BD6914 -00001 0020+00 1/0 0/0 0/0 .data l_daObjCrystal_Method */ -SECTION_DATA static void* l_daObjCrystal_Method[8] = { - (void*)daObjCrystal_Create__FP14daObjCrystal_c, - (void*)daObjCrystal_Delete__FP14daObjCrystal_c, - (void*)daObjCrystal_Execute__FP14daObjCrystal_c, - (void*)NULL, - (void*)daObjCrystal_Draw__FP14daObjCrystal_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjCrystal_Method = { + (process_method_func)daObjCrystal_Create, (process_method_func)daObjCrystal_Delete, + (process_method_func)daObjCrystal_Execute, (process_method_func)NULL, + (process_method_func)daObjCrystal_Draw, }; /* 80BD6914-80BD6944 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Crystal */ -SECTION_DATA extern void* g_profile_Obj_Crystal[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01A40000, (void*)&g_fpcLf_Method, - (void*)0x00000580, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02430000, (void*)&l_daObjCrystal_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_Crystal = { + -3, + 7, + -3, + PROC_Obj_Crystal, + &g_fpcLf_Method.mBase, + sizeof(daObjCrystal_c), + 0, + 0, + &g_fopAc_Method.base, + 579, + &l_daObjCrystal_Method, + 0x40000, + 0, + 14, }; - -/* 80BD68D8-80BD68D8 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp index 4e5d5404da..3861fd49b1 100644 --- a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp +++ b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp @@ -1,258 +1,123 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv3waterEff -// +/** + * d_a_obj_lv3waterEff.cpp + * Lakebed Temple Pre-Deku Toad Room Water Bubbles + */ #include "rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daObjWaterEff_c { - /* 80C5C4F8 */ void Create(); - /* 80C5C5DC */ void create(); - /* 80C5C6B0 */ void execute(); - /* 80C5C7B8 */ void _delete(); -}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct cXyz { - /* 80C5C670 */ ~cXyz(); - /* 80C5C6AC */ cXyz(); -}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -// -// Forward References: -// - -extern "C" void Create__15daObjWaterEff_cFv(); -extern "C" void create__15daObjWaterEff_cFv(); -extern "C" void __dt__4cXyzFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" void execute__15daObjWaterEff_cFv(); -extern "C" void _delete__15daObjWaterEff_cFv(); -extern "C" static void daObjWaterEff_Execute__FP15daObjWaterEff_c(); -extern "C" static void daObjWaterEff_Delete__FP15daObjWaterEff_c(); -extern "C" static void daObjWaterEff_Create__FP10fopAc_ac_c(); -extern "C" extern void* g_profile_Obj_WaterEff[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dKy_camera_water_in_status_check__Fv(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __construct_array(); -extern "C" void _savegpr_25(); -extern "C" void _restgpr_25(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80C5C878-80C5C880 000000 0008+00 1/1 0/0 0/0 .rodata l_eff_id */ -SECTION_RODATA static u8 const l_eff_id[8] = { - 0x86, 0xD2, 0x86, 0xD3, 0x86, 0xD4, 0x86, 0xD5, +static u16 const l_eff_id[] = { + 0x86D2, + 0x86D3, + 0x86D4, + 0x86D5, }; -COMPILER_STRIP_GATE(0x80C5C878, &l_eff_id); - -/* 80C5C880-80C5C884 000008 0004+00 1/2 0/0 0/0 .rodata @3637 */ -SECTION_RODATA static f32 const lit_3637 = 1.0f; -COMPILER_STRIP_GATE(0x80C5C880, &lit_3637); - -/* 80C5C884-80C5C888 00000C 0004+00 0/1 0/0 0/0 .rodata @3638 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3638 = 14420.0f; -COMPILER_STRIP_GATE(0x80C5C884, &lit_3638); -#pragma pop - -/* 80C5C888-80C5C88C 000010 0004+00 0/1 0/0 0/0 .rodata @3639 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3639 = -1100.0f; -COMPILER_STRIP_GATE(0x80C5C888, &lit_3639); -#pragma pop - -/* 80C5C88C-80C5C890 000014 0004+00 0/1 0/0 0/0 .rodata @3640 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3640 = -4950.0f; -COMPILER_STRIP_GATE(0x80C5C88C, &lit_3640); -#pragma pop - -/* 80C5C890-80C5C894 000018 0004+00 0/1 0/0 0/0 .rodata @3641 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3641 = 12585.0f; -COMPILER_STRIP_GATE(0x80C5C890, &lit_3641); -#pragma pop - -/* 80C5C894-80C5C898 00001C 0004+00 0/1 0/0 0/0 .rodata @3642 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3642 = -550.0f; -COMPILER_STRIP_GATE(0x80C5C894, &lit_3642); -#pragma pop - -/* 80C5C898-80C5C89C 000020 0004+00 0/1 0/0 0/0 .rodata @3643 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3643 = -2390.0f; -COMPILER_STRIP_GATE(0x80C5C898, &lit_3643); -#pragma pop /* 80C5C4F8-80C5C5DC 000078 00E4+00 1/1 0/0 0/0 .text Create__15daObjWaterEff_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjWaterEff_c::Create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/Create__15daObjWaterEff_cFv.s" +int daObjWaterEff_c::Create() { + for (int i = 0; i < 4; i++) { + mParticles[i] = dComIfGp_particle_set(l_eff_id[i], ¤t.pos, NULL, NULL, 0xFF, NULL, -1, + NULL, NULL, NULL); + } + + mSePositions[0].set(14420.0f, -1100.0f, -4950.0f); + mSePositions[1].set(12585.0f, -550.0f, -2390.0f); + return 1; } -#pragma pop /* 80C5C5DC-80C5C670 00015C 0094+00 1/1 0/0 0/0 .text create__15daObjWaterEff_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjWaterEff_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/func_80C5C5DC.s" -} -#pragma pop +int daObjWaterEff_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daObjWaterEff_c(); + fopAcM_OnCondition(this, 8); + } -/* 80C5C670-80C5C6AC 0001F0 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cXyz::~cXyz() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/__dt__4cXyzFv.s" -} -#pragma pop + if (!Create()) { + return cPhs_ERROR_e; + } -/* 80C5C6AC-80C5C6B0 00022C 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { - /* empty function */ + return cPhs_COMPLEATE_e; } -/* ############################################################################################## */ -/* 80C5C89C-80C5C8A0 000024 0004+00 1/1 0/0 0/0 .rodata @3710 */ -SECTION_RODATA static f32 const lit_3710 = -1.0f; -COMPILER_STRIP_GATE(0x80C5C89C, &lit_3710); - /* 80C5C6B0-80C5C7B8 000230 0108+00 1/1 0/0 0/0 .text execute__15daObjWaterEff_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjWaterEff_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/execute__15daObjWaterEff_cFv.s" +int daObjWaterEff_c::execute() { + if (dKy_camera_water_in_status_check()) { + for (int i = 0; i < 4; i++) { + if (mParticles[i] != NULL) { + mParticles[i]->setGlobalAlpha(255); + } + } + } else { + for (int i = 0; i < 4; i++) { + if (mParticles[i] != NULL) { + mParticles[i]->setGlobalAlpha(128); + } + } + } + + for (int i = 0; i < 2; i++) { + i_mDoAud_seStartLevel(Z2SE_OBJ_WTR_STREAM, &mSePositions[i], 0, 0); + } + + return 1; } -#pragma pop /* 80C5C7B8-80C5C810 000338 0058+00 1/1 0/0 0/0 .text _delete__15daObjWaterEff_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjWaterEff_c::_delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/_delete__15daObjWaterEff_cFv.s" +int daObjWaterEff_c::_delete() { + for (int i = 0; i < 4; i++) { + if (mParticles[i] != NULL) { + mParticles[i]->becomeInvalidEmitter(); + mParticles[i]->quitImmortalEmitter(); + mParticles[i] = NULL; + } + } + + return 1; } -#pragma pop /* 80C5C810-80C5C830 000390 0020+00 1/0 0/0 0/0 .text daObjWaterEff_Execute__FP15daObjWaterEff_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjWaterEff_Execute(daObjWaterEff_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Execute__FP15daObjWaterEff_c.s" +static int daObjWaterEff_Execute(daObjWaterEff_c* i_this) { + return i_this->execute(); } -#pragma pop /* 80C5C830-80C5C850 0003B0 0020+00 1/0 0/0 0/0 .text daObjWaterEff_Delete__FP15daObjWaterEff_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjWaterEff_Delete(daObjWaterEff_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Delete__FP15daObjWaterEff_c.s" +static int daObjWaterEff_Delete(daObjWaterEff_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 80C5C850-80C5C870 0003D0 0020+00 1/0 0/0 0/0 .text daObjWaterEff_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjWaterEff_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff/daObjWaterEff_Create__FP10fopAc_ac_c.s" +static int daObjWaterEff_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* ############################################################################################## */ /* 80C5C8A0-80C5C8C0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjWaterEff_Method */ -SECTION_DATA static void* l_daObjWaterEff_Method[8] = { - (void*)daObjWaterEff_Create__FP10fopAc_ac_c, - (void*)daObjWaterEff_Delete__FP15daObjWaterEff_c, - (void*)daObjWaterEff_Execute__FP15daObjWaterEff_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daObjWaterEff_Method = { + (process_method_func)daObjWaterEff_Create, + (process_method_func)daObjWaterEff_Delete, + (process_method_func)daObjWaterEff_Execute, + (process_method_func)NULL, + (process_method_func)NULL, }; /* 80C5C8C0-80C5C8F0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_WaterEff */ -SECTION_DATA extern void* g_profile_Obj_WaterEff[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x017F0000, (void*)&g_fpcLf_Method, - (void*)0x00000594, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x022B0000, (void*)&l_daObjWaterEff_Method, - (void*)0x00040100, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Obj_WaterEff = { + -3, + 7, + -3, + PROC_Obj_WaterEff, + &g_fpcLf_Method.mBase, + sizeof(daObjWaterEff_c), + 0, + 0, + &g_fopAc_Method.base, + 555, + &l_daObjWaterEff_Method, + 0x40100, + 0, + 14, }; diff --git a/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp b/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp index 6a73db8a1d..5b258932de 100644 --- a/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp +++ b/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp @@ -1,349 +1,126 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_lv4HsTarget -// +/** + * d_a_obj_lv4HsTarget.cpp + * Arbiter's Grounds Clawshot Target + */ #include "rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80C5F648 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c {}; - -struct daLv4HsTarget_c { - /* 80C5F690 */ void setBaseMtx(); - /* 80C5F718 */ void CreateHeap(); - /* 80C5F784 */ void create(); - /* 80C5F85C */ void Execute(f32 (**)[3][4]); - /* 80C5F870 */ void Draw(); - /* 80C5F8D4 */ void Delete(); -}; - -struct daLv4HsTarget_HIO_c { - /* 80C5F62C */ daLv4HsTarget_HIO_c(); - /* 80C5F990 */ ~daLv4HsTarget_HIO_c(); -}; - -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 J3DModel {}; - -// -// Forward References: -// - -extern "C" void __ct__19daLv4HsTarget_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__15daLv4HsTarget_cFv(); -extern "C" void CreateHeap__15daLv4HsTarget_cFv(); -extern "C" void create__15daLv4HsTarget_cFv(); -extern "C" void Execute__15daLv4HsTarget_cFPPA3_A4_f(); -extern "C" void Draw__15daLv4HsTarget_cFv(); -extern "C" void Delete__15daLv4HsTarget_cFv(); -extern "C" static void daLv4HsTarget_Draw__FP15daLv4HsTarget_c(); -extern "C" static void daLv4HsTarget_Execute__FP15daLv4HsTarget_c(); -extern "C" static void daLv4HsTarget_Delete__FP15daLv4HsTarget_c(); -extern "C" static void daLv4HsTarget_Create__FP10fopAc_ac_c(); -extern "C" void __dt__19daLv4HsTarget_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv4HsTarget_cpp(); -extern "C" extern char const* const d_a_obj_lv4HsTarget__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 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 __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C5FA48-80C5FA68 -00001 0020+00 1/0 0/0 0/0 .data l_daLv4HsTarget_Method */ -SECTION_DATA static void* l_daLv4HsTarget_Method[8] = { - (void*)daLv4HsTarget_Create__FP10fopAc_ac_c, - (void*)daLv4HsTarget_Delete__FP15daLv4HsTarget_c, - (void*)daLv4HsTarget_Execute__FP15daLv4HsTarget_c, - (void*)NULL, - (void*)daLv4HsTarget_Draw__FP15daLv4HsTarget_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80C5FA68-80C5FA98 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4HsTarget */ -SECTION_DATA extern void* g_profile_Obj_Lv4HsTarget[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x009F0000, (void*)&g_fpcLf_Method, - (void*)0x000005AC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02800000, (void*)&l_daLv4HsTarget_Method, - (void*)0x00040100, (void*)0x000E0000, -}; - -/* 80C5FA98-80C5FAC0 000050 0028+00 1/1 0/0 0/0 .data __vt__15daLv4HsTarget_c */ -SECTION_DATA extern void* __vt__15daLv4HsTarget_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__15daLv4HsTarget_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__15daLv4HsTarget_cFPPA3_A4_f, - (void*)Draw__15daLv4HsTarget_cFv, - (void*)Delete__15daLv4HsTarget_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C5FAC0-80C5FACC 000078 000C+00 2/2 0/0 0/0 .data __vt__19daLv4HsTarget_HIO_c */ -SECTION_DATA extern void* __vt__19daLv4HsTarget_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__19daLv4HsTarget_HIO_cFv, -}; - -/* 80C5FACC-80C5FAD8 000084 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, -}; +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 80C5F62C-80C5F648 0000EC 001C+00 1/1 0/0 0/0 .text __ct__19daLv4HsTarget_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daLv4HsTarget_HIO_c::daLv4HsTarget_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__ct__19daLv4HsTarget_HIO_cFv.s" -} -#pragma pop - -/* 80C5F648-80C5F690 000108 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_lv4HsTarget/d_a_obj_lv4HsTarget/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop +daLv4HsTarget_HIO_c::daLv4HsTarget_HIO_c() {} /* 80C5F690-80C5F718 000150 0088+00 1/1 0/0 0/0 .text setBaseMtx__15daLv4HsTarget_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv4HsTarget_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/setBaseMtx__15daLv4HsTarget_cFv.s" -} -#pragma pop +void daLv4HsTarget_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); -/* ############################################################################################## */ -/* 80C5FA3C-80C5FA3C 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C5FA3C = "L4HsMato"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80C5FA45 = "\0\0"; -#pragma pop + mpModel->setBaseScale(mScale); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); +} /* 80C5F718-80C5F784 0001D8 006C+00 1/0 0/0 0/0 .text CreateHeap__15daLv4HsTarget_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv4HsTarget_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/CreateHeap__15daLv4HsTarget_cFv.s" +int daLv4HsTarget_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L4HsMato", 4); + + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + return 1; } -#pragma pop /* 80C5F784-80C5F85C 000244 00D8+00 1/1 0/0 0/0 .text create__15daLv4HsTarget_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv4HsTarget_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/create__15daLv4HsTarget_cFv.s" +int daLv4HsTarget_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daLv4HsTarget_c(); + fopAcM_OnCondition(this, 8); + } + + int phase = dComIfG_resLoad(&mPhase, "L4HsMato"); + if (phase == cPhs_COMPLEATE_e) { + if (MoveBGCreate("L4HsMato", 7, dBgS_MoveBGProc_TypicalRotY, 0x1200, NULL) == cPhs_ERROR_e) + { + return cPhs_ERROR_e; + } + + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + setBaseMtx(); + } + + return phase; } -#pragma pop /* 80C5F85C-80C5F870 00031C 0014+00 1/0 0/0 0/0 .text Execute__15daLv4HsTarget_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv4HsTarget_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Execute__15daLv4HsTarget_cFPPA3_A4_f.s" +int daLv4HsTarget_c::Execute(Mtx** param_0) { + *param_0 = &mpModel->getBaseTRMtx(); + return 1; } -#pragma pop /* 80C5F870-80C5F8D4 000330 0064+00 1/0 0/0 0/0 .text Draw__15daLv4HsTarget_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv4HsTarget_c::Draw() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Draw__15daLv4HsTarget_cFv.s" +int daLv4HsTarget_c::Draw() { + g_env_light.settingTevStruct(0x40, ¤t.pos, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + + mDoExt_modelUpdateDL(mpModel); + return 1; } -#pragma pop /* 80C5F8D4-80C5F904 000394 0030+00 1/0 0/0 0/0 .text Delete__15daLv4HsTarget_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daLv4HsTarget_c::Delete() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/Delete__15daLv4HsTarget_cFv.s" +int daLv4HsTarget_c::Delete() { + dComIfG_resDelete(&mPhase, "L4HsMato"); + return 1; } -#pragma pop /* 80C5F904-80C5F930 0003C4 002C+00 1/0 0/0 0/0 .text daLv4HsTarget_Draw__FP15daLv4HsTarget_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv4HsTarget_Draw(daLv4HsTarget_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Draw__FP15daLv4HsTarget_c.s" +static int daLv4HsTarget_Draw(daLv4HsTarget_c* i_this) { + return i_this->MoveBGDraw(); } -#pragma pop /* 80C5F930-80C5F950 0003F0 0020+00 1/0 0/0 0/0 .text daLv4HsTarget_Execute__FP15daLv4HsTarget_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv4HsTarget_Execute(daLv4HsTarget_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Execute__FP15daLv4HsTarget_c.s" +static int daLv4HsTarget_Execute(daLv4HsTarget_c* i_this) { + return i_this->MoveBGExecute(); } -#pragma pop /* 80C5F950-80C5F970 000410 0020+00 1/0 0/0 0/0 .text daLv4HsTarget_Delete__FP15daLv4HsTarget_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv4HsTarget_Delete(daLv4HsTarget_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Delete__FP15daLv4HsTarget_c.s" +static int daLv4HsTarget_Delete(daLv4HsTarget_c* i_this) { + return i_this->MoveBGDelete(); } -#pragma pop /* 80C5F970-80C5F990 000430 0020+00 1/0 0/0 0/0 .text daLv4HsTarget_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daLv4HsTarget_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/daLv4HsTarget_Create__FP10fopAc_ac_c.s" +static int daLv4HsTarget_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop - -/* 80C5F990-80C5F9EC 000450 005C+00 2/1 0/0 0/0 .text __dt__19daLv4HsTarget_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daLv4HsTarget_HIO_c::~daLv4HsTarget_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__dt__19daLv4HsTarget_HIO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80C5FAE0-80C5FAEC 000008 000C+00 1/1 0/0 0/0 .bss @3618 */ -static u8 lit_3618[12]; /* 80C5FAEC-80C5FAF0 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[4]; +static daLv4HsTarget_HIO_c l_HIO; -/* 80C5F9EC-80C5FA28 0004AC 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv4HsTarget_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_lv4HsTarget_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget/__sinit_d_a_obj_lv4HsTarget_cpp.s" -} -#pragma pop +/* ############################################################################################## */ +/* 80C5FA48-80C5FA68 -00001 0020+00 1/0 0/0 0/0 .data l_daLv4HsTarget_Method */ +static actor_method_class l_daLv4HsTarget_Method = { + (process_method_func)daLv4HsTarget_Create, (process_method_func)daLv4HsTarget_Delete, + (process_method_func)daLv4HsTarget_Execute, (process_method_func)NULL, + (process_method_func)daLv4HsTarget_Draw, +}; -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C5F9EC, __sinit_d_a_obj_lv4HsTarget_cpp); -#pragma pop - -/* 80C5FA3C-80C5FA3C 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C5FA68-80C5FA98 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4HsTarget */ +extern actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { + -3, + 3, + -3, + PROC_Obj_Lv4HsTarget, + &g_fpcLf_Method.mBase, + sizeof(daLv4HsTarget_c), + 0, + 0, + &g_fopAc_Method.base, + 640, + &l_daLv4HsTarget_Method, + 0x40100, + 0, + 14, +}; diff --git a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp index 126f292b2a..275b58fd0e 100644 --- a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp +++ b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp @@ -16,6 +16,7 @@ int daTag_Lantern_c::create() { new (this) daTag_Lantern_c(); fopAcM_OnCondition(this, 8); } + initialize(); return cPhs_COMPLEATE_e; } @@ -28,35 +29,36 @@ int daTag_Lantern_c::Delete() { /* 8048EDDC-8048EF6C 00021C 0190+00 2/2 0/0 0/0 .text Execute__15daTag_Lantern_cFv */ int daTag_Lantern_c::Execute() { - s32 sVar; - dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); // fake match + dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); // fake match + if (i_dComIfGp_event_runCheck()) { - if (mEvtInfo.mCommand == 1) { + if (mEvtInfo.checkCommandTalk()) { if (!field_0x604) { - field_0x568.init(this, field_0x600, NULL, NULL); - field_0x604 += 1; - } else if (field_0x604 == 1 && field_0x568.doFlow(this, NULL, NULL)) { + mMsgFlow.init(this, mFlowIndex, 0, NULL); + field_0x604++; + } else if (field_0x604 == 1 && mMsgFlow.doFlow(this, NULL, 0)) { play.getEvent().reset(); field_0x604 = 0; field_0x5f8 = 0; } } - } else { - if (field_0x5f8) { - mEvtInfo.mCondition |= 1; - fopAcM_orderSpeakEvent(this, 0, 0); - } + } else if (field_0x5f8) { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); } - field_0x5b4.SetPos(¤t.pos); - field_0x5f4 = dComIfG_Bgsp().GroundCross(&field_0x5b4); - if (field_0x5f4 != -1000000000.0f) { - sVar = dComIfG_Bgsp().GetRoomId(field_0x5b4); - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0x5b4); + mGndChk.SetPos(¤t.pos); + mGroundCross = dComIfG_Bgsp().GroundCross(&mGndChk); + + s32 room_no; + if (mGroundCross != -1000000000.0f) { + room_no = dComIfG_Bgsp().GetRoomId(mGndChk); + mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); } else { - sVar = dComIfGp_roomControl_getStayNo(); + room_no = dComIfGp_roomControl_getStayNo(); } - mTevStr.mRoomNo = sVar; + + mTevStr.mRoomNo = room_no; fopAcM_SetRoomNo(this, mTevStr.mRoomNo); mAttentionInfo.mFlags = 0; mAttentionInfo.mPosition = current.pos; @@ -72,16 +74,20 @@ int daTag_Lantern_c::Draw() { /* 8048EF74-8048F024 0003B4 00B0+00 1/1 0/0 0/0 .text initialize__15daTag_Lantern_cFv */ void daTag_Lantern_c::initialize() { fopAcM_setCullSizeBox(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); - if (orig.angle.z != 0xffff) { - field_0x600 = orig.angle.z; + + if (orig.angle.z != 0xFFFF) { + mFlowIndex = orig.angle.z; } else { - field_0x600 = -1; + mFlowIndex = -1; } + orig.angle.z = 0; - field_0x5fc = fopAcM_GetParam(this) & 0xfff; + field_0x5fc = fopAcM_GetParam(this) & 0xFFF; + mScale.x *= 100.0f; mScale.y *= 100.0f; mScale.z *= 100.0f; + Execute(); } @@ -110,9 +116,6 @@ static int daTag_Lantern_IsDelete(void* i_this) { return 1; } -/* 8048F1C8-8048F1D4 000008 000C+00 1/1 0/0 0/0 .bss @3622 */ -static u8 lit_3622[12]; - /* 8048F1D4-8048F1D8 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daTag_Lantern_Param_c l_HIO; @@ -134,7 +137,7 @@ extern actor_process_profile_definition g_profile_TAG_LANTERN = { 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // mSubMtd - 0x011E, // mPriority + 286, // mPriority &daTag_Lantern_MethodTable, // mSubMtd 0x00040000, // mStatus 0, // mActorType diff --git a/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp b/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp index d870cfe188..ba3f17a6fd 100644 --- a/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp +++ b/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp @@ -1,243 +1,181 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_tag_mist -// +/** + * d_a_tag_mist.cpp + * + */ #include "rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daTagMist_c { - /* 8048F258 */ void offSw(); - /* 8048F2C4 */ void onMySw(); - /* 8048F310 */ void isMySw(); - /* 8048F370 */ void Create(); - /* 8048F444 */ void create(); - /* 8048F558 */ void execute(); - /* 8048F690 */ bool _delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct cXyz { - /* 8048F518 */ ~cXyz(); - /* 8048F554 */ cXyz(); -}; - -// -// Forward References: -// - -extern "C" void offSw__11daTagMist_cFv(); -extern "C" void onMySw__11daTagMist_cFv(); -extern "C" void isMySw__11daTagMist_cFv(); -extern "C" void Create__11daTagMist_cFv(); -extern "C" void create__11daTagMist_cFv(); -extern "C" void __dt__4cXyzFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" void execute__11daTagMist_cFv(); -extern "C" bool _delete__11daTagMist_cFv(); -extern "C" static void daTagMist_Execute__FP11daTagMist_c(); -extern "C" static void daTagMist_Delete__FP11daTagMist_c(); -extern "C" static void daTagMist_Create__FP10fopAc_ac_c(); -extern "C" extern void* g_profile_Tag_Mist[12]; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void offSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECSubtract(); -extern "C" void __construct_array(); -extern "C" void _savegpr_27(); -extern "C" void _restgpr_27(); -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 mPlayerNo__11daTagMist_c[4]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 8048F258-8048F2C4 000078 006C+00 1/1 0/0 0/0 .text offSw__11daTagMist_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagMist_c::offSw() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/offSw__11daTagMist_cFv.s" +void daTagMist_c::offSw() { + u8 sw_no_num; + u8 top_sw_no; + + top_sw_no = daTagMist_prm::getTopSwNo(this); + sw_no_num = daTagMist_prm::getSwNoNum(this); + + for (int i = 0; i < sw_no_num; i++) { + i_fopAcM_offSwitch(this, top_sw_no + i); + } } -#pragma pop /* 8048F2C4-8048F310 0000E4 004C+00 1/1 0/0 0/0 .text onMySw__11daTagMist_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagMist_c::onMySw() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/onMySw__11daTagMist_cFv.s" +void daTagMist_c::onMySw() { + u32 my_sw_no; + u32 top_sw_no; + + top_sw_no = daTagMist_prm::getTopSwNo(this); + my_sw_no = daTagMist_prm::getMySwNo(this); + + if (my_sw_no != 0xFF) { + i_fopAcM_onSwitch(this, top_sw_no + my_sw_no); + } } -#pragma pop /* 8048F310-8048F370 000130 0060+00 1/1 0/0 0/0 .text isMySw__11daTagMist_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagMist_c::isMySw() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/isMySw__11daTagMist_cFv.s" +BOOL daTagMist_c::isMySw() { + u32 my_sw_no; + u32 top_sw_no; + + top_sw_no = daTagMist_prm::getTopSwNo(this); + my_sw_no = daTagMist_prm::getMySwNo(this); + + if (my_sw_no != 0xFF && i_fopAcM_isSwitch(this, top_sw_no + my_sw_no)) { + return TRUE; + } else { + return FALSE; + } } -#pragma pop - -/* ############################################################################################## */ -/* 8048F700-8048F704 000000 0004+00 1/1 0/0 0/0 .rodata @3678 */ -SECTION_RODATA static f32 const lit_3678 = -50.0f; -COMPILER_STRIP_GATE(0x8048F700, &lit_3678); - -/* 8048F704-8048F708 000004 0004+00 0/1 0/0 0/0 .rodata @3679 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3679 = 50.0f; -COMPILER_STRIP_GATE(0x8048F704, &lit_3679); -#pragma pop - -/* 8048F708-8048F70C 000008 0004+00 0/1 0/0 0/0 .rodata @3680 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3680[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8048F708, &lit_3680); -#pragma pop /* 8048F370-8048F444 000190 00D4+00 1/1 0/0 0/0 .text Create__11daTagMist_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagMist_c::Create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/Create__11daTagMist_cFv.s" +int daTagMist_c::Create() { + mVertices[0].x = mScale.x * -50.0f; + mVertices[0].z = mScale.z * -50.0f; + + mVertices[1].x = mScale.x * 50.0f; + mVertices[1].z = mScale.z * -50.0f; + + mVertices[2].x = mScale.x * 50.0f; + mVertices[2].z = mScale.z * 50.0f; + + mVertices[3].x = mScale.x * -50.0f; + mVertices[3].z = mScale.z * 50.0f; + + mVertices[3].y = 0.0f; + mVertices[2].y = 0.0f; + mVertices[1].y = 0.0f; + mVertices[0].y = 0.0f; + + if (isMySw()) { + setPlayerNo(daTagMist_prm::getExitNo(this)); + } + + mPlayerTouched = false; + return 1; } -#pragma pop /* 8048F444-8048F518 000264 00D4+00 1/1 0/0 0/0 .text create__11daTagMist_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagMist_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/func_8048F444.s" -} -#pragma pop +int daTagMist_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daTagMist_c(); + fopAcM_OnCondition(this, 8); + } -/* 8048F518-8048F554 000338 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cXyz::~cXyz() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/__dt__4cXyzFv.s" -} -#pragma pop + if (!mInitParams) { + mInitParams = true; -/* 8048F554-8048F558 000374 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { - /* empty function */ + field_0x5a2 = orig.angle.x; + field_0x5a4 = orig.angle.z; + + orig.angle.z = 0; + orig.angle.x = 0; + current.angle.z = 0; + current.angle.x = 0; + shape_angle.z = 0; + shape_angle.x = 0; + } + + if (!Create()) { + return cPhs_ERROR_e; + } + + return cPhs_COMPLEATE_e; } /* 8048F558-8048F690 000378 0138+00 1/1 0/0 0/0 .text execute__11daTagMist_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagMist_c::execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/execute__11daTagMist_cFv.s" +int daTagMist_c::execute() { + if (i_fopAcM_isSwitch(this, daTagMist_prm::getSwNo2(this))) { + return 1; + } + + fopAc_ac_c* player_p = dComIfGp_getPlayer(0); + cXyz player_dist(player_p->current.pos); + player_dist -= orig.pos; + + mDoMtx_stack_c::YrotS(-current.angle.y); + mDoMtx_stack_c::multVec(&player_dist, &player_dist); + + u8 player_inside = (mVertices[0].x < player_dist.x && mVertices[0].z < player_dist.z) && + (mVertices[2].x > player_dist.x && mVertices[2].z > player_dist.z); + + if (player_inside && !mPlayerTouched) { + offSw(); + onMySw(); + mPlayerNo = daTagMist_prm::getExitNo(this); + } + + mPlayerTouched = player_inside; + return 1; } -#pragma pop /* 8048F690-8048F698 0004B0 0008+00 1/1 0/0 0/0 .text _delete__11daTagMist_cFv */ -bool daTagMist_c::_delete() { - return true; +int daTagMist_c::_delete() { + return 1; } /* 8048F698-8048F6B8 0004B8 0020+00 1/0 0/0 0/0 .text daTagMist_Execute__FP11daTagMist_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagMist_Execute(daTagMist_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Execute__FP11daTagMist_c.s" +static int daTagMist_Execute(daTagMist_c* i_this) { + return i_this->execute(); } -#pragma pop /* 8048F6B8-8048F6D8 0004D8 0020+00 1/0 0/0 0/0 .text daTagMist_Delete__FP11daTagMist_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagMist_Delete(daTagMist_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Delete__FP11daTagMist_c.s" +static int daTagMist_Delete(daTagMist_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 8048F6D8-8048F6F8 0004F8 0020+00 1/0 0/0 0/0 .text daTagMist_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagMist_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist/daTagMist_Create__FP10fopAc_ac_c.s" +static int daTagMist_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* ############################################################################################## */ /* 8048F70C-8048F72C -00001 0020+00 1/0 0/0 0/0 .data l_daTagMist_Method */ -SECTION_DATA static void* l_daTagMist_Method[8] = { - (void*)daTagMist_Create__FP10fopAc_ac_c, - (void*)daTagMist_Delete__FP11daTagMist_c, - (void*)daTagMist_Execute__FP11daTagMist_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTagMist_Method = { + (process_method_func)daTagMist_Create, + (process_method_func)daTagMist_Delete, + (process_method_func)daTagMist_Execute, + (process_method_func)NULL, + (process_method_func)NULL, }; /* 8048F72C-8048F75C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Mist */ -SECTION_DATA extern void* g_profile_Tag_Mist[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02D70000, (void*)&g_fpcLf_Method, - (void*)0x000005A8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01240000, (void*)&l_daTagMist_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Tag_Mist = { + -3, + 7, + -3, + PROC_Tag_Mist, + &g_fpcLf_Method.mBase, + sizeof(daTagMist_c), + 0, + 0, + &g_fopAc_Method.base, + 292, + &l_daTagMist_Method, + 0x40000, + 0, + 14, }; diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index d6e334fe01..52266c0325 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -2979,7 +2979,7 @@ static void dKy_Sound_init() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dKy_Sound_set(cXyz param_0, int param_1, unsigned int param_2, int param_3) { +asm void dKy_Sound_set(cXyz i_pos, int param_1, unsigned int i_actorID, int param_3) { nofralloc #include "asm/d/kankyo/d_kankyo/dKy_Sound_set__F4cXyziUii.s" }