summaryrefslogtreecommitdiff
path: root/asm/nw4r
diff options
context:
space:
mode:
authorMax <mparisi@stevens.edu>2020-09-29 19:18:08 -0400
committerMax <mparisi@stevens.edu>2020-09-29 19:18:08 -0400
commit0912e90a6ac1aee0d04cf4e26bc871a392b827d7 (patch)
treef0c99427dfbb5b3055f1added38a70303af04cba /asm/nw4r
parentbb28572125c45ec20f5fbf85120cd71fb2486bac (diff)
math library splits
Diffstat (limited to 'asm/nw4r')
-rw-r--r--asm/nw4r/lyt/lyt_arcResourceAccessor.s2
-rw-r--r--asm/nw4r/lyt/lyt_textBox.s2
-rw-r--r--asm/nw4r/snd/detail/snd_Util.s2
-rw-r--r--asm/nw4r/snd/snd_Sound3DManager.s10
4 files changed, 8 insertions, 8 deletions
diff --git a/asm/nw4r/lyt/lyt_arcResourceAccessor.s b/asm/nw4r/lyt/lyt_arcResourceAccessor.s
index 515d9d6..d99f559 100644
--- a/asm/nw4r/lyt/lyt_arcResourceAccessor.s
+++ b/asm/nw4r/lyt/lyt_arcResourceAccessor.s
@@ -37,7 +37,7 @@ lbl_8038E36C:
lbl_8038E3AC:
/* 8038E3AC 0038A00C 80 81 00 14 */ lwz r4, 0x14(r1)
/* 8038E3B0 0038A010 7F C3 F3 78 */ mr r3, r30
-/* 8038E3B4 0038A014 4B E4 26 4D */ bl func_801D0A00
+/* 8038E3B4 0038A014 4B E4 26 4D */ bl stricmp
/* 8038E3B8 0038A018 2C 03 00 00 */ cmpwi r3, 0
/* 8038E3BC 0038A01C 40 82 00 0C */ bne lbl_8038E3C8
/* 8038E3C0 0038A020 83 E1 00 0C */ lwz r31, 0xc(r1)
diff --git a/asm/nw4r/lyt/lyt_textBox.s b/asm/nw4r/lyt/lyt_textBox.s
index 6f27fc5..759e692 100644
--- a/asm/nw4r/lyt/lyt_textBox.s
+++ b/asm/nw4r/lyt/lyt_textBox.s
@@ -625,7 +625,7 @@ SetString__Q34nw4r3lyt7TextBoxFPCwUs:
/* 80387B80 003837E0 93 A1 00 14 */ stw r29, 0x14(r1)
/* 80387B84 003837E4 7C 7D 1B 78 */ mr r29, r3
/* 80387B88 003837E8 7F C3 F3 78 */ mr r3, r30
-/* 80387B8C 003837EC 4B E4 8C 45 */ bl func_801D07D0
+/* 80387B8C 003837EC 4B E4 8C 45 */ bl wcslen
/* 80387B90 003837F0 81 9D 00 00 */ lwz r12, 0(r29)
/* 80387B94 003837F4 54 66 04 3E */ clrlwi r6, r3, 0x10
/* 80387B98 003837F8 7F A3 EB 78 */ mr r3, r29
diff --git a/asm/nw4r/snd/detail/snd_Util.s b/asm/nw4r/snd/detail/snd_Util.s
index cfc7569..2135e58 100644
--- a/asm/nw4r/snd/detail/snd_Util.s
+++ b/asm/nw4r/snd/detail/snd_Util.s
@@ -290,7 +290,7 @@ lbl_80383334:
/* 8038333C 0037EF9C FC 42 08 28 */ fsub f2, f2, f1
/* 80383340 0037EFA0 C8 22 A7 D8 */ lfd f1, lbl_80642DD8-_SDA2_BASE_(r2)
/* 80383344 0037EFA4 FC 40 00 B2 */ fmul f2, f0, f2
-/* 80383348 0037EFA8 4B E5 12 9D */ bl func_801D45E4
+/* 80383348 0037EFA8 4B E5 12 9D */ bl pow
/* 8038334C 0037EFAC C8 02 A7 D0 */ lfd f0, lbl_80642DD0-_SDA2_BASE_(r2)
/* 80383350 0037EFB0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80383354 0037EFB4 FC 00 00 72 */ fmul f0, f0, f1
diff --git a/asm/nw4r/snd/snd_Sound3DManager.s b/asm/nw4r/snd/snd_Sound3DManager.s
index d1165c7..37be2fa 100644
--- a/asm/nw4r/snd/snd_Sound3DManager.s
+++ b/asm/nw4r/snd/snd_Sound3DManager.s
@@ -171,7 +171,7 @@ lbl_803767A8:
/* 803767CC 0037242C C0 02 A7 18 */ lfs f0, lbl_80642D18-_SDA2_BASE_(r2)
/* 803767D0 00372430 EC 21 18 28 */ fsubs f1, f1, f3
/* 803767D4 00372434 EC 21 00 32 */ fmuls f1, f1, f0
-/* 803767D8 00372438 4B E5 DE 0D */ bl func_801D45E4
+/* 803767D8 00372438 4B E5 DE 0D */ bl pow
/* 803767DC 0037243C FF A0 08 18 */ frsp f29, f1
/* 803767E0 00372440 48 00 00 50 */ b lbl_80376830
lbl_803767E4:
@@ -249,7 +249,7 @@ lbl_803768E8:
/* 803768E8 00372548 C0 01 00 1C */ lfs f0, 0x1c(r1)
/* 803768EC 0037254C C0 21 00 14 */ lfs f1, 0x14(r1)
/* 803768F0 00372550 FC 40 00 50 */ fneg f2, f0
-/* 803768F4 00372554 4B E5 DC E9 */ bl func_801D45DC
+/* 803768F4 00372554 4B E5 DC E9 */ bl atan2
/* 803768F8 00372558 FF E0 08 18 */ frsp f31, f1
/* 803768FC 0037255C 38 61 00 14 */ addi r3, r1, 0x14
/* 80376900 00372560 4B F0 64 85 */ bl func_8027CD84
@@ -445,17 +445,17 @@ lbl_80376BA4:
/* 80376BA4 00372804 C3 62 A7 14 */ lfs f27, lbl_80642D14-_SDA2_BASE_(r2)
lbl_80376BA8:
/* 80376BA8 00372808 C0 3C 00 1C */ lfs f1, 0x1c(r28)
-/* 80376BAC 0037280C 4B E5 D4 CD */ bl func_801D4078
+/* 80376BAC 0037280C 4B E5 D4 CD */ bl cos
/* 80376BB0 00372810 C0 1C 00 18 */ lfs f0, 0x18(r28)
/* 80376BB4 00372814 FF E0 08 18 */ frsp f31, f1
/* 80376BB8 00372818 FC 20 00 90 */ fmr f1, f0
-/* 80376BBC 0037281C 4B E5 D4 BD */ bl func_801D4078
+/* 80376BBC 0037281C 4B E5 D4 BD */ bl cos
/* 80376BC0 00372820 FC 40 08 18 */ frsp f2, f1
/* 80376BC4 00372824 C0 02 A7 30 */ lfs f0, lbl_80642D30-_SDA2_BASE_(r2)
/* 80376BC8 00372828 C0 3C 00 1C */ lfs f1, 0x1c(r28)
/* 80376BCC 0037282C EC 42 F8 2A */ fadds f2, f2, f31
/* 80376BD0 00372830 EF E2 00 32 */ fmuls f31, f2, f0
-/* 80376BD4 00372834 4B E5 D4 A5 */ bl func_801D4078
+/* 80376BD4 00372834 4B E5 D4 A5 */ bl cos
/* 80376BD8 00372838 FC 60 08 18 */ frsp f3, f1
/* 80376BDC 0037283C C0 3C 00 24 */ lfs f1, 0x24(r28)
/* 80376BE0 00372840 C0 42 A7 14 */ lfs f2, lbl_80642D14-_SDA2_BASE_(r2)