diff options
| -rw-r--r-- | asm/nw4r/snd/snd_Channel.s | 12 | ||||
| -rw-r--r-- | asm/nw4r/snd/snd_Lfo.s | 149 | ||||
| -rw-r--r-- | asm/text_10_6.s | 150 | ||||
| -rw-r--r-- | asm/text_11.s | 4 | ||||
| -rw-r--r-- | obj_files.mk | 1 |
5 files changed, 160 insertions, 156 deletions
diff --git a/asm/nw4r/snd/snd_Channel.s b/asm/nw4r/snd/snd_Channel.s index 1ab9931..2c84bff 100644 --- a/asm/nw4r/snd/snd_Channel.s +++ b/asm/nw4r/snd/snd_Channel.s @@ -221,7 +221,7 @@ InitParam__Q44nw4r3snd6detail7ChannelFPFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6d /* 8036E498 0036A0F8 93 E3 00 A0 */ stw r31, 0xa0(r3)
/* 8036E49C 0036A0FC 48 00 17 DD */ bl Init__Q44nw4r3snd6detail12EnvGeneratorFf
/* 8036E4A0 0036A100 38 7E 00 18 */ addi r3, r30, 0x18
-/* 8036E4A4 0036A104 48 00 37 59 */ bl func_80371BFC
+/* 8036E4A4 0036A104 48 00 37 59 */ bl Init__Q44nw4r3snd6detail8LfoParamFv
/* 8036E4A8 0036A108 9B FE 00 30 */ stb r31, 0x30(r30)
/* 8036E4AC 0036A10C 93 FE 00 CC */ stw r31, 0xcc(r30)
/* 8036E4B0 0036A110 93 FE 00 D0 */ stw r31, 0xd0(r30)
@@ -279,7 +279,7 @@ Update__Q44nw4r3snd6detail7ChannelFb: /* 8036E574 0036A1D4 3B E0 00 00 */ li r31, 0
lbl_8036E578:
/* 8036E578 0036A1D8 38 63 00 18 */ addi r3, r3, 0x18
-/* 8036E57C 0036A1DC 48 00 37 55 */ bl func_80371CD0
+/* 8036E57C 0036A1DC 48 00 37 55 */ bl GetValue__Q44nw4r3snd6detail3LfoCFv
/* 8036E580 0036A1E0 A0 7E 00 BC */ lhz r3, 0xbc(r30)
/* 8036E584 0036A1E4 FF E0 08 90 */ fmr f31, f1
/* 8036E588 0036A1E8 A0 1E 00 BA */ lhz r0, 0xba(r30)
@@ -618,13 +618,13 @@ lbl_8036E940: lbl_8036EA78:
/* 8036EA78 0036A6D8 38 7E 00 18 */ addi r3, r30, 0x18
/* 8036EA7C 0036A6DC 38 80 00 03 */ li r4, 3
-/* 8036EA80 0036A6E0 48 00 31 B5 */ bl func_80371C34
+/* 8036EA80 0036A6E0 48 00 31 B5 */ bl Update__Q44nw4r3snd6detail3LfoFi
/* 8036EA84 0036A6E4 7F C3 F3 78 */ mr r3, r30
/* 8036EA88 0036A6E8 38 80 00 03 */ li r4, 3
/* 8036EA8C 0036A6EC 48 00 12 6D */ bl Update__Q44nw4r3snd6detail12EnvGeneratorFi
lbl_8036EA90:
/* 8036EA90 0036A6F0 38 7E 00 18 */ addi r3, r30, 0x18
-/* 8036EA94 0036A6F4 48 00 32 3D */ bl func_80371CD0
+/* 8036EA94 0036A6F4 48 00 32 3D */ bl GetValue__Q44nw4r3snd6detail3LfoCFv
/* 8036EA98 0036A6F8 FE E0 08 90 */ fmr f23, f1
/* 8036EA9C 0036A6FC C2 82 A5 C4 */ lfs f20, lbl_80642BC4-_SDA2_BASE_(r2)
/* 8036EAA0 0036A700 7F C3 F3 78 */ mr r3, r30
@@ -757,7 +757,7 @@ Start__Q44nw4r3snd6detail7ChannelFRCQ44nw4r3snd6detail8WaveDataiUl: /* 8036EC80 0036A8E0 7C 7D 1B 78 */ mr r29, r3
/* 8036EC84 0036A8E4 90 A3 00 C8 */ stw r5, 0xc8(r3)
/* 8036EC88 0036A8E8 38 63 00 18 */ addi r3, r3, 0x18
-/* 8036EC8C 0036A8EC 48 00 2F 95 */ bl func_80371C20
+/* 8036EC8C 0036A8EC 48 00 2F 95 */ bl Reset__Q44nw4r3snd6detail3LfoFv
/* 8036EC90 0036A8F0 C0 22 A5 E8 */ lfs f1, lbl_80642BE8-_SDA2_BASE_(r2)
/* 8036EC94 0036A8F4 7F A3 EB 78 */ mr r3, r29
/* 8036EC98 0036A8F8 48 00 10 1D */ bl Reset__Q44nw4r3snd6detail12EnvGeneratorFf
@@ -1064,7 +1064,7 @@ lbl_8036F0C0: /* 8036F0C0 0036AD20 41 82 00 48 */ beq lbl_8036F108
/* 8036F0C4 0036AD24 48 00 0B 75 */ bl __ct__Q44nw4r3snd6detail12EnvGeneratorFv
/* 8036F0C8 0036AD28 38 7A 00 18 */ addi r3, r26, 0x18
-/* 8036F0CC 0036AD2C 48 00 2B 31 */ bl func_80371BFC
+/* 8036F0CC 0036AD2C 48 00 2B 31 */ bl Init__Q44nw4r3snd6detail8LfoParamFv
/* 8036F0D0 0036AD30 38 00 00 00 */ li r0, 0
/* 8036F0D4 0036AD34 C0 02 A5 C0 */ lfs f0, lbl_80642BC0-_SDA2_BASE_(r2)
/* 8036F0D8 0036AD38 90 1A 00 28 */ stw r0, 0x28(r26)
diff --git a/asm/nw4r/snd/snd_Lfo.s b/asm/nw4r/snd/snd_Lfo.s new file mode 100644 index 0000000..32c0ad8 --- /dev/null +++ b/asm/nw4r/snd/snd_Lfo.s @@ -0,0 +1,149 @@ +.include "macros.inc"
+
+.section .text, "ax" # 0x80006980 - 0x803E1E60
+
+.global Init__Q44nw4r3snd6detail8LfoParamFv
+Init__Q44nw4r3snd6detail8LfoParamFv:
+/* 80371BFC 0036D85C C0 22 A6 58 */ lfs f1, lbl_80642C58-_SDA2_BASE_(r2)
+/* 80371C00 0036D860 38 80 00 01 */ li r4, 1
+/* 80371C04 0036D864 C0 02 A6 5C */ lfs f0, lbl_80642C5C-_SDA2_BASE_(r2)
+/* 80371C08 0036D868 38 00 00 00 */ li r0, 0
+/* 80371C0C 0036D86C D0 23 00 00 */ stfs f1, 0(r3)
+/* 80371C10 0036D870 98 83 00 0C */ stb r4, 0xc(r3)
+/* 80371C14 0036D874 D0 03 00 04 */ stfs f0, 4(r3)
+/* 80371C18 0036D878 90 03 00 08 */ stw r0, 8(r3)
+/* 80371C1C 0036D87C 4E 80 00 20 */ blr
+
+.global Reset__Q44nw4r3snd6detail3LfoFv
+Reset__Q44nw4r3snd6detail3LfoFv:
+/* 80371C20 0036D880 C0 02 A6 58 */ lfs f0, lbl_80642C58-_SDA2_BASE_(r2)
+/* 80371C24 0036D884 38 00 00 00 */ li r0, 0
+/* 80371C28 0036D888 90 03 00 10 */ stw r0, 0x10(r3)
+/* 80371C2C 0036D88C D0 03 00 14 */ stfs f0, 0x14(r3)
+/* 80371C30 0036D890 4E 80 00 20 */ blr
+
+.global Update__Q44nw4r3snd6detail3LfoFi
+Update__Q44nw4r3snd6detail3LfoFi:
+/* 80371C34 0036D894 94 21 FF E0 */ stwu r1, -0x20(r1)
+/* 80371C38 0036D898 80 C3 00 08 */ lwz r6, 8(r3)
+/* 80371C3C 0036D89C 80 A3 00 10 */ lwz r5, 0x10(r3)
+/* 80371C40 0036D8A0 7C 05 30 40 */ cmplw r5, r6
+/* 80371C44 0036D8A4 40 80 00 24 */ bge lbl_80371C68
+/* 80371C48 0036D8A8 7C 05 22 14 */ add r0, r5, r4
+/* 80371C4C 0036D8AC 7C 00 30 40 */ cmplw r0, r6
+/* 80371C50 0036D8B0 41 81 00 0C */ bgt lbl_80371C5C
+/* 80371C54 0036D8B4 90 03 00 10 */ stw r0, 0x10(r3)
+/* 80371C58 0036D8B8 48 00 00 70 */ b lbl_80371CC8
+lbl_80371C5C:
+/* 80371C5C 0036D8BC 7C 05 30 50 */ subf r0, r5, r6
+/* 80371C60 0036D8C0 90 C3 00 10 */ stw r6, 0x10(r3)
+/* 80371C64 0036D8C4 7C 80 20 50 */ subf r4, r0, r4
+lbl_80371C68:
+/* 80371C68 0036D8C8 3C 00 43 30 */ lis r0, 0x4330
+/* 80371C6C 0036D8CC 6C 84 80 00 */ xoris r4, r4, 0x8000
+/* 80371C70 0036D8D0 90 81 00 0C */ stw r4, 0xc(r1)
+/* 80371C74 0036D8D4 C8 82 A6 68 */ lfd f4, lbl_80642C68-_SDA2_BASE_(r2)
+/* 80371C78 0036D8D8 90 01 00 08 */ stw r0, 8(r1)
+/* 80371C7C 0036D8DC C0 43 00 04 */ lfs f2, 4(r3)
+/* 80371C80 0036D8E0 C8 01 00 08 */ lfd f0, 8(r1)
+/* 80371C84 0036D8E4 C0 22 A6 60 */ lfs f1, lbl_80642C60-_SDA2_BASE_(r2)
+/* 80371C88 0036D8E8 EC 60 20 28 */ fsubs f3, f0, f4
+/* 80371C8C 0036D8EC C0 03 00 14 */ lfs f0, 0x14(r3)
+/* 80371C90 0036D8F0 90 01 00 18 */ stw r0, 0x18(r1)
+/* 80371C94 0036D8F4 EC 42 00 F2 */ fmuls f2, f2, f3
+/* 80371C98 0036D8F8 EC 22 08 24 */ fdivs f1, f2, f1
+/* 80371C9C 0036D8FC EC 20 08 2A */ fadds f1, f0, f1
+/* 80371CA0 0036D900 FC 00 08 1E */ fctiwz f0, f1
+/* 80371CA4 0036D904 D0 23 00 14 */ stfs f1, 0x14(r3)
+/* 80371CA8 0036D908 D8 01 00 10 */ stfd f0, 0x10(r1)
+/* 80371CAC 0036D90C 80 01 00 14 */ lwz r0, 0x14(r1)
+/* 80371CB0 0036D910 6C 00 80 00 */ xoris r0, r0, 0x8000
+/* 80371CB4 0036D914 90 01 00 1C */ stw r0, 0x1c(r1)
+/* 80371CB8 0036D918 C8 01 00 18 */ lfd f0, 0x18(r1)
+/* 80371CBC 0036D91C EC 00 20 28 */ fsubs f0, f0, f4
+/* 80371CC0 0036D920 EC 01 00 28 */ fsubs f0, f1, f0
+/* 80371CC4 0036D924 D0 03 00 14 */ stfs f0, 0x14(r3)
+lbl_80371CC8:
+/* 80371CC8 0036D928 38 21 00 20 */ addi r1, r1, 0x20
+/* 80371CCC 0036D92C 4E 80 00 20 */ blr
+
+.global GetValue__Q44nw4r3snd6detail3LfoCFv
+GetValue__Q44nw4r3snd6detail3LfoCFv:
+/* 80371CD0 0036D930 C0 22 A6 58 */ lfs f1, lbl_80642C58-_SDA2_BASE_(r2)
+/* 80371CD4 0036D934 C0 03 00 00 */ lfs f0, 0(r3)
+/* 80371CD8 0036D938 94 21 FF E0 */ stwu r1, -0x20(r1)
+/* 80371CDC 0036D93C FC 01 00 00 */ fcmpu cr0, f1, f0
+/* 80371CE0 0036D940 40 82 00 08 */ bne lbl_80371CE8
+/* 80371CE4 0036D944 48 00 01 00 */ b lbl_80371DE4
+lbl_80371CE8:
+/* 80371CE8 0036D948 80 83 00 10 */ lwz r4, 0x10(r3)
+/* 80371CEC 0036D94C 80 03 00 08 */ lwz r0, 8(r3)
+/* 80371CF0 0036D950 7C 04 00 40 */ cmplw r4, r0
+/* 80371CF4 0036D954 40 80 00 08 */ bge lbl_80371CFC
+/* 80371CF8 0036D958 48 00 00 EC */ b lbl_80371DE4
+lbl_80371CFC:
+/* 80371CFC 0036D95C C0 42 A6 74 */ lfs f2, lbl_80642C74-_SDA2_BASE_(r2)
+/* 80371D00 0036D960 C0 23 00 14 */ lfs f1, 0x14(r3)
+/* 80371D04 0036D964 C0 02 A6 70 */ lfs f0, lbl_80642C70-_SDA2_BASE_(r2)
+/* 80371D08 0036D968 EC 22 00 72 */ fmuls f1, f2, f1
+/* 80371D0C 0036D96C EC 00 00 72 */ fmuls f0, f0, f1
+/* 80371D10 0036D970 FC 00 00 1E */ fctiwz f0, f0
+/* 80371D14 0036D974 D8 01 00 08 */ stfd f0, 8(r1)
+/* 80371D18 0036D978 80 A1 00 0C */ lwz r5, 0xc(r1)
+/* 80371D1C 0036D97C 2C 05 00 20 */ cmpwi r5, 0x20
+/* 80371D20 0036D980 40 80 00 18 */ bge lbl_80371D38
+/* 80371D24 0036D984 3C 80 80 40 */ lis r4, lbl_804028F8@ha
+/* 80371D28 0036D988 38 84 28 F8 */ addi r4, r4, lbl_804028F8@l
+/* 80371D2C 0036D98C 7C 04 28 AE */ lbzx r0, r4, r5
+/* 80371D30 0036D990 7C 00 07 74 */ extsb r0, r0
+/* 80371D34 0036D994 48 00 00 68 */ b lbl_80371D9C
+lbl_80371D38:
+/* 80371D38 0036D998 2C 05 00 40 */ cmpwi r5, 0x40
+/* 80371D3C 0036D99C 40 80 00 20 */ bge lbl_80371D5C
+/* 80371D40 0036D9A0 38 05 FF E0 */ addi r0, r5, -32
+/* 80371D44 0036D9A4 3C 80 80 40 */ lis r4, lbl_804028F8@ha
+/* 80371D48 0036D9A8 20 00 00 20 */ subfic r0, r0, 0x20
+/* 80371D4C 0036D9AC 38 84 28 F8 */ addi r4, r4, lbl_804028F8@l
+/* 80371D50 0036D9B0 7C 04 00 AE */ lbzx r0, r4, r0
+/* 80371D54 0036D9B4 7C 00 07 74 */ extsb r0, r0
+/* 80371D58 0036D9B8 48 00 00 44 */ b lbl_80371D9C
+lbl_80371D5C:
+/* 80371D5C 0036D9BC 2C 05 00 60 */ cmpwi r5, 0x60
+/* 80371D60 0036D9C0 40 80 00 20 */ bge lbl_80371D80
+/* 80371D64 0036D9C4 3C 80 80 40 */ lis r4, lbl_804028F8@ha
+/* 80371D68 0036D9C8 38 84 28 F8 */ addi r4, r4, lbl_804028F8@l
+/* 80371D6C 0036D9CC 7C 85 22 14 */ add r4, r5, r4
+/* 80371D70 0036D9D0 88 04 FF C0 */ lbz r0, -0x40(r4)
+/* 80371D74 0036D9D4 7C 00 00 D0 */ neg r0, r0
+/* 80371D78 0036D9D8 7C 00 07 74 */ extsb r0, r0
+/* 80371D7C 0036D9DC 48 00 00 20 */ b lbl_80371D9C
+lbl_80371D80:
+/* 80371D80 0036D9E0 38 05 FF A0 */ addi r0, r5, -96
+/* 80371D84 0036D9E4 3C 80 80 40 */ lis r4, lbl_804028F8@ha
+/* 80371D88 0036D9E8 20 00 00 20 */ subfic r0, r0, 0x20
+/* 80371D8C 0036D9EC 38 84 28 F8 */ addi r4, r4, lbl_804028F8@l
+/* 80371D90 0036D9F0 7C 04 00 AE */ lbzx r0, r4, r0
+/* 80371D94 0036D9F4 7C 00 00 D0 */ neg r0, r0
+/* 80371D98 0036D9F8 7C 00 07 74 */ extsb r0, r0
+lbl_80371D9C:
+/* 80371D9C 0036D9FC 3C 80 43 30 */ lis r4, 0x4330
+/* 80371DA0 0036DA00 6C 00 80 00 */ xoris r0, r0, 0x8000
+/* 80371DA4 0036DA04 90 01 00 0C */ stw r0, 0xc(r1)
+/* 80371DA8 0036DA08 88 03 00 0C */ lbz r0, 0xc(r3)
+/* 80371DAC 0036DA0C 90 81 00 08 */ stw r4, 8(r1)
+/* 80371DB0 0036DA10 C8 42 A6 68 */ lfd f2, lbl_80642C68-_SDA2_BASE_(r2)
+/* 80371DB4 0036DA14 C8 21 00 08 */ lfd f1, 8(r1)
+/* 80371DB8 0036DA18 C0 02 A6 78 */ lfs f0, lbl_80642C78-_SDA2_BASE_(r2)
+/* 80371DBC 0036DA1C EC 21 10 28 */ fsubs f1, f1, f2
+/* 80371DC0 0036DA20 90 01 00 14 */ stw r0, 0x14(r1)
+/* 80371DC4 0036DA24 C0 63 00 00 */ lfs f3, 0(r3)
+/* 80371DC8 0036DA28 90 81 00 10 */ stw r4, 0x10(r1)
+/* 80371DCC 0036DA2C EC 21 00 24 */ fdivs f1, f1, f0
+/* 80371DD0 0036DA30 C8 42 A6 80 */ lfd f2, lbl_80642C80-_SDA2_BASE_(r2)
+/* 80371DD4 0036DA34 C8 01 00 10 */ lfd f0, 0x10(r1)
+/* 80371DD8 0036DA38 EC 21 00 F2 */ fmuls f1, f1, f3
+/* 80371DDC 0036DA3C EC 00 10 28 */ fsubs f0, f0, f2
+/* 80371DE0 0036DA40 EC 21 00 32 */ fmuls f1, f1, f0
+lbl_80371DE4:
+/* 80371DE4 0036DA44 38 21 00 20 */ addi r1, r1, 0x20
+/* 80371DE8 0036DA48 4E 80 00 20 */ blr
diff --git a/asm/text_10_6.s b/asm/text_10_6.s index c7f4b95..008bc7d 100644 --- a/asm/text_10_6.s +++ b/asm/text_10_6.s @@ -2,152 +2,6 @@ .section .text, "ax" # 0x80006980 - 0x803E1E60
-.global func_80371BFC
-func_80371BFC:
-/* 80371BFC 0036D85C C0 22 A6 58 */ lfs f1, lbl_80642C58-_SDA2_BASE_(r2)
-/* 80371C00 0036D860 38 80 00 01 */ li r4, 1
-/* 80371C04 0036D864 C0 02 A6 5C */ lfs f0, lbl_80642C5C-_SDA2_BASE_(r2)
-/* 80371C08 0036D868 38 00 00 00 */ li r0, 0
-/* 80371C0C 0036D86C D0 23 00 00 */ stfs f1, 0(r3)
-/* 80371C10 0036D870 98 83 00 0C */ stb r4, 0xc(r3)
-/* 80371C14 0036D874 D0 03 00 04 */ stfs f0, 4(r3)
-/* 80371C18 0036D878 90 03 00 08 */ stw r0, 8(r3)
-/* 80371C1C 0036D87C 4E 80 00 20 */ blr
-
-.global func_80371C20
-func_80371C20:
-/* 80371C20 0036D880 C0 02 A6 58 */ lfs f0, lbl_80642C58-_SDA2_BASE_(r2)
-/* 80371C24 0036D884 38 00 00 00 */ li r0, 0
-/* 80371C28 0036D888 90 03 00 10 */ stw r0, 0x10(r3)
-/* 80371C2C 0036D88C D0 03 00 14 */ stfs f0, 0x14(r3)
-/* 80371C30 0036D890 4E 80 00 20 */ blr
-
-.global func_80371C34
-func_80371C34:
-/* 80371C34 0036D894 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80371C38 0036D898 80 C3 00 08 */ lwz r6, 8(r3)
-/* 80371C3C 0036D89C 80 A3 00 10 */ lwz r5, 0x10(r3)
-/* 80371C40 0036D8A0 7C 05 30 40 */ cmplw r5, r6
-/* 80371C44 0036D8A4 40 80 00 24 */ bge lbl_80371C68
-/* 80371C48 0036D8A8 7C 05 22 14 */ add r0, r5, r4
-/* 80371C4C 0036D8AC 7C 00 30 40 */ cmplw r0, r6
-/* 80371C50 0036D8B0 41 81 00 0C */ bgt lbl_80371C5C
-/* 80371C54 0036D8B4 90 03 00 10 */ stw r0, 0x10(r3)
-/* 80371C58 0036D8B8 48 00 00 70 */ b lbl_80371CC8
-lbl_80371C5C:
-/* 80371C5C 0036D8BC 7C 05 30 50 */ subf r0, r5, r6
-/* 80371C60 0036D8C0 90 C3 00 10 */ stw r6, 0x10(r3)
-/* 80371C64 0036D8C4 7C 80 20 50 */ subf r4, r0, r4
-lbl_80371C68:
-/* 80371C68 0036D8C8 3C 00 43 30 */ lis r0, 0x4330
-/* 80371C6C 0036D8CC 6C 84 80 00 */ xoris r4, r4, 0x8000
-/* 80371C70 0036D8D0 90 81 00 0C */ stw r4, 0xc(r1)
-/* 80371C74 0036D8D4 C8 82 A6 68 */ lfd f4, lbl_80642C68-_SDA2_BASE_(r2)
-/* 80371C78 0036D8D8 90 01 00 08 */ stw r0, 8(r1)
-/* 80371C7C 0036D8DC C0 43 00 04 */ lfs f2, 4(r3)
-/* 80371C80 0036D8E0 C8 01 00 08 */ lfd f0, 8(r1)
-/* 80371C84 0036D8E4 C0 22 A6 60 */ lfs f1, lbl_80642C60-_SDA2_BASE_(r2)
-/* 80371C88 0036D8E8 EC 60 20 28 */ fsubs f3, f0, f4
-/* 80371C8C 0036D8EC C0 03 00 14 */ lfs f0, 0x14(r3)
-/* 80371C90 0036D8F0 90 01 00 18 */ stw r0, 0x18(r1)
-/* 80371C94 0036D8F4 EC 42 00 F2 */ fmuls f2, f2, f3
-/* 80371C98 0036D8F8 EC 22 08 24 */ fdivs f1, f2, f1
-/* 80371C9C 0036D8FC EC 20 08 2A */ fadds f1, f0, f1
-/* 80371CA0 0036D900 FC 00 08 1E */ fctiwz f0, f1
-/* 80371CA4 0036D904 D0 23 00 14 */ stfs f1, 0x14(r3)
-/* 80371CA8 0036D908 D8 01 00 10 */ stfd f0, 0x10(r1)
-/* 80371CAC 0036D90C 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 80371CB0 0036D910 6C 00 80 00 */ xoris r0, r0, 0x8000
-/* 80371CB4 0036D914 90 01 00 1C */ stw r0, 0x1c(r1)
-/* 80371CB8 0036D918 C8 01 00 18 */ lfd f0, 0x18(r1)
-/* 80371CBC 0036D91C EC 00 20 28 */ fsubs f0, f0, f4
-/* 80371CC0 0036D920 EC 01 00 28 */ fsubs f0, f1, f0
-/* 80371CC4 0036D924 D0 03 00 14 */ stfs f0, 0x14(r3)
-lbl_80371CC8:
-/* 80371CC8 0036D928 38 21 00 20 */ addi r1, r1, 0x20
-/* 80371CCC 0036D92C 4E 80 00 20 */ blr
-
-.global func_80371CD0
-func_80371CD0:
-/* 80371CD0 0036D930 C0 22 A6 58 */ lfs f1, lbl_80642C58-_SDA2_BASE_(r2)
-/* 80371CD4 0036D934 C0 03 00 00 */ lfs f0, 0(r3)
-/* 80371CD8 0036D938 94 21 FF E0 */ stwu r1, -0x20(r1)
-/* 80371CDC 0036D93C FC 01 00 00 */ fcmpu cr0, f1, f0
-/* 80371CE0 0036D940 40 82 00 08 */ bne lbl_80371CE8
-/* 80371CE4 0036D944 48 00 01 00 */ b lbl_80371DE4
-lbl_80371CE8:
-/* 80371CE8 0036D948 80 83 00 10 */ lwz r4, 0x10(r3)
-/* 80371CEC 0036D94C 80 03 00 08 */ lwz r0, 8(r3)
-/* 80371CF0 0036D950 7C 04 00 40 */ cmplw r4, r0
-/* 80371CF4 0036D954 40 80 00 08 */ bge lbl_80371CFC
-/* 80371CF8 0036D958 48 00 00 EC */ b lbl_80371DE4
-lbl_80371CFC:
-/* 80371CFC 0036D95C C0 42 A6 74 */ lfs f2, lbl_80642C74-_SDA2_BASE_(r2)
-/* 80371D00 0036D960 C0 23 00 14 */ lfs f1, 0x14(r3)
-/* 80371D04 0036D964 C0 02 A6 70 */ lfs f0, lbl_80642C70-_SDA2_BASE_(r2)
-/* 80371D08 0036D968 EC 22 00 72 */ fmuls f1, f2, f1
-/* 80371D0C 0036D96C EC 00 00 72 */ fmuls f0, f0, f1
-/* 80371D10 0036D970 FC 00 00 1E */ fctiwz f0, f0
-/* 80371D14 0036D974 D8 01 00 08 */ stfd f0, 8(r1)
-/* 80371D18 0036D978 80 A1 00 0C */ lwz r5, 0xc(r1)
-/* 80371D1C 0036D97C 2C 05 00 20 */ cmpwi r5, 0x20
-/* 80371D20 0036D980 40 80 00 18 */ bge lbl_80371D38
-/* 80371D24 0036D984 3C 80 80 40 */ lis r4, lbl_804028F8@ha
-/* 80371D28 0036D988 38 84 28 F8 */ addi r4, r4, lbl_804028F8@l
-/* 80371D2C 0036D98C 7C 04 28 AE */ lbzx r0, r4, r5
-/* 80371D30 0036D990 7C 00 07 74 */ extsb r0, r0
-/* 80371D34 0036D994 48 00 00 68 */ b lbl_80371D9C
-lbl_80371D38:
-/* 80371D38 0036D998 2C 05 00 40 */ cmpwi r5, 0x40
-/* 80371D3C 0036D99C 40 80 00 20 */ bge lbl_80371D5C
-/* 80371D40 0036D9A0 38 05 FF E0 */ addi r0, r5, -32
-/* 80371D44 0036D9A4 3C 80 80 40 */ lis r4, lbl_804028F8@ha
-/* 80371D48 0036D9A8 20 00 00 20 */ subfic r0, r0, 0x20
-/* 80371D4C 0036D9AC 38 84 28 F8 */ addi r4, r4, lbl_804028F8@l
-/* 80371D50 0036D9B0 7C 04 00 AE */ lbzx r0, r4, r0
-/* 80371D54 0036D9B4 7C 00 07 74 */ extsb r0, r0
-/* 80371D58 0036D9B8 48 00 00 44 */ b lbl_80371D9C
-lbl_80371D5C:
-/* 80371D5C 0036D9BC 2C 05 00 60 */ cmpwi r5, 0x60
-/* 80371D60 0036D9C0 40 80 00 20 */ bge lbl_80371D80
-/* 80371D64 0036D9C4 3C 80 80 40 */ lis r4, lbl_804028F8@ha
-/* 80371D68 0036D9C8 38 84 28 F8 */ addi r4, r4, lbl_804028F8@l
-/* 80371D6C 0036D9CC 7C 85 22 14 */ add r4, r5, r4
-/* 80371D70 0036D9D0 88 04 FF C0 */ lbz r0, -0x40(r4)
-/* 80371D74 0036D9D4 7C 00 00 D0 */ neg r0, r0
-/* 80371D78 0036D9D8 7C 00 07 74 */ extsb r0, r0
-/* 80371D7C 0036D9DC 48 00 00 20 */ b lbl_80371D9C
-lbl_80371D80:
-/* 80371D80 0036D9E0 38 05 FF A0 */ addi r0, r5, -96
-/* 80371D84 0036D9E4 3C 80 80 40 */ lis r4, lbl_804028F8@ha
-/* 80371D88 0036D9E8 20 00 00 20 */ subfic r0, r0, 0x20
-/* 80371D8C 0036D9EC 38 84 28 F8 */ addi r4, r4, lbl_804028F8@l
-/* 80371D90 0036D9F0 7C 04 00 AE */ lbzx r0, r4, r0
-/* 80371D94 0036D9F4 7C 00 00 D0 */ neg r0, r0
-/* 80371D98 0036D9F8 7C 00 07 74 */ extsb r0, r0
-lbl_80371D9C:
-/* 80371D9C 0036D9FC 3C 80 43 30 */ lis r4, 0x4330
-/* 80371DA0 0036DA00 6C 00 80 00 */ xoris r0, r0, 0x8000
-/* 80371DA4 0036DA04 90 01 00 0C */ stw r0, 0xc(r1)
-/* 80371DA8 0036DA08 88 03 00 0C */ lbz r0, 0xc(r3)
-/* 80371DAC 0036DA0C 90 81 00 08 */ stw r4, 8(r1)
-/* 80371DB0 0036DA10 C8 42 A6 68 */ lfd f2, lbl_80642C68-_SDA2_BASE_(r2)
-/* 80371DB4 0036DA14 C8 21 00 08 */ lfd f1, 8(r1)
-/* 80371DB8 0036DA18 C0 02 A6 78 */ lfs f0, lbl_80642C78-_SDA2_BASE_(r2)
-/* 80371DBC 0036DA1C EC 21 10 28 */ fsubs f1, f1, f2
-/* 80371DC0 0036DA20 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80371DC4 0036DA24 C0 63 00 00 */ lfs f3, 0(r3)
-/* 80371DC8 0036DA28 90 81 00 10 */ stw r4, 0x10(r1)
-/* 80371DCC 0036DA2C EC 21 00 24 */ fdivs f1, f1, f0
-/* 80371DD0 0036DA30 C8 42 A6 80 */ lfd f2, lbl_80642C80-_SDA2_BASE_(r2)
-/* 80371DD4 0036DA34 C8 01 00 10 */ lfd f0, 0x10(r1)
-/* 80371DD8 0036DA38 EC 21 00 F2 */ fmuls f1, f1, f3
-/* 80371DDC 0036DA3C EC 00 10 28 */ fsubs f0, f0, f2
-/* 80371DE0 0036DA40 EC 21 00 32 */ fmuls f1, f1, f0
-lbl_80371DE4:
-/* 80371DE4 0036DA44 38 21 00 20 */ addi r1, r1, 0x20
-/* 80371DE8 0036DA48 4E 80 00 20 */ blr
-
.global func_80371DEC
func_80371DEC:
/* 80371DEC 0036DA4C 38 00 00 00 */ li r0, 0
@@ -4022,7 +3876,7 @@ func_803753AC: /* 803753D0 00371030 9B E3 00 05 */ stb r31, 5(r3)
/* 803753D4 00371034 90 83 00 00 */ stw r4, 0(r3)
/* 803753D8 00371038 38 63 00 6C */ addi r3, r3, 0x6c
-/* 803753DC 0037103C 4B FF C8 21 */ bl func_80371BFC
+/* 803753DC 0037103C 4B FF C8 21 */ bl Init__Q44nw4r3snd6detail8LfoParamFv
/* 803753E0 00371040 93 FE 00 B8 */ stw r31, 0xb8(r30)
/* 803753E4 00371044 38 7E 00 C0 */ addi r3, r30, 0xc0
/* 803753E8 00371048 93 FE 00 BC */ stw r31, 0xbc(r30)
@@ -4170,7 +4024,7 @@ func_803754FC: /* 803755F0 00371250 D0 03 00 80 */ stfs f0, 0x80(r3)
/* 803755F4 00371254 9B E3 00 8B */ stb r31, 0x8b(r3)
/* 803755F8 00371258 38 63 00 6C */ addi r3, r3, 0x6c
-/* 803755FC 0037125C 4B FF C6 01 */ bl func_80371BFC
+/* 803755FC 0037125C 4B FF C6 01 */ bl Init__Q44nw4r3snd6detail8LfoParamFv
/* 80375600 00371260 9B FE 00 7C */ stb r31, 0x7c(r30)
/* 80375604 00371264 38 00 FF FF */ li r0, -1
/* 80375608 00371268 B0 1E 00 98 */ sth r0, 0x98(r30)
diff --git a/asm/text_11.s b/asm/text_11.s index 3ae795c..8573f7e 100644 --- a/asm/text_11.s +++ b/asm/text_11.s @@ -3276,7 +3276,7 @@ func_80383D24: /* 80383D68 0037F9C8 90 9F 00 7C */ stw r4, 0x7c(r31) /* 80383D6C 0037F9CC 90 1F 00 88 */ stw r0, 0x88(r31) /* 80383D70 0037F9D0 98 DF 00 8C */ stb r6, 0x8c(r31) -/* 80383D74 0037F9D4 4B FE DE 89 */ bl func_80371BFC +/* 80383D74 0037F9D4 4B FE DE 89 */ bl Init__Q44nw4r3snd6detail8LfoParamFv /* 80383D78 0037F9D8 38 7F 00 A8 */ addi r3, r31, 0xa8 /* 80383D7C 0037F9DC 4B EE BB 95 */ bl func_8026F910 /* 80383D80 0037F9E0 7F E3 FB 78 */ mr r3, r31 @@ -3321,7 +3321,7 @@ func_80383D98: /* 80383E10 0037FA70 9B FB 00 E7 */ stb r31, 0xe7(r27) /* 80383E14 0037FA74 9B FB 00 E8 */ stb r31, 0xe8(r27) /* 80383E18 0037FA78 98 1B 00 E9 */ stb r0, 0xe9(r27) -/* 80383E1C 0037FA7C 4B FE DD E1 */ bl func_80371BFC +/* 80383E1C 0037FA7C 4B FE DD E1 */ bl Init__Q44nw4r3snd6detail8LfoParamFv /* 80383E20 0037FA80 9B FB 00 8F */ stb r31, 0x8f(r27) /* 80383E24 0037FA84 39 61 00 20 */ addi r11, r1, 0x20 /* 80383E28 0037FA88 93 FB 00 EC */ stw r31, 0xec(r27) diff --git a/obj_files.mk b/obj_files.mk index aa8c5ae..db45972 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -123,6 +123,7 @@ TEXT_O_FILES := \ $(BUILD_DIR)/asm/nw4r/snd/snd_FxReverbHi.o \ $(BUILD_DIR)/asm/text_10_5.o \ $(BUILD_DIR)/asm/nw4r/snd/snd_InstancePool.o \ + $(BUILD_DIR)/asm/nw4r/snd/snd_Lfo.o \ $(BUILD_DIR)/asm/text_10_6.o \ $(BUILD_DIR)/asm/text_11.o |