diff options
| author | Erin Moon <erin@hecke.rs> | 2021-01-03 00:04:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 01:04:15 -0500 |
| commit | 5c4ac052c3eadf70cfb4810341ccfbbba22869e2 (patch) | |
| tree | 37f1e2f9a5d7f0ba7313c7229fa60bac11dcb453 /include/Z2AudioLib | |
| parent | b6791276753f676f07e5251d823b0969208f1dc8 (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 'include/Z2AudioLib')
| -rw-r--r-- | include/Z2AudioLib/Z2Calc/asm/func_802A98D4.s | 2 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h | 2 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/Z2AudioLib/Z2Calc/asm/func_802A98D4.s b/include/Z2AudioLib/Z2Calc/asm/func_802A98D4.s index b45098ff84..5f79372049 100644 --- a/include/Z2AudioLib/Z2Calc/asm/func_802A98D4.s +++ b/include/Z2AudioLib/Z2Calc/asm/func_802A98D4.s @@ -6,7 +6,7 @@ /* 802A98E8 002A6828 40 82 00 18 */ bne lbl_802A9900 /* 802A98EC 002A682C 38 6D 8D B4 */ subi r3, r13, 0x724c /* 802A98F0 002A6830 38 80 00 00 */ li r4, 0 -/* 802A98F4 002A6834 48 09 01 F1 */ bl JMath_NS_TRandom_fast_ +/* 802A98F4 002A6834 48 09 01 F1 */ bl __ct__Q25JMath13TRandom_fast_FUl /* 802A98F8 002A6838 38 00 00 01 */ li r0, 1 /* 802A98FC 002A683C 98 0D 8D B0 */ stb r0, lbl_80451330-_SDA_BASE_(r13) lbl_802A9900: diff --git a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h index 1744b17b77..b722ceeb37 100644 --- a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h +++ b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h @@ -76,6 +76,8 @@ void registMultiSePos__12Z2MultiSeMgrFP3Vec(Vec*); void resetMultiSePos__12Z2MultiSeMgrFv(void); float getPanPower__12Z2MultiSeMgrFv(void); float getDolbyPower__12Z2MultiSeMgrFv(void); + +void __ct__14JAISoundHandleFv(void); } extern Z2SeMgr* lbl_80450B88; // Z2SeMgr sInstance diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s index e047f08c65..038eacedfd 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s @@ -4,8 +4,8 @@ /* 802AB658 002A8598 93 E1 00 0C */ stw r31, 0xc(r1) /* 802AB65C 002A859C 7C 7F 1B 78 */ mr r31, r3 /* 802AB660 002A85A0 93 ED 86 08 */ stw r31, lbl_80450B88-_SDA_BASE_(r13) -/* 802AB664 002A85A4 3C 80 80 2A */ lis r4, JAISoundHandle@ha -/* 802AB668 002A85A8 38 84 4A C4 */ addi r4, r4, JAISoundHandle@l +/* 802AB664 002A85A4 3C 80 80 2A */ lis r4, __ct__14JAISoundHandleFv@ha +/* 802AB668 002A85A8 38 84 4A C4 */ addi r4, r4, __ct__14JAISoundHandleFv@l /* 802AB66C 002A85AC 3C A0 80 00 */ lis r5, JAISoundHandle_NS_dtor@ha /* 802AB670 002A85B0 38 A5 78 38 */ addi r5, r5, JAISoundHandle_NS_dtor@l /* 802AB674 002A85B4 38 C0 00 04 */ li r6, 4 |