mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-04 01:03:47 -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/Z2SoundStarter/Z2SoundStarter.h
+31
View File
@@ -0,0 +1,31 @@
#ifndef Z2SOUNDSTARTER_H_
#define Z2SOUNDSTARTER_H_
#include "JSystem/JAudio2/JAISound/JAISound.h"
#include "JSystem/JGeometry/JGeometry.h"
struct Z2SoundStarter_vtable {
void* field_0x0;
void* field_0x4;
void* dtor;
void* startSound1;
void* startSound2;
};
struct Z2SoundStarter {
// Z2SoundStarter_vtable* vtable;
Z2SoundStarter(bool);
virtual ~Z2SoundStarter();
virtual void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
virtual void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*, u32, float,
float, float, float, float, u32);
void setPortData(JAISoundHandle*, u32, u16, s8);
void getPortData(JAISoundHandle*, u32, s8);
};
extern Z2SoundStarter* lbl_80450B74;
#endif // Z2SOUNDSTARTER_H_
include/Z2AudioLib/Z2SoundStarter/asm/func_802AABF4.s
+1 -1
View File
@@ -11,7 +11,7 @@
/* 802AAC1C 002A7B5C C0 82 BE 60 */ lfs f4, lbl_80455860-_SDA2_BASE_(r2)
/* 802AAC20 002A7B60 FC A0 20 90 */ fmr f5, f4
/* 802AAC24 002A7B64 39 00 00 00 */ li r8, 0
/* 802AAC28 002A7B68 48 00 00 15 */ bl Z2SoundStarter_NS_startSound_X1_
/* 802AAC28 002A7B68 48 00 00 15 */ bl startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3_SUB_0f_SUB_1UlfffffUl
/* 802AAC2C 002A7B6C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802AAC30 002A7B70 7C 08 03 A6 */ mtlr r0
/* 802AAC34 002A7B74 38 21 00 10 */ addi r1, r1, 0x10
include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s
+1 -1
View File
@@ -116,7 +116,7 @@ lbl_802AADA0:
/* 802AADE8 002A7D28 38 A0 00 06 */ li r5, 6
/* 802AADEC 002A7D2C 57 C6 04 3E */ clrlwi r6, r30, 0x10
/* 802AADF0 002A7D30 38 E0 FF FF */ li r7, -1
/* 802AADF4 002A7D34 48 00 00 E9 */ bl Z2SoundStarter_NS_setPortData
/* 802AADF4 002A7D34 48 00 00 E9 */ bl setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc
lbl_802AADF8:
/* 802AADF8 002A7D38 C0 02 BE 58 */ lfs f0, lbl_80455858-_SDA2_BASE_(r2)
/* 802AADFC 002A7D3C FC 1B 00 40 */ fcmpo cr0, f27, f0