encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07: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 23:16:51 -05:00
committed by GitHub
co-authored by Pheenoh notyourav
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
asm/JAudio2/JAISeMgr.s
+5 -5
View File
@@ -72,7 +72,7 @@ lbl_8029F97C:
/* 8029F97C 0029C8BC 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 8029F980 0029C8C0 41 82 00 10 */ beq lbl_8029F990
/* 8029F984 0029C8C4 38 64 00 10 */ addi r3, r4, 0x10
/* 8029F988 0029C8C8 48 00 2C 11 */ bl JAISound_NS_stop_X1_
/* 8029F988 0029C8C8 48 00 2C 11 */ bl stop__8JAISoundFv
/* 8029F98C 0029C8CC 38 A0 00 01 */ li r5, 1
lbl_8029F990:
/* 8029F990 0029C8D0 83 BD 00 0C */ lwz r29, 0xc(r29)
@@ -417,7 +417,7 @@ lbl_8029FE00:
/* 8029FE00 0029CD40 80 7F 00 00 */ lwz r3, 0(r31)
/* 8029FE04 0029CD44 38 63 00 10 */ addi r3, r3, 0x10
/* 8029FE08 0029CD48 7F C4 F3 78 */ mr r4, r30
/* 8029FE0C 0029CD4C 48 00 26 D1 */ bl JAISound_NS_stop
/* 8029FE0C 0029CD4C 48 00 26 D1 */ bl stop__8JAISoundFUl
/* 8029FE10 0029CD50 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_8029FE14:
/* 8029FE14 0029CD54 28 1F 00 00 */ cmplwi r31, 0
@@ -440,7 +440,7 @@ JAISeCategoryMgr_NS_stop_X1_:
lbl_8029FE4C:
/* 8029FE4C 0029CD8C 80 7F 00 00 */ lwz r3, 0(r31)
/* 8029FE50 0029CD90 38 63 00 10 */ addi r3, r3, 0x10
/* 8029FE54 0029CD94 48 00 27 45 */ bl JAISound_NS_stop_X1_
/* 8029FE54 0029CD94 48 00 27 45 */ bl stop__8JAISoundFv
/* 8029FE58 0029CD98 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_8029FE5C:
/* 8029FE5C 0029CD9C 28 1F 00 00 */ cmplwi r31, 0
@@ -473,7 +473,7 @@ lbl_8029FEA8:
/* 8029FEB8 0029CDF8 7C 03 00 40 */ cmplw r3, r0
/* 8029FEBC 0029CDFC 40 82 00 0C */ bne lbl_8029FEC8
/* 8029FEC0 0029CE00 38 64 00 10 */ addi r3, r4, 0x10
/* 8029FEC4 0029CE04 48 00 26 D5 */ bl JAISound_NS_stop_X1_
/* 8029FEC4 0029CE04 48 00 26 D5 */ bl stop__8JAISoundFv
lbl_8029FEC8:
/* 8029FEC8 0029CE08 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_8029FECC:
@@ -1134,7 +1134,7 @@ JAISeMgr_NS_startSound:
/* 802A0790 0029D6D0 80 7E 00 00 */ lwz r3, 0(r30)
/* 802A0794 0029D6D4 28 03 00 00 */ cmplwi r3, 0
/* 802A0798 0029D6D8 41 82 00 08 */ beq lbl_802A07A0
/* 802A079C 0029D6DC 48 00 1D FD */ bl JAISound_NS_stop_X1_
/* 802A079C 0029D6DC 48 00 1D FD */ bl stop__8JAISoundFv
lbl_802A07A0:
/* 802A07A0 0029D6E0 83 6D 85 DC */ lwz r27, lbl_80450B5C-_SDA_BASE_(r13)
/* 802A07A4 0029D6E4 28 1B 00 00 */ cmplwi r27, 0
asm/JAudio2/JAISeqMgr.s
+5 -5
View File
@@ -66,7 +66,7 @@ lbl_802A18CC:
lbl_802A18D0:
/* 802A18D0 0029E810 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 802A18D4 0029E814 41 82 00 0C */ beq lbl_802A18E0
/* 802A18D8 0029E818 48 00 0C C1 */ bl JAISound_NS_stop_X1_
/* 802A18D8 0029E818 48 00 0C C1 */ bl stop__8JAISoundFv
/* 802A18DC 0029E81C 38 A0 00 01 */ li r5, 1
lbl_802A18E0:
/* 802A18E0 0029E820 83 BD 00 0C */ lwz r29, 0xc(r29)
@@ -259,7 +259,7 @@ JAISeqMgr_NS_startSound:
/* 802A1B70 0029EAB0 80 7B 00 00 */ lwz r3, 0(r27)
/* 802A1B74 0029EAB4 28 03 00 00 */ cmplwi r3, 0
/* 802A1B78 0029EAB8 41 82 00 08 */ beq lbl_802A1B80
/* 802A1B7C 0029EABC 48 00 0A 1D */ bl JAISound_NS_stop_X1_
/* 802A1B7C 0029EABC 48 00 0A 1D */ bl stop__8JAISoundFv
lbl_802A1B80:
/* 802A1B80 0029EAC0 83 CD 85 DC */ lwz r30, lbl_80450B5C-_SDA_BASE_(r13)
/* 802A1B84 0029EAC4 28 1E 00 00 */ cmplwi r30, 0
@@ -452,7 +452,7 @@ JAISeqMgr_NS_stop:
/* 802A1E10 0029ED50 48 00 00 10 */ b lbl_802A1E20
lbl_802A1E14:
/* 802A1E14 0029ED54 80 7F 00 00 */ lwz r3, 0(r31)
/* 802A1E18 0029ED58 48 00 07 81 */ bl JAISound_NS_stop_X1_
/* 802A1E18 0029ED58 48 00 07 81 */ bl stop__8JAISoundFv
/* 802A1E1C 0029ED5C 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A1E20:
/* 802A1E20 0029ED60 28 1F 00 00 */ cmplwi r31, 0
@@ -476,7 +476,7 @@ JAISeqMgr_NS_stop_X1_:
lbl_802A1E5C:
/* 802A1E5C 0029ED9C 80 7F 00 00 */ lwz r3, 0(r31)
/* 802A1E60 0029EDA0 7F C4 F3 78 */ mr r4, r30
/* 802A1E64 0029EDA4 48 00 06 79 */ bl JAISound_NS_stop
/* 802A1E64 0029EDA4 48 00 06 79 */ bl stop__8JAISoundFUl
/* 802A1E68 0029EDA8 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A1E6C:
/* 802A1E6C 0029EDAC 28 1F 00 00 */ cmplwi r31, 0
@@ -509,7 +509,7 @@ lbl_802A1EBC:
/* 802A1EC8 0029EE08 80 1E 00 00 */ lwz r0, 0(r30)
/* 802A1ECC 0029EE0C 7C 04 00 40 */ cmplw r4, r0
/* 802A1ED0 0029EE10 40 82 00 08 */ bne lbl_802A1ED8
/* 802A1ED4 0029EE14 48 00 06 C5 */ bl JAISound_NS_stop_X1_
/* 802A1ED4 0029EE14 48 00 06 C5 */ bl stop__8JAISoundFv
lbl_802A1ED8:
/* 802A1ED8 0029EE18 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A1EDC:
asm/JAudio2/JAISound.s
+8 -8
View File
@@ -3,8 +3,8 @@
.section .text, "ax" # 802a2184
.global JAISoundHandle_NS_releaseSound
JAISoundHandle_NS_releaseSound:
.global releaseSound__14JAISoundHandleFv
releaseSound__14JAISoundHandleFv:
/* 802A2184 0029F0C4 80 83 00 00 */ lwz r4, 0(r3)
/* 802A2188 0029F0C8 28 04 00 00 */ cmplwi r4, 0
/* 802A218C 0029F0CC 4D 82 00 20 */ beqlr
@@ -35,7 +35,7 @@ JAISound_NS_attachHandle:
/* 802A21D8 0029F118 80 64 00 00 */ lwz r3, 0(r4)
/* 802A21DC 0029F11C 28 03 00 00 */ cmplwi r3, 0
/* 802A21E0 0029F120 41 82 00 08 */ beq lbl_802A21E8
/* 802A21E4 0029F124 48 00 03 B5 */ bl JAISound_NS_stop_X1_
/* 802A21E4 0029F124 48 00 03 B5 */ bl stop__8JAISoundFv
lbl_802A21E8:
/* 802A21E8 0029F128 80 1E 00 04 */ lwz r0, 4(r30)
/* 802A21EC 0029F12C 28 00 00 00 */ cmplwi r0, 0
@@ -256,14 +256,14 @@ lbl_802A249C:
/* 802A24D4 0029F414 38 21 00 20 */ addi r1, r1, 0x20
/* 802A24D8 0029F418 4E 80 00 20 */ blr
.global JAISound_NS_stop
JAISound_NS_stop:
.global stop__8JAISoundFUl
stop__8JAISoundFUl:
/* 802A24DC 0029F41C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802A24E0 0029F420 7C 08 02 A6 */ mflr r0
/* 802A24E4 0029F424 90 01 00 14 */ stw r0, 0x14(r1)
/* 802A24E8 0029F428 28 04 00 00 */ cmplwi r4, 0
/* 802A24EC 0029F42C 40 82 00 0C */ bne lbl_802A24F8
/* 802A24F0 0029F430 48 00 00 A9 */ bl JAISound_NS_stop_X1_
/* 802A24F0 0029F430 48 00 00 A9 */ bl stop__8JAISoundFv
/* 802A24F4 0029F434 48 00 00 94 */ b lbl_802A2588
lbl_802A24F8:
/* 802A24F8 0029F438 41 82 00 40 */ beq lbl_802A2538
@@ -310,8 +310,8 @@ lbl_802A2588:
/* 802A2590 0029F4D0 38 21 00 10 */ addi r1, r1, 0x10
/* 802A2594 0029F4D4 4E 80 00 20 */ blr
.global JAISound_NS_stop_X1_
JAISound_NS_stop_X1_:
.global stop__8JAISoundFv
stop__8JAISoundFv:
/* 802A2598 0029F4D8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802A259C 0029F4DC 7C 08 02 A6 */ mflr r0
/* 802A25A0 0029F4E0 90 01 00 14 */ stw r0, 0x14(r1)
asm/JAudio2/JAIStreamMgr.s
+4 -4
View File
@@ -75,7 +75,7 @@ JAIStreamMgr_NS_startSound:
/* 802A3C64 002A0BA4 80 7B 00 00 */ lwz r3, 0(r27)
/* 802A3C68 002A0BA8 28 03 00 00 */ cmplwi r3, 0
/* 802A3C6C 002A0BAC 41 82 00 08 */ beq lbl_802A3C74
/* 802A3C70 002A0BB0 4B FF E9 29 */ bl JAISound_NS_stop_X1_
/* 802A3C70 002A0BB0 4B FF E9 29 */ bl stop__8JAISoundFv
lbl_802A3C74:
/* 802A3C74 002A0BB4 80 1A 00 00 */ lwz r0, 0(r26)
/* 802A3C78 002A0BB8 90 01 00 14 */ stw r0, 0x14(r1)
@@ -360,7 +360,7 @@ JAIStreamMgr_NS_stop:
/* 802A403C 002A0F7C 48 00 00 10 */ b lbl_802A404C
lbl_802A4040:
/* 802A4040 002A0F80 80 7F 00 00 */ lwz r3, 0(r31)
/* 802A4044 002A0F84 4B FF E5 55 */ bl JAISound_NS_stop_X1_
/* 802A4044 002A0F84 4B FF E5 55 */ bl stop__8JAISoundFv
/* 802A4048 002A0F88 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A404C:
/* 802A404C 002A0F8C 28 1F 00 00 */ cmplwi r31, 0
@@ -384,7 +384,7 @@ JAIStreamMgr_NS_stop_X1_:
lbl_802A4088:
/* 802A4088 002A0FC8 80 7F 00 00 */ lwz r3, 0(r31)
/* 802A408C 002A0FCC 7F C4 F3 78 */ mr r4, r30
/* 802A4090 002A0FD0 4B FF E4 4D */ bl JAISound_NS_stop
/* 802A4090 002A0FD0 4B FF E4 4D */ bl stop__8JAISoundFUl
/* 802A4094 002A0FD4 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A4098:
/* 802A4098 002A0FD8 28 1F 00 00 */ cmplwi r31, 0
@@ -413,7 +413,7 @@ lbl_802A40D8:
/* 802A40E4 002A1024 80 1E 00 00 */ lwz r0, 0(r30)
/* 802A40E8 002A1028 7C 04 00 40 */ cmplw r4, r0
/* 802A40EC 002A102C 40 82 00 08 */ bne lbl_802A40F4
/* 802A40F0 002A1030 4B FF E4 A9 */ bl JAISound_NS_stop_X1_
/* 802A40F0 002A1030 4B FF E4 A9 */ bl stop__8JAISoundFv
lbl_802A40F4:
/* 802A40F4 002A1034 83 FF 00 0C */ lwz r31, 0xc(r31)
lbl_802A40F8: