summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorErin Moon <erin@hecke.rs>2021-01-03 00:04:15 -0600
committerGitHub <noreply@github.com>2021-01-03 01:04:15 -0500
commit5c4ac052c3eadf70cfb4810341ccfbbba22869e2 (patch)
tree37f1e2f9a5d7f0ba7313c7229fa60bac11dcb453 /asm
parentb6791276753f676f07e5251d823b0969208f1dc8 (diff)
decomp some small files, do some cleanup (#42)
* remove leftover asm: JSUList.s * d_save_init: decomp * JMath/random: decomp * J3DUDL: fixup label * JAUClusterSound: decomp * c_API_controller_pad: decomp, elaborate globals/types * clang-format * don't add guards to functions.h * semantic merge of m_cpadInfo stuff * fix undef symbols Co-authored-by: Pheenoh <pheenoh@gmail.com>
Diffstat (limited to 'asm')
-rw-r--r--asm/J3DU/J3DUDL.s4
-rw-r--r--asm/JAudio2/JASSeqParser.s2
-rw-r--r--asm/JAudio2/JAUClusterSound.s11
-rw-r--r--asm/JMath/random.s9
-rw-r--r--asm/JSupport/JSUList.s3
-rw-r--r--asm/SComponent/c/API/controller/c_API_controller_pad.s26
-rw-r--r--asm/Z2AudioLib/Z2SpeechMgr2.s2
-rw-r--r--asm/d/file/d_file_select.s4
-rw-r--r--asm/d/menu/d_menu_save.s2
-rw-r--r--asm/d/save/d_save_init.s9
-rw-r--r--asm/m/Do/m_Do_machine.s2
11 files changed, 9 insertions, 65 deletions
diff --git a/asm/J3DU/J3DUDL.s b/asm/J3DU/J3DUDL.s
index 008696ea56..0264c1e315 100644
--- a/asm/J3DU/J3DUDL.s
+++ b/asm/J3DU/J3DUDL.s
@@ -2,7 +2,9 @@
.section .text, "ax" # 80273e08
-
+/* only pointed at from vtables afaict, and mislabeled */
+.global getUseMtxNum__11J3DShapeMtxCFv
+getUseMtxNum__11J3DShapeMtxCFv:
/* 80273E08 00270D48 38 60 00 01 */ li r3, 1
/* 80273E0C 00270D4C 4E 80 00 20 */ blr
diff --git a/asm/JAudio2/JASSeqParser.s b/asm/JAudio2/JASSeqParser.s
index 197093c271..f5a5c7aed7 100644
--- a/asm/JAudio2/JASSeqParser.s
+++ b/asm/JAudio2/JASSeqParser.s
@@ -1166,7 +1166,7 @@ lbl_80294D5C:
/* 80294E70 00291DB0 40 82 00 18 */ bne lbl_80294E88
/* 80294E74 00291DB4 38 6D 8C C8 */ addi r3, r13, lbl_80451248-_SDA_BASE_
/* 80294E78 00291DB8 38 80 00 00 */ li r4, 0
-/* 80294E7C 00291DBC 48 0A 4C 69 */ bl JMath_NS_TRandom_fast_
+/* 80294E7C 00291DBC 48 0A 4C 69 */ bl __ct__Q25JMath13TRandom_fast_FUl
/* 80294E80 00291DC0 38 00 00 01 */ li r0, 1
/* 80294E84 00291DC4 98 0D 8C C4 */ stb r0, lbl_80451244-_SDA_BASE_(r13)
lbl_80294E88:
diff --git a/asm/JAudio2/JAUClusterSound.s b/asm/JAudio2/JAUClusterSound.s
deleted file mode 100644
index d687f70f1f..0000000000
--- a/asm/JAudio2/JAUClusterSound.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax" # 802a4ac4
-
-
-.global JAISoundHandle
-JAISoundHandle:
-/* 802A4AC4 002A1A04 38 00 00 00 */ li r0, 0
-/* 802A4AC8 002A1A08 90 03 00 00 */ stw r0, 0(r3)
-/* 802A4ACC 002A1A0C 4E 80 00 20 */ blr
-
diff --git a/asm/JMath/random.s b/asm/JMath/random.s
deleted file mode 100644
index 98aa8ad52b..0000000000
--- a/asm/JMath/random.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax" # 80339ae4
-
-
-.global JMath_NS_TRandom_fast_
-JMath_NS_TRandom_fast_:
-/* 80339AE4 00336A24 90 83 00 00 */ stw r4, 0(r3)
-/* 80339AE8 00336A28 4E 80 00 20 */ blr
diff --git a/asm/JSupport/JSUList.s b/asm/JSupport/JSUList.s
deleted file mode 100644
index dc797e3536..0000000000
--- a/asm/JSupport/JSUList.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax" # 802dbdfc
diff --git a/asm/SComponent/c/API/controller/c_API_controller_pad.s b/asm/SComponent/c/API/controller/c_API_controller_pad.s
deleted file mode 100644
index b099701159..0000000000
--- a/asm/SComponent/c/API/controller/c_API_controller_pad.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax" # 8026328c
-
-
-.global cAPICPad_recalibrate
-cAPICPad_recalibrate:
-/* 8026328C 002601CC 94 21 FF F0 */ stwu r1, -0x10(r1)
-/* 80263290 002601D0 7C 08 02 A6 */ mflr r0
-/* 80263294 002601D4 90 01 00 14 */ stw r0, 0x14(r1)
-/* 80263298 002601D8 4B DA 4A DD */ bl recalibrate__8mDoCPd_cFv
-/* 8026329C 002601DC 80 01 00 14 */ lwz r0, 0x14(r1)
-/* 802632A0 002601E0 7C 08 03 A6 */ mtlr r0
-/* 802632A4 002601E4 38 21 00 10 */ addi r1, r1, 0x10
-/* 802632A8 002601E8 4E 80 00 20 */ blr
-
-.global cAPICPad_ANY_BUTTON
-cAPICPad_ANY_BUTTON:
-/* 802632AC 002601EC 54 64 30 32 */ slwi r4, r3, 6
-/* 802632B0 002601F0 3C 60 80 3E */ lis r3, m_cpadInfo@ha
-/* 802632B4 002601F4 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
-/* 802632B8 002601F8 7C 60 22 14 */ add r3, r0, r4
-/* 802632BC 002601FC 80 03 00 34 */ lwz r0, 0x34(r3)
-/* 802632C0 00260200 70 03 13 00 */ andi. r3, r0, 0x1300
-/* 802632C4 00260204 4E 80 00 20 */ blr
-
diff --git a/asm/Z2AudioLib/Z2SpeechMgr2.s b/asm/Z2AudioLib/Z2SpeechMgr2.s
index 7480746676..6e108be2fd 100644
--- a/asm/Z2AudioLib/Z2SpeechMgr2.s
+++ b/asm/Z2AudioLib/Z2SpeechMgr2.s
@@ -16,7 +16,7 @@ Z2SpeechMgr2:
/* 802CBC80 002C8BC0 90 03 00 04 */ stw r0, 4(r3)
/* 802CBC84 002C8BC4 38 7F 00 08 */ addi r3, r31, 8
/* 802CBC88 002C8BC8 38 80 00 00 */ li r4, 0
-/* 802CBC8C 002C8BCC 48 06 DE 59 */ bl JMath_NS_TRandom_fast_
+/* 802CBC8C 002C8BCC 48 06 DE 59 */ bl __ct__Q25JMath13TRandom_fast_FUl
/* 802CBC90 002C8BD0 38 7F 00 0C */ addi r3, r31, 0xc
/* 802CBC94 002C8BD4 48 00 13 25 */ bl Z2SpeechStarter
/* 802CBC98 002C8BD8 38 00 00 00 */ li r0, 0
diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s
index ec6e75a76d..86c8b74738 100644
--- a/asm/d/file/d_file_select.s
+++ b/asm/d/file/d_file_select.s
@@ -8132,7 +8132,7 @@ lbl_8018AD20:
/* 8018AD5C 00187C9C B0 1F 03 AC */ sth r0, 0x3ac(r31)
lbl_8018AD60:
/* 8018AD60 00187CA0 38 60 00 00 */ li r3, 0
-/* 8018AD64 00187CA4 48 0D 85 49 */ bl cAPICPad_ANY_BUTTON
+/* 8018AD64 00187CA4 48 0D 85 49 */ bl cAPICPad_ANY_BUTTON__FUl
/* 8018AD68 00187CA8 28 03 00 00 */ cmplwi r3, 0
/* 8018AD6C 00187CAC 40 82 00 10 */ bne lbl_8018AD7C
/* 8018AD70 00187CB0 A8 1F 03 AC */ lha r0, 0x3ac(r31)
@@ -12180,7 +12180,7 @@ lbl_8018E928:
/* 8018E948 0018B888 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8018E94C 0018B88C 7C 7F 1B 78 */ mr r31, r3
/* 8018E950 0018B890 38 60 00 00 */ li r3, 0
-/* 8018E954 0018B894 48 0D 49 59 */ bl cAPICPad_ANY_BUTTON
+/* 8018E954 0018B894 48 0D 49 59 */ bl cAPICPad_ANY_BUTTON__FUl
/* 8018E958 0018B898 28 03 00 00 */ cmplwi r3, 0
/* 8018E95C 0018B89C 41 82 00 40 */ beq lbl_8018E99C
/* 8018E960 0018B8A0 3C 60 80 43 */ lis r3, lbl_80430188@ha
diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s
index 7b219acb10..0b8e23336f 100644
--- a/asm/d/menu/d_menu_save.s
+++ b/asm/d/menu/d_menu_save.s
@@ -2395,7 +2395,7 @@ lbl_801F1908:
/* 801F1928 001EE868 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801F192C 001EE86C 7C 7F 1B 78 */ mr r31, r3
/* 801F1930 001EE870 38 60 00 00 */ li r3, 0
-/* 801F1934 001EE874 48 07 19 79 */ bl cAPICPad_ANY_BUTTON
+/* 801F1934 001EE874 48 07 19 79 */ bl cAPICPad_ANY_BUTTON__FUl
/* 801F1938 001EE878 28 03 00 00 */ cmplwi r3, 0
/* 801F193C 001EE87C 41 82 00 58 */ beq lbl_801F1994
/* 801F1940 001EE880 3C 60 80 43 */ lis r3, lbl_80430188@ha
diff --git a/asm/d/save/d_save_init.s b/asm/d/save/d_save_init.s
deleted file mode 100644
index 966388af66..0000000000
--- a/asm/d/save/d_save_init.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax" # 80035c88
-
-
-.global setInitEventBit
-setInitEventBit:
-/* 80035C88 00032BC8 4E 80 00 20 */ blr
-
diff --git a/asm/m/Do/m_Do_machine.s b/asm/m/Do/m_Do_machine.s
index f6782f536d..bb8b7893d7 100644
--- a/asm/m/Do/m_Do_machine.s
+++ b/asm/m/Do/m_Do_machine.s
@@ -448,7 +448,7 @@ myExceptionCallback:
/* 8000B7DC 0000871C 90 8D 85 94 */ stw r4, lbl_80450B14-_SDA_BASE_(r13)
/* 8000B7E0 00008720 90 6D 85 90 */ stw r3, lbl_80450B10-_SDA_BASE_(r13)
/* 8000B7E4 00008724 4B FF B0 BD */ bl OSReportEnable
-/* 8000B7E8 00008728 48 25 7A A5 */ bl cAPICPad_recalibrate
+/* 8000B7E8 00008728 48 25 7A A5 */ bl cAPICPad_recalibrate__Fv
/* 8000B7EC 0000872C 3C 60 80 37 */ lis r3, lbl_80373DE8@ha
/* 8000B7F0 00008730 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l
/* 8000B7F4 00008734 38 63 01 19 */ addi r3, r3, 0x119
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-21 10:08:20 +0000