split AXOut, AXSPB, AXVPB

1 files changed, 15 insertions, 15 deletions

diff --git a/asm/text_7.s b/asm/text_7.s
index 0dc96ec..339d8a5 100644
--- a/asm/text_7.s
+++ b/asm/text_7.s
@@ -61810,18 +61810,18 @@ lbl_80258358:
 /* 8025839C 00253FFC  B0 61 00 1C */	sth r3, 0x1c(r1)
 /* 802583A0 00254000  B0 C1 00 1E */	sth r6, 0x1e(r1)
 /* 802583A4 00254004  80 7E 01 A0 */	lwz r3, 0x1a0(r30)
-/* 802583A8 00254008  48 03 9C ED */	bl func_80292094
+/* 802583A8 00254008  48 03 9C ED */	bl AXSetVoiceAddr
 /* 802583AC 0025400C  80 1E 00 58 */	lwz r0, 0x58(r30)
 /* 802583B0 00254010  28 00 7D 00 */	cmplwi r0, 0x7d00
 /* 802583B4 00254014  40 82 00 14 */	bne lbl_802583C8
 /* 802583B8 00254018  80 7E 01 A0 */	lwz r3, 0x1a0(r30)
 /* 802583BC 0025401C  38 80 00 00 */	li r4, 0
-/* 802583C0 00254020  48 03 9B A5 */	bl func_80291F64
+/* 802583C0 00254020  48 03 9B A5 */	bl AXSetVoiceSrcType
 /* 802583C4 00254024  48 00 00 40 */	b lbl_80258404
 lbl_802583C8:
 /* 802583C8 00254028  80 7E 01 A0 */	lwz r3, 0x1a0(r30)
 /* 802583CC 0025402C  38 80 00 03 */	li r4, 3
-/* 802583D0 00254030  48 03 9B 95 */	bl func_80291F64
+/* 802583D0 00254030  48 03 9B 95 */	bl AXSetVoiceSrcType
 /* 802583D4 00254034  80 7E 00 58 */	lwz r3, 0x58(r30)
 /* 802583D8 00254038  3C 00 43 30 */	lis r0, 0x4330
 /* 802583DC 0025403C  90 01 00 20 */	stw r0, 0x20(r1)
@@ -61833,7 +61833,7 @@ lbl_802583C8:
 /* 802583F4 00254054  FC 21 10 28 */	fsub f1, f1, f2
 /* 802583F8 00254058  FC 21 00 24 */	fdiv f1, f1, f0
 /* 802583FC 0025405C  FC 20 08 18 */	frsp f1, f1
-/* 80258400 00254060  48 03 9D E1 */	bl func_802921E0
+/* 80258400 00254060  48 03 9D E1 */	bl AXSetVoiceSrcRatio
 lbl_80258404:
 /* 80258404 00254064  80 1E 00 54 */	lwz r0, 0x54(r30)
 /* 80258408 00254068  28 00 00 02 */	cmplwi r0, 2
@@ -61884,18 +61884,18 @@ lbl_8025844C:
 /* 802584B8 00254118  B0 61 00 1C */	sth r3, 0x1c(r1)
 /* 802584BC 0025411C  B0 C1 00 1E */	sth r6, 0x1e(r1)
 /* 802584C0 00254120  80 7E 01 A4 */	lwz r3, 0x1a4(r30)
-/* 802584C4 00254124  48 03 9B D1 */	bl func_80292094
+/* 802584C4 00254124  48 03 9B D1 */	bl AXSetVoiceAddr
 /* 802584C8 00254128  80 1E 00 58 */	lwz r0, 0x58(r30)
 /* 802584CC 0025412C  28 00 7D 00 */	cmplwi r0, 0x7d00
 /* 802584D0 00254130  40 82 00 14 */	bne lbl_802584E4
 /* 802584D4 00254134  80 7E 01 A4 */	lwz r3, 0x1a4(r30)
 /* 802584D8 00254138  38 80 00 00 */	li r4, 0
-/* 802584DC 0025413C  48 03 9A 89 */	bl func_80291F64
+/* 802584DC 0025413C  48 03 9A 89 */	bl AXSetVoiceSrcType
 /* 802584E0 00254140  48 00 00 40 */	b lbl_80258520
 lbl_802584E4:
 /* 802584E4 00254144  80 7E 01 A4 */	lwz r3, 0x1a4(r30)
 /* 802584E8 00254148  38 80 00 03 */	li r4, 3
-/* 802584EC 0025414C  48 03 9A 79 */	bl func_80291F64
+/* 802584EC 0025414C  48 03 9A 79 */	bl AXSetVoiceSrcType
 /* 802584F0 00254150  80 7E 00 58 */	lwz r3, 0x58(r30)
 /* 802584F4 00254154  3C 00 43 30 */	lis r0, 0x4330
 /* 802584F8 00254158  90 01 00 20 */	stw r0, 0x20(r1)
@@ -61907,7 +61907,7 @@ lbl_802584E4:
 /* 80258510 00254170  FC 21 10 28 */	fsub f1, f1, f2
 /* 80258514 00254174  FC 21 00 24 */	fdiv f1, f1, f0
 /* 80258518 00254178  FC 20 08 18 */	frsp f1, f1
-/* 8025851C 0025417C  48 03 9C C5 */	bl func_802921E0
+/* 8025851C 0025417C  48 03 9C C5 */	bl AXSetVoiceSrcRatio
 lbl_80258520:
 /* 80258520 00254180  80 1E 00 54 */	lwz r0, 0x54(r30)
 /* 80258524 00254184  38 60 00 00 */	li r3, 0
@@ -62204,7 +62204,7 @@ lbl_80258934:
 /* 8025895C 002545BC  80 79 01 A4 */	lwz r3, 0x1a4(r25)
 /* 80258960 002545C0  3C 04 80 00 */	addis r0, r4, 0x8000
 /* 80258964 002545C4  54 04 F8 7E */	srwi r4, r0, 1
-/* 80258968 002545C8  48 03 98 25 */	bl func_8029218C
+/* 80258968 002545C8  48 03 98 25 */	bl AXSetVoiceCurrentAddr
 lbl_8025896C:
 /* 8025896C 002545CC  80 79 01 A8 */	lwz r3, 0x1a8(r25)
 /* 80258970 002545D0  57 64 08 3C */	slwi r4, r27, 1
@@ -62213,7 +62213,7 @@ lbl_8025896C:
 /* 8025897C 002545DC  80 79 01 A0 */	lwz r3, 0x1a0(r25)
 /* 80258980 002545E0  3C 04 80 00 */	addis r0, r4, 0x8000
 /* 80258984 002545E4  54 04 F8 7E */	srwi r4, r0, 1
-/* 80258988 002545E8  48 03 98 05 */	bl func_8029218C
+/* 80258988 002545E8  48 03 98 05 */	bl AXSetVoiceCurrentAddr
 /* 8025898C 002545EC  80 79 01 A8 */	lwz r3, 0x1a8(r25)
 /* 80258990 002545F0  39 61 00 30 */	addi r11, r1, 0x30
 /* 80258994 002545F4  3C 03 80 00 */	addis r0, r3, 0x8000
@@ -62688,13 +62688,13 @@ func_80259000:
 /* 8025901C 00254C7C  41 82 00 10 */	beq lbl_8025902C
 /* 80259020 00254C80  7C 03 03 78 */	mr r3, r0
 /* 80259024 00254C84  38 80 00 01 */	li r4, 1
-/* 80259028 00254C88  48 03 8F FD */	bl func_80292024
+/* 80259028 00254C88  48 03 8F FD */	bl AXSetVoiceState
 lbl_8025902C:
 /* 8025902C 00254C8C  80 7F 01 A4 */	lwz r3, 0x1a4(r31)
 /* 80259030 00254C90  2C 03 00 00 */	cmpwi r3, 0
 /* 80259034 00254C94  41 82 00 0C */	beq lbl_80259040
 /* 80259038 00254C98  38 80 00 01 */	li r4, 1
-/* 8025903C 00254C9C  48 03 8F E9 */	bl func_80292024
+/* 8025903C 00254C9C  48 03 8F E9 */	bl AXSetVoiceState
 lbl_80259040:
 /* 80259040 00254CA0  80 01 00 14 */	lwz r0, 0x14(r1)
 /* 80259044 00254CA4  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -62900,7 +62900,7 @@ func_802592DC:
 /* 80259300 00254F60  48 00 00 7C */	b lbl_8025937C
 lbl_80259304:
 /* 80259304 00254F64  48 03 E6 7D */	bl func_80297980
-/* 80259308 00254F68  48 03 90 15 */	bl func_8029231C
+/* 80259308 00254F68  48 03 90 15 */	bl AXGetMaxVoices
 /* 8025930C 00254F6C  2C 03 00 00 */	cmpwi r3, 0
 /* 80259310 00254F70  40 82 00 08 */	bne lbl_80259318
 /* 80259314 00254F74  38 60 00 02 */	li r3, 2
@@ -62926,7 +62926,7 @@ lbl_80259338:
 /* 8025935C 00254FBC  38 63 90 D4 */	addi r3, r3, lbl_802590D4@l
 /* 80259360 00254FC0  90 85 00 74 */	stw r4, 0x74(r5)
 /* 80259364 00254FC4  90 0D A6 60 */	stw r0, lbl_8063F920-_SDA_BASE_(r13)
-/* 80259368 00254FC8  48 03 7A E9 */	bl func_80290E50
+/* 80259368 00254FC8  48 03 7A E9 */	bl AXRegisterCallback
 /* 8025936C 00254FCC  38 00 00 01 */	li r0, 1
 /* 80259370 00254FD0  90 6D A6 64 */	stw r3, lbl_8063F924-_SDA_BASE_(r13)
 /* 80259374 00254FD4  38 60 00 01 */	li r3, 1
@@ -62956,7 +62956,7 @@ func_80259390:
 /* 802593C4 00255024  90 03 00 74 */	stw r0, 0x74(r3)
 /* 802593C8 00255028  93 ED A6 60 */	stw r31, lbl_8063F920-_SDA_BASE_(r13)
 /* 802593CC 0025502C  80 6D A6 64 */	lwz r3, lbl_8063F924-_SDA_BASE_(r13)
-/* 802593D0 00255030  48 03 7A 81 */	bl func_80290E50
+/* 802593D0 00255030  48 03 7A 81 */	bl AXRegisterCallback
 /* 802593D4 00255034  93 ED A6 64 */	stw r31, lbl_8063F924-_SDA_BASE_(r13)
 /* 802593D8 00255038  48 03 E7 C1 */	bl func_80297B98
 /* 802593DC 0025503C  80 6D 96 2C */	lwz r3, lbl_8063E8EC-_SDA_BASE_(r13)