mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-21 22:10:59 -04:00
JAudio fixes
This commit is contained in:
@@ -220,7 +220,7 @@ public:
|
||||
/* 0x0061 */ u8 field_0x0061;
|
||||
/* 0x0062 */ u8 field_0x0062;
|
||||
/* 0x0063 */ u8 field_0x0063;
|
||||
/* 0x0064 */ u8 field_0x0064[0x0065 - 0x0064];
|
||||
/* 0x0064 */ u8 field_0x0064;
|
||||
/* 0x0065 */ u8 field_0x0065;
|
||||
/* 0x0066 */ u8 field_0x0066;
|
||||
/* 0x0067 */ u8 field_0x0067[0x0068 - 0x0067];
|
||||
|
||||
@@ -73,8 +73,8 @@ JAIZelBasic::JAIZelBasic() {
|
||||
field_0x01f8 = 0;
|
||||
field_0x0201 = 0;
|
||||
field_0x0204 = 0;
|
||||
field_0x0064[0] = 0;
|
||||
field_0x0064[1] = 0;
|
||||
field_0x0064 = 0;
|
||||
field_0x0065 = 0;
|
||||
field_0x00b8 = 0;
|
||||
field_0x00ba = 0;
|
||||
field_0x00bb = 0;
|
||||
@@ -332,8 +332,8 @@ void JAIZelBasic::bgmStop(u32 param_1, s32 param_2) {
|
||||
field_0x1f3c = 0;
|
||||
field_0x0201 = 0;
|
||||
mLastMinibossSubBGMType = 0;
|
||||
field_0x0064[0] = 0;
|
||||
field_0x0064[1] = 0;
|
||||
field_0x0064 = 0;
|
||||
field_0x0065 = 0;
|
||||
field_0x00b8 = 0;
|
||||
field_0x00cb = 0xff;
|
||||
field_0x00cc = 0;
|
||||
@@ -872,7 +872,7 @@ void JAIZelBasic::setOutputMode(u32 param_1) {
|
||||
|
||||
/* 802A98A0-802A9A20 .text talkIn__11JAIZelBasicFv */
|
||||
void JAIZelBasic::talkIn() {
|
||||
if (field_0x0064[0] != 1 && isDemo() != 1 && field_0x0098 != 0.0f) {
|
||||
if (field_0x0064 != 1 && isDemo() != 1 && field_0x0098 != 0.0f) {
|
||||
field_0x0084 = JAIZelParam::VOL_BGM_TALKING;
|
||||
if (mpMainBgmSound && field_0x0078 != JA_BGM_BIRDMAN_GOAL && field_0x0078 != JA_BGM_BIRDMAN_FAIL) {
|
||||
mpMainBgmSound->setVolume(calcMainBgmVol(), 2, 0);
|
||||
|
||||
@@ -43,7 +43,7 @@ JAIBasic::JAIBasic() {
|
||||
mAudioCamera = NULL;
|
||||
field_0x10 = 0;
|
||||
initLoadFileSw = 2;
|
||||
field_0x1c = 0;
|
||||
field_0x1c = NULL;
|
||||
field_0x8 = NULL;
|
||||
field_0x18 = 0;
|
||||
msCurrentHeap = JASDram;
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "JSystem/JAudio/JAIBasic.h"
|
||||
#include "JSystem/JAudio/JASDSPInterface.h"
|
||||
#include "JSystem/JKernel/JKRSolidHeap.h"
|
||||
#include "global.h"
|
||||
|
||||
JAInter::Fx::initOnCodeFxScene_s* JAInter::Fx::initOnCodeFxScene;
|
||||
u8 JAInter::Fx::mSceneMax;
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "JSystem/JAudio/JAIBasic.h"
|
||||
#include "JSystem/JAudio/JAIGlobalParameter.h"
|
||||
#include "JSystem/JKernel/JKRSolidHeap.h"
|
||||
#include "global.h"
|
||||
|
||||
JAInter::HeapBlock* JAInter::HeapMgr::sAutoHeap;
|
||||
JAInter::HeapBlock* JAInter::HeapMgr::sStayHeap;
|
||||
|
||||
Reference in New Issue
Block a user