mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-31 00:04:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Z2AudioLib misc decomp (#75)

Browse Source 
* Z2SoundHandles: decomp portions

* start decomping: Z2SpeechMgr2, Z2SoundHandles

* Z2SoundHandles::stopAllSounds(): ok

* Z2SoundHandles::getHandleUserData(): ok

* Z2SoundInfo: header

* Z2SoundObjBase::framework(): ok

* Z2SoundObjBase::Z2SoundObjBase(), Z2SoundObjBase::init(): ok

* Z2SoundObjBase::~Z2SoundObjBase(): ok

* Z2SoundObjBase::stopOK(): ok

* Z2SoundObjBase::stopOK, incomplete Z2SoundObjBase::dispose()

* clang-format

* Z2SoundObjBase::dispose(): ok

* JAISound::operator->(): null assert

* JAIAudience: stub

* Z2SoundObject::{init, deleteObject, isAlive}: ok

* Z2SeMgr: elaborate struct (and decl JAISoundHandles to support this)

* start subclassing Z2SoundObjBase; nonmatching Z2SoundObjSimple::init()

* Z2SeMGr::{incrCrowdSize, decrCrowdSize}: ok

* Z2MultiSeMgr::resetMultiSePos(): ok

* Z2WolfHowlMgr.h: decls

* Z2SoundStarter: move to decls and fix postprocess.py symbol pass

* Z2AudioArcLoader: decls

* Z2SoundObjMgr: ok some fns
- deleteEnemyAll()
- isTwilightBattle()
- setGhostEnemyState()

additionally elaborates parts of the Z2Creature hierarchy

* delete unused .s files and add tool to find them (only runs on linux)

* run clang-format

* postprocess.py: comment out debugging

* add python step to ok-check workflow

* address review comments

* address review comments

Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>

Co-authored-by: Pheenoh <pheenoh@gmail.com>
Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>
This commit is contained in:
Erin Moon
2021-01-21 22:16:51 -06:00
committed by GitHub
parent afb426c60c
commit a072e71c33
595 changed files with 1228 additions and 9009 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h
+1 -1
View File
@@ -1,5 +1,5 @@
#include "JSystem/JAudio2/JAISe/JAISe.h"
#include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h"
#include "JSystem/JAudio2/JAISound/JAISound.h"
#include "global.h"
struct Z2SoundObjBase {};
include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s
+1 -1
View File
@@ -3,7 +3,7 @@
/* 802C3344 002C0284 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C3348 002C0288 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802C334C 002C028C 7C 7F 1B 78 */ mr r31, r3
/* 802C3350 002C0290 4B FF D0 79 */ bl Z2Creature
/* 802C3350 002C0290 4B FF D0 79 */ bl __ct__10Z2CreatureFv
/* 802C3354 002C0294 38 7F 00 90 */ addi r3, r31, 0x90
/* 802C3358 002C0298 48 00 15 91 */ bl Z2LinkSoundStarter_NS_ctor
/* 802C335C 002C029C 3C 60 80 3D */ lis r3, lbl_803CB980@ha
include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s
+1 -1
View File
@@ -22,7 +22,7 @@
/* 802C3554 002C0494 90 1F 00 A4 */ stw r0, 0xa4(r31)
/* 802C3558 002C0498 38 7F 00 94 */ addi r3, r31, 0x94
/* 802C355C 002C049C 38 80 00 00 */ li r4, 0
/* 802C3560 002C04A0 4B FF A9 E9 */ bl Z2SoundObjBase_NS_dtor
/* 802C3560 002C04A0 4B FF A9 E9 */ bl __dt__14Z2SoundObjBaseFv
lbl_802C3564:
/* 802C3564 002C04A4 34 1F 00 90 */ addic. r0, r31, 0x90
/* 802C3568 002C04A8 41 82 00 58 */ beq lbl_802C35C0
include/Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s
+1 -1
View File
@@ -4,7 +4,7 @@
/* 802C3758 002C0698 38 00 00 00 */ li r0, 0
/* 802C375C 002C069C 98 03 00 C5 */ stb r0, 0xc5(r3)
/* 802C3760 002C06A0 38 63 00 94 */ addi r3, r3, 0x94
/* 802C3764 002C06A4 4B FF A8 95 */ bl Z2SoundObjBase_NS_deleteObject
/* 802C3764 002C06A4 4B FF A8 95 */ bl deleteObject__14Z2SoundObjBaseFv
/* 802C3768 002C06A8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C376C 002C06AC 7C 08 03 A6 */ mtlr r0
/* 802C3770 002C06B0 38 21 00 10 */ addi r1, r1, 0x10
include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s
+2 -2
View File
@@ -26,7 +26,7 @@
/* 802C3B60 002C0AA0 4B FF 72 BD */ bl Z2FxLineMgr_NS_setFxForceOff
/* 802C3B64 002C0AA4 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802C3B68 002C0AA8 38 80 00 20 */ li r4, 0x20
/* 802C3B6C 002C0AAC 4B FF C4 81 */ bl Z2SoundObjMgr_NS_setGhostEnemyState
/* 802C3B6C 002C0AAC 4B FF C4 81 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc
/* 802C3B70 002C0AB0 48 00 00 54 */ b lbl_802C3BC4
lbl_802C3B74:
/* 802C3B74 002C0AB4 3C 60 00 02 */ lis r3, 0x00020095@ha
@@ -48,7 +48,7 @@ lbl_802C3B74:
/* 802C3BB4 002C0AF4 4B FF 72 69 */ bl Z2FxLineMgr_NS_setFxForceOff
/* 802C3BB8 002C0AF8 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13)
/* 802C3BBC 002C0AFC 38 80 00 10 */ li r4, 0x10
/* 802C3BC0 002C0B00 4B FF C4 2D */ bl Z2SoundObjMgr_NS_setGhostEnemyState
/* 802C3BC0 002C0B00 4B FF C4 2D */ bl setGhostEnemyState__13Z2SoundObjMgrFUc
lbl_802C3BC4:
/* 802C3BC4 002C0B04 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C3BC8 002C0B08 7C 08 03 A6 */ mtlr r0
include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s
+2 -2
View File
@@ -53,12 +53,12 @@ lbl_802C3C94:
/* 802C3C98 002C0BD8 90 01 00 08 */ stw r0, 8(r1)
/* 802C3C9C 002C0BDC 38 7E 00 08 */ addi r3, r30, 8
/* 802C3CA0 002C0BE0 38 81 00 08 */ addi r4, r1, 8
/* 802C3CA4 002C0BE4 4B FE 75 B1 */ bl Z2SoundHandles_NS_getHandleSoundID
/* 802C3CA4 002C0BE4 4B FE 75 B1 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID
/* 802C3CA8 002C0BE8 28 03 00 00 */ cmplwi r3, 0
/* 802C3CAC 002C0BEC 41 82 01 90 */ beq lbl_802C3E3C
/* 802C3CB0 002C0BF0 80 63 00 00 */ lwz r3, 0(r3)
/* 802C3CB4 002C0BF4 38 80 00 00 */ li r4, 0
/* 802C3CB8 002C0BF8 4B FD E8 25 */ bl JAISound_NS_stop
/* 802C3CB8 002C0BF8 4B FD E8 25 */ bl stop__8JAISoundFUl
/* 802C3CBC 002C0BFC 48 00 01 80 */ b lbl_802C3E3C
lbl_802C3CC0:
/* 802C3CC0 002C0C00 28 1F 00 00 */ cmplwi r31, 0
include/Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s
+1 -1
View File
@@ -53,7 +53,7 @@ lbl_802C43D4:
/* 802C43D8 002C1318 90 01 00 2C */ stw r0, 0x2c(r1)
/* 802C43DC 002C131C 38 7D 00 50 */ addi r3, r29, 0x50
/* 802C43E0 002C1320 38 81 00 2C */ addi r4, r1, 0x2c
/* 802C43E4 002C1324 4B FE 6E 71 */ bl Z2SoundHandles_NS_getHandleSoundID
/* 802C43E4 002C1324 4B FE 6E 71 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID
/* 802C43E8 002C1328 28 03 00 00 */ cmplwi r3, 0
/* 802C43EC 002C132C 41 82 01 88 */ beq lbl_802C4574
/* 802C43F0 002C1330 38 60 00 00 */ li r3, 0
include/Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s
+1 -1
View File
@@ -67,7 +67,7 @@ lbl_802C4650:
/* 802C469C 002C15DC 38 A0 00 08 */ li r5, 8
/* 802C46A0 002C15E0 57 E6 06 3E */ clrlwi r6, r31, 0x18
/* 802C46A4 002C15E4 38 E0 FF FF */ li r7, -1
/* 802C46A8 002C15E8 4B FE 68 35 */ bl Z2SoundStarter_NS_setPortData
/* 802C46A8 002C15E8 4B FE 68 35 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc
lbl_802C46AC:
/* 802C46AC 002C15EC 7F C3 F3 78 */ mr r3, r30
/* 802C46B0 002C15F0 48 00 00 20 */ b lbl_802C46D0
include/Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s
+1 -1
View File
@@ -4,7 +4,7 @@
/* 802C48F4 002C1834 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802C48F8 002C1838 7C 7F 1B 78 */ mr r31, r3
/* 802C48FC 002C183C 38 80 00 00 */ li r4, 0
/* 802C4900 002C1840 4B FE 62 95 */ bl Z2SoundStarter_NS_ctor
/* 802C4900 002C1840 4B FE 62 95 */ bl __ct__14Z2SoundStarterFb
/* 802C4904 002C1844 3C 60 80 3D */ lis r3, lbl_803CB96C@ha
/* 802C4908 002C1848 38 03 B9 6C */ addi r0, r3, lbl_803CB96C@l
/* 802C490C 002C184C 90 1F 00 00 */ stw r0, 0(r31)
include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s
+7 -7
View File
@@ -178,13 +178,13 @@ lbl_802C4B9C:
lbl_802C4BAC:
/* 802C4BAC 002C1AEC 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13)
/* 802C4BB0 002C1AF0 38 63 00 50 */ addi r3, r3, 0x50
/* 802C4BB4 002C1AF4 4B FE 69 51 */ bl Z2SoundHandles_NS_isActive
/* 802C4BB4 002C1AF4 4B FE 69 51 */ bl isActive__14Z2SoundHandlesCFv
/* 802C4BB8 002C1AF8 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802C4BBC 002C1AFC 41 82 01 48 */ beq lbl_802C4D04
/* 802C4BC0 002C1B00 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13)
/* 802C4BC4 002C1B04 38 63 00 50 */ addi r3, r3, 0x50
/* 802C4BC8 002C1B08 38 80 00 01 */ li r4, 1
/* 802C4BCC 002C1B0C 4B FE 68 D5 */ bl Z2SoundHandles_NS_stopAllSounds
/* 802C4BCC 002C1B0C 4B FE 68 D5 */ bl stopAllSounds__14Z2SoundHandlesFUl
/* 802C4BD0 002C1B10 48 00 01 34 */ b lbl_802C4D04
lbl_802C4BD4:
/* 802C4BD4 002C1B14 3B E0 00 01 */ li r31, 1
@@ -225,7 +225,7 @@ lbl_802C4C44:
/* 802C4C50 002C1B90 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13)
/* 802C4C54 002C1B94 38 63 00 50 */ addi r3, r3, 0x50
/* 802C4C58 002C1B98 38 81 00 30 */ addi r4, r1, 0x30
/* 802C4C5C 002C1B9C 4B FE 65 F9 */ bl Z2SoundHandles_NS_getHandleSoundID
/* 802C4C5C 002C1B9C 4B FE 65 F9 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID
/* 802C4C60 002C1BA0 28 03 00 00 */ cmplwi r3, 0
/* 802C4C64 002C1BA4 41 82 00 A0 */ beq lbl_802C4D04
/* 802C4C68 002C1BA8 3C 60 00 01 */ lis r3, 0x0001000B@ha
@@ -246,7 +246,7 @@ lbl_802C4C90:
/* 802C4C9C 002C1BDC 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13)
/* 802C4CA0 002C1BE0 38 63 00 50 */ addi r3, r3, 0x50
/* 802C4CA4 002C1BE4 38 81 00 28 */ addi r4, r1, 0x28
/* 802C4CA8 002C1BE8 4B FE 65 AD */ bl Z2SoundHandles_NS_getHandleSoundID
/* 802C4CA8 002C1BE8 4B FE 65 AD */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID
/* 802C4CAC 002C1BEC 28 03 00 00 */ cmplwi r3, 0
/* 802C4CB0 002C1BF0 41 82 00 54 */ beq lbl_802C4D04
/* 802C4CB4 002C1BF4 3C 60 00 01 */ lis r3, 0x0001000D@ha
@@ -264,12 +264,12 @@ lbl_802C4CD4:
/* 802C4CE0 002C1C20 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13)
/* 802C4CE4 002C1C24 38 63 00 08 */ addi r3, r3, 8
/* 802C4CE8 002C1C28 38 81 00 08 */ addi r4, r1, 8
/* 802C4CEC 002C1C2C 4B FE 65 69 */ bl Z2SoundHandles_NS_getHandleSoundID
/* 802C4CEC 002C1C2C 4B FE 65 69 */ bl getHandleSoundID__14Z2SoundHandlesF10JAISoundID
/* 802C4CF0 002C1C30 28 03 00 00 */ cmplwi r3, 0
/* 802C4CF4 002C1C34 41 82 00 10 */ beq lbl_802C4D04
/* 802C4CF8 002C1C38 80 63 00 00 */ lwz r3, 0(r3)
/* 802C4CFC 002C1C3C 38 80 00 00 */ li r4, 0
/* 802C4D00 002C1C40 4B FD D7 DD */ bl JAISound_NS_stop
/* 802C4D00 002C1C40 4B FD D7 DD */ bl stop__8JAISoundFUl
lbl_802C4D04:
/* 802C4D04 002C1C44 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13)
/* 802C4D08 002C1C48 88 A3 00 CA */ lbz r5, 0xca(r3)
@@ -341,7 +341,7 @@ lbl_802C4DD8:
/* 802C4E00 002C1D40 FC 80 E8 90 */ fmr f4, f29
/* 802C4E04 002C1D44 FC A0 F0 90 */ fmr f5, f30
/* 802C4E08 002C1D48 7F A8 EB 78 */ mr r8, r29
/* 802C4E0C 002C1D4C 4B FE 5E 31 */ bl Z2SoundStarter_NS_startSound_X1_
/* 802C4E0C 002C1D4C 4B FE 5E 31 */ bl startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl
/* 802C4E10 002C1D50 7C 7D 1B 78 */ mr r29, r3
/* 802C4E14 002C1D54 57 E0 06 3F */ clrlwi. r0, r31, 0x18
/* 802C4E18 002C1D58 41 82 01 24 */ beq lbl_802C4F3C
include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s
+1 -1
View File
@@ -3,7 +3,7 @@
/* 802C5004 002C1F44 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C5008 002C1F48 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802C500C 002C1F4C 7C 7F 1B 78 */ mr r31, r3
/* 802C5010 002C1F50 4B FF B3 B9 */ bl Z2Creature
/* 802C5010 002C1F50 4B FF B3 B9 */ bl __ct__10Z2CreatureFv
/* 802C5014 002C1F54 38 7F 00 90 */ addi r3, r31, 0x90
/* 802C5018 002C1F58 7F E4 FB 78 */ mr r4, r31
/* 802C501C 002C1F5C 48 00 02 19 */ bl Z2RideSoundStarter
include/Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s
+1 -1
View File
@@ -6,7 +6,7 @@
/* 802C5248 002C2188 7C 7E 1B 78 */ mr r30, r3
/* 802C524C 002C218C 7C 9F 23 78 */ mr r31, r4
/* 802C5250 002C2190 38 80 00 00 */ li r4, 0
/* 802C5254 002C2194 4B FE 59 41 */ bl Z2SoundStarter_NS_ctor
/* 802C5254 002C2194 4B FE 59 41 */ bl __ct__14Z2SoundStarterFb
/* 802C5258 002C2198 3C 60 80 3D */ lis r3, lbl_803CB910@ha
/* 802C525C 002C219C 38 03 B9 10 */ addi r0, r3, lbl_803CB910@l
/* 802C5260 002C21A0 90 1E 00 00 */ stw r0, 0(r30)
include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s
+1 -1
View File
@@ -42,7 +42,7 @@ lbl_802C5310:
/* 802C5314 002C2254 7F A3 EB 78 */ mr r3, r29
/* 802C5318 002C2258 38 81 00 18 */ addi r4, r1, 0x18
/* 802C531C 002C225C FC 20 F8 90 */ fmr f1, f31
/* 802C5320 002C2260 4B FE 59 1D */ bl Z2SoundStarter_NS_startSound_X1_
/* 802C5320 002C2260 4B FE 59 1D */ bl startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl
/* 802C5324 002C2264 7C 7E 1B 78 */ mr r30, r3
/* 802C5328 002C2268 80 7D 00 04 */ lwz r3, 4(r29)
/* 802C532C 002C226C 88 03 00 98 */ lbz r0, 0x98(r3)
include/Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s
+1 -1
View File
@@ -3,7 +3,7 @@
/* 802C54C0 002C2400 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C54C4 002C2404 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802C54C8 002C2408 7C 7F 1B 78 */ mr r31, r3
/* 802C54CC 002C240C 4B FF 8A 25 */ bl Z2SoundObjBase_NS_ctor
/* 802C54CC 002C240C 4B FF 8A 25 */ bl __ct__14Z2SoundObjBaseFv
/* 802C54D0 002C2410 3C 60 80 3D */ lis r3, lbl_803CB8F0@ha
/* 802C54D4 002C2414 38 03 B8 F0 */ addi r0, r3, lbl_803CB8F0@l
/* 802C54D8 002C2418 90 1F 00 10 */ stw r0, 0x10(r31)
include/Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s
+1 -1
View File
@@ -1,7 +1,7 @@
/* 802C54FC 002C243C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C5500 002C2440 7C 08 02 A6 */ mflr r0
/* 802C5504 002C2444 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C5508 002C2448 4B FF 8A A9 */ bl Z2SoundObjBase_NS_init
/* 802C5508 002C2448 4B FF 8A A9 */ bl init__14Z2SoundObjBaseFP3VecUc
/* 802C550C 002C244C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C5510 002C2450 7C 08 03 A6 */ mtlr r0
/* 802C5514 002C2454 38 21 00 10 */ addi r1, r1, 0x10