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/JStudio_JAudio2/object-sound.s
+6 -6
View File
@@ -151,22 +151,22 @@ JStudio_JAudio2_NS_TAdaptor_sound:
/* 8028D92C 0028A86C 88 1E 01 1F */ lbz r0, 0x11f(r30)
/* 8028D930 0028A870 28 00 00 00 */ cmplwi r0, 0
/* 8028D934 0028A874 40 82 00 0C */ bne lbl_8028D940
/* 8028D938 0028A878 48 01 4C 61 */ bl JAISound_NS_stop_X1_
/* 8028D938 0028A878 48 01 4C 61 */ bl stop__8JAISoundFv
/* 8028D93C 0028A87C 48 00 00 20 */ b lbl_8028D95C
lbl_8028D940:
/* 8028D940 0028A880 88 1E 01 1C */ lbz r0, 0x11c(r30)
/* 8028D944 0028A884 28 00 00 00 */ cmplwi r0, 0
/* 8028D948 0028A888 41 82 00 10 */ beq lbl_8028D958
/* 8028D94C 0028A88C 38 7E 01 18 */ addi r3, r30, 0x118
/* 8028D950 0028A890 48 01 48 35 */ bl JAISoundHandle_NS_releaseSound
/* 8028D950 0028A890 48 01 48 35 */ bl releaseSound__14JAISoundHandleFv
/* 8028D954 0028A894 48 00 00 08 */ b lbl_8028D95C
lbl_8028D958:
/* 8028D958 0028A898 48 01 4C 41 */ bl JAISound_NS_stop_X1_
/* 8028D958 0028A898 48 01 4C 41 */ bl stop__8JAISoundFv
lbl_8028D95C:
/* 8028D95C 0028A89C 34 1E 01 18 */ addic. r0, r30, 0x118
/* 8028D960 0028A8A0 41 82 00 0C */ beq lbl_8028D96C
/* 8028D964 0028A8A4 38 7E 01 18 */ addi r3, r30, 0x118
/* 8028D968 0028A8A8 48 01 48 1D */ bl JAISoundHandle_NS_releaseSound
/* 8028D968 0028A8A8 48 01 48 1D */ bl releaseSound__14JAISoundHandleFv
lbl_8028D96C:
/* 8028D96C 0028A8AC 7F C3 F3 78 */ mr r3, r30
/* 8028D970 0028A8B0 38 80 00 00 */ li r4, 0
@@ -570,7 +570,7 @@ JStudio_JAudio2_NS_TAdaptor_sound_NS_prepareSound_:
/* 8028DF18 0028AE58 80 63 01 18 */ lwz r3, 0x118(r3)
/* 8028DF1C 0028AE5C 28 03 00 00 */ cmplwi r3, 0
/* 8028DF20 0028AE60 41 82 00 08 */ beq lbl_8028DF28
/* 8028DF24 0028AE64 48 01 46 75 */ bl JAISound_NS_stop_X1_
/* 8028DF24 0028AE64 48 01 46 75 */ bl stop__8JAISoundFv
lbl_8028DF28:
/* 8028DF28 0028AE68 80 7F 01 14 */ lwz r3, 0x114(r31)
/* 8028DF2C 0028AE6C 80 63 00 0C */ lwz r3, 0xc(r3)
@@ -667,7 +667,7 @@ JStudio_JAudio2_NS_TAdaptor_sound_NS_endSound_fadeOut_:
/* 8028E068 0028AFA8 80 63 01 18 */ lwz r3, 0x118(r3)
/* 8028E06C 0028AFAC 28 03 00 00 */ cmplwi r3, 0
/* 8028E070 0028AFB0 41 82 00 10 */ beq lbl_8028E080
/* 8028E074 0028AFB4 48 01 44 69 */ bl JAISound_NS_stop
/* 8028E074 0028AFB4 48 01 44 69 */ bl stop__8JAISoundFUl
/* 8028E078 0028AFB8 38 00 00 00 */ li r0, 0
/* 8028E07C 0028AFBC 98 1F 01 20 */ stb r0, 0x120(r31)
lbl_8028E080: