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
include/d/d_a/d_a_alink/asm/func_800C12DC.s
+1 -1
View File
@@ -279,7 +279,7 @@ lbl_800C1630:
/* 800C16D4 000BE614 80 7F 07 6C */ lwz r3, 0x76c(r31)
/* 800C16D8 000BE618 28 03 00 00 */ cmplwi r3, 0
/* 800C16DC 000BE61C 41 82 00 10 */ beq lbl_800C16EC
/* 800C16E0 000BE620 48 1F C9 19 */ bl Z2SoundObjBase_NS_deleteObject
/* 800C16E0 000BE620 48 1F C9 19 */ bl deleteObject__14Z2SoundObjBaseFv
/* 800C16E4 000BE624 38 00 00 00 */ li r0, 0
/* 800C16E8 000BE628 90 1F 07 6C */ stw r0, 0x76c(r31)
lbl_800C16EC:
include/d/d_a/d_a_alink/asm/func_800CD7AC.s
+4 -4
View File
@@ -31,7 +31,7 @@
/* 800CD824 000CA764 80 7F 07 6C */ lwz r3, 0x76c(r31)
/* 800CD828 000CA768 28 03 00 00 */ cmplwi r3, 0
/* 800CD82C 000CA76C 41 82 00 10 */ beq lbl_800CD83C
/* 800CD830 000CA770 48 1F 07 C9 */ bl Z2SoundObjBase_NS_deleteObject
/* 800CD830 000CA770 48 1F 07 C9 */ bl deleteObject__14Z2SoundObjBaseFv
/* 800CD834 000CA774 38 00 00 00 */ li r0, 0
/* 800CD838 000CA778 90 1F 07 6C */ stw r0, 0x76c(r31)
lbl_800CD83C:
@@ -192,16 +192,16 @@ lbl_800CDA64:
/* 800CDA68 000CA9A8 41 82 00 4C */ beq lbl_800CDAB4
/* 800CDA6C 000CA9AC 34 7F 2D 8C */ addic. r3, r31, 0x2d8c
/* 800CDA70 000CA9B0 41 82 00 08 */ beq lbl_800CDA78
/* 800CDA74 000CA9B4 48 1D 47 11 */ bl JAISoundHandle_NS_releaseSound
/* 800CDA74 000CA9B4 48 1D 47 11 */ bl releaseSound__14JAISoundHandleFv
lbl_800CDA78:
/* 800CDA78 000CA9B8 34 7F 2D 88 */ addic. r3, r31, 0x2d88
/* 800CDA7C 000CA9BC 41 82 00 08 */ beq lbl_800CDA84
/* 800CDA80 000CA9C0 48 1D 47 05 */ bl JAISoundHandle_NS_releaseSound
/* 800CDA80 000CA9C0 48 1D 47 05 */ bl releaseSound__14JAISoundHandleFv
lbl_800CDA84:
/* 800CDA84 000CA9C4 34 1F 2D 84 */ addic. r0, r31, 0x2d84
/* 800CDA88 000CA9C8 41 82 00 0C */ beq lbl_800CDA94
/* 800CDA8C 000CA9CC 38 7F 2D 84 */ addi r3, r31, 0x2d84
/* 800CDA90 000CA9D0 48 1D 46 F5 */ bl JAISoundHandle_NS_releaseSound
/* 800CDA90 000CA9D0 48 1D 46 F5 */ bl releaseSound__14JAISoundHandleFv
lbl_800CDA94:
/* 800CDA94 000CA9D4 34 1F 2D 84 */ addic. r0, r31, 0x2d84
/* 800CDA98 000CA9D8 41 82 00 1C */ beq lbl_800CDAB4
include/d/d_a/d_a_alink/asm/func_800CF380.s
+1 -1
View File
@@ -487,7 +487,7 @@
/* 800CFA60 000CC9A0 38 7F 2C A8 */ addi r3, r31, 0x2ca8
/* 800CFA64 000CC9A4 48 1F 38 D9 */ bl __ct__14Z2CreatureLinkFv
/* 800CFA68 000CC9A8 38 7F 2D 84 */ addi r3, r31, 0x2d84
/* 800CFA6C 000CC9AC 48 1F B0 55 */ bl Z2WolfHowlMgr
/* 800CFA6C 000CC9AC 48 1F B0 55 */ bl __ct__13Z2WolfHowlMgrFv
/* 800CFA70 000CC9B0 38 7F 2E 44 */ addi r3, r31, 0x2e44
/* 800CFA74 000CC9B4 4B F6 62 19 */ bl dJntCol_c
/* 800CFA78 000CC9B8 3C 60 80 3B */ lis r3, lbl_803A8578@ha
include/d/d_a/d_a_alink/asm/func_80130700.s
+7 -7
View File
@@ -142,7 +142,7 @@ lbl_801308D4:
/* 80130914 0012D854 88 1F 04 99 */ lbz r0, 0x499(r31)
/* 80130918 0012D858 54 04 06 7E */ clrlwi r4, r0, 0x19
/* 8013091C 0012D85C 38 A0 00 00 */ li r5, 0
/* 80130920 0012D860 48 19 A7 E1 */ bl Z2WolfHowlMgr_NS_setCorrectData
/* 80130920 0012D860 48 19 A7 E1 */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData
/* 80130924 0012D864 80 1F 00 B0 */ lwz r0, 0xb0(r31)
/* 80130928 0012D868 54 00 06 3E */ clrlwi r0, r0, 0x18
/* 8013092C 0012D86C B0 1E 30 12 */ sth r0, 0x3012(r30)
@@ -169,7 +169,7 @@ lbl_8013096C:
/* 80130978 0012D8B8 88 83 05 68 */ lbz r4, 0x568(r3)
/* 8013097C 0012D8BC 38 7E 2D 84 */ addi r3, r30, 0x2d84
/* 80130980 0012D8C0 38 A0 00 00 */ li r5, 0
/* 80130984 0012D8C4 48 19 A7 7D */ bl Z2WolfHowlMgr_NS_setCorrectData
/* 80130984 0012D8C4 48 19 A7 7D */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData
/* 80130988 0012D8C8 48 00 00 B4 */ b lbl_80130A3C
lbl_8013098C:
/* 8013098C 0012D8CC 2C 00 01 8A */ cmpwi r0, 0x18a
@@ -180,7 +180,7 @@ lbl_8013098C:
/* 801309A0 0012D8E0 7C 04 07 74 */ extsb r4, r0
/* 801309A4 0012D8E4 38 7E 2D 84 */ addi r3, r30, 0x2d84
/* 801309A8 0012D8E8 38 A0 00 00 */ li r5, 0
/* 801309AC 0012D8EC 48 19 A7 55 */ bl Z2WolfHowlMgr_NS_setCorrectData
/* 801309AC 0012D8EC 48 19 A7 55 */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData
/* 801309B0 0012D8F0 80 7E 27 F4 */ lwz r3, 0x27f4(r30)
/* 801309B4 0012D8F4 80 03 00 B0 */ lwz r0, 0xb0(r3)
/* 801309B8 0012D8F8 54 00 07 3E */ clrlwi r0, r0, 0x1c
@@ -194,7 +194,7 @@ lbl_801309CC:
/* 801309D4 0012D914 38 7E 2D 84 */ addi r3, r30, 0x2d84
/* 801309D8 0012D918 38 80 00 02 */ li r4, 2
/* 801309DC 0012D91C 38 A0 00 00 */ li r5, 0
/* 801309E0 0012D920 48 19 A7 21 */ bl Z2WolfHowlMgr_NS_setCorrectData
/* 801309E0 0012D920 48 19 A7 21 */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData
/* 801309E4 0012D924 38 00 00 01 */ li r0, 1
/* 801309E8 0012D928 B0 1E 30 10 */ sth r0, 0x3010(r30)
/* 801309EC 0012D92C 48 00 00 50 */ b lbl_80130A3C
@@ -207,19 +207,19 @@ lbl_801309F0:
/* 80130A04 0012D944 7C 04 07 74 */ extsb r4, r0
/* 80130A08 0012D948 38 7E 2D 84 */ addi r3, r30, 0x2d84
/* 80130A0C 0012D94C 38 A0 00 00 */ li r5, 0
/* 80130A10 0012D950 48 19 A6 F1 */ bl Z2WolfHowlMgr_NS_setCorrectData
/* 80130A10 0012D950 48 19 A6 F1 */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData
/* 80130A14 0012D954 48 00 00 28 */ b lbl_80130A3C
lbl_80130A18:
/* 80130A18 0012D958 38 7E 2D 84 */ addi r3, r30, 0x2d84
/* 80130A1C 0012D95C 38 80 FF FF */ li r4, -1
/* 80130A20 0012D960 38 A0 00 00 */ li r5, 0
/* 80130A24 0012D964 48 19 A6 DD */ bl Z2WolfHowlMgr_NS_setCorrectData
/* 80130A24 0012D964 48 19 A6 DD */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData
/* 80130A28 0012D968 48 00 00 14 */ b lbl_80130A3C
lbl_80130A2C:
/* 80130A2C 0012D96C 38 7E 2D 84 */ addi r3, r30, 0x2d84
/* 80130A30 0012D970 38 80 FF FF */ li r4, -1
/* 80130A34 0012D974 38 A0 00 00 */ li r5, 0
/* 80130A38 0012D978 48 19 A6 C9 */ bl Z2WolfHowlMgr_NS_setCorrectData
/* 80130A38 0012D978 48 19 A6 C9 */ bl setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData
lbl_80130A3C:
/* 80130A3C 0012D97C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2)
/* 80130A40 0012D980 D0 1E 33 98 */ stfs f0, 0x3398(r30)
include/d/d_a/d_a_alink/asm/func_80130BC4.s
+2 -2
View File
@@ -18,7 +18,7 @@
/* 80130C08 0012DB48 54 1B 06 3F */ clrlwi. r27, r0, 0x18
/* 80130C0C 0012DB4C 41 82 00 0C */ beq lbl_80130C18
/* 80130C10 0012DB50 38 7F 2D 84 */ addi r3, r31, 0x2d84
/* 80130C14 0012DB54 48 19 AF 45 */ bl Z2WolfHowlMgr_NS_skipCorrectDemo
/* 80130C14 0012DB54 48 19 AF 45 */ bl skipCorrectDemo__13Z2WolfHowlMgrFv
lbl_80130C18:
/* 80130C18 0012DB58 7F E3 FB 78 */ mr r3, r31
/* 80130C1C 0012DB5C 80 9F 32 CC */ lwz r4, 0x32cc(r31)
@@ -260,7 +260,7 @@ lbl_80130F50:
/* 80130F68 0012DEA8 FC 40 F8 90 */ fmr f2, f31
/* 80130F6C 0012DEAC 7F 44 D3 78 */ mr r4, r26
/* 80130F70 0012DEB0 FC 60 08 90 */ fmr f3, f1
/* 80130F74 0012DEB4 48 19 9F 61 */ bl Z2WolfHowlMgr_NS_startWolfHowlSound
/* 80130F74 0012DEB4 48 19 9F 61 */ bl startWolfHowlSound__13Z2WolfHowlMgrFffbf
/* 80130F78 0012DEB8 7C 60 07 74 */ extsb r0, r3
/* 80130F7C 0012DEBC B0 1F 30 0E */ sth r0, 0x300e(r31)
/* 80130F80 0012DEC0 3B 40 00 00 */ li r26, 0