mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-02 18:18:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reintroduce missing changes from pull request #2200 (#2213)

Browse Source 
* Reintroduce missing changes from pull request  #2200

* m_Do_audio OK
This commit is contained in:
hatal175
2024-10-16 22:41:21 +03:00
committed by GitHub
parent 030d6533f0
commit ec07abb09b
18 changed files with 894 additions and 1918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JAudio2/JAISeMgr.h
+1 -1
View File
@@ -95,7 +95,7 @@ public:
/* 802A0768 */ bool startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f32> const*);
/* 802A08D0 */ int getNumActiveSe() const;
/* 802A08FC */ virtual ~JAISeMgr(); // inline?
/* 802A08FC */ virtual ~JAISeMgr() {}
/* 802A0168 */ virtual bool isUsingSeqData(JAISeqDataRegion const&);
/* 802A01D8 */ virtual int releaseSeqData(JAISeqDataRegion const&);
include/JSystem/JAudio2/JAISeqMgr.h
+1 -1
View File
@@ -29,7 +29,7 @@ public:
/* 802A1F58 */ JAISeq* beginStartSeq_();
/* 802A1FE8 */ bool endStartSeq_(JAISeq*, JAISoundHandle*);
/* 802A20F0 */ virtual ~JAISeqMgr(); // inline?
/* 802A20F0 */ virtual ~JAISeqMgr() {}
/* 802A1804 */ virtual bool isUsingSeqData(JAISeqDataRegion const&);
/* 802A1870 */ virtual int releaseSeqData(JAISeqDataRegion const&);
include/Z2AudioLib/Z2SoundInfo.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
/* 802BB6DC */ virtual void getSeInfo(JAISoundID, JAISe*) const;
/* 802BB8B4 */ virtual void getSeqInfo(JAISoundID, JAISeq*) const;
/* 802BB8E0 */ virtual void getStreamInfo(JAISoundID, JAIStream*) const;
/* 802BBBE0 */ virtual ~Z2SoundInfo();
/* 802BBBE0 */ virtual ~Z2SoundInfo() {}
/* 802BB158 */ JAUAudibleParam getAudibleSwFull(JAISoundID);
/* 802BBA10 */ const char* getStreamFilePath(JAISoundID);
include/Z2AudioLib/Z2SpeechMgr2.h
+2 -1
View File
@@ -8,7 +8,7 @@
struct Z2SpeechStarter : public Z2SoundStarter {
/* 802CCFB8 */ Z2SpeechStarter();
/* 802CBCEC */ virtual ~Z2SpeechStarter();
/* 802CBCEC */ virtual ~Z2SpeechStarter() {}
/* 802CCFF8 */ virtual bool startSound(JAISoundID, JAISoundHandle*,
JGeometry::TVec3<f32> const*, u32, f32, f32, f32, f32,
f32, u32);
@@ -20,6 +20,7 @@ struct Z2SpeechMgr : public JASGlobalInstance<Z2SpeechMgr> {
struct Z2SpeechMgr2 : public JASGlobalInstance<Z2SpeechMgr2> {
/* 802CBC60 */ Z2SpeechMgr2();
~Z2SpeechMgr2() {}
/* 802CBD88 */ void setString(u16 const*, s16, u8, u16);
/* 802CBF60 */ void setTextCount(s16);
/* 802CC190 */ void speakOneWord(bool);
include/d/actor/d_a_tag_TWgate.h
+1 -1
View File
@@ -112,7 +112,7 @@ public:
callInit();
}
static u8 const mAttr[1 + 3 /* padding */];
static u8 const mAttr[1];
static actionFunc ActionTable[13][2];
private:
include/d/actor/d_a_tag_qs.h
+26
View File
@@ -1,5 +1,31 @@
#ifndef D_A_TAG_QS_H
#define D_A_TAG_QS_H
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_d.h"
class daTagQs_c : public fopAc_ac_c {
public:
/* 80D5DE78 */ ~daTagQs_c();
/* 80D5DFB0 */ int create();
/* 80D5E1FC */ f32 getPower();
/* 80D5E220 */ f32 getSafeArea();
/* 80D5E244 */ f32 getPower80();
/* 80D5E268 */ f32 getCenterPower();
/* 80D5E28C */ f32 calcPower(f32, f32);
/* 80D5E9F8 */ int execute();
/* 80D5EBF8 */ int draw();
u8 getType() { return fopAcM_GetParamBit(this, 0, 1); }
int getSwNo() { return fopAcM_GetParamBit(this, 1, 8); }
/* 0x568 */ f32 field_0x568;
/* 0x56C */ f32 field_0x56c;
/* 0x570 */ int field_0x570;
/* 0x574 */ int field_0x574;
/* 0x578 */ dCcD_Cyl mCyl;
/* 0x6B4 */ dCcD_Stts mStts;
};
#endif /* D_A_TAG_QS_H */
include/d/d_menu_option.h
+1 -1
View File
@@ -87,7 +87,7 @@ public:
/* 801E8CB0 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
/* 801E8CFC */ u8 yesnoWakuAlpahAnm(u8);
/* 801E8E6C */ virtual void draw();
/* 801E8E6C */ virtual void draw() { _draw(); }
/* 801E2014 */ virtual ~dMenu_Option_c();
u8 getQuitStatus() { return mQuitStatus; }