diff --git a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/__dt__12daObjDigpl_cFv.s b/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/__dt__12daObjDigpl_cFv.s deleted file mode 100644 index f891e2b7237..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/__dt__12daObjDigpl_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8057C158: -/* 8057C158 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057C15C 7C 08 02 A6 */ mflr r0 -/* 8057C160 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057C164 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057C168 93 C1 00 08 */ stw r30, 8(r1) -/* 8057C16C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8057C170 7C 9F 23 78 */ mr r31, r4 -/* 8057C174 41 82 00 28 */ beq lbl_8057C19C -/* 8057C178 3C 80 80 58 */ lis r4, __vt__12daObjDigpl_c@ha /* 0x8057C948@ha */ -/* 8057C17C 38 04 C9 48 */ addi r0, r4, __vt__12daObjDigpl_c@l /* 0x8057C948@l */ -/* 8057C180 90 1E 05 BC */ stw r0, 0x5bc(r30) -/* 8057C184 38 80 00 00 */ li r4, 0 -/* 8057C188 4B A9 CB 05 */ bl __dt__10fopAc_ac_cFv -/* 8057C18C 7F E0 07 35 */ extsh. r0, r31 -/* 8057C190 40 81 00 0C */ ble lbl_8057C19C -/* 8057C194 7F C3 F3 78 */ mr r3, r30 -/* 8057C198 4B D5 2B A5 */ bl __dl__FPv -lbl_8057C19C: -/* 8057C19C 7F C3 F3 78 */ mr r3, r30 -/* 8057C1A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057C1A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 8057C1A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057C1AC 7C 08 03 A6 */ mtlr r0 -/* 8057C1B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057C1B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/create__12daObjDigpl_cFv.s b/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/create__12daObjDigpl_cFv.s deleted file mode 100644 index 10629c95660..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/create__12daObjDigpl_cFv.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_8057BF98: -/* 8057BF98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057BF9C 7C 08 02 A6 */ mflr r0 -/* 8057BFA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057BFA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8057BFA8 93 C1 00 08 */ stw r30, 8(r1) -/* 8057BFAC 7C 7E 1B 78 */ mr r30, r3 -/* 8057BFB0 3C 80 80 58 */ lis r4, lit_3822@ha /* 0x8057C8B0@ha */ -/* 8057BFB4 3B E4 C8 B0 */ addi r31, r4, lit_3822@l /* 0x8057C8B0@l */ -/* 8057BFB8 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 8057BFBC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 8057BFC0 40 82 00 28 */ bne lbl_8057BFE8 -/* 8057BFC4 28 1E 00 00 */ cmplwi r30, 0 -/* 8057BFC8 41 82 00 14 */ beq lbl_8057BFDC -/* 8057BFCC 4B A9 CB 99 */ bl __ct__10fopAc_ac_cFv -/* 8057BFD0 3C 60 80 58 */ lis r3, __vt__12daObjDigpl_c@ha /* 0x8057C948@ha */ -/* 8057BFD4 38 03 C9 48 */ addi r0, r3, __vt__12daObjDigpl_c@l /* 0x8057C948@l */ -/* 8057BFD8 90 1E 05 BC */ stw r0, 0x5bc(r30) -lbl_8057BFDC: -/* 8057BFDC 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 8057BFE0 60 00 00 08 */ ori r0, r0, 8 -/* 8057BFE4 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_8057BFE8: -/* 8057BFE8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8057BFEC 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f -/* 8057BFF0 98 1E 05 68 */ stb r0, 0x568(r30) -/* 8057BFF4 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8057BFF8 98 1E 05 69 */ stb r0, 0x569(r30) -/* 8057BFFC 88 1E 05 68 */ lbz r0, 0x568(r30) -/* 8057C000 28 00 00 05 */ cmplwi r0, 5 -/* 8057C004 40 82 00 28 */ bne lbl_8057C02C -/* 8057C008 80 1E 04 9C */ lwz r0, 0x49c(r30) -/* 8057C00C 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 -/* 8057C010 90 1E 04 9C */ stw r0, 0x49c(r30) -/* 8057C014 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 8057C018 54 03 66 3E */ rlwinm r3, r0, 0xc, 0x18, 0x1f -/* 8057C01C 88 1E 04 E2 */ lbz r0, 0x4e2(r30) -/* 8057C020 7C 04 07 74 */ extsb r4, r0 -/* 8057C024 4B AD 57 C9 */ bl dPath_GetRoomPath__Fii -/* 8057C028 90 7E 05 B8 */ stw r3, 0x5b8(r30) -lbl_8057C02C: -/* 8057C02C 88 1E 05 68 */ lbz r0, 0x568(r30) -/* 8057C030 28 00 00 04 */ cmplwi r0, 4 -/* 8057C034 41 80 00 0C */ blt lbl_8057C040 -/* 8057C038 38 00 00 00 */ li r0, 0 -/* 8057C03C 98 1E 05 68 */ stb r0, 0x568(r30) -lbl_8057C040: -/* 8057C040 88 9E 05 69 */ lbz r4, 0x569(r30) -/* 8057C044 28 04 00 FF */ cmplwi r4, 0xff -/* 8057C048 41 82 00 28 */ beq lbl_8057C070 -/* 8057C04C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057C050 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057C054 88 1E 04 BA */ lbz r0, 0x4ba(r30) -/* 8057C058 7C 05 07 74 */ extsb r5, r0 -/* 8057C05C 4B AB 93 05 */ bl isSwitch__10dSv_info_cCFii -/* 8057C060 2C 03 00 00 */ cmpwi r3, 0 -/* 8057C064 41 82 00 0C */ beq lbl_8057C070 -/* 8057C068 38 60 00 05 */ li r3, 5 -/* 8057C06C 48 00 00 B4 */ b lbl_8057C120 -lbl_8057C070: -/* 8057C070 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8057C074 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8057C078 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) -/* 8057C07C C0 5E 04 D4 */ lfs f2, 0x4d4(r30) -/* 8057C080 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) -/* 8057C084 4B DC A8 65 */ bl PSMTXTrans -/* 8057C088 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8057C08C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8057C090 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 8057C094 4B A9 03 A1 */ bl mDoMtx_YrotM__FPA4_fs -/* 8057C098 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8057C09C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8057C0A0 38 9E 05 70 */ addi r4, r30, 0x570 -/* 8057C0A4 4B DC A4 0D */ bl PSMTXCopy -/* 8057C0A8 38 1E 05 70 */ addi r0, r30, 0x570 -/* 8057C0AC 90 1E 05 04 */ stw r0, 0x504(r30) -/* 8057C0B0 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 8057C0B4 D0 1E 05 50 */ stfs f0, 0x550(r30) -/* 8057C0B8 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 8057C0BC D0 1E 05 54 */ stfs f0, 0x554(r30) -/* 8057C0C0 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 8057C0C4 D0 1E 05 58 */ stfs f0, 0x558(r30) -/* 8057C0C8 C0 1E 05 50 */ lfs f0, 0x550(r30) -/* 8057C0CC D0 1E 05 38 */ stfs f0, 0x538(r30) -/* 8057C0D0 C0 1E 05 54 */ lfs f0, 0x554(r30) -/* 8057C0D4 D0 1E 05 3C */ stfs f0, 0x53c(r30) -/* 8057C0D8 C0 1E 05 58 */ lfs f0, 0x558(r30) -/* 8057C0DC D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 8057C0E0 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ -/* 8057C0E4 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ -/* 8057C0E8 98 1E 04 8C */ stb r0, 0x48c(r30) -/* 8057C0EC 7F C3 F3 78 */ mr r3, r30 -/* 8057C0F0 C0 3F 00 00 */ lfs f1, 0(r31) -/* 8057C0F4 C0 5F 00 04 */ lfs f2, 4(r31) -/* 8057C0F8 FC 60 08 90 */ fmr f3, f1 -/* 8057C0FC 4B A9 E4 2D */ bl fopAcM_SetMin__FP10fopAc_ac_cfff -/* 8057C100 7F C3 F3 78 */ mr r3, r30 -/* 8057C104 C0 3F 00 08 */ lfs f1, 8(r31) -/* 8057C108 C0 5F 00 0C */ lfs f2, 0xc(r31) -/* 8057C10C FC 60 08 90 */ fmr f3, f1 -/* 8057C110 4B A9 E4 29 */ bl fopAcM_SetMax__FP10fopAc_ac_cfff -/* 8057C114 38 00 00 1B */ li r0, 0x1b -/* 8057C118 98 1E 05 4B */ stb r0, 0x54b(r30) -/* 8057C11C 38 60 00 04 */ li r3, 4 -lbl_8057C120: -/* 8057C120 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8057C124 83 C1 00 08 */ lwz r30, 8(r1) -/* 8057C128 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057C12C 7C 08 03 A6 */ mtlr r0 -/* 8057C130 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057C134 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 55dbbbe10d4..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8057C138: -/* 8057C138 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057C13C 7C 08 02 A6 */ mflr r0 -/* 8057C140 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057C144 4B FF FE 55 */ bl create__12daObjDigpl_cFv -/* 8057C148 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057C14C 7C 08 03 A6 */ mtlr r0 -/* 8057C150 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057C154 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Delete__FP12daObjDigpl_c.s b/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Delete__FP12daObjDigpl_c.s deleted file mode 100644 index a963e9111c2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Delete__FP12daObjDigpl_c.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_8057C1B8: -/* 8057C1B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057C1BC 7C 08 02 A6 */ mflr r0 -/* 8057C1C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057C1C4 38 80 FF FF */ li r4, -1 -/* 8057C1C8 81 83 05 BC */ lwz r12, 0x5bc(r3) -/* 8057C1CC 81 8C 00 08 */ lwz r12, 8(r12) -/* 8057C1D0 7D 89 03 A6 */ mtctr r12 -/* 8057C1D4 4E 80 04 21 */ bctrl -/* 8057C1D8 38 60 00 01 */ li r3, 1 -/* 8057C1DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057C1E0 7C 08 03 A6 */ mtlr r0 -/* 8057C1E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057C1E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Execute__FP12daObjDigpl_c.s b/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Execute__FP12daObjDigpl_c.s deleted file mode 100644 index 02cb563295d..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Execute__FP12daObjDigpl_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8057C880: -/* 8057C880 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8057C884 7C 08 02 A6 */ mflr r0 -/* 8057C888 90 01 00 14 */ stw r0, 0x14(r1) -/* 8057C88C 4B FF F9 61 */ bl execute__12daObjDigpl_cFv -/* 8057C890 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8057C894 7C 08 03 A6 */ mtlr r0 -/* 8057C898 38 21 00 10 */ addi r1, r1, 0x10 -/* 8057C89C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/execute__12daObjDigpl_cFv.s b/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/execute__12daObjDigpl_cFv.s deleted file mode 100644 index a7ae9b7ebe2..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/execute__12daObjDigpl_cFv.s +++ /dev/null @@ -1,459 +0,0 @@ -lbl_8057C1EC: -/* 8057C1EC 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 8057C1F0 7C 08 02 A6 */ mflr r0 -/* 8057C1F4 90 01 00 84 */ stw r0, 0x84(r1) -/* 8057C1F8 DB E1 00 70 */ stfd f31, 0x70(r1) -/* 8057C1FC F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0 /* qr0 */ -/* 8057C200 39 61 00 70 */ addi r11, r1, 0x70 -/* 8057C204 4B DE 5F C9 */ bl _savegpr_25 -/* 8057C208 7C 79 1B 78 */ mr r25, r3 -/* 8057C20C 3C 60 80 58 */ lis r3, lit_3822@ha /* 0x8057C8B0@ha */ -/* 8057C210 3B A3 C8 B0 */ addi r29, r3, lit_3822@l /* 0x8057C8B0@l */ -/* 8057C214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057C218 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057C21C 83 9E 5D B4 */ lwz r28, 0x5db4(r30) -/* 8057C220 88 19 05 6A */ lbz r0, 0x56a(r25) -/* 8057C224 28 00 00 01 */ cmplwi r0, 1 -/* 8057C228 40 82 01 54 */ bne lbl_8057C37C -/* 8057C22C 88 99 05 69 */ lbz r4, 0x569(r25) -/* 8057C230 28 04 00 FF */ cmplwi r4, 0xff -/* 8057C234 41 82 00 14 */ beq lbl_8057C248 -/* 8057C238 7F C3 F3 78 */ mr r3, r30 -/* 8057C23C 88 19 04 BA */ lbz r0, 0x4ba(r25) -/* 8057C240 7C 05 07 74 */ extsb r5, r0 -/* 8057C244 4B AB 8F BD */ bl onSwitch__10dSv_info_cFii -lbl_8057C248: -/* 8057C248 C0 59 04 D8 */ lfs f2, 0x4d8(r25) -/* 8057C24C C0 39 04 D4 */ lfs f1, 0x4d4(r25) -/* 8057C250 C0 1D 00 10 */ lfs f0, 0x10(r29) -/* 8057C254 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8057C258 C0 19 04 D0 */ lfs f0, 0x4d0(r25) -/* 8057C25C D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 8057C260 D0 21 00 40 */ stfs f1, 0x40(r1) -/* 8057C264 D0 41 00 44 */ stfs f2, 0x44(r1) -/* 8057C268 80 79 05 B8 */ lwz r3, 0x5b8(r25) -/* 8057C26C 28 03 00 00 */ cmplwi r3, 0 -/* 8057C270 41 82 00 18 */ beq lbl_8057C288 -/* 8057C274 80 63 00 08 */ lwz r3, 8(r3) -/* 8057C278 88 19 05 6C */ lbz r0, 0x56c(r25) -/* 8057C27C 54 00 20 36 */ slwi r0, r0, 4 -/* 8057C280 7C 83 00 AE */ lbzx r4, r3, r0 -/* 8057C284 48 00 00 10 */ b lbl_8057C294 -lbl_8057C288: -/* 8057C288 80 19 00 B0 */ lwz r0, 0xb0(r25) -/* 8057C28C 54 00 A6 3E */ rlwinm r0, r0, 0x14, 0x18, 0x1f -/* 8057C290 7C 04 03 78 */ mr r4, r0 -lbl_8057C294: -/* 8057C294 88 19 05 68 */ lbz r0, 0x568(r25) -/* 8057C298 28 00 00 00 */ cmplwi r0, 0 -/* 8057C29C 40 82 00 2C */ bne lbl_8057C2C8 -/* 8057C2A0 38 61 00 3C */ addi r3, r1, 0x3c -/* 8057C2A4 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 8057C2A8 38 A0 FF FF */ li r5, -1 -/* 8057C2AC 88 19 04 E2 */ lbz r0, 0x4e2(r25) -/* 8057C2B0 7C 06 07 74 */ extsb r6, r0 -/* 8057C2B4 38 FC 04 E4 */ addi r7, r28, 0x4e4 -/* 8057C2B8 39 00 00 00 */ li r8, 0 -/* 8057C2BC 39 20 00 09 */ li r9, 9 -/* 8057C2C0 4B A9 FF 81 */ bl fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi -/* 8057C2C4 48 00 00 40 */ b lbl_8057C304 -lbl_8057C2C8: -/* 8057C2C8 28 00 00 02 */ cmplwi r0, 2 -/* 8057C2CC 40 82 00 38 */ bne lbl_8057C304 -/* 8057C2D0 38 00 00 00 */ li r0, 0 -/* 8057C2D4 90 01 00 08 */ stw r0, 8(r1) -/* 8057C2D8 90 01 00 0C */ stw r0, 0xc(r1) -/* 8057C2DC 38 61 00 3C */ addi r3, r1, 0x3c -/* 8057C2E0 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 8057C2E4 38 A0 FF FF */ li r5, -1 -/* 8057C2E8 88 19 04 E2 */ lbz r0, 0x4e2(r25) -/* 8057C2EC 7C 06 07 74 */ extsb r6, r0 -/* 8057C2F0 38 FC 04 E4 */ addi r7, r28, 0x4e4 -/* 8057C2F4 39 00 00 09 */ li r8, 9 -/* 8057C2F8 39 20 00 00 */ li r9, 0 -/* 8057C2FC 39 40 00 00 */ li r10, 0 -/* 8057C300 4B A9 FC 65 */ bl fopAcM_createItemFromTable__FPC4cXyziiiPC5csXyziPC4cXyzPfPfb -lbl_8057C304: -/* 8057C304 88 19 05 68 */ lbz r0, 0x568(r25) -/* 8057C308 28 00 00 01 */ cmplwi r0, 1 -/* 8057C30C 40 82 00 10 */ bne lbl_8057C31C -/* 8057C310 38 00 00 02 */ li r0, 2 -/* 8057C314 98 19 05 6A */ stb r0, 0x56a(r25) -/* 8057C318 48 00 00 64 */ b lbl_8057C37C -lbl_8057C31C: -/* 8057C31C 80 19 05 B8 */ lwz r0, 0x5b8(r25) -/* 8057C320 28 00 00 00 */ cmplwi r0, 0 -/* 8057C324 41 82 00 48 */ beq lbl_8057C36C -/* 8057C328 88 79 05 6C */ lbz r3, 0x56c(r25) -/* 8057C32C 7C 60 2E 70 */ srawi r0, r3, 5 -/* 8057C330 54 00 10 3A */ slwi r0, r0, 2 -/* 8057C334 7C D9 02 14 */ add r6, r25, r0 -/* 8057C338 80 A6 05 A0 */ lwz r5, 0x5a0(r6) -/* 8057C33C 38 80 00 01 */ li r4, 1 -/* 8057C340 54 60 D8 08 */ slwi r0, r3, 0x1b -/* 8057C344 54 63 0F FE */ srwi r3, r3, 0x1f -/* 8057C348 7C 03 00 50 */ subf r0, r3, r0 -/* 8057C34C 54 00 28 3E */ rotlwi r0, r0, 5 -/* 8057C350 7C 00 1A 14 */ add r0, r0, r3 -/* 8057C354 7C 80 00 30 */ slw r0, r4, r0 -/* 8057C358 7C A0 03 78 */ or r0, r5, r0 -/* 8057C35C 90 06 05 A0 */ stw r0, 0x5a0(r6) -/* 8057C360 38 00 00 00 */ li r0, 0 -/* 8057C364 98 19 05 6A */ stb r0, 0x56a(r25) -/* 8057C368 48 00 00 14 */ b lbl_8057C37C -lbl_8057C36C: -/* 8057C36C 7F 23 CB 78 */ mr r3, r25 -/* 8057C370 4B A9 D9 0D */ bl fopAcM_delete__FP10fopAc_ac_c -/* 8057C374 38 60 00 01 */ li r3, 1 -/* 8057C378 48 00 04 E8 */ b lbl_8057C860 -lbl_8057C37C: -/* 8057C37C 80 19 05 5C */ lwz r0, 0x55c(r25) -/* 8057C380 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 -/* 8057C384 90 19 05 5C */ stw r0, 0x55c(r25) -/* 8057C388 80 19 05 B8 */ lwz r0, 0x5b8(r25) -/* 8057C38C 28 00 00 00 */ cmplwi r0, 0 -/* 8057C390 41 82 02 C4 */ beq lbl_8057C654 -/* 8057C394 C0 3D 00 14 */ lfs f1, 0x14(r29) -/* 8057C398 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 8057C39C EC 01 00 2A */ fadds f0, f1, f0 -/* 8057C3A0 D0 19 04 D4 */ stfs f0, 0x4d4(r25) -/* 8057C3A4 C0 19 04 D4 */ lfs f0, 0x4d4(r25) -/* 8057C3A8 D0 19 05 54 */ stfs f0, 0x554(r25) -/* 8057C3AC 80 79 05 B8 */ lwz r3, 0x5b8(r25) -/* 8057C3B0 83 63 00 08 */ lwz r27, 8(r3) -/* 8057C3B4 3C 60 80 45 */ lis r3, __float_max@ha /* 0x80450AE8@ha */ -/* 8057C3B8 C3 E3 0A E8 */ lfs f31, __float_max@l(r3) /* 0x80450AE8@l */ -/* 8057C3BC 3B 40 00 00 */ li r26, 0 -/* 8057C3C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057C3C4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057C3C8 48 00 02 7C */ b lbl_8057C644 -lbl_8057C3CC: -/* 8057C3CC 7F 40 2E 70 */ srawi r0, r26, 5 -/* 8057C3D0 54 03 10 3A */ slwi r3, r0, 2 -/* 8057C3D4 38 03 05 A0 */ addi r0, r3, 0x5a0 -/* 8057C3D8 7C B9 00 2E */ lwzx r5, r25, r0 -/* 8057C3DC 38 80 00 01 */ li r4, 1 -/* 8057C3E0 57 40 D8 08 */ slwi r0, r26, 0x1b -/* 8057C3E4 57 43 0F FE */ srwi r3, r26, 0x1f -/* 8057C3E8 7C 03 00 50 */ subf r0, r3, r0 -/* 8057C3EC 54 00 28 3E */ rotlwi r0, r0, 5 -/* 8057C3F0 7C 00 1A 14 */ add r0, r0, r3 -/* 8057C3F4 7C 80 00 30 */ slw r0, r4, r0 -/* 8057C3F8 7C A0 00 39 */ and. r0, r5, r0 -/* 8057C3FC 40 82 02 40 */ bne lbl_8057C63C -/* 8057C400 C0 5B 00 0C */ lfs f2, 0xc(r27) -/* 8057C404 C0 3B 00 08 */ lfs f1, 8(r27) -/* 8057C408 C0 1B 00 04 */ lfs f0, 4(r27) -/* 8057C40C D0 01 00 30 */ stfs f0, 0x30(r1) -/* 8057C410 D0 21 00 34 */ stfs f1, 0x34(r1) -/* 8057C414 D0 41 00 38 */ stfs f2, 0x38(r1) -/* 8057C418 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 8057C41C 38 81 00 30 */ addi r4, r1, 0x30 -/* 8057C420 4B DC AF 7D */ bl PSVECSquareDistance -/* 8057C424 C0 1D 00 18 */ lfs f0, 0x18(r29) -/* 8057C428 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8057C42C 40 81 00 58 */ ble lbl_8057C484 -/* 8057C430 FC 00 08 34 */ frsqrte f0, f1 -/* 8057C434 C8 9D 00 20 */ lfd f4, 0x20(r29) -/* 8057C438 FC 44 00 32 */ fmul f2, f4, f0 -/* 8057C43C C8 7D 00 28 */ lfd f3, 0x28(r29) -/* 8057C440 FC 00 00 32 */ fmul f0, f0, f0 -/* 8057C444 FC 01 00 32 */ fmul f0, f1, f0 -/* 8057C448 FC 03 00 28 */ fsub f0, f3, f0 -/* 8057C44C FC 02 00 32 */ fmul f0, f2, f0 -/* 8057C450 FC 44 00 32 */ fmul f2, f4, f0 -/* 8057C454 FC 00 00 32 */ fmul f0, f0, f0 -/* 8057C458 FC 01 00 32 */ fmul f0, f1, f0 -/* 8057C45C FC 03 00 28 */ fsub f0, f3, f0 -/* 8057C460 FC 02 00 32 */ fmul f0, f2, f0 -/* 8057C464 FC 44 00 32 */ fmul f2, f4, f0 -/* 8057C468 FC 00 00 32 */ fmul f0, f0, f0 -/* 8057C46C FC 01 00 32 */ fmul f0, f1, f0 -/* 8057C470 FC 03 00 28 */ fsub f0, f3, f0 -/* 8057C474 FC 02 00 32 */ fmul f0, f2, f0 -/* 8057C478 FC 21 00 32 */ fmul f1, f1, f0 -/* 8057C47C FC 20 08 18 */ frsp f1, f1 -/* 8057C480 48 00 00 88 */ b lbl_8057C508 -lbl_8057C484: -/* 8057C484 C8 1D 00 30 */ lfd f0, 0x30(r29) -/* 8057C488 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8057C48C 40 80 00 10 */ bge lbl_8057C49C -/* 8057C490 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8057C494 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8057C498 48 00 00 70 */ b lbl_8057C508 -lbl_8057C49C: -/* 8057C49C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 8057C4A0 80 81 00 14 */ lwz r4, 0x14(r1) -/* 8057C4A4 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8057C4A8 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8057C4AC 7C 03 00 00 */ cmpw r3, r0 -/* 8057C4B0 41 82 00 14 */ beq lbl_8057C4C4 -/* 8057C4B4 40 80 00 40 */ bge lbl_8057C4F4 -/* 8057C4B8 2C 03 00 00 */ cmpwi r3, 0 -/* 8057C4BC 41 82 00 20 */ beq lbl_8057C4DC -/* 8057C4C0 48 00 00 34 */ b lbl_8057C4F4 -lbl_8057C4C4: -/* 8057C4C4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8057C4C8 41 82 00 0C */ beq lbl_8057C4D4 -/* 8057C4CC 38 00 00 01 */ li r0, 1 -/* 8057C4D0 48 00 00 28 */ b lbl_8057C4F8 -lbl_8057C4D4: -/* 8057C4D4 38 00 00 02 */ li r0, 2 -/* 8057C4D8 48 00 00 20 */ b lbl_8057C4F8 -lbl_8057C4DC: -/* 8057C4DC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8057C4E0 41 82 00 0C */ beq lbl_8057C4EC -/* 8057C4E4 38 00 00 05 */ li r0, 5 -/* 8057C4E8 48 00 00 10 */ b lbl_8057C4F8 -lbl_8057C4EC: -/* 8057C4EC 38 00 00 03 */ li r0, 3 -/* 8057C4F0 48 00 00 08 */ b lbl_8057C4F8 -lbl_8057C4F4: -/* 8057C4F4 38 00 00 04 */ li r0, 4 -lbl_8057C4F8: -/* 8057C4F8 2C 00 00 01 */ cmpwi r0, 1 -/* 8057C4FC 40 82 00 0C */ bne lbl_8057C508 -/* 8057C500 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8057C504 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8057C508: -/* 8057C508 C0 1D 00 38 */ lfs f0, 0x38(r29) -/* 8057C50C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8057C510 40 80 00 5C */ bge lbl_8057C56C -/* 8057C514 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 8057C518 38 80 07 0F */ li r4, 0x70f -/* 8057C51C 38 A1 00 30 */ addi r5, r1, 0x30 -/* 8057C520 38 C0 00 00 */ li r6, 0 -/* 8057C524 38 E0 00 FF */ li r7, 0xff -/* 8057C528 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 8057C52C 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 8057C530 7D 09 43 78 */ mr r9, r8 -/* 8057C534 39 40 00 00 */ li r10, 0 -/* 8057C538 C0 3D 00 18 */ lfs f1, 0x18(r29) -/* 8057C53C 4B AD 0C 7D */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 8057C540 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 8057C544 38 80 07 3D */ li r4, 0x73d -/* 8057C548 38 A1 00 30 */ addi r5, r1, 0x30 -/* 8057C54C 38 C0 00 00 */ li r6, 0 -/* 8057C550 38 E0 00 FF */ li r7, 0xff -/* 8057C554 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 8057C558 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 8057C55C 7D 09 43 78 */ mr r9, r8 -/* 8057C560 39 40 00 00 */ li r10, 0 -/* 8057C564 C0 3D 00 18 */ lfs f1, 0x18(r29) -/* 8057C568 4B AD 0C 51 */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -lbl_8057C56C: -/* 8057C56C C0 5C 04 D8 */ lfs f2, 0x4d8(r28) -/* 8057C570 C0 1C 04 D0 */ lfs f0, 0x4d0(r28) -/* 8057C574 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8057C578 C0 3D 00 18 */ lfs f1, 0x18(r29) -/* 8057C57C D0 21 00 1C */ stfs f1, 0x1c(r1) -/* 8057C580 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 8057C584 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 8057C588 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 8057C58C D0 21 00 28 */ stfs f1, 0x28(r1) -/* 8057C590 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 8057C594 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 8057C598 38 61 00 18 */ addi r3, r1, 0x18 -/* 8057C59C 38 81 00 24 */ addi r4, r1, 0x24 -/* 8057C5A0 4B DC AD FD */ bl PSVECSquareDistance -/* 8057C5A4 FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 8057C5A8 40 81 00 94 */ ble lbl_8057C63C -/* 8057C5AC C0 41 00 34 */ lfs f2, 0x34(r1) -/* 8057C5B0 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 8057C5B4 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8057C5B8 FC 00 02 10 */ fabs f0, f0 -/* 8057C5BC FC 40 00 18 */ frsp f2, f0 -/* 8057C5C0 C0 1D 00 3C */ lfs f0, 0x3c(r29) -/* 8057C5C4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8057C5C8 40 80 00 74 */ bge lbl_8057C63C -/* 8057C5CC FF E0 08 90 */ fmr f31, f1 -/* 8057C5D0 9B 59 05 6C */ stb r26, 0x56c(r25) -/* 8057C5D4 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 8057C5D8 D0 19 04 D0 */ stfs f0, 0x4d0(r25) -/* 8057C5DC C0 01 00 34 */ lfs f0, 0x34(r1) -/* 8057C5E0 D0 19 04 D4 */ stfs f0, 0x4d4(r25) -/* 8057C5E4 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 8057C5E8 D0 19 04 D8 */ stfs f0, 0x4d8(r25) -/* 8057C5EC C0 01 00 30 */ lfs f0, 0x30(r1) -/* 8057C5F0 D0 19 05 50 */ stfs f0, 0x550(r25) -/* 8057C5F4 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 8057C5F8 D0 19 05 54 */ stfs f0, 0x554(r25) -/* 8057C5FC C0 01 00 38 */ lfs f0, 0x38(r1) -/* 8057C600 D0 19 05 58 */ stfs f0, 0x558(r25) -/* 8057C604 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 8057C608 D0 19 05 38 */ stfs f0, 0x538(r25) -/* 8057C60C C0 01 00 34 */ lfs f0, 0x34(r1) -/* 8057C610 D0 19 05 3C */ stfs f0, 0x53c(r25) -/* 8057C614 C0 01 00 38 */ lfs f0, 0x38(r1) -/* 8057C618 D0 19 05 40 */ stfs f0, 0x540(r25) -/* 8057C61C 88 1B 00 03 */ lbz r0, 3(r27) -/* 8057C620 28 00 00 00 */ cmplwi r0, 0 -/* 8057C624 40 82 00 10 */ bne lbl_8057C634 -/* 8057C628 38 00 00 00 */ li r0, 0 -/* 8057C62C 98 19 05 68 */ stb r0, 0x568(r25) -/* 8057C630 48 00 00 0C */ b lbl_8057C63C -lbl_8057C634: -/* 8057C634 38 00 00 02 */ li r0, 2 -/* 8057C638 98 19 05 68 */ stb r0, 0x568(r25) -lbl_8057C63C: -/* 8057C63C 3B 5A 00 01 */ addi r26, r26, 1 -/* 8057C640 3B 7B 00 10 */ addi r27, r27, 0x10 -lbl_8057C644: -/* 8057C644 80 79 05 B8 */ lwz r3, 0x5b8(r25) -/* 8057C648 A0 03 00 00 */ lhz r0, 0(r3) -/* 8057C64C 7C 1A 00 00 */ cmpw r26, r0 -/* 8057C650 41 80 FD 7C */ blt lbl_8057C3CC -lbl_8057C654: -/* 8057C654 80 7E 5D B4 */ lwz r3, 0x5db4(r30) -/* 8057C658 80 03 05 74 */ lwz r0, 0x574(r3) -/* 8057C65C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8057C660 41 82 01 FC */ beq lbl_8057C85C -/* 8057C664 88 19 05 6A */ lbz r0, 0x56a(r25) -/* 8057C668 28 00 00 00 */ cmplwi r0, 0 -/* 8057C66C 40 82 01 F0 */ bne lbl_8057C85C -/* 8057C670 88 19 05 6B */ lbz r0, 0x56b(r25) -/* 8057C674 28 00 00 00 */ cmplwi r0, 0 -/* 8057C678 40 82 00 7C */ bne lbl_8057C6F4 -/* 8057C67C 7F 83 E3 78 */ mr r3, r28 -/* 8057C680 7F 24 CB 78 */ mr r4, r25 -/* 8057C684 4B A9 E1 19 */ bl fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8057C688 7C 7A 1B 78 */ mr r26, r3 -/* 8057C68C 7F 23 CB 78 */ mr r3, r25 -/* 8057C690 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057C694 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057C698 80 84 5D AC */ lwz r4, 0x5dac(r4) -/* 8057C69C 4B A9 E3 F9 */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 8057C6A0 2C 1A 28 00 */ cmpwi r26, 0x2800 -/* 8057C6A4 40 81 00 10 */ ble lbl_8057C6B4 -/* 8057C6A8 C0 1D 00 40 */ lfs f0, 0x40(r29) -/* 8057C6AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8057C6B0 40 80 00 10 */ bge lbl_8057C6C0 -lbl_8057C6B4: -/* 8057C6B4 80 19 05 5C */ lwz r0, 0x55c(r25) -/* 8057C6B8 60 00 00 80 */ ori r0, r0, 0x80 -/* 8057C6BC 90 19 05 5C */ stw r0, 0x55c(r25) -lbl_8057C6C0: -/* 8057C6C0 C0 1D 00 44 */ lfs f0, 0x44(r29) -/* 8057C6C4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8057C6C8 40 80 00 2C */ bge lbl_8057C6F4 -/* 8057C6CC C0 39 04 D4 */ lfs f1, 0x4d4(r25) -/* 8057C6D0 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 8057C6D4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8057C6D8 FC 00 02 10 */ fabs f0, f0 -/* 8057C6DC FC 20 00 18 */ frsp f1, f0 -/* 8057C6E0 C0 1D 00 3C */ lfs f0, 0x3c(r29) -/* 8057C6E4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8057C6E8 40 80 00 0C */ bge lbl_8057C6F4 -/* 8057C6EC 38 79 05 50 */ addi r3, r25, 0x550 -/* 8057C6F0 4B BE 2E 01 */ bl setLookPos__9daPy_py_cFP4cXyz -lbl_8057C6F4: -/* 8057C6F4 80 19 05 B8 */ lwz r0, 0x5b8(r25) -/* 8057C6F8 28 00 00 00 */ cmplwi r0, 0 -/* 8057C6FC 40 82 01 60 */ bne lbl_8057C85C -/* 8057C700 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 8057C704 38 99 04 D0 */ addi r4, r25, 0x4d0 -/* 8057C708 4B DC AC 95 */ bl PSVECSquareDistance -/* 8057C70C C0 1D 00 18 */ lfs f0, 0x18(r29) -/* 8057C710 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8057C714 40 81 00 58 */ ble lbl_8057C76C -/* 8057C718 FC 00 08 34 */ frsqrte f0, f1 -/* 8057C71C C8 9D 00 20 */ lfd f4, 0x20(r29) -/* 8057C720 FC 44 00 32 */ fmul f2, f4, f0 -/* 8057C724 C8 7D 00 28 */ lfd f3, 0x28(r29) -/* 8057C728 FC 00 00 32 */ fmul f0, f0, f0 -/* 8057C72C FC 01 00 32 */ fmul f0, f1, f0 -/* 8057C730 FC 03 00 28 */ fsub f0, f3, f0 -/* 8057C734 FC 02 00 32 */ fmul f0, f2, f0 -/* 8057C738 FC 44 00 32 */ fmul f2, f4, f0 -/* 8057C73C FC 00 00 32 */ fmul f0, f0, f0 -/* 8057C740 FC 01 00 32 */ fmul f0, f1, f0 -/* 8057C744 FC 03 00 28 */ fsub f0, f3, f0 -/* 8057C748 FC 02 00 32 */ fmul f0, f2, f0 -/* 8057C74C FC 44 00 32 */ fmul f2, f4, f0 -/* 8057C750 FC 00 00 32 */ fmul f0, f0, f0 -/* 8057C754 FC 01 00 32 */ fmul f0, f1, f0 -/* 8057C758 FC 03 00 28 */ fsub f0, f3, f0 -/* 8057C75C FC 02 00 32 */ fmul f0, f2, f0 -/* 8057C760 FC 21 00 32 */ fmul f1, f1, f0 -/* 8057C764 FC 20 08 18 */ frsp f1, f1 -/* 8057C768 48 00 00 88 */ b lbl_8057C7F0 -lbl_8057C76C: -/* 8057C76C C8 1D 00 30 */ lfd f0, 0x30(r29) -/* 8057C770 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8057C774 40 80 00 10 */ bge lbl_8057C784 -/* 8057C778 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8057C77C C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 8057C780 48 00 00 70 */ b lbl_8057C7F0 -lbl_8057C784: -/* 8057C784 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 8057C788 80 81 00 10 */ lwz r4, 0x10(r1) -/* 8057C78C 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 8057C790 3C 00 7F 80 */ lis r0, 0x7f80 -/* 8057C794 7C 03 00 00 */ cmpw r3, r0 -/* 8057C798 41 82 00 14 */ beq lbl_8057C7AC -/* 8057C79C 40 80 00 40 */ bge lbl_8057C7DC -/* 8057C7A0 2C 03 00 00 */ cmpwi r3, 0 -/* 8057C7A4 41 82 00 20 */ beq lbl_8057C7C4 -/* 8057C7A8 48 00 00 34 */ b lbl_8057C7DC -lbl_8057C7AC: -/* 8057C7AC 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8057C7B0 41 82 00 0C */ beq lbl_8057C7BC -/* 8057C7B4 38 00 00 01 */ li r0, 1 -/* 8057C7B8 48 00 00 28 */ b lbl_8057C7E0 -lbl_8057C7BC: -/* 8057C7BC 38 00 00 02 */ li r0, 2 -/* 8057C7C0 48 00 00 20 */ b lbl_8057C7E0 -lbl_8057C7C4: -/* 8057C7C4 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 8057C7C8 41 82 00 0C */ beq lbl_8057C7D4 -/* 8057C7CC 38 00 00 05 */ li r0, 5 -/* 8057C7D0 48 00 00 10 */ b lbl_8057C7E0 -lbl_8057C7D4: -/* 8057C7D4 38 00 00 03 */ li r0, 3 -/* 8057C7D8 48 00 00 08 */ b lbl_8057C7E0 -lbl_8057C7DC: -/* 8057C7DC 38 00 00 04 */ li r0, 4 -lbl_8057C7E0: -/* 8057C7E0 2C 00 00 01 */ cmpwi r0, 1 -/* 8057C7E4 40 82 00 0C */ bne lbl_8057C7F0 -/* 8057C7E8 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 8057C7EC C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_8057C7F0: -/* 8057C7F0 C0 1D 00 38 */ lfs f0, 0x38(r29) -/* 8057C7F4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8057C7F8 40 80 00 64 */ bge lbl_8057C85C -/* 8057C7FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8057C800 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8057C804 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) -/* 8057C808 38 80 07 0F */ li r4, 0x70f -/* 8057C80C 38 B9 04 D0 */ addi r5, r25, 0x4d0 -/* 8057C810 38 C0 00 00 */ li r6, 0 -/* 8057C814 38 E0 00 FF */ li r7, 0xff -/* 8057C818 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 8057C81C 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 8057C820 7D 09 43 78 */ mr r9, r8 -/* 8057C824 39 40 00 00 */ li r10, 0 -/* 8057C828 C0 3D 00 18 */ lfs f1, 0x18(r29) -/* 8057C82C 4B AD 09 8D */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -/* 8057C830 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) -/* 8057C834 38 80 07 3D */ li r4, 0x73d -/* 8057C838 38 B9 04 D0 */ addi r5, r25, 0x4d0 -/* 8057C83C 38 C0 00 00 */ li r6, 0 -/* 8057C840 38 E0 00 FF */ li r7, 0xff -/* 8057C844 3D 00 80 45 */ lis r8, g_whiteColor@ha /* 0x80450608@ha */ -/* 8057C848 39 08 06 08 */ addi r8, r8, g_whiteColor@l /* 0x80450608@l */ -/* 8057C84C 7D 09 43 78 */ mr r9, r8 -/* 8057C850 39 40 00 00 */ li r10, 0 -/* 8057C854 C0 3D 00 18 */ lfs f1, 0x18(r29) -/* 8057C858 4B AD 09 61 */ bl setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif -lbl_8057C85C: -/* 8057C85C 38 60 00 01 */ li r3, 1 -lbl_8057C860: -/* 8057C860 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* qr0 */ -/* 8057C864 CB E1 00 70 */ lfd f31, 0x70(r1) -/* 8057C868 39 61 00 70 */ addi r11, r1, 0x70 -/* 8057C86C 4B DE 59 AD */ bl _restgpr_25 -/* 8057C870 80 01 00 84 */ lwz r0, 0x84(r1) -/* 8057C874 7C 08 03 A6 */ mtlr r0 -/* 8057C878 38 21 00 80 */ addi r1, r1, 0x80 -/* 8057C87C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/Execute__14daSnowEffTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/Execute__14daSnowEffTag_cFv.s deleted file mode 100644 index f29e2228267..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/Execute__14daSnowEffTag_cFv.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_80CDF498: -/* 80CDF498 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80CDF49C 7C 08 02 A6 */ mflr r0 -/* 80CDF4A0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80CDF4A4 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80CDF4A8 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80CDF4AC 7C 7F 1B 78 */ mr r31, r3 -/* 80CDF4B0 4B FF FE 09 */ bl playerAreaCheck__14daSnowEffTag_cFv -/* 80CDF4B4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80CDF4B8 28 00 00 01 */ cmplwi r0, 1 -/* 80CDF4BC 40 82 01 0C */ bne lbl_80CDF5C8 -/* 80CDF4C0 88 1F 05 69 */ lbz r0, 0x569(r31) -/* 80CDF4C4 28 00 00 00 */ cmplwi r0, 0 -/* 80CDF4C8 40 82 00 60 */ bne lbl_80CDF528 -/* 80CDF4CC 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80CDF4D0 7C 03 07 74 */ extsb r3, r0 -/* 80CDF4D4 4B 34 DB 99 */ bl dComIfGp_getReverb__Fi -/* 80CDF4D8 7C 67 1B 78 */ mr r7, r3 -/* 80CDF4DC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080050@ha */ -/* 80CDF4E0 38 03 00 50 */ addi r0, r3, 0x0050 /* 0x00080050@l */ -/* 80CDF4E4 90 01 00 20 */ stw r0, 0x20(r1) -/* 80CDF4E8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80CDF4EC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 80CDF4F0 80 63 00 00 */ lwz r3, 0(r3) -/* 80CDF4F4 38 81 00 20 */ addi r4, r1, 0x20 -/* 80CDF4F8 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 80CDF4FC 38 C0 00 00 */ li r6, 0 -/* 80CDF500 3D 00 80 CE */ lis r8, lit_3806@ha /* 0x80CDF750@ha */ -/* 80CDF504 C0 28 F7 50 */ lfs f1, lit_3806@l(r8) /* 0x80CDF750@l */ -/* 80CDF508 FC 40 08 90 */ fmr f2, f1 -/* 80CDF50C 3D 00 80 CE */ lis r8, lit_3807@ha /* 0x80CDF754@ha */ -/* 80CDF510 C0 68 F7 54 */ lfs f3, lit_3807@l(r8) /* 0x80CDF754@l */ -/* 80CDF514 FC 80 18 90 */ fmr f4, f3 -/* 80CDF518 39 00 00 00 */ li r8, 0 -/* 80CDF51C 4B 5C C4 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80CDF520 38 00 00 01 */ li r0, 1 -/* 80CDF524 98 1F 05 69 */ stb r0, 0x569(r31) -lbl_80CDF528: -/* 80CDF528 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CDF52C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CDF530 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80CDF534 38 00 00 FF */ li r0, 0xff -/* 80CDF538 90 01 00 08 */ stw r0, 8(r1) -/* 80CDF53C 38 80 00 00 */ li r4, 0 -/* 80CDF540 90 81 00 0C */ stw r4, 0xc(r1) -/* 80CDF544 38 00 FF FF */ li r0, -1 -/* 80CDF548 90 01 00 10 */ stw r0, 0x10(r1) -/* 80CDF54C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80CDF550 90 81 00 18 */ stw r4, 0x18(r1) -/* 80CDF554 90 81 00 1C */ stw r4, 0x1c(r1) -/* 80CDF558 80 9F 05 78 */ lwz r4, 0x578(r31) -/* 80CDF55C 38 A0 00 00 */ li r5, 0 -/* 80CDF560 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000886D@ha */ -/* 80CDF564 38 C6 88 6D */ addi r6, r6, 0x886D /* 0x0000886D@l */ -/* 80CDF568 38 FF 04 D0 */ addi r7, r31, 0x4d0 -/* 80CDF56C 39 00 00 00 */ li r8, 0 -/* 80CDF570 39 20 00 00 */ li r9, 0 -/* 80CDF574 39 40 00 00 */ li r10, 0 -/* 80CDF578 3D 60 80 CE */ lis r11, lit_3806@ha /* 0x80CDF750@ha */ -/* 80CDF57C C0 2B F7 50 */ lfs f1, lit_3806@l(r11) /* 0x80CDF750@l */ -/* 80CDF580 4B 36 DF 4D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf -/* 80CDF584 90 7F 05 78 */ stw r3, 0x578(r31) -/* 80CDF588 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80CDF58C 38 63 02 10 */ addi r3, r3, 0x210 -/* 80CDF590 80 9F 05 78 */ lwz r4, 0x578(r31) -/* 80CDF594 4B 36 C3 85 */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 80CDF598 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CDF59C 41 82 00 2C */ beq lbl_80CDF5C8 -/* 80CDF5A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CDF5A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CDF5A8 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80CDF5AC 81 83 06 28 */ lwz r12, 0x628(r3) -/* 80CDF5B0 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 80CDF5B4 7D 89 03 A6 */ mtctr r12 -/* 80CDF5B8 4E 80 04 21 */ bctrl -/* 80CDF5BC 38 9F 00 68 */ addi r4, r31, 0x68 -/* 80CDF5C0 38 BF 00 A4 */ addi r5, r31, 0xa4 -/* 80CDF5C4 4B 5A 12 1D */ bl func_802807E0 -lbl_80CDF5C8: -/* 80CDF5C8 38 60 00 01 */ li r3, 1 -/* 80CDF5CC 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80CDF5D0 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80CDF5D4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80CDF5D8 7C 08 03 A6 */ mtlr r0 -/* 80CDF5DC 38 21 00 30 */ addi r1, r1, 0x30 -/* 80CDF5E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__ct__18daSnowEffTag_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__ct__18daSnowEffTag_HIO_cFv.s deleted file mode 100644 index 9f296a228a7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__ct__18daSnowEffTag_HIO_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80CDF0AC: -/* 80CDF0AC 3C 80 80 CE */ lis r4, __vt__14mDoHIO_entry_c@ha /* 0x80CDF7B4@ha */ -/* 80CDF0B0 38 04 F7 B4 */ addi r0, r4, __vt__14mDoHIO_entry_c@l /* 0x80CDF7B4@l */ -/* 80CDF0B4 90 03 00 00 */ stw r0, 0(r3) -/* 80CDF0B8 3C 80 80 CE */ lis r4, __vt__18daSnowEffTag_HIO_c@ha /* 0x80CDF7A8@ha */ -/* 80CDF0BC 38 04 F7 A8 */ addi r0, r4, __vt__18daSnowEffTag_HIO_c@l /* 0x80CDF7A8@l */ -/* 80CDF0C0 90 03 00 00 */ stw r0, 0(r3) -/* 80CDF0C4 38 00 00 14 */ li r0, 0x14 -/* 80CDF0C8 98 03 00 04 */ stb r0, 4(r3) -/* 80CDF0CC 38 00 00 00 */ li r0, 0 -/* 80CDF0D0 98 03 00 05 */ stb r0, 5(r3) -/* 80CDF0D4 38 00 00 01 */ li r0, 1 -/* 80CDF0D8 98 03 00 06 */ stb r0, 6(r3) -/* 80CDF0DC 98 03 00 07 */ stb r0, 7(r3) -/* 80CDF0E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__dt__14mDoHIO_entry_cFv.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__dt__14mDoHIO_entry_cFv.s deleted file mode 100644 index 0557e8bfea7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__dt__14mDoHIO_entry_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80CDF0E4: -/* 80CDF0E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF0E8 7C 08 02 A6 */ mflr r0 -/* 80CDF0EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF0F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDF0F4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CDF0F8 41 82 00 1C */ beq lbl_80CDF114 -/* 80CDF0FC 3C A0 80 CE */ lis r5, __vt__14mDoHIO_entry_c@ha /* 0x80CDF7B4@ha */ -/* 80CDF100 38 05 F7 B4 */ addi r0, r5, __vt__14mDoHIO_entry_c@l /* 0x80CDF7B4@l */ -/* 80CDF104 90 1F 00 00 */ stw r0, 0(r31) -/* 80CDF108 7C 80 07 35 */ extsh. r0, r4 -/* 80CDF10C 40 81 00 08 */ ble lbl_80CDF114 -/* 80CDF110 4B 5E FC 2D */ bl __dl__FPv -lbl_80CDF114: -/* 80CDF114 7F E3 FB 78 */ mr r3, r31 -/* 80CDF118 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDF11C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF120 7C 08 03 A6 */ mtlr r0 -/* 80CDF124 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF128 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__dt__18daSnowEffTag_HIO_cFv.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__dt__18daSnowEffTag_HIO_cFv.s deleted file mode 100644 index ef3a1b44874..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__dt__18daSnowEffTag_HIO_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80CDF674: -/* 80CDF674 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF678 7C 08 02 A6 */ mflr r0 -/* 80CDF67C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF680 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDF684 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80CDF688 41 82 00 30 */ beq lbl_80CDF6B8 -/* 80CDF68C 3C 60 80 CE */ lis r3, __vt__18daSnowEffTag_HIO_c@ha /* 0x80CDF7A8@ha */ -/* 80CDF690 38 03 F7 A8 */ addi r0, r3, __vt__18daSnowEffTag_HIO_c@l /* 0x80CDF7A8@l */ -/* 80CDF694 90 1F 00 00 */ stw r0, 0(r31) -/* 80CDF698 41 82 00 10 */ beq lbl_80CDF6A8 -/* 80CDF69C 3C 60 80 CE */ lis r3, __vt__14mDoHIO_entry_c@ha /* 0x80CDF7B4@ha */ -/* 80CDF6A0 38 03 F7 B4 */ addi r0, r3, __vt__14mDoHIO_entry_c@l /* 0x80CDF7B4@l */ -/* 80CDF6A4 90 1F 00 00 */ stw r0, 0(r31) -lbl_80CDF6A8: -/* 80CDF6A8 7C 80 07 35 */ extsh. r0, r4 -/* 80CDF6AC 40 81 00 0C */ ble lbl_80CDF6B8 -/* 80CDF6B0 7F E3 FB 78 */ mr r3, r31 -/* 80CDF6B4 4B 5E F6 89 */ bl __dl__FPv -lbl_80CDF6B8: -/* 80CDF6B8 7F E3 FB 78 */ mr r3, r31 -/* 80CDF6BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDF6C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF6C4 7C 08 03 A6 */ mtlr r0 -/* 80CDF6C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF6CC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__sinit_d_a_obj_snowEffTag_cpp.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__sinit_d_a_obj_snowEffTag_cpp.s deleted file mode 100644 index 461beb854ca..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__sinit_d_a_obj_snowEffTag_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80CDF6D0: -/* 80CDF6D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF6D4 7C 08 02 A6 */ mflr r0 -/* 80CDF6D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF6DC 3C 60 80 CE */ lis r3, l_HIO@ha /* 0x80CDF7D4@ha */ -/* 80CDF6E0 38 63 F7 D4 */ addi r3, r3, l_HIO@l /* 0x80CDF7D4@l */ -/* 80CDF6E4 4B FF F9 C9 */ bl __ct__18daSnowEffTag_HIO_cFv -/* 80CDF6E8 3C 80 80 CE */ lis r4, __dt__18daSnowEffTag_HIO_cFv@ha /* 0x80CDF674@ha */ -/* 80CDF6EC 38 84 F6 74 */ addi r4, r4, __dt__18daSnowEffTag_HIO_cFv@l /* 0x80CDF674@l */ -/* 80CDF6F0 3C A0 80 CE */ lis r5, lit_3643@ha /* 0x80CDF7C8@ha */ -/* 80CDF6F4 38 A5 F7 C8 */ addi r5, r5, lit_3643@l /* 0x80CDF7C8@l */ -/* 80CDF6F8 4B FF F9 41 */ bl __register_global_object -/* 80CDF6FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF700 7C 08 03 A6 */ mtlr r0 -/* 80CDF704 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF708 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/create__14daSnowEffTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/create__14daSnowEffTag_cFv.s deleted file mode 100644 index 748d40895fc..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/create__14daSnowEffTag_cFv.s +++ /dev/null @@ -1,86 +0,0 @@ -lbl_80CDF184: -/* 80CDF184 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF188 7C 08 02 A6 */ mflr r0 -/* 80CDF18C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF190 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDF194 93 C1 00 08 */ stw r30, 8(r1) -/* 80CDF198 7C 7E 1B 78 */ mr r30, r3 -/* 80CDF19C 3C 80 80 CE */ lis r4, lit_3702@ha /* 0x80CDF720@ha */ -/* 80CDF1A0 3B E4 F7 20 */ addi r31, r4, lit_3702@l /* 0x80CDF720@l */ -/* 80CDF1A4 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80CDF1A8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80CDF1AC 40 82 00 1C */ bne lbl_80CDF1C8 -/* 80CDF1B0 28 1E 00 00 */ cmplwi r30, 0 -/* 80CDF1B4 41 82 00 08 */ beq lbl_80CDF1BC -/* 80CDF1B8 4B 33 99 AD */ bl __ct__10fopAc_ac_cFv -lbl_80CDF1BC: -/* 80CDF1BC 80 1E 04 A0 */ lwz r0, 0x4a0(r30) -/* 80CDF1C0 60 00 00 08 */ ori r0, r0, 8 -/* 80CDF1C4 90 1E 04 A0 */ stw r0, 0x4a0(r30) -lbl_80CDF1C8: -/* 80CDF1C8 C0 3F 00 00 */ lfs f1, 0(r31) -/* 80CDF1CC C0 1E 04 EC */ lfs f0, 0x4ec(r30) -/* 80CDF1D0 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CDF1D4 D0 1E 05 6C */ stfs f0, 0x56c(r30) -/* 80CDF1D8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80CDF1DC 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 80CDF1E0 2C 00 00 02 */ cmpwi r0, 2 -/* 80CDF1E4 41 82 00 48 */ beq lbl_80CDF22C -/* 80CDF1E8 40 80 00 18 */ bge lbl_80CDF200 -/* 80CDF1EC 2C 00 00 01 */ cmpwi r0, 1 -/* 80CDF1F0 40 80 00 28 */ bge lbl_80CDF218 -/* 80CDF1F4 2C 00 FF FF */ cmpwi r0, -1 -/* 80CDF1F8 40 80 00 14 */ bge lbl_80CDF20C -/* 80CDF1FC 48 00 00 54 */ b lbl_80CDF250 -lbl_80CDF200: -/* 80CDF200 2C 00 00 04 */ cmpwi r0, 4 -/* 80CDF204 40 80 00 4C */ bge lbl_80CDF250 -/* 80CDF208 48 00 00 38 */ b lbl_80CDF240 -lbl_80CDF20C: -/* 80CDF20C C0 1E 05 6C */ lfs f0, 0x56c(r30) -/* 80CDF210 D0 1E 05 70 */ stfs f0, 0x570(r30) -/* 80CDF214 48 00 00 3C */ b lbl_80CDF250 -lbl_80CDF218: -/* 80CDF218 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80CDF21C C0 1E 05 6C */ lfs f0, 0x56c(r30) -/* 80CDF220 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CDF224 D0 1E 05 70 */ stfs f0, 0x570(r30) -/* 80CDF228 48 00 00 28 */ b lbl_80CDF250 -lbl_80CDF22C: -/* 80CDF22C C0 3F 00 08 */ lfs f1, 8(r31) -/* 80CDF230 C0 1E 05 6C */ lfs f0, 0x56c(r30) -/* 80CDF234 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CDF238 D0 1E 05 70 */ stfs f0, 0x570(r30) -/* 80CDF23C 48 00 00 14 */ b lbl_80CDF250 -lbl_80CDF240: -/* 80CDF240 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 80CDF244 C0 1E 05 6C */ lfs f0, 0x56c(r30) -/* 80CDF248 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CDF24C D0 1E 05 70 */ stfs f0, 0x570(r30) -lbl_80CDF250: -/* 80CDF250 C0 3E 05 6C */ lfs f1, 0x56c(r30) -/* 80CDF254 C0 1E 05 70 */ lfs f0, 0x570(r30) -/* 80CDF258 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80CDF25C C0 5F 00 00 */ lfs f2, 0(r31) -/* 80CDF260 C0 1E 04 F0 */ lfs f0, 0x4f0(r30) -/* 80CDF264 EC 42 00 32 */ fmuls f2, f2, f0 -/* 80CDF268 4B 58 84 0D */ bl cM_atan2s__Fff -/* 80CDF26C 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c -/* 80CDF270 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 80CDF274 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 80CDF278 7C 23 04 2E */ lfsx f1, r3, r0 -/* 80CDF27C 7C 63 02 14 */ add r3, r3, r0 -/* 80CDF280 C0 03 00 04 */ lfs f0, 4(r3) -/* 80CDF284 EC 01 00 24 */ fdivs f0, f1, f0 -/* 80CDF288 D0 1E 05 74 */ stfs f0, 0x574(r30) -/* 80CDF28C 38 00 00 00 */ li r0, 0 -/* 80CDF290 98 1E 05 69 */ stb r0, 0x569(r30) -/* 80CDF294 7F C3 F3 78 */ mr r3, r30 -/* 80CDF298 4B FF FE 95 */ bl setBaseMtx__14daSnowEffTag_cFv -/* 80CDF29C 38 60 00 04 */ li r3, 4 -/* 80CDF2A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDF2A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 80CDF2A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF2AC 7C 08 03 A6 */ mtlr r0 -/* 80CDF2B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF2B4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Create__FP10fopAc_ac_c.s deleted file mode 100644 index fe5f57a5d24..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CDF654: -/* 80CDF654 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF658 7C 08 02 A6 */ mflr r0 -/* 80CDF65C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF660 4B FF FB 25 */ bl create__14daSnowEffTag_cFv -/* 80CDF664 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF668 7C 08 03 A6 */ mtlr r0 -/* 80CDF66C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF670 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Delete__FP14daSnowEffTag_c.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Delete__FP14daSnowEffTag_c.s deleted file mode 100644 index 853c8083db1..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Delete__FP14daSnowEffTag_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CDF634: -/* 80CDF634 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF638 7C 08 02 A6 */ mflr r0 -/* 80CDF63C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF640 4B FF FF AD */ bl Delete__14daSnowEffTag_cFv -/* 80CDF644 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF648 7C 08 03 A6 */ mtlr r0 -/* 80CDF64C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF650 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Draw__FP14daSnowEffTag_c.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Draw__FP14daSnowEffTag_c.s deleted file mode 100644 index 46e76efadc7..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Draw__FP14daSnowEffTag_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CDF5F4: -/* 80CDF5F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF5F8 7C 08 02 A6 */ mflr r0 -/* 80CDF5FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF600 4B FF FF E5 */ bl Draw__14daSnowEffTag_cFv -/* 80CDF604 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF608 7C 08 03 A6 */ mtlr r0 -/* 80CDF60C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF610 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Execute__FP14daSnowEffTag_c.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Execute__FP14daSnowEffTag_c.s deleted file mode 100644 index 92ef8722283..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Execute__FP14daSnowEffTag_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80CDF614: -/* 80CDF614 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF618 7C 08 02 A6 */ mflr r0 -/* 80CDF61C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF620 4B FF FE 79 */ bl Execute__14daSnowEffTag_cFv -/* 80CDF624 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF628 7C 08 03 A6 */ mtlr r0 -/* 80CDF62C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF630 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/playerAreaCheck__14daSnowEffTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/playerAreaCheck__14daSnowEffTag_cFv.s deleted file mode 100644 index 9d9774219ec..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/playerAreaCheck__14daSnowEffTag_cFv.s +++ /dev/null @@ -1,135 +0,0 @@ -lbl_80CDF2B8: -/* 80CDF2B8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80CDF2BC 7C 08 02 A6 */ mflr r0 -/* 80CDF2C0 90 01 00 44 */ stw r0, 0x44(r1) -/* 80CDF2C4 39 61 00 40 */ addi r11, r1, 0x40 -/* 80CDF2C8 4B 68 2F 11 */ bl _savegpr_28 -/* 80CDF2CC 7C 7F 1B 78 */ mr r31, r3 -/* 80CDF2D0 3C 60 80 CE */ lis r3, lit_3702@ha /* 0x80CDF720@ha */ -/* 80CDF2D4 3B C3 F7 20 */ addi r30, r3, lit_3702@l /* 0x80CDF720@l */ -/* 80CDF2D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80CDF2DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80CDF2E0 83 A3 5D AC */ lwz r29, 0x5dac(r3) -/* 80CDF2E4 3B 80 00 00 */ li r28, 0 -/* 80CDF2E8 C0 7D 04 D4 */ lfs f3, 0x4d4(r29) -/* 80CDF2EC C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CDF2F0 FC 03 10 40 */ fcmpo cr0, f3, f2 -/* 80CDF2F4 41 80 00 1C */ blt lbl_80CDF310 -/* 80CDF2F8 C0 3E 00 00 */ lfs f1, 0(r30) -/* 80CDF2FC C0 1F 04 F0 */ lfs f0, 0x4f0(r31) -/* 80CDF300 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80CDF304 EC 02 00 2A */ fadds f0, f2, f0 -/* 80CDF308 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80CDF30C 40 81 00 0C */ ble lbl_80CDF318 -lbl_80CDF310: -/* 80CDF310 38 60 00 00 */ li r3, 0 -/* 80CDF314 48 00 01 6C */ b lbl_80CDF480 -lbl_80CDF318: -/* 80CDF318 38 61 00 18 */ addi r3, r1, 0x18 -/* 80CDF31C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80CDF320 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 80CDF324 4B 58 78 11 */ bl __mi__4cXyzCFRC3Vec -/* 80CDF328 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 80CDF32C D0 41 00 24 */ stfs f2, 0x24(r1) -/* 80CDF330 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 80CDF334 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80CDF338 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 80CDF33C D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 80CDF340 D0 41 00 0C */ stfs f2, 0xc(r1) -/* 80CDF344 C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 80CDF348 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80CDF34C D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80CDF350 38 61 00 0C */ addi r3, r1, 0xc -/* 80CDF354 4B 66 7D E5 */ bl PSVECSquareMag -/* 80CDF358 C0 1E 00 10 */ lfs f0, 0x10(r30) -/* 80CDF35C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CDF360 40 81 00 58 */ ble lbl_80CDF3B8 -/* 80CDF364 FC 00 08 34 */ frsqrte f0, f1 -/* 80CDF368 C8 9E 00 18 */ lfd f4, 0x18(r30) -/* 80CDF36C FC 44 00 32 */ fmul f2, f4, f0 -/* 80CDF370 C8 7E 00 20 */ lfd f3, 0x20(r30) -/* 80CDF374 FC 00 00 32 */ fmul f0, f0, f0 -/* 80CDF378 FC 01 00 32 */ fmul f0, f1, f0 -/* 80CDF37C FC 03 00 28 */ fsub f0, f3, f0 -/* 80CDF380 FC 02 00 32 */ fmul f0, f2, f0 -/* 80CDF384 FC 44 00 32 */ fmul f2, f4, f0 -/* 80CDF388 FC 00 00 32 */ fmul f0, f0, f0 -/* 80CDF38C FC 01 00 32 */ fmul f0, f1, f0 -/* 80CDF390 FC 03 00 28 */ fsub f0, f3, f0 -/* 80CDF394 FC 02 00 32 */ fmul f0, f2, f0 -/* 80CDF398 FC 44 00 32 */ fmul f2, f4, f0 -/* 80CDF39C FC 00 00 32 */ fmul f0, f0, f0 -/* 80CDF3A0 FC 01 00 32 */ fmul f0, f1, f0 -/* 80CDF3A4 FC 03 00 28 */ fsub f0, f3, f0 -/* 80CDF3A8 FC 02 00 32 */ fmul f0, f2, f0 -/* 80CDF3AC FC 21 00 32 */ fmul f1, f1, f0 -/* 80CDF3B0 FC 20 08 18 */ frsp f1, f1 -/* 80CDF3B4 48 00 00 88 */ b lbl_80CDF43C -lbl_80CDF3B8: -/* 80CDF3B8 C8 1E 00 28 */ lfd f0, 0x28(r30) -/* 80CDF3BC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CDF3C0 40 80 00 10 */ bge lbl_80CDF3D0 -/* 80CDF3C4 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80CDF3C8 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -/* 80CDF3CC 48 00 00 70 */ b lbl_80CDF43C -lbl_80CDF3D0: -/* 80CDF3D0 D0 21 00 08 */ stfs f1, 8(r1) -/* 80CDF3D4 80 81 00 08 */ lwz r4, 8(r1) -/* 80CDF3D8 54 83 00 50 */ rlwinm r3, r4, 0, 1, 8 -/* 80CDF3DC 3C 00 7F 80 */ lis r0, 0x7f80 -/* 80CDF3E0 7C 03 00 00 */ cmpw r3, r0 -/* 80CDF3E4 41 82 00 14 */ beq lbl_80CDF3F8 -/* 80CDF3E8 40 80 00 40 */ bge lbl_80CDF428 -/* 80CDF3EC 2C 03 00 00 */ cmpwi r3, 0 -/* 80CDF3F0 41 82 00 20 */ beq lbl_80CDF410 -/* 80CDF3F4 48 00 00 34 */ b lbl_80CDF428 -lbl_80CDF3F8: -/* 80CDF3F8 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80CDF3FC 41 82 00 0C */ beq lbl_80CDF408 -/* 80CDF400 38 00 00 01 */ li r0, 1 -/* 80CDF404 48 00 00 28 */ b lbl_80CDF42C -lbl_80CDF408: -/* 80CDF408 38 00 00 02 */ li r0, 2 -/* 80CDF40C 48 00 00 20 */ b lbl_80CDF42C -lbl_80CDF410: -/* 80CDF410 54 80 02 7F */ clrlwi. r0, r4, 9 -/* 80CDF414 41 82 00 0C */ beq lbl_80CDF420 -/* 80CDF418 38 00 00 05 */ li r0, 5 -/* 80CDF41C 48 00 00 10 */ b lbl_80CDF42C -lbl_80CDF420: -/* 80CDF420 38 00 00 03 */ li r0, 3 -/* 80CDF424 48 00 00 08 */ b lbl_80CDF42C -lbl_80CDF428: -/* 80CDF428 38 00 00 04 */ li r0, 4 -lbl_80CDF42C: -/* 80CDF42C 2C 00 00 01 */ cmpwi r0, 1 -/* 80CDF430 40 82 00 0C */ bne lbl_80CDF43C -/* 80CDF434 3C 60 80 45 */ lis r3, __float_nan@ha /* 0x80450AE0@ha */ -/* 80CDF438 C0 23 0A E0 */ lfs f1, __float_nan@l(r3) /* 0x80450AE0@l */ -lbl_80CDF43C: -/* 80CDF43C C0 5D 04 D4 */ lfs f2, 0x4d4(r29) -/* 80CDF440 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 80CDF444 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80CDF448 FC 00 02 10 */ fabs f0, f0 -/* 80CDF44C FC 60 00 18 */ frsp f3, f0 -/* 80CDF450 C0 5F 05 6C */ lfs f2, 0x56c(r31) -/* 80CDF454 C0 1F 05 74 */ lfs f0, 0x574(r31) -/* 80CDF458 EC 00 00 F2 */ fmuls f0, f0, f3 -/* 80CDF45C EC 02 00 28 */ fsubs f0, f2, f0 -/* 80CDF460 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80CDF464 4C 40 13 82 */ cror 2, 0, 2 -/* 80CDF468 40 82 00 0C */ bne lbl_80CDF474 -/* 80CDF46C 3B 80 00 01 */ li r28, 1 -/* 80CDF470 48 00 00 0C */ b lbl_80CDF47C -lbl_80CDF474: -/* 80CDF474 38 00 00 00 */ li r0, 0 -/* 80CDF478 98 1F 05 69 */ stb r0, 0x569(r31) -lbl_80CDF47C: -/* 80CDF47C 7F 83 E3 78 */ mr r3, r28 -lbl_80CDF480: -/* 80CDF480 39 61 00 40 */ addi r11, r1, 0x40 -/* 80CDF484 4B 68 2D A1 */ bl _restgpr_28 -/* 80CDF488 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80CDF48C 7C 08 03 A6 */ mtlr r0 -/* 80CDF490 38 21 00 40 */ addi r1, r1, 0x40 -/* 80CDF494 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/setBaseMtx__14daSnowEffTag_cFv.s b/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/setBaseMtx__14daSnowEffTag_cFv.s deleted file mode 100644 index a0f402a1984..00000000000 --- a/asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/setBaseMtx__14daSnowEffTag_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80CDF12C: -/* 80CDF12C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80CDF130 7C 08 02 A6 */ mflr r0 -/* 80CDF134 90 01 00 14 */ stw r0, 0x14(r1) -/* 80CDF138 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80CDF13C 7C 7F 1B 78 */ mr r31, r3 -/* 80CDF140 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CDF144 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CDF148 C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 80CDF14C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 80CDF150 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 80CDF154 4B 66 77 95 */ bl PSMTXTrans -/* 80CDF158 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80CDF15C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80CDF160 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 80CDF164 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80CDF168 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 80CDF16C 4B 32 D1 35 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 80CDF170 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80CDF174 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80CDF178 7C 08 03 A6 */ mtlr r0 -/* 80CDF17C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80CDF180 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/Create__15daTagLv2PrChk_cFv.s b/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/Create__15daTagLv2PrChk_cFv.s deleted file mode 100644 index d74319f0646..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/Create__15daTagLv2PrChk_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_805A4C58: -/* 805A4C58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A4C5C 7C 08 02 A6 */ mflr r0 -/* 805A4C60 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A4C64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A4C68 7C 7F 1B 78 */ mr r31, r3 -/* 805A4C6C 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 805A4C70 54 00 C6 3E */ rlwinm r0, r0, 0x18, 0x18, 0x1f -/* 805A4C74 98 03 05 6B */ stb r0, 0x56b(r3) -/* 805A4C78 88 03 05 6B */ lbz r0, 0x56b(r3) -/* 805A4C7C 28 00 00 FF */ cmplwi r0, 0xff -/* 805A4C80 40 82 00 0C */ bne lbl_805A4C8C -/* 805A4C84 38 60 00 00 */ li r3, 0 -/* 805A4C88 48 00 00 40 */ b lbl_805A4CC8 -lbl_805A4C8C: -/* 805A4C8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A4C90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A4C94 80 1F 00 B0 */ lwz r0, 0xb0(r31) -/* 805A4C98 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 805A4C9C 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 805A4CA0 7C 05 07 74 */ extsb r5, r0 -/* 805A4CA4 4B A9 06 BD */ bl isSwitch__10dSv_info_cCFii -/* 805A4CA8 2C 03 00 00 */ cmpwi r3, 0 -/* 805A4CAC 41 82 00 10 */ beq lbl_805A4CBC -/* 805A4CB0 38 00 00 01 */ li r0, 1 -/* 805A4CB4 98 1F 05 69 */ stb r0, 0x569(r31) -/* 805A4CB8 48 00 00 0C */ b lbl_805A4CC4 -lbl_805A4CBC: -/* 805A4CBC 38 00 00 00 */ li r0, 0 -/* 805A4CC0 98 1F 05 69 */ stb r0, 0x569(r31) -lbl_805A4CC4: -/* 805A4CC4 38 60 00 01 */ li r3, 1 -lbl_805A4CC8: -/* 805A4CC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A4CCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A4CD0 7C 08 03 A6 */ mtlr r0 -/* 805A4CD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A4CD8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/actionCheck__15daTagLv2PrChk_cFv.s b/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/actionCheck__15daTagLv2PrChk_cFv.s deleted file mode 100644 index d5e075dc53e..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/actionCheck__15daTagLv2PrChk_cFv.s +++ /dev/null @@ -1,331 +0,0 @@ -lbl_805A4DF4: -/* 805A4DF4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 805A4DF8 7C 08 02 A6 */ mflr r0 -/* 805A4DFC 90 01 00 24 */ stw r0, 0x24(r1) -/* 805A4E00 39 61 00 20 */ addi r11, r1, 0x20 -/* 805A4E04 4B DB D3 D5 */ bl _savegpr_28 -/* 805A4E08 7C 7C 1B 78 */ mr r28, r3 -/* 805A4E0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A4E10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A4E14 88 9C 05 6B */ lbz r4, 0x56b(r28) -/* 805A4E18 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 805A4E1C 7C 05 07 74 */ extsb r5, r0 -/* 805A4E20 4B A9 05 41 */ bl isSwitch__10dSv_info_cCFii -/* 805A4E24 30 03 FF FF */ addic r0, r3, -1 -/* 805A4E28 7C 00 19 10 */ subfe r0, r0, r3 -/* 805A4E2C 54 1D 06 3E */ clrlwi r29, r0, 0x18 -/* 805A4E30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A4E34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A4E38 88 9C 05 6B */ lbz r4, 0x56b(r28) -/* 805A4E3C 38 84 00 01 */ addi r4, r4, 1 -/* 805A4E40 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 805A4E44 7C 05 07 74 */ extsb r5, r0 -/* 805A4E48 4B A9 05 19 */ bl isSwitch__10dSv_info_cCFii -/* 805A4E4C 30 03 FF FF */ addic r0, r3, -1 -/* 805A4E50 7C 00 19 10 */ subfe r0, r0, r3 -/* 805A4E54 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 805A4E58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A4E5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A4E60 88 9C 05 6B */ lbz r4, 0x56b(r28) -/* 805A4E64 38 84 00 02 */ addi r4, r4, 2 -/* 805A4E68 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 805A4E6C 7C 05 07 74 */ extsb r5, r0 -/* 805A4E70 4B A9 04 F1 */ bl isSwitch__10dSv_info_cCFii -/* 805A4E74 30 03 FF FF */ addic r0, r3, -1 -/* 805A4E78 7C 00 19 10 */ subfe r0, r0, r3 -/* 805A4E7C 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 805A4E80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A4E84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A4E88 88 9C 05 6B */ lbz r4, 0x56b(r28) -/* 805A4E8C 38 84 00 03 */ addi r4, r4, 3 -/* 805A4E90 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 805A4E94 7C 05 07 74 */ extsb r5, r0 -/* 805A4E98 4B A9 04 C9 */ bl isSwitch__10dSv_info_cCFii -/* 805A4E9C 30 03 FF FF */ addic r0, r3, -1 -/* 805A4EA0 7C 00 19 10 */ subfe r0, r0, r3 -/* 805A4EA4 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 805A4EA8 7C 1E FA 14 */ add r0, r30, r31 -/* 805A4EAC 7C 80 1A 14 */ add r4, r0, r3 -/* 805A4EB0 7C 9D 22 14 */ add r4, r29, r4 -/* 805A4EB4 88 1C 05 68 */ lbz r0, 0x568(r28) -/* 805A4EB8 2C 00 00 64 */ cmpwi r0, 0x64 -/* 805A4EBC 41 82 03 48 */ beq lbl_805A5204 -/* 805A4EC0 40 80 00 30 */ bge lbl_805A4EF0 -/* 805A4EC4 2C 00 00 02 */ cmpwi r0, 2 -/* 805A4EC8 41 82 01 6C */ beq lbl_805A5034 -/* 805A4ECC 40 80 00 14 */ bge lbl_805A4EE0 -/* 805A4ED0 2C 00 00 00 */ cmpwi r0, 0 -/* 805A4ED4 41 82 00 34 */ beq lbl_805A4F08 -/* 805A4ED8 40 80 00 B8 */ bge lbl_805A4F90 -/* 805A4EDC 48 00 03 9C */ b lbl_805A5278 -lbl_805A4EE0: -/* 805A4EE0 2C 00 00 04 */ cmpwi r0, 4 -/* 805A4EE4 41 82 02 94 */ beq lbl_805A5178 -/* 805A4EE8 40 80 03 90 */ bge lbl_805A5278 -/* 805A4EEC 48 00 02 0C */ b lbl_805A50F8 -lbl_805A4EF0: -/* 805A4EF0 2C 00 00 C8 */ cmpwi r0, 0xc8 -/* 805A4EF4 41 82 02 AC */ beq lbl_805A51A0 -/* 805A4EF8 40 80 03 80 */ bge lbl_805A5278 -/* 805A4EFC 2C 00 00 96 */ cmpwi r0, 0x96 -/* 805A4F00 41 82 03 50 */ beq lbl_805A5250 -/* 805A4F04 48 00 03 74 */ b lbl_805A5278 -lbl_805A4F08: -/* 805A4F08 38 00 00 00 */ li r0, 0 -/* 805A4F0C 98 1C 05 6C */ stb r0, 0x56c(r28) -/* 805A4F10 28 1D 00 00 */ cmplwi r29, 0 -/* 805A4F14 41 82 00 2C */ beq lbl_805A4F40 -/* 805A4F18 28 1E 00 00 */ cmplwi r30, 0 -/* 805A4F1C 40 82 00 24 */ bne lbl_805A4F40 -/* 805A4F20 28 1F 00 00 */ cmplwi r31, 0 -/* 805A4F24 40 82 00 1C */ bne lbl_805A4F40 -/* 805A4F28 28 03 00 00 */ cmplwi r3, 0 -/* 805A4F2C 40 82 00 14 */ bne lbl_805A4F40 -/* 805A4F30 38 00 00 01 */ li r0, 1 -/* 805A4F34 98 1C 05 6A */ stb r0, 0x56a(r28) -/* 805A4F38 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A4F3C 48 00 03 3C */ b lbl_805A5278 -lbl_805A4F40: -/* 805A4F40 28 03 00 00 */ cmplwi r3, 0 -/* 805A4F44 41 82 00 30 */ beq lbl_805A4F74 -/* 805A4F48 28 1D 00 00 */ cmplwi r29, 0 -/* 805A4F4C 40 82 00 28 */ bne lbl_805A4F74 -/* 805A4F50 28 1E 00 00 */ cmplwi r30, 0 -/* 805A4F54 40 82 00 20 */ bne lbl_805A4F74 -/* 805A4F58 28 1F 00 00 */ cmplwi r31, 0 -/* 805A4F5C 40 82 00 18 */ bne lbl_805A4F74 -/* 805A4F60 38 00 FF FF */ li r0, -1 -/* 805A4F64 98 1C 05 6A */ stb r0, 0x56a(r28) -/* 805A4F68 38 00 00 01 */ li r0, 1 -/* 805A4F6C 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A4F70 48 00 03 08 */ b lbl_805A5278 -lbl_805A4F74: -/* 805A4F74 28 1E 00 00 */ cmplwi r30, 0 -/* 805A4F78 40 82 00 0C */ bne lbl_805A4F84 -/* 805A4F7C 28 1F 00 00 */ cmplwi r31, 0 -/* 805A4F80 41 82 02 F8 */ beq lbl_805A5278 -lbl_805A4F84: -/* 805A4F84 38 00 00 64 */ li r0, 0x64 -/* 805A4F88 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A4F8C 48 00 02 EC */ b lbl_805A5278 -lbl_805A4F90: -/* 805A4F90 88 1C 05 6A */ lbz r0, 0x56a(r28) -/* 805A4F94 7C 00 07 75 */ extsb. r0, r0 -/* 805A4F98 40 81 00 50 */ ble lbl_805A4FE8 -/* 805A4F9C 28 1D 00 00 */ cmplwi r29, 0 -/* 805A4FA0 41 82 00 18 */ beq lbl_805A4FB8 -/* 805A4FA4 28 1E 00 00 */ cmplwi r30, 0 -/* 805A4FA8 41 82 00 10 */ beq lbl_805A4FB8 -/* 805A4FAC 38 00 00 02 */ li r0, 2 -/* 805A4FB0 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A4FB4 48 00 02 C4 */ b lbl_805A5278 -lbl_805A4FB8: -/* 805A4FB8 28 1D 00 00 */ cmplwi r29, 0 -/* 805A4FBC 40 82 00 10 */ bne lbl_805A4FCC -/* 805A4FC0 38 00 00 C8 */ li r0, 0xc8 -/* 805A4FC4 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A4FC8 48 00 02 B0 */ b lbl_805A5278 -lbl_805A4FCC: -/* 805A4FCC 28 1F 00 00 */ cmplwi r31, 0 -/* 805A4FD0 40 82 00 0C */ bne lbl_805A4FDC -/* 805A4FD4 28 03 00 00 */ cmplwi r3, 0 -/* 805A4FD8 41 82 02 A0 */ beq lbl_805A5278 -lbl_805A4FDC: -/* 805A4FDC 38 00 00 64 */ li r0, 0x64 -/* 805A4FE0 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A4FE4 48 00 02 94 */ b lbl_805A5278 -lbl_805A4FE8: -/* 805A4FE8 28 03 00 00 */ cmplwi r3, 0 -/* 805A4FEC 41 82 00 18 */ beq lbl_805A5004 -/* 805A4FF0 28 1F 00 00 */ cmplwi r31, 0 -/* 805A4FF4 41 82 00 10 */ beq lbl_805A5004 -/* 805A4FF8 38 00 00 02 */ li r0, 2 -/* 805A4FFC 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A5000 48 00 02 78 */ b lbl_805A5278 -lbl_805A5004: -/* 805A5004 28 03 00 00 */ cmplwi r3, 0 -/* 805A5008 40 82 00 10 */ bne lbl_805A5018 -/* 805A500C 38 00 00 C8 */ li r0, 0xc8 -/* 805A5010 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A5014 48 00 02 64 */ b lbl_805A5278 -lbl_805A5018: -/* 805A5018 28 1E 00 00 */ cmplwi r30, 0 -/* 805A501C 40 82 00 0C */ bne lbl_805A5028 -/* 805A5020 28 1D 00 00 */ cmplwi r29, 0 -/* 805A5024 41 82 02 54 */ beq lbl_805A5278 -lbl_805A5028: -/* 805A5028 38 00 00 64 */ li r0, 0x64 -/* 805A502C 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A5030 48 00 02 48 */ b lbl_805A5278 -lbl_805A5034: -/* 805A5034 88 1C 05 6A */ lbz r0, 0x56a(r28) -/* 805A5038 7C 00 07 75 */ extsb. r0, r0 -/* 805A503C 40 81 00 60 */ ble lbl_805A509C -/* 805A5040 28 1D 00 00 */ cmplwi r29, 0 -/* 805A5044 41 82 00 20 */ beq lbl_805A5064 -/* 805A5048 28 1E 00 00 */ cmplwi r30, 0 -/* 805A504C 41 82 00 18 */ beq lbl_805A5064 -/* 805A5050 28 1F 00 00 */ cmplwi r31, 0 -/* 805A5054 41 82 00 10 */ beq lbl_805A5064 -/* 805A5058 38 00 00 03 */ li r0, 3 -/* 805A505C 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A5060 48 00 02 18 */ b lbl_805A5278 -lbl_805A5064: -/* 805A5064 28 1D 00 00 */ cmplwi r29, 0 -/* 805A5068 41 82 00 0C */ beq lbl_805A5074 -/* 805A506C 28 1E 00 00 */ cmplwi r30, 0 -/* 805A5070 40 82 00 18 */ bne lbl_805A5088 -lbl_805A5074: -/* 805A5074 38 00 00 01 */ li r0, 1 -/* 805A5078 98 1C 05 6D */ stb r0, 0x56d(r28) -/* 805A507C 38 00 00 C8 */ li r0, 0xc8 -/* 805A5080 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A5084 48 00 01 F4 */ b lbl_805A5278 -lbl_805A5088: -/* 805A5088 28 03 00 00 */ cmplwi r3, 0 -/* 805A508C 41 82 01 EC */ beq lbl_805A5278 -/* 805A5090 38 00 00 64 */ li r0, 0x64 -/* 805A5094 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A5098 48 00 01 E0 */ b lbl_805A5278 -lbl_805A509C: -/* 805A509C 28 03 00 00 */ cmplwi r3, 0 -/* 805A50A0 41 82 00 20 */ beq lbl_805A50C0 -/* 805A50A4 28 1F 00 00 */ cmplwi r31, 0 -/* 805A50A8 41 82 00 18 */ beq lbl_805A50C0 -/* 805A50AC 28 1E 00 00 */ cmplwi r30, 0 -/* 805A50B0 41 82 00 10 */ beq lbl_805A50C0 -/* 805A50B4 38 00 00 03 */ li r0, 3 -/* 805A50B8 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A50BC 48 00 01 BC */ b lbl_805A5278 -lbl_805A50C0: -/* 805A50C0 28 03 00 00 */ cmplwi r3, 0 -/* 805A50C4 41 82 00 0C */ beq lbl_805A50D0 -/* 805A50C8 28 1F 00 00 */ cmplwi r31, 0 -/* 805A50CC 40 82 00 18 */ bne lbl_805A50E4 -lbl_805A50D0: -/* 805A50D0 38 00 00 01 */ li r0, 1 -/* 805A50D4 98 1C 05 6D */ stb r0, 0x56d(r28) -/* 805A50D8 38 00 00 C8 */ li r0, 0xc8 -/* 805A50DC 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A50E0 48 00 01 98 */ b lbl_805A5278 -lbl_805A50E4: -/* 805A50E4 28 1D 00 00 */ cmplwi r29, 0 -/* 805A50E8 41 82 01 90 */ beq lbl_805A5278 -/* 805A50EC 38 00 00 64 */ li r0, 0x64 -/* 805A50F0 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A50F4 48 00 01 84 */ b lbl_805A5278 -lbl_805A50F8: -/* 805A50F8 28 1D 00 00 */ cmplwi r29, 0 -/* 805A50FC 41 82 00 28 */ beq lbl_805A5124 -/* 805A5100 28 1E 00 00 */ cmplwi r30, 0 -/* 805A5104 41 82 00 20 */ beq lbl_805A5124 -/* 805A5108 28 1F 00 00 */ cmplwi r31, 0 -/* 805A510C 41 82 00 18 */ beq lbl_805A5124 -/* 805A5110 28 03 00 00 */ cmplwi r3, 0 -/* 805A5114 41 82 00 10 */ beq lbl_805A5124 -/* 805A5118 38 00 00 04 */ li r0, 4 -/* 805A511C 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A5120 48 00 01 58 */ b lbl_805A5278 -lbl_805A5124: -/* 805A5124 88 1C 05 6A */ lbz r0, 0x56a(r28) -/* 805A5128 7C 00 07 75 */ extsb. r0, r0 -/* 805A512C 40 81 00 28 */ ble lbl_805A5154 -/* 805A5130 28 1D 00 00 */ cmplwi r29, 0 -/* 805A5134 41 82 00 14 */ beq lbl_805A5148 -/* 805A5138 28 1E 00 00 */ cmplwi r30, 0 -/* 805A513C 41 82 00 0C */ beq lbl_805A5148 -/* 805A5140 28 1F 00 00 */ cmplwi r31, 0 -/* 805A5144 40 82 01 34 */ bne lbl_805A5278 -lbl_805A5148: -/* 805A5148 38 00 00 C8 */ li r0, 0xc8 -/* 805A514C 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A5150 48 00 01 28 */ b lbl_805A5278 -lbl_805A5154: -/* 805A5154 28 03 00 00 */ cmplwi r3, 0 -/* 805A5158 41 82 00 14 */ beq lbl_805A516C -/* 805A515C 28 1F 00 00 */ cmplwi r31, 0 -/* 805A5160 41 82 00 0C */ beq lbl_805A516C -/* 805A5164 28 1E 00 00 */ cmplwi r30, 0 -/* 805A5168 40 82 01 10 */ bne lbl_805A5278 -lbl_805A516C: -/* 805A516C 38 00 00 C8 */ li r0, 0xc8 -/* 805A5170 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A5174 48 00 01 04 */ b lbl_805A5278 -lbl_805A5178: -/* 805A5178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A517C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A5180 80 1C 00 B0 */ lwz r0, 0xb0(r28) -/* 805A5184 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 805A5188 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 805A518C 7C 05 07 74 */ extsb r5, r0 -/* 805A5190 4B A9 00 71 */ bl onSwitch__10dSv_info_cFii -/* 805A5194 38 00 00 01 */ li r0, 1 -/* 805A5198 98 1C 05 69 */ stb r0, 0x569(r28) -/* 805A519C 48 00 00 DC */ b lbl_805A5278 -lbl_805A51A0: -/* 805A51A0 28 1D 00 00 */ cmplwi r29, 0 -/* 805A51A4 40 82 00 2C */ bne lbl_805A51D0 -/* 805A51A8 28 1E 00 00 */ cmplwi r30, 0 -/* 805A51AC 40 82 00 24 */ bne lbl_805A51D0 -/* 805A51B0 28 1F 00 00 */ cmplwi r31, 0 -/* 805A51B4 40 82 00 1C */ bne lbl_805A51D0 -/* 805A51B8 28 03 00 00 */ cmplwi r3, 0 -/* 805A51BC 40 82 00 14 */ bne lbl_805A51D0 -/* 805A51C0 38 00 00 00 */ li r0, 0 -/* 805A51C4 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A51C8 98 1C 05 6D */ stb r0, 0x56d(r28) -/* 805A51CC 48 00 00 AC */ b lbl_805A5278 -lbl_805A51D0: -/* 805A51D0 2C 04 00 01 */ cmpwi r4, 1 -/* 805A51D4 41 81 00 10 */ bgt lbl_805A51E4 -/* 805A51D8 88 1C 05 6D */ lbz r0, 0x56d(r28) -/* 805A51DC 28 00 00 01 */ cmplwi r0, 1 -/* 805A51E0 40 82 00 98 */ bne lbl_805A5278 -lbl_805A51E4: -/* 805A51E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 805A51E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 805A51EC 80 1C 00 B0 */ lwz r0, 0xb0(r28) -/* 805A51F0 54 04 86 3E */ rlwinm r4, r0, 0x10, 0x18, 0x1f -/* 805A51F4 88 1C 04 BA */ lbz r0, 0x4ba(r28) -/* 805A51F8 7C 05 07 74 */ extsb r5, r0 -/* 805A51FC 4B A9 00 05 */ bl onSwitch__10dSv_info_cFii -/* 805A5200 48 00 00 78 */ b lbl_805A5278 -lbl_805A5204: -/* 805A5204 28 1D 00 00 */ cmplwi r29, 0 -/* 805A5208 41 82 00 3C */ beq lbl_805A5244 -/* 805A520C 28 1E 00 00 */ cmplwi r30, 0 -/* 805A5210 41 82 00 34 */ beq lbl_805A5244 -/* 805A5214 28 1F 00 00 */ cmplwi r31, 0 -/* 805A5218 41 82 00 2C */ beq lbl_805A5244 -/* 805A521C 28 03 00 00 */ cmplwi r3, 0 -/* 805A5220 41 82 00 24 */ beq lbl_805A5244 -/* 805A5224 88 1C 05 6C */ lbz r0, 0x56c(r28) -/* 805A5228 28 00 00 00 */ cmplwi r0, 0 -/* 805A522C 40 82 00 4C */ bne lbl_805A5278 -/* 805A5230 7F 83 E3 78 */ mr r3, r28 -/* 805A5234 48 00 00 61 */ bl seStartWrong__15daTagLv2PrChk_cFv -/* 805A5238 38 00 00 01 */ li r0, 1 -/* 805A523C 98 1C 05 6C */ stb r0, 0x56c(r28) -/* 805A5240 48 00 00 38 */ b lbl_805A5278 -lbl_805A5244: -/* 805A5244 38 00 00 C8 */ li r0, 0xc8 -/* 805A5248 98 1C 05 68 */ stb r0, 0x568(r28) -/* 805A524C 48 00 00 2C */ b lbl_805A5278 -lbl_805A5250: -/* 805A5250 28 1D 00 00 */ cmplwi r29, 0 -/* 805A5254 40 82 00 24 */ bne lbl_805A5278 -/* 805A5258 28 1E 00 00 */ cmplwi r30, 0 -/* 805A525C 40 82 00 1C */ bne lbl_805A5278 -/* 805A5260 28 1F 00 00 */ cmplwi r31, 0 -/* 805A5264 40 82 00 14 */ bne lbl_805A5278 -/* 805A5268 28 03 00 00 */ cmplwi r3, 0 -/* 805A526C 40 82 00 0C */ bne lbl_805A5278 -/* 805A5270 38 00 00 00 */ li r0, 0 -/* 805A5274 98 1C 05 68 */ stb r0, 0x568(r28) -lbl_805A5278: -/* 805A5278 39 61 00 20 */ addi r11, r1, 0x20 -/* 805A527C 4B DB CF A9 */ bl _restgpr_28 -/* 805A5280 80 01 00 24 */ lwz r0, 0x24(r1) -/* 805A5284 7C 08 03 A6 */ mtlr r0 -/* 805A5288 38 21 00 20 */ addi r1, r1, 0x20 -/* 805A528C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/action__15daTagLv2PrChk_cFv.s b/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/action__15daTagLv2PrChk_cFv.s deleted file mode 100644 index c518d632992..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/action__15daTagLv2PrChk_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_805A4D68: -/* 805A4D68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A4D6C 7C 08 02 A6 */ mflr r0 -/* 805A4D70 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A4D74 3C 80 80 5A */ lis r4, cNullVec__6Z2Calc@ha /* 0x805A536C@ha */ -/* 805A4D78 38 E4 53 6C */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x805A536C@l */ -/* 805A4D7C 3C 80 80 5A */ lis r4, data_805A5410@ha /* 0x805A5410@ha */ -/* 805A4D80 38 C4 54 10 */ addi r6, r4, data_805A5410@l /* 0x805A5410@l */ -/* 805A4D84 88 06 00 00 */ lbz r0, 0(r6) -/* 805A4D88 7C 00 07 75 */ extsb. r0, r0 -/* 805A4D8C 40 82 00 40 */ bne lbl_805A4DCC -/* 805A4D90 80 87 00 20 */ lwz r4, 0x20(r7) -/* 805A4D94 80 07 00 24 */ lwz r0, 0x24(r7) -/* 805A4D98 90 87 00 38 */ stw r4, 0x38(r7) -/* 805A4D9C 90 07 00 3C */ stw r0, 0x3c(r7) -/* 805A4DA0 80 07 00 28 */ lwz r0, 0x28(r7) -/* 805A4DA4 90 07 00 40 */ stw r0, 0x40(r7) -/* 805A4DA8 38 A7 00 38 */ addi r5, r7, 0x38 -/* 805A4DAC 80 87 00 2C */ lwz r4, 0x2c(r7) -/* 805A4DB0 80 07 00 30 */ lwz r0, 0x30(r7) -/* 805A4DB4 90 85 00 0C */ stw r4, 0xc(r5) -/* 805A4DB8 90 05 00 10 */ stw r0, 0x10(r5) -/* 805A4DBC 80 07 00 34 */ lwz r0, 0x34(r7) -/* 805A4DC0 90 05 00 14 */ stw r0, 0x14(r5) -/* 805A4DC4 38 00 00 01 */ li r0, 1 -/* 805A4DC8 98 06 00 00 */ stb r0, 0(r6) -lbl_805A4DCC: -/* 805A4DCC 88 03 05 69 */ lbz r0, 0x569(r3) -/* 805A4DD0 1C 00 00 0C */ mulli r0, r0, 0xc -/* 805A4DD4 39 87 00 38 */ addi r12, r7, 0x38 -/* 805A4DD8 7D 8C 02 14 */ add r12, r12, r0 -/* 805A4DDC 4B DB D2 A9 */ bl __ptmf_scall -/* 805A4DE0 60 00 00 00 */ nop -/* 805A4DE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A4DE8 7C 08 03 A6 */ mtlr r0 -/* 805A4DEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A4DF0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Create__FP15daTagLv2PrChk_c.s b/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Create__FP15daTagLv2PrChk_c.s deleted file mode 100644 index 9967fb75135..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Create__FP15daTagLv2PrChk_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A533C: -/* 805A533C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A5340 7C 08 02 A6 */ mflr r0 -/* 805A5344 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A5348 4B FF F9 95 */ bl create__15daTagLv2PrChk_cFv -/* 805A534C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A5350 7C 08 03 A6 */ mtlr r0 -/* 805A5354 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A5358 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Delete__FP15daTagLv2PrChk_c.s b/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Delete__FP15daTagLv2PrChk_c.s deleted file mode 100644 index bb2d2eb458c..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Delete__FP15daTagLv2PrChk_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A531C: -/* 805A531C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A5320 7C 08 02 A6 */ mflr r0 -/* 805A5324 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A5328 4B FF FF CD */ bl _delete__15daTagLv2PrChk_cFv -/* 805A532C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A5330 7C 08 03 A6 */ mtlr r0 -/* 805A5334 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A5338 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Execute__FP15daTagLv2PrChk_c.s b/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Execute__FP15daTagLv2PrChk_c.s deleted file mode 100644 index a0704a3d459..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Execute__FP15daTagLv2PrChk_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A52FC: -/* 805A52FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A5300 7C 08 02 A6 */ mflr r0 -/* 805A5304 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A5308 4B FF FA 3D */ bl execute__15daTagLv2PrChk_cFv -/* 805A530C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A5310 7C 08 03 A6 */ mtlr r0 -/* 805A5314 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A5318 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/execute__15daTagLv2PrChk_cFv.s b/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/execute__15daTagLv2PrChk_cFv.s deleted file mode 100644 index 6636b6c2758..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/execute__15daTagLv2PrChk_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_805A4D44: -/* 805A4D44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A4D48 7C 08 02 A6 */ mflr r0 -/* 805A4D4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A4D50 48 00 00 19 */ bl action__15daTagLv2PrChk_cFv -/* 805A4D54 38 60 00 01 */ li r3, 1 -/* 805A4D58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A4D5C 7C 08 03 A6 */ mtlr r0 -/* 805A4D60 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A4D64 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/func_805A4CDC.s b/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/func_805A4CDC.s deleted file mode 100644 index d71b0d6a412..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/func_805A4CDC.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_805A4CDC: -/* 805A4CDC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A4CE0 7C 08 02 A6 */ mflr r0 -/* 805A4CE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A4CE8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A4CEC 7C 7F 1B 78 */ mr r31, r3 -/* 805A4CF0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 805A4CF4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 805A4CF8 40 82 00 1C */ bne lbl_805A4D14 -/* 805A4CFC 28 1F 00 00 */ cmplwi r31, 0 -/* 805A4D00 41 82 00 08 */ beq lbl_805A4D08 -/* 805A4D04 4B A7 3E 61 */ bl __ct__10fopAc_ac_cFv -lbl_805A4D08: -/* 805A4D08 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 805A4D0C 60 00 00 08 */ ori r0, r0, 8 -/* 805A4D10 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_805A4D14: -/* 805A4D14 7F E3 FB 78 */ mr r3, r31 -/* 805A4D18 4B FF FF 41 */ bl Create__15daTagLv2PrChk_cFv -/* 805A4D1C 2C 03 00 00 */ cmpwi r3, 0 -/* 805A4D20 40 82 00 0C */ bne lbl_805A4D2C -/* 805A4D24 38 60 00 05 */ li r3, 5 -/* 805A4D28 48 00 00 08 */ b lbl_805A4D30 -lbl_805A4D2C: -/* 805A4D2C 38 60 00 04 */ li r3, 4 -lbl_805A4D30: -/* 805A4D30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A4D34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A4D38 7C 08 03 A6 */ mtlr r0 -/* 805A4D3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A4D40 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/seStartWrong__15daTagLv2PrChk_cFv.s b/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/seStartWrong__15daTagLv2PrChk_cFv.s deleted file mode 100644 index e144bb13680..00000000000 --- a/asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/seStartWrong__15daTagLv2PrChk_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_805A5294: -/* 805A5294 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A5298 7C 08 02 A6 */ mflr r0 -/* 805A529C 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A52A0 38 00 00 3B */ li r0, 0x3b -/* 805A52A4 90 01 00 08 */ stw r0, 8(r1) -/* 805A52A8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 805A52AC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 805A52B0 80 63 00 00 */ lwz r3, 0(r3) -/* 805A52B4 38 81 00 08 */ addi r4, r1, 8 -/* 805A52B8 38 A0 00 00 */ li r5, 0 -/* 805A52BC 38 C0 00 00 */ li r6, 0 -/* 805A52C0 38 E0 00 00 */ li r7, 0 -/* 805A52C4 3D 00 80 5A */ lis r8, lit_3844@ha /* 0x805A5364@ha */ -/* 805A52C8 C0 28 53 64 */ lfs f1, lit_3844@l(r8) /* 0x805A5364@l */ -/* 805A52CC FC 40 08 90 */ fmr f2, f1 -/* 805A52D0 3D 00 80 5A */ lis r8, lit_3845@ha /* 0x805A5368@ha */ -/* 805A52D4 C0 68 53 68 */ lfs f3, lit_3845@l(r8) /* 0x805A5368@l */ -/* 805A52D8 FC 80 18 90 */ fmr f4, f3 -/* 805A52DC 39 00 00 00 */ li r8, 0 -/* 805A52E0 4B D0 66 A5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 805A52E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A52E8 7C 08 03 A6 */ mtlr r0 -/* 805A52EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A52F0 4E 80 00 20 */ blr diff --git a/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h b/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h index 47170d218c8..5ce77d9a1e8 100644 --- a/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h +++ b/include/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.h @@ -1,6 +1,27 @@ #ifndef D_A_OBJ_DIGPLACE_H #define D_A_OBJ_DIGPLACE_H -#include "dolphin/types.h" +#include "d/d_path.h" +#include "f_op/f_op_actor_mng.h" + +class daObjDigpl_c : public fopAc_ac_c { +public: + /* 8057BF98 */ int create(); + /* 8057C1EC */ int execute(); + + /* 0x568 */ u8 mType; + /* 0x569 */ u8 mSwitch; + /* 0x56A */ u8 mDigFlg; + /* 0x56B */ u8 field_0x56b; + /* 0x56C */ u8 mCurrentDigPoint; + /* 0x570 */ Mtx field_0x570; + /* 0x5A0 */ int mUsedDigFlags[6]; + /* 0x5B8 */ dPath* mpDigPoints; + + /* 8057C158 */ virtual ~daObjDigpl_c(); + + u8 getSceneNum() { return (fopAcM_GetParam(this) >> 0xC) & 0xFF; } + int getItemNum() { return getSceneNum(); } +}; #endif /* D_A_OBJ_DIGPLACE_H */ diff --git a/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h b/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h index 2e8f08c194f..532a37b465b 100644 --- a/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h +++ b/include/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h @@ -1,6 +1,37 @@ #ifndef D_A_OBJ_SNOWEFFTAG_H #define D_A_OBJ_SNOWEFFTAG_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_hostIO.h" + +class daSnowEffTag_c : public fopAc_ac_c { +public: + /* 80CDF12C */ void setBaseMtx(); + /* 80CDF184 */ int create(); + /* 80CDF2B8 */ bool playerAreaCheck(); + /* 80CDF498 */ int Execute(); + /* 80CDF5E4 */ int Draw(); + /* 80CDF5EC */ int Delete(); + + int getArg0() { return fopAcM_GetParamBit(this, 0, 8); } + + /* 0x568 */ u8 field_0x568; + /* 0x569 */ bool mPlayedSound; + /* 0x56C */ f32 mMaxSize; + /* 0x570 */ f32 mSize; + /* 0x574 */ f32 field_0x574; + /* 0x578 */ u32 mEmitterID; +}; + +class daSnowEffTag_HIO_c : public mDoHIO_entry_c { +public: + /* 80CDF0AC */ daSnowEffTag_HIO_c(); + /* 80CDF674 */ virtual ~daSnowEffTag_HIO_c(); + + /* 0x4 */ u8 field_0x4; + /* 0x5 */ u8 mDisplayRange; + /* 0x6 */ u8 mTop; + /* 0x7 */ u8 mBottom; +}; #endif /* D_A_OBJ_SNOWEFFTAG_H */ diff --git a/include/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.h b/include/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.h index adf25aa45b4..be4b8b4f15f 100644 --- a/include/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.h +++ b/include/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.h @@ -1,6 +1,44 @@ #ifndef D_A_TAG_LV2PRCHK_H #define D_A_TAG_LV2PRCHK_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daTagLv2PrChk_c : public fopAc_ac_c { +public: + enum Action_e { + ACTION_CHECK_e, + ACTION_END_e, + }; + + enum Mode_e { + MODE_CHECK_FIRST_SW, + MODE_CHECK_SECOND_SW, + MODE_CHECK_THIRD_SW, + MODE_CHECK_FOURTH_SW, + MODE_PUZZLE_CLEAR, + MODE_CHECK_RESET = 200, + MODE_CHECK_WRONG_ORDER = 100, + }; + + /* 805A4C58 */ int Create(); + /* 805A4CDC */ int create(); + /* 805A4D44 */ int execute(); + /* 805A4D68 */ void action(); + /* 805A4DF4 */ void actionCheck(); + /* 805A5290 */ void actionEnd(); + /* 805A5294 */ void seStartWrong(); + /* 805A52F4 */ int _delete(); + + u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); } + u8 getSwbit3() { return fopAcM_GetParamBit(this, 16, 8); } + + /* 0x568 */ u8 mMode; + /* 0x569 */ u8 mAction; + /* 0x56A */ s8 mDirection; // Signifies starting at either the first (1) or last (-1) switch + /* 0x56B */ u8 mSwbit2; + /* 0x56C */ u8 mPlayedSound; + /* 0x56D */ u8 field_0x56d; +}; #endif /* D_A_TAG_LV2PRCHK_H */ diff --git a/include/std/cmath.h b/include/std/cmath.h new file mode 100644 index 00000000000..ad1775c2d30 --- /dev/null +++ b/include/std/cmath.h @@ -0,0 +1,12 @@ +#ifndef STD_CMATH_H_ +#define STD_CMATH_H_ + +#include "MSL_C/math.h" + +namespace std { +float fabs(float num) { + return fabsf(num); +} +} // namespace std + +#endif diff --git a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp index cd39f9ae8ca..1fcdde7dab8 100644 --- a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp +++ b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp @@ -1,309 +1,207 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_digplace -// +/** + * d_a_obj_digplace.cpp + * Generic Wolf Digging Spots + */ #include "rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.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(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct cXyz {}; - -struct daPy_py_c { - /* 8015F4F0 */ void setLookPos(cXyz*); -}; - -struct daObjDigpl_c { - /* 8057BF98 */ void create(); - /* 8057C158 */ ~daObjDigpl_c(); - /* 8057C1EC */ void execute(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dKy_tevstr_c {}; - -struct _GXColor {}; - -struct dPa_control_c { - /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, - _GXColor const&, int, f32); -}; - -struct csXyz {}; - -// -// Forward References: -// - -extern "C" void create__12daObjDigpl_cFv(); -extern "C" static void daObjDigpl_Create__FP10fopAc_ac_c(); -extern "C" void __dt__12daObjDigpl_cFv(); -extern "C" static void daObjDigpl_Delete__FP12daObjDigpl_c(); -extern "C" void execute__12daObjDigpl_cFv(); -extern "C" static void daObjDigpl_Execute__FP12daObjDigpl_c(); -extern "C" static bool daObjDigpl_Draw__FP12daObjDigpl_c(); - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_createItemFromTable__FPC4cXyziiiPC5csXyziPC4cXyzPfPfb(); -extern "C" void fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif(); -extern "C" void dPath_GetRoomPath__Fii(); -extern "C" void setLookPos__9daPy_py_cFP4cXyz(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareDistance(); -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" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 8057C8B0-8057C8B4 000000 0004+00 2/2 0/0 0/0 .rodata @3822 */ -SECTION_RODATA static f32 const lit_3822 = -550.0f; -COMPILER_STRIP_GATE(0x8057C8B0, &lit_3822); - -/* 8057C8B4-8057C8B8 000004 0004+00 0/1 0/0 0/0 .rodata @3823 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3823 = -250.0f; -COMPILER_STRIP_GATE(0x8057C8B4, &lit_3823); -#pragma pop - -/* 8057C8B8-8057C8BC 000008 0004+00 0/1 0/0 0/0 .rodata @3824 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3824 = 550.0f; -COMPILER_STRIP_GATE(0x8057C8B8, &lit_3824); -#pragma pop - -/* 8057C8BC-8057C8C0 00000C 0004+00 0/1 0/0 0/0 .rodata @3825 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3825 = 250.0f; -COMPILER_STRIP_GATE(0x8057C8BC, &lit_3825); -#pragma pop - -/* 8057C8F8-8057C918 -00001 0020+00 1/0 0/0 0/0 .data l_daObjDigpl_Method */ -SECTION_DATA static void* l_daObjDigpl_Method[8] = { - (void*)daObjDigpl_Create__FP10fopAc_ac_c, - (void*)daObjDigpl_Delete__FP12daObjDigpl_c, - (void*)daObjDigpl_Execute__FP12daObjDigpl_c, - (void*)NULL, - (void*)daObjDigpl_Draw__FP12daObjDigpl_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 8057C918-8057C948 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Digpl */ -SECTION_DATA extern void* g_profile_Obj_Digpl[12] = { - (void*)0xFFFFFFFD, (void*)0x0003FFFD, - (void*)0x00530000, (void*)&g_fpcLf_Method, - (void*)0x000005C0, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00FA0000, (void*)&l_daObjDigpl_Method, - (void*)0x00044080, (void*)0x030E0000, -}; - -/* 8057C948-8057C954 000050 000C+00 2/2 0/0 0/0 .data __vt__12daObjDigpl_c */ -SECTION_DATA extern void* __vt__12daObjDigpl_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12daObjDigpl_cFv, -}; +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 8057BF98-8057C138 000078 01A0+00 1/1 0/0 0/0 .text create__12daObjDigpl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigpl_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/create__12daObjDigpl_cFv.s" +int daObjDigpl_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daObjDigpl_c(); + fopAcM_OnCondition(this, 8); + } + + mType = (fopAcM_GetParam(this) >> 8) & 0xF; + mSwitch = fopAcM_GetParam(this) & 0xFF; + + if (mType == 5) { + fopAcM_OffStatus(this, 0x80); + mpDigPoints = + dPath_GetRoomPath((fopAcM_GetParam(this) >> 0x14) & 0xFF, fopAcM_GetRoomNo(this)); + } + + if (mType >= 4) { + mType = 0; + } + + if (mSwitch != 0xFF && i_fopAcM_isSwitch(this, mSwitch)) { + return cPhs_ERROR_e; + } + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mDoMtx_copy(mDoMtx_stack_c::get(), field_0x570); + fopAcM_SetMtx(this, field_0x570); + + mAttentionInfo.mPosition = current.pos; + mEyePos = mAttentionInfo.mPosition; + mTevStr.mRoomNo = dComIfGp_roomControl_getStayNo(); + fopAcM_SetMin(this, -550.0f, -250.0f, -550.0f); + fopAcM_SetMax(this, 550.0f, 250.0f, 550.0f); + mAttentionInfo.field_0x0[7] = 27; + + return cPhs_COMPLEATE_e; } -#pragma pop /* 8057C138-8057C158 000218 0020+00 1/0 0/0 0/0 .text daObjDigpl_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigpl_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Create__FP10fopAc_ac_c.s" +static int daObjDigpl_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 8057C158-8057C1B8 000238 0060+00 1/0 0/0 0/0 .text __dt__12daObjDigpl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daObjDigpl_c::~daObjDigpl_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/__dt__12daObjDigpl_cFv.s" -} -#pragma pop +daObjDigpl_c::~daObjDigpl_c() {} /* 8057C1B8-8057C1EC 000298 0034+00 1/0 0/0 0/0 .text daObjDigpl_Delete__FP12daObjDigpl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigpl_Delete(daObjDigpl_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Delete__FP12daObjDigpl_c.s" +static int daObjDigpl_Delete(daObjDigpl_c* i_this) { + i_this->~daObjDigpl_c(); + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 8057C8C0-8057C8C4 000010 0004+00 0/1 0/0 0/0 .rodata @4023 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4023 = 30.0f; -COMPILER_STRIP_GATE(0x8057C8C0, &lit_4023); -#pragma pop - -/* 8057C8C4-8057C8C8 000014 0004+00 0/1 0/0 0/0 .rodata @4024 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4024 = 100000.0f; -COMPILER_STRIP_GATE(0x8057C8C4, &lit_4024); -#pragma pop - -/* 8057C8C8-8057C8D0 000018 0004+04 0/1 0/0 0/0 .rodata @4025 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4025[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x8057C8C8, &lit_4025); -#pragma pop - -/* 8057C8D0-8057C8D8 000020 0008+00 0/1 0/0 0/0 .rodata @4026 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4026[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8057C8D0, &lit_4026); -#pragma pop - -/* 8057C8D8-8057C8E0 000028 0008+00 0/1 0/0 0/0 .rodata @4027 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4027[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8057C8D8, &lit_4027); -#pragma pop - -/* 8057C8E0-8057C8E8 000030 0008+00 0/1 0/0 0/0 .rodata @4028 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4028[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8057C8E0, &lit_4028); -#pragma pop - -/* 8057C8E8-8057C8EC 000038 0004+00 0/1 0/0 0/0 .rodata @4029 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4029 = 1000.0f; -COMPILER_STRIP_GATE(0x8057C8E8, &lit_4029); -#pragma pop - -/* 8057C8EC-8057C8F0 00003C 0004+00 0/1 0/0 0/0 .rodata @4030 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4030 = 200.0f; -COMPILER_STRIP_GATE(0x8057C8EC, &lit_4030); -#pragma pop - -/* 8057C8F0-8057C8F4 000040 0004+00 0/1 0/0 0/0 .rodata @4031 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4031 = 1600.0f; -COMPILER_STRIP_GATE(0x8057C8F0, &lit_4031); -#pragma pop - -/* 8057C8F4-8057C8F8 000044 0004+00 0/1 0/0 0/0 .rodata @4032 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4032 = 250000.0f; -COMPILER_STRIP_GATE(0x8057C8F4, &lit_4032); -#pragma pop /* 8057C1EC-8057C880 0002CC 0694+00 1/1 0/0 0/0 .text execute__12daObjDigpl_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjDigpl_c::execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/execute__12daObjDigpl_cFv.s" +int daObjDigpl_c::execute() { + daPy_py_c* player_p = daPy_getLinkPlayerActorClass(); + + if (mDigFlg == 1) { + if (mSwitch != 0xFF) { + i_fopAcM_onSwitch(this, mSwitch); + } + + cXyz item_pos(current.pos.x, current.pos.y - 30.0f, current.pos.z); + + u8 item_no; + if (mpDigPoints != NULL) { + item_no = mpDigPoints->m_points[mCurrentDigPoint].field_0x0; + } else { + item_no = getItemNum(); + } + + if (mType == 0) { + fopAcM_createItem(&item_pos, item_no, -1, fopAcM_GetRoomNo(this), + &player_p->shape_angle, NULL, 9); + } else if (mType == 2) { + fopAcM_createItemFromTable(&item_pos, item_no, -1, fopAcM_GetRoomNo(this), + &player_p->shape_angle, 9, NULL, NULL, NULL, false); + } + + if (mType == 1) { + mDigFlg = 2; + } else if (mpDigPoints != NULL) { + mUsedDigFlags[mCurrentDigPoint >> 5] |= 1 << (mCurrentDigPoint % 32); + mDigFlg = 0; + } else { + fopAcM_delete(this); + return 1; + } + } + + mAttentionInfo.mFlags &= ~0x80; + + if (mpDigPoints != NULL) { + current.pos.y = player_p->current.pos.y + 100000.0f; + mAttentionInfo.mPosition.y = current.pos.y; + cXyz point_pos; + + dStage_dPnt_c* point_p = mpDigPoints->m_points; + f32 dist_to_current_pnt = FLT_MAX; + + for (int i = 0; i < mpDigPoints->m_num; i++, point_p++) { + if ((mUsedDigFlags[i >> 5] & (1 << (i % 32))) == 0) { + point_pos.set(point_p->m_position.x, point_p->m_position.y, point_p->m_position.z); + + if (player_p->current.pos.abs(point_pos) < 1000.0f) { + dComIfGp_particle_setSimple(0x70F, &point_pos, 255, g_whiteColor, g_whiteColor, + 0, 0.0f); + dComIfGp_particle_setSimple(0x73D, &point_pos, 255, g_whiteColor, g_whiteColor, + 0, 0.0f); + } + + f32 point_to_plyr_dist = player_p->current.pos.abs2XZ(point_pos); + if (dist_to_current_pnt > point_to_plyr_dist && + fabsf(point_pos.y - player_p->current.pos.y) < 200.0f) + { + dist_to_current_pnt = point_to_plyr_dist; + + mCurrentDigPoint = i; + current.pos = point_pos; + mAttentionInfo.mPosition = point_pos; + mEyePos = point_pos; + + if (point_p->field_0x3 == 0) { + mType = 0; + } else { + mType = 2; + } + } + } + } + } + + if (daPy_py_c::i_checkNowWolf() && mDigFlg == 0) { + if (field_0x56b == 0) { + int seen_angle = fopAcM_seenActorAngleY(player_p, this); + f32 dist_to_player = fopAcM_searchPlayerDistanceXZ2(this); + + if (seen_angle <= 0x2800 || dist_to_player < 1600.0f) { + mAttentionInfo.mFlags |= 0x80; + } + + if (dist_to_player < 250000.0f && + fabsf(current.pos.y - player_p->current.pos.y) < 200.0f) + { + daPy_py_c::setLookPos(&mAttentionInfo.mPosition); + } + } + + if (mpDigPoints == NULL && player_p->current.pos.abs(current.pos) < 1000.0f) { + dComIfGp_particle_setSimple(0x70F, ¤t.pos, 255, g_whiteColor, g_whiteColor, 0, + 0.0f); + dComIfGp_particle_setSimple(0x73D, ¤t.pos, 255, g_whiteColor, g_whiteColor, 0, + 0.0f); + } + } + + return 1; } -#pragma pop /* 8057C880-8057C8A0 000960 0020+00 1/0 0/0 0/0 .text daObjDigpl_Execute__FP12daObjDigpl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daObjDigpl_Execute(daObjDigpl_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/daObjDigpl_Execute__FP12daObjDigpl_c.s" +static int daObjDigpl_Execute(daObjDigpl_c* i_this) { + return i_this->execute(); } -#pragma pop /* 8057C8A0-8057C8A8 000980 0008+00 1/0 0/0 0/0 .text daObjDigpl_Draw__FP12daObjDigpl_c */ -static bool daObjDigpl_Draw(daObjDigpl_c* param_0) { - return true; +static int daObjDigpl_Draw(daObjDigpl_c* i_this) { + return 1; } + +/* 8057C8F8-8057C918 -00001 0020+00 1/0 0/0 0/0 .data l_daObjDigpl_Method */ +static actor_method_class l_daObjDigpl_Method = { + (process_method_func)daObjDigpl_Create, (process_method_func)daObjDigpl_Delete, + (process_method_func)daObjDigpl_Execute, (process_method_func)NULL, + (process_method_func)daObjDigpl_Draw, +}; + +/* 8057C918-8057C948 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Digpl */ +extern actor_process_profile_definition g_profile_Obj_Digpl = { + -3, + 3, + -3, + PROC_Obj_Digpl, + &g_fpcLf_Method.mBase, + sizeof(daObjDigpl_c), + 0, + 0, + &g_fopAc_Method.base, + 250, + &l_daObjDigpl_Method, + 0x44080, + 3, + 14, +}; diff --git a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp index 7cda08c2934..a4d9e5846d6 100644 --- a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp +++ b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp @@ -1,395 +1,169 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_obj_snowEffTag -// +/** + * d_a_obj_snowEffTag.cpp + * Snow Effect Generator Tag + */ #include "rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoHIO_entry_c { - /* 80CDF0E4 */ ~mDoHIO_entry_c(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daSnowEffTag_c { - /* 80CDF12C */ void setBaseMtx(); - /* 80CDF184 */ void create(); - /* 80CDF2B8 */ void playerAreaCheck(); - /* 80CDF498 */ void Execute(); - /* 80CDF5E4 */ bool Draw(); - /* 80CDF5EC */ bool Delete(); -}; - -struct daSnowEffTag_HIO_c { - /* 80CDF0AC */ daSnowEffTag_HIO_c(); - /* 80CDF674 */ ~daSnowEffTag_HIO_c(); -}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct csXyz {}; - -struct _GXColor {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - -struct dPa_control_c { - struct level_c { - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004D4CC */ void set(u32, 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 Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct JMath { - static u8 sincosTable_[65536]; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -// -// Forward References: -// - -extern "C" void __ct__18daSnowEffTag_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__14daSnowEffTag_cFv(); -extern "C" void create__14daSnowEffTag_cFv(); -extern "C" void playerAreaCheck__14daSnowEffTag_cFv(); -extern "C" void Execute__14daSnowEffTag_cFv(); -extern "C" bool Draw__14daSnowEffTag_cFv(); -extern "C" bool Delete__14daSnowEffTag_cFv(); -extern "C" static void daSnowEffTag_Draw__FP14daSnowEffTag_c(); -extern "C" static void daSnowEffTag_Execute__FP14daSnowEffTag_c(); -extern "C" static void daSnowEffTag_Delete__FP14daSnowEffTag_c(); -extern "C" static void daSnowEffTag_Create__FP10fopAc_ac_c(); -extern "C" void __dt__18daSnowEffTag_HIO_cFv(); -extern "C" void __sinit_d_a_obj_snowEffTag_cpp(); - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void cM_atan2s__Fff(); -extern "C" void func_802807E0(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void PSMTXTrans(); -extern "C" void PSVECSquareMag(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80CDF758-80CDF778 -00001 0020+00 1/0 0/0 0/0 .data l_daSnowEffTag_Method */ -SECTION_DATA static void* l_daSnowEffTag_Method[8] = { - (void*)daSnowEffTag_Create__FP10fopAc_ac_c, - (void*)daSnowEffTag_Delete__FP14daSnowEffTag_c, - (void*)daSnowEffTag_Execute__FP14daSnowEffTag_c, - (void*)NULL, - (void*)daSnowEffTag_Draw__FP14daSnowEffTag_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80CDF778-80CDF7A8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_SnowEff */ -SECTION_DATA extern void* g_profile_Tag_SnowEff[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x018F0000, (void*)&g_fpcLf_Method, - (void*)0x0000057C, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x02900000, (void*)&l_daSnowEffTag_Method, - (void*)0x00044000, (void*)0x000E0000, -}; - -/* 80CDF7A8-80CDF7B4 000050 000C+00 2/2 0/0 0/0 .data __vt__18daSnowEffTag_HIO_c */ -SECTION_DATA extern void* __vt__18daSnowEffTag_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18daSnowEffTag_HIO_cFv, -}; - -/* 80CDF7B4-80CDF7C0 00005C 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 "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "std/cmath.h" /* 80CDF0AC-80CDF0E4 0000EC 0038+00 1/1 0/0 0/0 .text __ct__18daSnowEffTag_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daSnowEffTag_HIO_c::daSnowEffTag_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__ct__18daSnowEffTag_HIO_cFv.s" +daSnowEffTag_HIO_c::daSnowEffTag_HIO_c() { + field_0x4 = 20; + mDisplayRange = false; + mTop = 1; + mBottom = 1; } -#pragma pop - -/* 80CDF0E4-80CDF12C 000124 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_snowEffTag/d_a_obj_snowEffTag/__dt__14mDoHIO_entry_cFv.s" -} -#pragma pop /* 80CDF12C-80CDF184 00016C 0058+00 1/1 0/0 0/0 .text setBaseMtx__14daSnowEffTag_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSnowEffTag_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/setBaseMtx__14daSnowEffTag_cFv.s" +void daSnowEffTag_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); } -#pragma pop - -/* ############################################################################################## */ -/* 80CDF720-80CDF724 000000 0004+00 2/2 0/0 0/0 .rodata @3702 */ -SECTION_RODATA static f32 const lit_3702 = 100.0f; -COMPILER_STRIP_GATE(0x80CDF720, &lit_3702); - -/* 80CDF724-80CDF728 000004 0004+00 0/1 0/0 0/0 .rodata @3703 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3703 = 0.5f; -COMPILER_STRIP_GATE(0x80CDF724, &lit_3703); -#pragma pop - -/* 80CDF728-80CDF72C 000008 0004+00 0/1 0/0 0/0 .rodata @3704 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3704 = 0.25f; -COMPILER_STRIP_GATE(0x80CDF728, &lit_3704); -#pragma pop - -/* 80CDF72C-80CDF730 00000C 0004+00 0/1 0/0 0/0 .rodata @3705 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3705 = 0.125f; -COMPILER_STRIP_GATE(0x80CDF72C, &lit_3705); -#pragma pop /* 80CDF184-80CDF2B8 0001C4 0134+00 1/1 0/0 0/0 .text create__14daSnowEffTag_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSnowEffTag_c::create() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/create__14daSnowEffTag_cFv.s" +int daSnowEffTag_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daSnowEffTag_c(); + fopAcM_OnCondition(this, 8); + } + + mMaxSize = mScale.x * 100.0f; + + switch (getArg0()) { + case -1: + case 0: + mSize = mMaxSize; + break; + case 1: + mSize = mMaxSize * 0.5f; + break; + case 2: + mSize = mMaxSize * 0.25f; + break; + case 3: + mSize = mMaxSize * 0.125f; + break; + } + + s16 tan = cM_atan2s(mMaxSize - mSize, mScale.y * 100.0f); + field_0x574 = cM_ssin(tan) / cM_scos(tan); + mPlayedSound = false; + + setBaseMtx(); + return cPhs_COMPLEATE_e; } -#pragma pop - -/* ############################################################################################## */ -/* 80CDF730-80CDF738 000010 0004+04 0/1 0/0 0/0 .rodata @3765 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3765[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CDF730, &lit_3765); -#pragma pop - -/* 80CDF738-80CDF740 000018 0008+00 0/1 0/0 0/0 .rodata @3766 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3766[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CDF738, &lit_3766); -#pragma pop - -/* 80CDF740-80CDF748 000020 0008+00 0/1 0/0 0/0 .rodata @3767 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3767[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CDF740, &lit_3767); -#pragma pop - -/* 80CDF748-80CDF750 000028 0008+00 0/1 0/0 0/0 .rodata @3768 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3768[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CDF748, &lit_3768); -#pragma pop /* 80CDF2B8-80CDF498 0002F8 01E0+00 1/1 0/0 0/0 .text playerAreaCheck__14daSnowEffTag_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSnowEffTag_c::playerAreaCheck() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/playerAreaCheck__14daSnowEffTag_cFv.s" +bool daSnowEffTag_c::playerAreaCheck() { + fopAc_ac_c* player_p = dComIfGp_getPlayer(0); + bool in_area = false; + + if (player_p->current.pos.y < current.pos.y || + player_p->current.pos.y > current.pos.y + mScale.y * 100.0f) + { + return false; + } else { + cXyz pos_diff = current.pos - player_p->current.pos; + f32 dist_to_player = pos_diff.absXZ(); + + // supposed to be std::fabs, but it changes regalloc + if (dist_to_player <= + mMaxSize - field_0x574 * fabsf(player_p->current.pos.y - current.pos.y)) + { + in_area = true; + } else { + mPlayedSound = false; + } + } + + return in_area; } -#pragma pop - -/* ############################################################################################## */ -/* 80CDF750-80CDF754 000030 0004+00 1/1 0/0 0/0 .rodata @3806 */ -SECTION_RODATA static f32 const lit_3806 = 1.0f; -COMPILER_STRIP_GATE(0x80CDF750, &lit_3806); - -/* 80CDF754-80CDF758 000034 0004+00 1/1 0/0 0/0 .rodata @3807 */ -SECTION_RODATA static f32 const lit_3807 = -1.0f; -COMPILER_STRIP_GATE(0x80CDF754, &lit_3807); /* 80CDF498-80CDF5E4 0004D8 014C+00 1/1 0/0 0/0 .text Execute__14daSnowEffTag_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daSnowEffTag_c::Execute() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/Execute__14daSnowEffTag_cFv.s" +int daSnowEffTag_c::Execute() { + if (playerAreaCheck() == true) { + if (!mPlayedSound) { + mDoAud_seStart(Z2SE_OBJ_SNOWTREE_HIT, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mPlayedSound = true; + } + + mEmitterID = dComIfGp_particle_set(mEmitterID, 0x886D, ¤t.pos, NULL, NULL); + + JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(mEmitterID); + if (emitter_p != NULL) { + MtxP link_mtx = daPy_getLinkPlayerActorClass()->getLinkBackBone1Matrix(); + emitter_p->setGlobalRTMatrix(link_mtx); + } + } + + return 1; } -#pragma pop /* 80CDF5E4-80CDF5EC 000624 0008+00 1/1 0/0 0/0 .text Draw__14daSnowEffTag_cFv */ -bool daSnowEffTag_c::Draw() { - return true; +int daSnowEffTag_c::Draw() { + return 1; } /* 80CDF5EC-80CDF5F4 00062C 0008+00 1/1 0/0 0/0 .text Delete__14daSnowEffTag_cFv */ -bool daSnowEffTag_c::Delete() { - return true; +int daSnowEffTag_c::Delete() { + return 1; } /* 80CDF5F4-80CDF614 000634 0020+00 1/0 0/0 0/0 .text daSnowEffTag_Draw__FP14daSnowEffTag_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSnowEffTag_Draw(daSnowEffTag_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Draw__FP14daSnowEffTag_c.s" +static int daSnowEffTag_Draw(daSnowEffTag_c* i_this) { + return i_this->Draw(); } -#pragma pop /* 80CDF614-80CDF634 000654 0020+00 1/0 0/0 0/0 .text daSnowEffTag_Execute__FP14daSnowEffTag_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSnowEffTag_Execute(daSnowEffTag_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Execute__FP14daSnowEffTag_c.s" +static int daSnowEffTag_Execute(daSnowEffTag_c* i_this) { + return i_this->Execute(); } -#pragma pop /* 80CDF634-80CDF654 000674 0020+00 1/0 0/0 0/0 .text daSnowEffTag_Delete__FP14daSnowEffTag_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSnowEffTag_Delete(daSnowEffTag_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Delete__FP14daSnowEffTag_c.s" +static int daSnowEffTag_Delete(daSnowEffTag_c* i_this) { + return i_this->Delete(); } -#pragma pop /* 80CDF654-80CDF674 000694 0020+00 1/0 0/0 0/0 .text daSnowEffTag_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daSnowEffTag_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/daSnowEffTag_Create__FP10fopAc_ac_c.s" +static int daSnowEffTag_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 80CDF674-80CDF6D0 0006B4 005C+00 2/1 0/0 0/0 .text __dt__18daSnowEffTag_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daSnowEffTag_HIO_c::~daSnowEffTag_HIO_c() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__dt__18daSnowEffTag_HIO_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80CDF7C8-80CDF7D4 000008 000C+00 1/1 0/0 0/0 .bss @3643 */ -static u8 lit_3643[12]; +daSnowEffTag_HIO_c::~daSnowEffTag_HIO_c() {} /* 80CDF7D4-80CDF7DC 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[8]; +static daSnowEffTag_HIO_c l_HIO; -/* 80CDF6D0-80CDF70C 000710 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_snowEffTag_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_a_obj_snowEffTag_cpp() { - nofralloc -#include "asm/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag/__sinit_d_a_obj_snowEffTag_cpp.s" -} -#pragma pop +/* 80CDF758-80CDF778 -00001 0020+00 1/0 0/0 0/0 .data l_daSnowEffTag_Method */ +static actor_method_class l_daSnowEffTag_Method = { + (process_method_func)daSnowEffTag_Create, (process_method_func)daSnowEffTag_Delete, + (process_method_func)daSnowEffTag_Execute, (process_method_func)NULL, + (process_method_func)daSnowEffTag_Draw, +}; -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80CDF6D0, __sinit_d_a_obj_snowEffTag_cpp); -#pragma pop +/* 80CDF778-80CDF7A8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_SnowEff */ +extern actor_process_profile_definition g_profile_Tag_SnowEff = { + -3, + 7, + -3, + PROC_Tag_SnowEff, + &g_fpcLf_Method.mBase, + sizeof(daSnowEffTag_c), + 0, + 0, + &g_fopAc_Method.base, + 656, + &l_daSnowEffTag_Method, + 0x44000, + 0, + 14, +}; diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/Makefile b/rel/d/a/tag/d_a_tag_lv2prchk/Makefile index 2ac9618a267..96bb97b0bb9 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/Makefile +++ b/rel/d/a/tag/d_a_tag_lv2prchk/Makefile @@ -8,12 +8,10 @@ M128_MAP := $(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv2prchk.map M128_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_bss.cpp \ rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp \ M128_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.o \ M128_LIBS := \ diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp b/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp index 01625541c68..55fdfc2d3e3 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp +++ b/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp @@ -1,126 +1,59 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_tag_lv2prchk -// +/** + * d_a_tag_lv2prchk.cpp + * Boomerang Switch Puzzle Tag + */ #include "rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daTagLv2PrChk_c { - /* 805A4C58 */ void Create(); - /* 805A4CDC */ void create(); - /* 805A4D44 */ void execute(); - /* 805A4D68 */ void action(); - /* 805A4DF4 */ void actionCheck(); - /* 805A5290 */ void actionEnd(); - /* 805A5294 */ void seStartWrong(); - /* 805A52F4 */ bool _delete(); -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -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" void Create__15daTagLv2PrChk_cFv(); -extern "C" void create__15daTagLv2PrChk_cFv(); -extern "C" void execute__15daTagLv2PrChk_cFv(); -extern "C" void action__15daTagLv2PrChk_cFv(); -extern "C" void actionCheck__15daTagLv2PrChk_cFv(); -extern "C" void actionEnd__15daTagLv2PrChk_cFv(); -extern "C" void seStartWrong__15daTagLv2PrChk_cFv(); -extern "C" bool _delete__15daTagLv2PrChk_cFv(); -extern "C" static void daTagLv2PrChk_Execute__FP15daTagLv2PrChk_c(); -extern "C" static void daTagLv2PrChk_Delete__FP15daTagLv2PrChk_c(); -extern "C" static void daTagLv2PrChk_Create__FP15daTagLv2PrChk_c(); -extern "C" extern void* g_profile_Tag_Lv2PrChk[12]; - -// -// External References: -// - -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_805A5410[4]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 805A4C58-805A4CDC 000078 0084+00 1/1 0/0 0/0 .text Create__15daTagLv2PrChk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagLv2PrChk_c::Create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/Create__15daTagLv2PrChk_cFv.s" +int daTagLv2PrChk_c::Create() { + mSwbit2 = getSwbit2(); + if (mSwbit2 == 0xFF) { + return 0; + } + + if (i_fopAcM_isSwitch(this, getSwbit())) { + mAction = ACTION_END_e; + } else { + mAction = ACTION_CHECK_e; + } + + return 1; } -#pragma pop /* 805A4CDC-805A4D44 0000FC 0068+00 1/1 0/0 0/0 .text create__15daTagLv2PrChk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagLv2PrChk_c::create() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/func_805A4CDC.s" +int daTagLv2PrChk_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daTagLv2PrChk_c(); + fopAcM_OnCondition(this, 8); + } + + if (!Create()) { + return cPhs_ERROR_e; + } + + return cPhs_COMPLEATE_e; } -#pragma pop /* 805A4D44-805A4D68 000164 0024+00 1/1 0/0 0/0 .text execute__15daTagLv2PrChk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagLv2PrChk_c::execute() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/execute__15daTagLv2PrChk_cFv.s" +int daTagLv2PrChk_c::execute() { + action(); + return 1; } -#pragma pop /* ############################################################################################## */ /* 805A536C-805A5378 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 805A5378-805A538C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -130,135 +63,170 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 805A538C-805A5398 -00001 000C+00 0/1 0/0 0/0 .data @3667 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3667[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionCheck__15daTagLv2PrChk_cFv, -}; -#pragma pop - -/* 805A5398-805A53A4 -00001 000C+00 0/1 0/0 0/0 .data @3668 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3668[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEnd__15daTagLv2PrChk_cFv, -}; -#pragma pop - -/* 805A53A4-805A53BC 000038 0018+00 0/1 0/0 0/0 .data l_func$3666 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[24] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - /* 805A4D68-805A4DF4 000188 008C+00 1/1 0/0 0/0 .text action__15daTagLv2PrChk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagLv2PrChk_c::action() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/action__15daTagLv2PrChk_cFv.s" +void daTagLv2PrChk_c::action() { + typedef void (daTagLv2PrChk_c::*actionFunc)(); + static actionFunc l_func[] = {&daTagLv2PrChk_c::actionCheck, &daTagLv2PrChk_c::actionEnd}; + + (this->*l_func[mAction])(); } -#pragma pop /* 805A4DF4-805A5290 000214 049C+00 1/0 0/0 0/0 .text actionCheck__15daTagLv2PrChk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagLv2PrChk_c::actionCheck() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/actionCheck__15daTagLv2PrChk_cFv.s" +void daTagLv2PrChk_c::actionCheck() { + bool switch_1 = i_fopAcM_isSwitch(this, mSwbit2); + bool switch_2 = i_fopAcM_isSwitch(this, mSwbit2 + 1); + bool switch_3 = i_fopAcM_isSwitch(this, mSwbit2 + 2); + bool switch_4 = i_fopAcM_isSwitch(this, mSwbit2 + 3); + int active_switch_num = switch_1 + switch_2 + switch_3 + switch_4; + + switch (mMode) { + case MODE_CHECK_FIRST_SW: + mPlayedSound = false; + if (switch_1 && !switch_2 && !switch_3 && !switch_4) { + mDirection = 1; + mMode = MODE_CHECK_SECOND_SW; + } else if (switch_4 && !switch_1 && !switch_2 && !switch_3) { + mDirection = -1; + mMode = MODE_CHECK_SECOND_SW; + } else if (switch_2 || switch_3) { + mMode = MODE_CHECK_WRONG_ORDER; + } + break; + case MODE_CHECK_SECOND_SW: + if (mDirection > 0) { + if (switch_1 && switch_2) { + mMode = MODE_CHECK_THIRD_SW; + } else if (!switch_1) { + mMode = MODE_CHECK_RESET; + } else if (switch_3 || switch_4) { + mMode = MODE_CHECK_WRONG_ORDER; + } + } else { + if (switch_4 && switch_3) { + mMode = MODE_CHECK_THIRD_SW; + } else if (!switch_4) { + mMode = MODE_CHECK_RESET; + } else if (switch_2 || switch_1) { + mMode = MODE_CHECK_WRONG_ORDER; + } + } + break; + case MODE_CHECK_THIRD_SW: + if (mDirection > 0) { + if (switch_1 && switch_2 && switch_3) { + mMode = MODE_CHECK_FOURTH_SW; + } else if (!switch_1 || !switch_2) { + field_0x56d = 1; + mMode = MODE_CHECK_RESET; + } else if (switch_4) { + mMode = MODE_CHECK_WRONG_ORDER; + } + } else { + if (switch_4 && switch_3 && switch_2) { + mMode = MODE_CHECK_FOURTH_SW; + } else if (!switch_4 || !switch_3) { + field_0x56d = 1; + mMode = MODE_CHECK_RESET; + } else if (switch_1) { + mMode = MODE_CHECK_WRONG_ORDER; + } + } + break; + case MODE_CHECK_FOURTH_SW: + if (switch_1 && switch_2 && switch_3 && switch_4) { + mMode = MODE_PUZZLE_CLEAR; + } else if (mDirection > 0) { + if (!switch_1 || !switch_2 || !switch_3) { + mMode = MODE_CHECK_RESET; + } + } else if (!switch_4 || !switch_3 || !switch_2) { + mMode = MODE_CHECK_RESET; + } + break; + case MODE_PUZZLE_CLEAR: + i_fopAcM_onSwitch(this, getSwbit()); + mAction = ACTION_END_e; + break; + case MODE_CHECK_RESET: + if (!switch_1 && !switch_2 && !switch_3 && !switch_4) { + mMode = MODE_CHECK_FIRST_SW; + field_0x56d = 0; + } else if (active_switch_num > 1 || field_0x56d == 1) { + i_fopAcM_onSwitch(this, getSwbit3()); + } + break; + case MODE_CHECK_WRONG_ORDER: + if (switch_1 && switch_2 && switch_3 && switch_4) { + if (!mPlayedSound) { + seStartWrong(); + mPlayedSound = true; + } + } else { + mMode = MODE_CHECK_RESET; + } + break; + case 150: + if (!switch_1 && !switch_2 && !switch_3 && !switch_4) { + mMode = MODE_CHECK_FIRST_SW; + } + break; + } } -#pragma pop /* 805A5290-805A5294 0006B0 0004+00 1/0 0/0 0/0 .text actionEnd__15daTagLv2PrChk_cFv */ -void daTagLv2PrChk_c::actionEnd() { - /* empty function */ -} - -/* ############################################################################################## */ -/* 805A5364-805A5368 000000 0004+00 1/1 0/0 0/0 .rodata @3844 */ -SECTION_RODATA static f32 const lit_3844 = 1.0f; -COMPILER_STRIP_GATE(0x805A5364, &lit_3844); - -/* 805A5368-805A536C 000004 0004+00 1/1 0/0 0/0 .rodata @3845 */ -SECTION_RODATA static f32 const lit_3845 = -1.0f; -COMPILER_STRIP_GATE(0x805A5368, &lit_3845); +void daTagLv2PrChk_c::actionEnd() {} /* 805A5294-805A52F4 0006B4 0060+00 1/1 0/0 0/0 .text seStartWrong__15daTagLv2PrChk_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagLv2PrChk_c::seStartWrong() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/seStartWrong__15daTagLv2PrChk_cFv.s" +void daTagLv2PrChk_c::seStartWrong() { + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SYS_RESULT_WRONG, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } -#pragma pop /* 805A52F4-805A52FC 000714 0008+00 1/1 0/0 0/0 .text _delete__15daTagLv2PrChk_cFv */ -bool daTagLv2PrChk_c::_delete() { - return true; +int daTagLv2PrChk_c::_delete() { + return 1; } /* 805A52FC-805A531C 00071C 0020+00 1/0 0/0 0/0 .text daTagLv2PrChk_Execute__FP15daTagLv2PrChk_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagLv2PrChk_Execute(daTagLv2PrChk_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Execute__FP15daTagLv2PrChk_c.s" +static int daTagLv2PrChk_Execute(daTagLv2PrChk_c* i_this) { + return i_this->execute(); } -#pragma pop /* 805A531C-805A533C 00073C 0020+00 1/0 0/0 0/0 .text daTagLv2PrChk_Delete__FP15daTagLv2PrChk_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagLv2PrChk_Delete(daTagLv2PrChk_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Delete__FP15daTagLv2PrChk_c.s" +static int daTagLv2PrChk_Delete(daTagLv2PrChk_c* i_this) { + return i_this->_delete(); } -#pragma pop /* 805A533C-805A535C 00075C 0020+00 1/0 0/0 0/0 .text daTagLv2PrChk_Create__FP15daTagLv2PrChk_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagLv2PrChk_Create(daTagLv2PrChk_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk/daTagLv2PrChk_Create__FP15daTagLv2PrChk_c.s" +static int daTagLv2PrChk_Create(daTagLv2PrChk_c* i_this) { + return i_this->create(); } -#pragma pop /* ############################################################################################## */ /* 805A53BC-805A53DC -00001 0020+00 1/0 0/0 0/0 .data l_daTagLv2PrChk_Method */ -SECTION_DATA static void* l_daTagLv2PrChk_Method[8] = { - (void*)daTagLv2PrChk_Create__FP15daTagLv2PrChk_c, - (void*)daTagLv2PrChk_Delete__FP15daTagLv2PrChk_c, - (void*)daTagLv2PrChk_Execute__FP15daTagLv2PrChk_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daTagLv2PrChk_Method = { + (process_method_func)daTagLv2PrChk_Create, + (process_method_func)daTagLv2PrChk_Delete, + (process_method_func)daTagLv2PrChk_Execute, + (process_method_func)NULL, + (process_method_func)NULL, }; /* 805A53DC-805A540C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Lv2PrChk */ -SECTION_DATA extern void* g_profile_Tag_Lv2PrChk[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01820000, (void*)&g_fpcLf_Method, - (void*)0x00000570, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x022E0000, (void*)&l_daTagLv2PrChk_Method, - (void*)0x00040000, (void*)0x000E0000, +extern actor_process_profile_definition g_profile_Tag_Lv2PrChk = { + -3, + 7, + -3, + PROC_Tag_Lv2PrChk, + &g_fpcLf_Method.mBase, + sizeof(daTagLv2PrChk_c), + 0, + 0, + &g_fopAc_Method.base, + 558, + &l_daTagLv2PrChk_Method, + 0x40000, + 0, + 14, }; diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_bss.cpp b/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_bss.cpp deleted file mode 100644 index 84764d7ca9c..00000000000 --- a/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_bss.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: unknown_translation_unit_bss -// - -#include "rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_bss.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 data_805A5410[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 805A5410-805A5414 000000 0004+00 0/0 1/1 0/0 .bss None */ -extern u8 data_805A5410[4]; -u8 data_805A5410[4]; diff --git a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp index e7c9ae62591..f31dfa81bf6 100644 --- a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp +++ b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp @@ -1,6 +1,6 @@ /** -/* Translation Unit: d_a_tag_waterfall -/* + * d_a_tag_waterfall.cpp + * */ #include "rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.h" @@ -28,7 +28,7 @@ static u32 m_master_id = static_cast(0xFFFFFFFF); static actor_method_class l_daTagWaterFall_Method = { (process_method_func)daTagWaterFall_Create, (process_method_func)daTagWaterFall_Delete, (process_method_func)daTagWaterFall_Execute, (process_method_func)daTagWaterFall_IsDelete, - (process_method_func)daTagWaterFall_Draw + (process_method_func)daTagWaterFall_Draw, }; /* 80D64DB8-80D64DE8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_WaterFall */ @@ -46,7 +46,7 @@ extern actor_process_profile_definition g_profile_Tag_WaterFall = { &l_daTagWaterFall_Method, 0x00044000, 0, - 0 + 0, }; /* 80D6462C-80D64680 0000EC 0054+00 1/1 0/0 0/0 .text __ct__20daTagWaterFall_HIO_cFv */ @@ -70,7 +70,7 @@ int daTagWaterFall_c::draw() { /* 80D64688-80D646A8 000148 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Draw__FP16daTagWaterFall_c */ static int daTagWaterFall_Draw(daTagWaterFall_c* i_this) { - i_this->draw(); + return i_this->draw(); } /* 80D646A8-80D64724 000168 007C+00 1/1 0/0 0/0 .text s_waterfall__FPvPv */ @@ -127,8 +127,7 @@ bool daTagWaterFall_c::checkHitWaterFall(cXyz objPos) { if (fabsf(dst.z) < absEllipseY) { if (waterfallTagPos.y < objPos.y) { // Instruction reordering occurs when mCylinderHeight == 0.0f is used - if (!mCylinderHeight || (waterfallTagPos.y + mCylinderHeight) > objPos.y) - { + if (!mCylinderHeight || (waterfallTagPos.y + mCylinderHeight) > objPos.y) { return true; } } @@ -177,7 +176,9 @@ int daTagWaterFall_c::execute() { } } - if ((!mPrevCameraInWaterfall && currCameraInWaterfall) || (mPrevCameraInWaterfall && !currCameraInWaterfall)) { + if ((!mPrevCameraInWaterfall && currCameraInWaterfall) || + (mPrevCameraInWaterfall && !currCameraInWaterfall)) + { mColorBlend = 1.0f - mColorBlend; mPrevCameraInWaterfall = currCameraInWaterfall; } @@ -200,10 +201,12 @@ int daTagWaterFall_c::execute() { } else { instanceFogMultiplier = mColorBlend; HIOFogMultiplier = 1.0f - mColorBlend; - }; + } - f32 fogParam0 = (mFogNear * instanceFogMultiplier) + (l_HIO.mBaseFogNear * HIOFogMultiplier); - f32 fogParam1 = (mFogFar * instanceFogMultiplier) + (l_HIO.mBaseFogFar * HIOFogMultiplier); + f32 fogParam0 = + (mFogNear * instanceFogMultiplier) + (l_HIO.mBaseFogNear * HIOFogMultiplier); + f32 fogParam1 = + (mFogFar * instanceFogMultiplier) + (l_HIO.mBaseFogFar * HIOFogMultiplier); dKy_fog_startendz_set(fogParam0, fogParam1, 1.0f); } @@ -217,7 +220,7 @@ int daTagWaterFall_c::execute() { */ static int daTagWaterFall_Execute(daTagWaterFall_c* i_this) { - i_this->execute(); + return i_this->execute(); } /* 80D64AD8-80D64AE0 000598 0008+00 1/0 0/0 0/0 .text @@ -237,7 +240,7 @@ int daTagWaterFall_c::_delete() { /* 80D64B00-80D64B20 0005C0 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Delete__FP16daTagWaterFall_c */ static int daTagWaterFall_Delete(daTagWaterFall_c* i_this) { - i_this->_delete(); + return i_this->_delete(); } /* 80D64B20-80D64CBC 0005E0 019C+00 1/1 0/0 0/0 .text create__16daTagWaterFall_cFv */ @@ -289,7 +292,7 @@ cPhs__Step daTagWaterFall_c::create() { /* 80D64CBC-80D64CDC 00077C 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Create__FP16daTagWaterFall_c */ static int daTagWaterFall_Create(daTagWaterFall_c* i_this) { - i_this->create(); + return i_this->create(); } /* 80D64CDC-80D64D24 00079C 0048+00 2/1 0/0 0/0 .text __dt__20daTagWaterFall_HIO_cFv */