From 46644fcdd47231d0328dc4d1dd72033ca889e749 Mon Sep 17 00:00:00 2001 From: jdflyer Date: Thu, 29 Dec 2022 15:45:50 -0700 Subject: [PATCH] remove unused asm --- asm/JSystem/JAudio2/JAISound/func_802A2474.s | 28 --------- ...reasePrepareCount_JAISound___8JAISoundFv.s | 21 ------- ...nitTrack_JAISound___8JAISoundFP8JASTrack.s | 59 ------------------- .../JAudio2/JAISound/stop__8JAISoundFv.s | 17 ------ .../calc__15JASAudioReseterFv.s | 59 ------------------- .../start__15JASAudioReseterFUlb.s | 43 -------------- .../JAudio2/dspproc/setup_callback__FUs.s | 4 -- 7 files changed, 231 deletions(-) delete mode 100644 asm/JSystem/JAudio2/JAISound/func_802A2474.s delete mode 100644 asm/JSystem/JAudio2/JAISound/increasePrepareCount_JAISound___8JAISoundFv.s delete mode 100644 asm/JSystem/JAudio2/JAISound/initTrack_JAISound___8JAISoundFP8JASTrack.s delete mode 100644 asm/JSystem/JAudio2/JAISound/stop__8JAISoundFv.s delete mode 100644 asm/JSystem/JAudio2/JASAudioReseter/calc__15JASAudioReseterFv.s delete mode 100644 asm/JSystem/JAudio2/JASAudioReseter/start__15JASAudioReseterFUlb.s delete mode 100644 asm/JSystem/JAudio2/dspproc/setup_callback__FUs.s diff --git a/asm/JSystem/JAudio2/JAISound/func_802A2474.s b/asm/JSystem/JAudio2/JAISound/func_802A2474.s deleted file mode 100644 index b677eb5c10..0000000000 --- a/asm/JSystem/JAudio2/JAISound/func_802A2474.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_802A2474: -/* 802A2474 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802A2478 7C 08 02 A6 */ mflr r0 -/* 802A247C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802A2480 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802A2484 7C 7F 1B 78 */ mr r31, r3 -/* 802A2488 7C A9 2B 78 */ mr r9, r5 -/* 802A248C 7C C8 33 78 */ mr r8, r6 -/* 802A2490 28 07 00 00 */ cmplwi r7, 0 -/* 802A2494 41 82 00 08 */ beq lbl_802A249C -/* 802A2498 90 FF 00 0C */ stw r7, 0xc(r31) -lbl_802A249C: -/* 802A249C 80 1F 00 18 */ lwz r0, 0x18(r31) -/* 802A24A0 90 01 00 08 */ stw r0, 8(r1) -/* 802A24A4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802A24A8 38 A1 00 08 */ addi r5, r1, 8 -/* 802A24AC 7D 26 4B 78 */ mr r6, r9 -/* 802A24B0 7D 07 43 78 */ mr r7, r8 -/* 802A24B4 81 83 00 00 */ lwz r12, 0(r3) -/* 802A24B8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802A24BC 7D 89 03 A6 */ mtctr r12 -/* 802A24C0 4E 80 04 21 */ bctrl -/* 802A24C4 90 7F 00 08 */ stw r3, 8(r31) -/* 802A24C8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 802A24CC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802A24D0 7C 08 03 A6 */ mtlr r0 -/* 802A24D4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802A24D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JAISound/increasePrepareCount_JAISound___8JAISoundFv.s b/asm/JSystem/JAudio2/JAISound/increasePrepareCount_JAISound___8JAISoundFv.s deleted file mode 100644 index 3ae33c8ba9..0000000000 --- a/asm/JSystem/JAudio2/JAISound/increasePrepareCount_JAISound___8JAISoundFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_802A266C: -/* 802A266C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802A2670 7C 08 02 A6 */ mflr r0 -/* 802A2674 90 01 00 14 */ stw r0, 0x14(r1) -/* 802A2678 7C 66 1B 78 */ mr r6, r3 -/* 802A267C 80 63 00 14 */ lwz r3, 0x14(r3) -/* 802A2680 38 03 00 01 */ addi r0, r3, 1 -/* 802A2684 90 06 00 14 */ stw r0, 0x14(r6) -/* 802A2688 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 802A268C 40 82 00 1C */ bne lbl_802A26A8 -/* 802A2690 3C 60 80 3A */ lis r3, JAISound__stringBase0@ha /* 0x8039B910@ha */ -/* 802A2694 38 63 B9 10 */ addi r3, r3, JAISound__stringBase0@l /* 0x8039B910@l */ -/* 802A2698 80 86 00 14 */ lwz r4, 0x14(r6) -/* 802A269C 80 A6 00 18 */ lwz r5, 0x18(r6) -/* 802A26A0 4C C6 31 82 */ crclr 6 -/* 802A26A4 4B FE E8 C1 */ bl JASReport__FPCce -lbl_802A26A8: -/* 802A26A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802A26AC 7C 08 03 A6 */ mtlr r0 -/* 802A26B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A26B4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JAISound/initTrack_JAISound___8JAISoundFP8JASTrack.s b/asm/JSystem/JAudio2/JAISound/initTrack_JAISound___8JAISoundFP8JASTrack.s deleted file mode 100644 index fdf4bf8074..0000000000 --- a/asm/JSystem/JAudio2/JAISound/initTrack_JAISound___8JAISoundFP8JASTrack.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_802A29DC: -/* 802A29DC 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802A29E0 7C 08 02 A6 */ mflr r0 -/* 802A29E4 90 01 00 44 */ stw r0, 0x44(r1) -/* 802A29E8 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A29EC 48 0B F7 E5 */ bl _savegpr_26 -/* 802A29F0 7C 7A 1B 78 */ mr r26, r3 -/* 802A29F4 7C 9B 23 78 */ mr r27, r4 -/* 802A29F8 3B A0 00 00 */ li r29, 0 -/* 802A29FC 3B E0 00 00 */ li r31, 0 -/* 802A2A00 3B 80 00 00 */ li r28, 0 -/* 802A2A04 3B C1 00 08 */ addi r30, r1, 8 -/* 802A2A08 48 00 00 34 */ b lbl_802A2A3C -lbl_802A2A0C: -/* 802A2A0C 80 7A 00 08 */ lwz r3, 8(r26) -/* 802A2A10 7F 84 E3 78 */ mr r4, r28 -/* 802A2A14 81 83 00 00 */ lwz r12, 0(r3) -/* 802A2A18 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802A2A1C 7D 89 03 A6 */ mtctr r12 -/* 802A2A20 4E 80 04 21 */ bctrl -/* 802A2A24 28 03 00 00 */ cmplwi r3, 0 -/* 802A2A28 41 82 00 10 */ beq lbl_802A2A38 -/* 802A2A2C 7C 7E F9 2E */ stwx r3, r30, r31 -/* 802A2A30 3B BD 00 01 */ addi r29, r29, 1 -/* 802A2A34 3B FF 00 04 */ addi r31, r31, 4 -lbl_802A2A38: -/* 802A2A38 3B 9C 00 01 */ addi r28, r28, 1 -lbl_802A2A3C: -/* 802A2A3C 80 7A 00 0C */ lwz r3, 0xc(r26) -/* 802A2A40 81 83 00 00 */ lwz r12, 0(r3) -/* 802A2A44 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802A2A48 7D 89 03 A6 */ mtctr r12 -/* 802A2A4C 4E 80 04 21 */ bctrl -/* 802A2A50 7C 1C 18 00 */ cmpw r28, r3 -/* 802A2A54 41 80 FF B8 */ blt lbl_802A2A0C -/* 802A2A58 7F 63 DB 78 */ mr r3, r27 -/* 802A2A5C 7F A4 EB 78 */ mr r4, r29 -/* 802A2A60 4B FE E9 E5 */ bl setChannelMgrCount__8JASTrackFUl -/* 802A2A64 3B 80 00 00 */ li r28, 0 -/* 802A2A68 3B E0 00 00 */ li r31, 0 -/* 802A2A6C 3B C1 00 08 */ addi r30, r1, 8 -/* 802A2A70 48 00 00 1C */ b lbl_802A2A8C -lbl_802A2A74: -/* 802A2A74 7F 63 DB 78 */ mr r3, r27 -/* 802A2A78 7F 84 E3 78 */ mr r4, r28 -/* 802A2A7C 7C BE F8 2E */ lwzx r5, r30, r31 -/* 802A2A80 4B FE EF 75 */ bl assignExtBuffer__8JASTrackFUlP14JASSoundParams -/* 802A2A84 3B 9C 00 01 */ addi r28, r28, 1 -/* 802A2A88 3B FF 00 04 */ addi r31, r31, 4 -lbl_802A2A8C: -/* 802A2A8C 80 1B 01 D0 */ lwz r0, 0x1d0(r27) -/* 802A2A90 7C 1C 00 40 */ cmplw r28, r0 -/* 802A2A94 41 80 FF E0 */ blt lbl_802A2A74 -/* 802A2A98 39 61 00 40 */ addi r11, r1, 0x40 -/* 802A2A9C 48 0B F7 81 */ bl _restgpr_26 -/* 802A2AA0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802A2AA4 7C 08 03 A6 */ mtlr r0 -/* 802A2AA8 38 21 00 40 */ addi r1, r1, 0x40 -/* 802A2AAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JAISound/stop__8JAISoundFv.s b/asm/JSystem/JAudio2/JAISound/stop__8JAISoundFv.s deleted file mode 100644 index be2ecbbd20..0000000000 --- a/asm/JSystem/JAudio2/JAISound/stop__8JAISoundFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_802A2598: -/* 802A2598 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802A259C 7C 08 02 A6 */ mflr r0 -/* 802A25A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802A25A4 38 80 00 00 */ li r4, 0 -/* 802A25A8 88 03 00 1F */ lbz r0, 0x1f(r3) -/* 802A25AC 50 80 1F 38 */ rlwimi r0, r4, 3, 0x1c, 0x1c -/* 802A25B0 98 03 00 1F */ stb r0, 0x1f(r3) -/* 802A25B4 38 80 00 01 */ li r4, 1 -/* 802A25B8 88 03 00 1F */ lbz r0, 0x1f(r3) -/* 802A25BC 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 -/* 802A25C0 98 03 00 1F */ stb r0, 0x1f(r3) -/* 802A25C4 4B FF FB DD */ bl releaseHandle__8JAISoundFv -/* 802A25C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802A25CC 7C 08 03 A6 */ mtlr r0 -/* 802A25D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802A25D4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASAudioReseter/calc__15JASAudioReseterFv.s b/asm/JSystem/JAudio2/JASAudioReseter/calc__15JASAudioReseterFv.s deleted file mode 100644 index beab1fea43..0000000000 --- a/asm/JSystem/JAudio2/JASAudioReseter/calc__15JASAudioReseterFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8029D200: -/* 8029D200 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8029D204 7C 08 02 A6 */ mflr r0 -/* 8029D208 90 01 00 24 */ stw r0, 0x24(r1) -/* 8029D20C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8029D210 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8029D214 7C 7E 1B 78 */ mr r30, r3 -/* 8029D218 80 63 00 00 */ lwz r3, 0(r3) -/* 8029D21C 28 03 00 00 */ cmplwi r3, 0 -/* 8029D220 40 82 00 50 */ bne lbl_8029D270 -/* 8029D224 3B E0 00 00 */ li r31, 0 -lbl_8029D228: -/* 8029D228 7F E3 FB 78 */ mr r3, r31 -/* 8029D22C 48 00 07 1D */ bl getHandle__13JASDSPChannelFUl -/* 8029D230 80 03 00 00 */ lwz r0, 0(r3) -/* 8029D234 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8029D238 40 82 00 08 */ bne lbl_8029D240 -/* 8029D23C 48 00 01 05 */ bl drop__13JASDSPChannelFv -lbl_8029D240: -/* 8029D240 3B FF 00 01 */ addi r31, r31, 1 -/* 8029D244 28 1F 00 40 */ cmplwi r31, 0x40 -/* 8029D248 41 80 FF E0 */ blt lbl_8029D228 -/* 8029D24C 88 1E 00 0C */ lbz r0, 0xc(r30) -/* 8029D250 28 00 00 00 */ cmplwi r0, 0 -/* 8029D254 41 82 00 0C */ beq lbl_8029D260 -/* 8029D258 80 6D 86 0C */ lwz r3, data_80450B8C(r13) -/* 8029D25C 4B FF FB 65 */ bl stop__14JASAudioThreadFv -lbl_8029D260: -/* 8029D260 38 00 00 01 */ li r0, 1 -/* 8029D264 90 1E 00 08 */ stw r0, 8(r30) -/* 8029D268 38 60 FF FF */ li r3, -1 -/* 8029D26C 48 00 00 50 */ b lbl_8029D2BC -lbl_8029D270: -/* 8029D270 38 03 FF FF */ addi r0, r3, -1 -/* 8029D274 90 1E 00 00 */ stw r0, 0(r30) -/* 8029D278 83 FE 00 00 */ lwz r31, 0(r30) -/* 8029D27C 48 00 0E DD */ bl getDSPLevel__9JASDriverFv -/* 8029D280 C8 42 BD 40 */ lfd f2, lit_156(r2) -/* 8029D284 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8029D288 3C 60 43 30 */ lis r3, 0x4330 -/* 8029D28C 90 61 00 08 */ stw r3, 8(r1) -/* 8029D290 C8 01 00 08 */ lfd f0, 8(r1) -/* 8029D294 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8029D298 EC 20 00 72 */ fmuls f1, f0, f1 -/* 8029D29C 38 1F 00 01 */ addi r0, r31, 1 -/* 8029D2A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029D2A4 90 61 00 10 */ stw r3, 0x10(r1) -/* 8029D2A8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 8029D2AC EC 00 10 28 */ fsubs f0, f0, f2 -/* 8029D2B0 EC 21 00 24 */ fdivs f1, f1, f0 -/* 8029D2B4 48 00 0E 7D */ bl setDSPLevel__9JASDriverFf -/* 8029D2B8 38 60 00 00 */ li r3, 0 -lbl_8029D2BC: -/* 8029D2BC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8029D2C0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8029D2C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8029D2C8 7C 08 03 A6 */ mtlr r0 -/* 8029D2CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029D2D0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/JASAudioReseter/start__15JASAudioReseterFUlb.s b/asm/JSystem/JAudio2/JASAudioReseter/start__15JASAudioReseterFUlb.s deleted file mode 100644 index 40bd2006aa..0000000000 --- a/asm/JSystem/JAudio2/JASAudioReseter/start__15JASAudioReseterFUlb.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8029D138: -/* 8029D138 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8029D13C 7C 08 02 A6 */ mflr r0 -/* 8029D140 90 01 00 24 */ stw r0, 0x24(r1) -/* 8029D144 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8029D148 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8029D14C 7C 7E 1B 78 */ mr r30, r3 -/* 8029D150 7C 9F 23 78 */ mr r31, r4 -/* 8029D154 80 03 00 08 */ lwz r0, 8(r3) -/* 8029D158 2C 00 00 00 */ cmpwi r0, 0 -/* 8029D15C 40 82 00 0C */ bne lbl_8029D168 -/* 8029D160 38 60 00 00 */ li r3, 0 -/* 8029D164 48 00 00 58 */ b lbl_8029D1BC -lbl_8029D168: -/* 8029D168 98 BE 00 0C */ stb r5, 0xc(r30) -/* 8029D16C 48 0A 05 89 */ bl OSDisableInterrupts -/* 8029D170 90 61 00 08 */ stw r3, 8(r1) -/* 8029D174 3C 60 80 2A */ lis r3, callback__15JASAudioReseterFPv@ha /* 0x8029D2D4@ha */ -/* 8029D178 38 63 D2 D4 */ addi r3, r3, callback__15JASAudioReseterFPv@l /* 0x8029D2D4@l */ -/* 8029D17C 7F C4 F3 78 */ mr r4, r30 -/* 8029D180 48 00 10 C1 */ bl registerDspSyncCallback__9JASDriverFPFPv_lPv -/* 8029D184 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8029D188 40 82 00 14 */ bne lbl_8029D19C -/* 8029D18C 80 61 00 08 */ lwz r3, 8(r1) -/* 8029D190 48 0A 05 8D */ bl OSRestoreInterrupts -/* 8029D194 38 60 00 00 */ li r3, 0 -/* 8029D198 48 00 00 24 */ b lbl_8029D1BC -lbl_8029D19C: -/* 8029D19C 48 00 0F BD */ bl getDSPLevel__9JASDriverFv -/* 8029D1A0 D0 3E 00 04 */ stfs f1, 4(r30) -/* 8029D1A4 93 FE 00 00 */ stw r31, 0(r30) -/* 8029D1A8 38 00 00 00 */ li r0, 0 -/* 8029D1AC 90 1E 00 08 */ stw r0, 8(r30) -/* 8029D1B0 80 61 00 08 */ lwz r3, 8(r1) -/* 8029D1B4 48 0A 05 69 */ bl OSRestoreInterrupts -/* 8029D1B8 38 60 00 01 */ li r3, 1 -lbl_8029D1BC: -/* 8029D1BC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8029D1C0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8029D1C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8029D1C8 7C 08 03 A6 */ mtlr r0 -/* 8029D1CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8029D1D0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JAudio2/dspproc/setup_callback__FUs.s b/asm/JSystem/JAudio2/dspproc/setup_callback__FUs.s deleted file mode 100644 index ddb1344557..0000000000 --- a/asm/JSystem/JAudio2/dspproc/setup_callback__FUs.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8029E540: -/* 8029E540 38 00 00 00 */ li r0, 0 -/* 8029E544 90 0D 8D 78 */ stw r0, flag(r13) -/* 8029E548 4E 80 00 20 */ blr