mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-12 05:28:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pjb-audio

Browse Source
This commit is contained in:
PJB3005
2026-03-27 17:18:11 +01:00
parent 4b30cd7ddb 04df9d5397
commit 248f3945b4
100 changed files with 2987 additions and 1076 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Z2AudioLib/SpotName.h
+20
View File
@@ -0,0 +1,20 @@
#ifndef SPOTNAME_H
#define SPOTNAME_H
// This symbol has polluted multiple TUs in the lib, hence,
// it probably was defined in the header as static by accident
static const char* sSpotName[] = {
"F_SP00", "F_SP103", "R_SP01", "F_SP104", "R_SP107", "F_SP108", "R_SP108", "F_SP117",
"F_SP109", "R_SP109", "R_SP209", "F_SP110", "R_SP110", "F_SP111", "F_SP128", "R_SP128",
"F_SP115", "F_SP112", "F_SP126", "F_SP127", "R_SP127", "F_SP113", "F_SP116", "R_SP116",
"R_SP160", "R_SP161", "F_SP114", "F_SP118", "F_SP124", "F_SP125", "F_SP121", "F_SP122",
"F_SP123", "F_SP200", "F_SP102", "", "R_SP300", "R_SP301", "T_ENEMY", "D_MN54",
"D_MN05", "D_MN05B", "D_MN05A", "D_MN04", "D_MN04B", "D_MN04A", "D_MN01", "D_MN01B",
"D_MN01A", "D_MN10", "D_MN10B", "D_MN10A", "D_MN11", "D_MN11B", "D_MN11A", "D_MN06",
"D_MN06B", "D_MN06A", "D_MN07", "D_MN07B", "D_MN07A", "D_MN08", "D_MN08B", "D_MN08C",
"D_MN08A", "D_MN08D", "D_MN09", "D_MN09A", "D_MN09B", "D_MN09C", "D_SB00", "D_SB01",
"D_SB02", "D_SB03", "D_SB04", "D_SB05", "D_SB06", "D_SB07", "D_SB08", "D_SB09",
"D_SB10",
};
#endif /* SPOTNAME_H */
src/Z2AudioLib/Z2AudioMgr.cpp
+1
View File
@@ -20,6 +20,7 @@
#endif
Z2AudioMgr* Z2AudioMgr::mAudioMgrPtr;
u8 gMuffleOutOfRangeMic = false;
Z2AudioMgr::Z2AudioMgr() : mSoundStarter(true) {
mAudioMgrPtr = this;
src/Z2AudioLib/Z2DebugSys.cpp
+108 -2
View File
@@ -14,14 +14,15 @@
#include "JSystem/JKernel/JKRExpHeap.h"
#include "Z2AudioLib/Z2F1TestWindow.h"
#include "Z2AudioLib/Z2FxLineMgr.h"
#include "Z2AudioLib/Z2Param.h"
#include "Z2AudioLib/Z2SeView.h"
#include "Z2AudioLib/Z2SoundPlayer.h"
#include "Z2AudioLib/Z2TrackView.h"
#include "Z2AudioLib/Z2WaveArcLoader.h"
#include "m_Do/m_Do_hostIO.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_hostIO.h"
Z2DebugSys::Z2DebugSys() : JASGlobalInstance<Z2DebugSys>(true) { }
Z2DebugSys::Z2DebugSys() : JASGlobalInstance<Z2DebugSys>(true) {}
void Z2DebugSys::initJAW() {
JKRHeap* oldHeap = JKRHeap::getCurrentHeap();
@@ -117,3 +118,108 @@ JAISeqDataMgr* Z2DebugSys::initSeSeqDataMgr(const void* param_1) {
JKRSetCurrentHeap(oldHeap);
return seqDataMgr;
}
u8 gMicOn = true;
u8 gMicOffWhenOutOfSight = true;
extern u8 gMuffleOutOfRangeMic;
void Z2ParamNode::message(JAHControl& ctrl) {
ctrl.makeComment("**** 各種パラメータ編集用ノード ****", 0, 5, 0);
ctrl.returnY(1);
ctrl.indent(1);
ctrl.makeCheckBox("ＢＧＭ強制ボリュームＯＮ", &Z2GetSeqMgr()->field_0x04_debug, 1, false, 0);
ctrl.makeSlider("ＢＧＭ強制ボリューム", &Z2GetSeqMgr()->field_0x00_debug, 0.0f, 1.0f, 0);
ctrl.returnY(1);
ctrl.makeComment("-- ミドナボイス --", 0, 5, 0);
ctrl.indent(1);
ctrl.makeSlider("発話スタイル", (s16*)Z2GetSpeechMgr2()->getStylePtr(), 0, 0x10, 0);
ctrl.makeSlider("語尾(1=UP)", Z2GetSpeechMgr2()->getTalkerPtr(), 0, 1, 0);
ctrl.indent(-1);
ctrl.makeComment("-- ＢＧＭ汎用パラメータ --", 0, 5, 0);
ctrl.indent(1);
ctrl.makeSlider("シーンチェンジ時のＢＧＭフェードアウトタイム",
&Z2Param::SCENE_CHANGE_BGM_FADEOUT_TIME, 0, 0xff, 0);
ctrl.makeSlider("ＢＧＭクロスフェードインタイム", &Z2Param::BGM_CROSS_FADEIN_TIME, 0, 0xff, 0);
ctrl.makeSlider("ＢＧＭクロスフェードアウトタイム", &Z2Param::BGM_CROSS_FADEOUT_TIME, 0, 0xff,
0);
ctrl.indent(-1);
ctrl.makeComment("-- 戦闘ＢＧＭパラメータ --", 0, 5, 0);
ctrl.indent(1);
ctrl.makeSlider("戦闘ＢＧＭスタート禁止時間", &Z2Param::BATTLE_BGM_WAIT_TIME, 0, 0xff, 0);
ctrl.makeSlider("戦闘ＢＧＭスタート距離", &Z2Param::BATTLE_FADEIN_DIST, 0.0f, 5000.0f, 0);
ctrl.makeSlider("戦闘ＢＧＭフェードアウト距離", &Z2Param::BATTLE_FADEOUT_DIST, 0.0f, 5000.0f,
0);
ctrl.makeSlider("接近戦状態距離", &Z2Param::ENEMY_NEARBY_DIST, 0.0f, 5000.0f, 0);
ctrl.makeSlider("接近戦トラックＦＩタイム", &Z2Param::CLOSE_BATTLE_TRACK_FI_TIME, 0, 0xff, 0);
ctrl.makeSlider("接近戦トラックＦＯタイム", &Z2Param::CLOSE_BATTLE_TRACK_FO_TIME, 0, 0xff, 0);
ctrl.makeSlider("見つかりトラックＦＩタイム", &Z2Param::FOUND_TRACK_FI_TIME, 0, 0xff, 0);
ctrl.makeSlider("見つかりトラックＦＯタイム", &Z2Param::FOUND_TRACK_FO_TIME, 0, 0xff, 0);
ctrl.makeSlider("最後の一撃音量下げ範囲", &Z2Param::ENEMY_LASTHIT_MUTE_VOLUME, 0.0f, 1.0f, 0);
ctrl.makeSlider("最後の一撃音量下げ時間", &Z2Param::ENDING_BLOW_VOL_DOWN_TIME, 0, 0xff, 0);
ctrl.makeSlider("最後の一撃音量下げ持続時間", &Z2Param::ENDING_BLOW_VOL_LOWER_TIME, 0, 0xff, 0);
ctrl.makeSlider("最後の一撃音量下げ復帰時間", &Z2Param::ENDING_BLOW_VOL_LOWER_RECOVER_TIME, 0,
0xff, 0);
ctrl.makeSlider("最後の一撃〜フィニッシュ最低時間", &Z2Param::ENDING_BLOW_MIN_FINISH_TIME, 0,
0xff, 0);
ctrl.indent(-1);
ctrl.returnY(1);
ctrl.makeComment("-- オーディブル演算パラメータ --", 0, 5, 0);
ctrl.indent(1);
ctrl.makeSlider("ボリューム変化許容範囲(+-)", &Z2Param::AUDIBLE_DELTA_RANGE_VOLUME, 0.0f, 1.0f,
0);
ctrl.makeSlider("パン変化許容範囲(+-)", &Z2Param::AUDIBLE_DELTA_RANGE_PAN, 0.0f, 1.0f, 0);
ctrl.makeSlider("ドルビー変化許容範囲(+-)", &Z2Param::AUDIBLE_DELTA_RANGE_DOLBY, 0.0f, 1.0f, 0);
ctrl.makeSlider("ドップラーピッチ変化許容範囲(*/)", &Z2GetAudience()->getSetting()->field_0x60,
1.0f, 2.0f, 0);
ctrl.indent(-1);
ctrl.returnY(1);
Z2SpotMic* pfVar2 = Z2GetAudience()->getLinkMic();
if (pfVar2 != NULL) {
ctrl.makeComment("-- リンクスポットマイク設定 --", 0, 5, 0);
ctrl.indent(1);
ctrl.makeCheckBox("マイクＯＮ？", &gMicOn, 1, false, 0);
ctrl.makeCheckBox("視野外でマイクオフ？", &gMicOffWhenOutOfSight, 1, false, 0);
ctrl.makeSlider("マイク音量最大距離", &pfVar2->field_0x0, 0.0f, 1000.0f, 0);
ctrl.makeSlider("マイク音量最小距離", &pfVar2->field_0x4, 0.0f, 1000.0f, 0);
ctrl.makeSlider("最小音量", &pfVar2->field_0x8, 0.0f, 1.0f, 0);
ctrl.makeSlider("最大音量の最小値", &pfVar2->field_0xc, 0.0f, 1.0f, 0);
ctrl.makeButton("マイク設定更新", 3, 3, 0);
ctrl.returnY(1);
ctrl.makeCheckBox("マイク圏外をボリュームダウン", &gMuffleOutOfRangeMic, 1, false, 0);
ctrl.indent(1);
ctrl.makeSlider("マイク圏外の音量比", &Z2GetAudience()->field_0x4, 0.0f, 1.0f, 0);
ctrl.indent(-1);
ctrl.indent(-1);
}
ctrl.makeComment("-- 闇のＳＥフィルタ実験 --", 0, 5, 0);
ctrl.indent(1);
ctrl.makeButton("フィルタリセット", 2, 3, 0);
ctrl.makeCheckBox("フィルタＯＮ", &Z2Param::DARK_SE_FILTER_ON, 1, false, 0);
ctrl.makeCheckBox("システムＳＥにも適用", &Z2Param::SYSTEM_SE_USE_DARK_SE_SETTING, 1, false, 0);
ctrl.makeSlider("ローパスフィルタ設定（強→弱）", &Z2Param::DARK_SE_LOW_PASS_FILTER_SETTING, 0,
0x7f, 0);
}
void Z2ParamNode::propertyEvent(JAH_P_Event param_1, u32 param_2) {
if (param_1 == JAH_P_EVENT0)
return;
switch (param_2) {
case 2:
Z2GetSoundMgr()->resetFilterAll();
break;
case 3:
Z2GetAudience()->getLinkMic()->calcPriorityFactor();
break;
}
}
void Z2ParamNode::onFrame() {
Z2SpotMic* mic = Z2GetAudience()->getLinkMic();
if (!mic)
return;
mic->setMicOn(gMicOn != 0);
mic->setIgnoreIfOut(gMicOffWhenOutOfSight != 0);
Z2GetAudience()->setUsingOffMicVol(gMuffleOutOfRangeMic != 0);
}
src/Z2AudioLib/Z2EnvSeMgr.cpp
+1 -86
View File
@@ -3,92 +3,7 @@
#include "JSystem/JAudio2/JASCalc.h"
#include "d/d_save.h"
#include "d/d_com_inf_game.h"
#if DEBUG
static const char* sSpotName[] = {
"F_SP00",
"F_SP103",
"R_SP01",
"F_SP104",
"R_SP107",
"F_SP108",
"R_SP108",
"F_SP117",
"F_SP109",
"R_SP109",
"R_SP209",
"F_SP110",
"R_SP110",
"F_SP111",
"F_SP128",
"R_SP128",
"F_SP115",
"F_SP112",
"F_SP126",
"F_SP127",
"R_SP127",
"F_SP113",
"F_SP116",
"R_SP116",
"R_SP160",
"R_SP161",
"F_SP114",
"F_SP118",
"F_SP124",
"F_SP125",
"F_SP121",
"F_SP122",
"F_SP123",
"F_SP200",
"F_SP102",
"",
"R_SP300",
"R_SP301",
"T_ENEMY",
"D_MN54",
"D_MN05",
"D_MN05B",
"D_MN05A",
"D_MN04",
"D_MN04B",
"D_MN04A",
"D_MN01",
"D_MN01B",
"D_MN01A",
"D_MN10",
"D_MN10B",
"D_MN10A",
"D_MN11",
"D_MN11B",
"D_MN11A",
"D_MN06",
"D_MN06B",
"D_MN06A",
"D_MN07",
"D_MN07B",
"D_MN07A",
"D_MN08",
"D_MN08B",
"D_MN08C",
"D_MN08A",
"D_MN08D",
"D_MN09",
"D_MN09A",
"D_MN09B",
"D_MN09C",
"D_SB00",
"D_SB01",
"D_SB02",
"D_SB03",
"D_SB04",
"D_SB05",
"D_SB06",
"D_SB07",
"D_SB08",
"D_SB09",
"D_SB10",
};
#endif
#include "Z2AudioLib/SpotName.h"
Z2EnvSeBase::Z2EnvSeBase(Vec* posPtr) {
mPos = posPtr;
src/Z2AudioLib/Z2F1TestWindow.cpp
+198
View File
@@ -0,0 +1,198 @@
#include "Z2AudioLib/Z2F1TestWindow.h"
#include "JSystem/JAHostIO/JAHioMessage.h"
#include "JSystem/JAudio2/JASAudioThread.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "Z2AudioLib/Z2Audience.h"
f32 sF1_Diff = 0.01f;
f32 sF1_i = 0.1f;
f32 sF1_Geta = 0.2f;
s32 sF1_Frame = 200;
f32 sF1_Pitch_Width = 0.2f;
f32 sF1_Pan_Width;
Z2F1TestWindow::Z2F1TestWindow() : JAWWindow("Z2F1TestWindow", 500, 450) {}
void Z2F1TestWindow::onDraw(JAWGraphContext*) {}
void Z2F1TestWindow::frameWork() {}
void Z2F1TestWindow::calcF1() {}
void Z2F1TestWindow::onPadProc(const JUTGamePad&) {}
f32 Z2F1TestWindow::tau(f32) {}
f32 Z2F1TestWindow::calcThreshold(int) {}
f32 Z2F1TestWindow::getRawX() const {
return field_0x3f0;
}
f32 Z2F1TestWindow::calcNoise() {
field_0x3f0 = field_0x3f4;
field_0x3f4 = tau(field_0x3f0);
return field_0x3f0;
}
void Z2F1TestWindow::setValue(f32 param_1, f32 param_2) {
field_0x3f0 = param_1;
field_0x3f4 = param_1;
field_0xbd4 = param_2;
}
void Z2F1TestWindow::onTrigY(const JUTGamePad&) {
for (u16 i = 0; i < 500; ++i)
field_0x3f8[i] = 0.0f;
field_0x3f0 = tau(sF1_i);
field_0x3f4 = tau(field_0x3f0);
field_0xbd4 = calcThreshold(sF1_Frame);
}
void Z2F1TestWindow::onTrigMenu(const JUTGamePad&) {
if (field_0xbd0)
field_0xbd0 = 0;
else
field_0xbd0 = 1;
}
Z2F1SwingTestNode::Z2F1SwingTestNode()
: JAHFrameNode("1/fゆらぎテスト"), field_0xc48(-1, NULL), field_0xcd0(-1, NULL) {
appendVirNode(&field_0xc48);
appendVirNode(&field_0xcd0);
mModulateVolume = 0;
mModulatePitch = 0;
mModulatePan = 0;
mModulateDolby = 0;
field_0xd5c = 0.0f;
field_0xd60 = 0.0f;
field_0xd64 = 0.0f;
field_0xd68 = 0.0f;
}
void Z2F1SwingTestNode::message(JAHControl& ctrl) {
ctrl.makeComment("--1/fゆらぎテスト--", 0, 5, 0);
ctrl.indent(1);
ctrl.makeSlider("Diff値", &sF1_Diff, 0.0, 0.1, 0);
ctrl.makeSlider("i値", &sF1_i, 0.0f, 1.0f, 0);
ctrl.makeSlider("Geta値", &sF1_Geta, 0.0f, 1.0f, 0);
ctrl.makeSlider("frame値", &sF1_Frame, 2, 200, 0);
ctrl.returnY(1);
ctrl.makeCheckBox("ボリューム変調", &mModulateVolume, 1, false, 0);
ctrl.makeCheckBox("ピッチ変調", &mModulatePitch, 1, false, 0);
ctrl.makeSlider("Pitch ゆらぎ幅", &sF1_Pitch_Width, 0.0f, 1.0f, 0);
ctrl.makeCheckBox("パン変調", &mModulatePan, 1, false, 0);
ctrl.makeSlider("パン移動幅", &sF1_Pan_Width, 0.0f, 1.0f, 0);
ctrl.makeCheckBox("ドルビー変調", &mModulateDolby, 1, false, 0);
}
void Z2F1SwingTestNode::onFrame() {
f32 fVar1 = 1.0;
f32 fVar2 = getValue() * (1.0f - sF1_Geta) + sF1_Geta;
f32 fVar3 = getValue2() * (1.0f - sF1_Geta) + sF1_Geta;
if (field_0xc48.unk40.isSoundAttached() && field_0xcd0.unk40.isSoundAttached()) {
fVar1 = 0.5f;
field_0xc48.unk40->getAuxiliary().moveVolume(fVar2 * fVar1, 0);
field_0xcd0.unk40->getAuxiliary().moveVolume(fVar3 * fVar1, 0);
} else if (field_0xc48.unk40.isSoundAttached()) {
fVar1 = 1.0f;
field_0xc48.unk40->getAuxiliary().moveVolume(fVar2 * fVar1, 0);
} else if (field_0xcd0.unk40.isSoundAttached()) {
fVar1 = 1.0f;
field_0xcd0.unk40->getAuxiliary().moveVolume(fVar3 * fVar1, 0);
}
if (field_0xc48.unk40.isSoundAttached()) {
if (mModulateVolume)
field_0xc48.unk40->getAuxiliary().moveVolume(fVar3 * fVar1, 0);
else
field_0xc48.unk40->getAuxiliary().moveVolume(0.5f, 0);
if (mModulatePitch)
field_0xc48.unk40->getAuxiliary().movePitch(
getValue2() * sF1_Pitch_Width + (1.0f - sF1_Pitch_Width), 0);
else
field_0xc48.unk40->getAuxiliary().movePitch(1.0f, 0);
if (mModulatePan)
field_0xc48.unk40->getAuxiliary().movePan(0.5f - getValue2() * sF1_Pan_Width / 2, 0);
else
field_0xc48.unk40->getAuxiliary().movePan(0.5f, 0);
if (mModulateDolby)
field_0xc48.unk40->getAuxiliary().moveDolby(fVar3, 0);
else
field_0xc48.unk40->getAuxiliary().moveDolby(0.0f, 0);
} else if (field_0xcd0.unk40.isSoundAttached()) {
if (mModulateVolume)
field_0xcd0.unk40->getAuxiliary().moveVolume(fVar3 * fVar1, 0);
else
field_0xcd0.unk40->getAuxiliary().moveVolume(0.5f, 0);
if (mModulatePitch)
field_0xcd0.unk40->getAuxiliary().movePitch(
getValue2() * sF1_Pitch_Width + (1.0f - sF1_Pitch_Width), 0);
else
field_0xcd0.unk40->getAuxiliary().movePitch(1.0f, 0);
if (mModulatePan)
field_0xcd0.unk40->getAuxiliary().movePan(0.5f + getValue2() * sF1_Pan_Width / 2, 0);
else
field_0xcd0.unk40->getAuxiliary().movePan(0.5f, 0);
if (mModulateDolby)
field_0xcd0.unk40->getAuxiliary().moveDolby(fVar3, 0);
else
field_0xcd0.unk40->getAuxiliary().moveDolby(0.0f, 0);
}
}
f32 Z2F1TestWindow::getValue2() {
return field_0x3f8[field_0xbcc];
}
f32 Z2F1TestWindow::getValue() {
return field_0x3f8[field_0xbc8];
}
Z2AudSettingView::Z2AudSettingView() : JAWWindow("Z2AudSettingView", 400, 300) {}
void Z2AudSettingView::onDraw(JAWGraphContext* param_1) {
const Z2AudioCamera* this_00 = Z2GetAudience()->getAudioCamera(0);
Z2Audience3DSetting* pfVar2 = Z2GetAudience()->getSetting();
int l = 0;
param_1->print(0, l++, "<SETTING>");
param_1->print(0, l++, "far dist %.3f", pfVar2->field_0x0[0]);
param_1->print(0, l++, "near dist %.3f", pfVar2->field_0x3c);
param_1->print(0, l++, "frontDolbyZ %.3f", pfVar2->field_0x44);
param_1->print(0, l++, "behindDolbyZ %.3f", pfVar2->field_0x48);
param_1->print(0, l++, "centerDolby %.3f", pfVar2->field_0x4c);
++l;
param_1->print(0, l++, "<AUD CAMERA>");
param_1->print(0, l++, "CamDist %.3f", this_00->getCamDist());
param_1->print(0, l++, "vel.x %.3f", this_00->getVel()->x);
param_1->print(0, l++, "vel.y %.3f", this_00->getVel()->y);
param_1->print(0, l++, "vel.z %.3f", this_00->getVel()->z);
param_1->print(0, l++, "TargetVolume %.3f", this_00->getTargetVolume());
param_1->print(0, l++, "VolCenterZ %.3f", this_00->getVolCenterZ());
param_1->print(0, l++, "DolbyCenterZ %.3f", this_00->getDolbyCenterZ());
param_1->print(0, l++, "getFovySin %.3f", this_00->getFovySin());
}
void Z2DSPCheck::onDraw(JAWGraphContext* param_1) {
u8* puVar1 = (u8*)JKRHeap::getAltAramStartAdr();
DCInvalidateRange(puVar1, 0x20);
int l = 0;
param_1->print(0, l++, "<DISP INFO>");
param_1->print(0, l++, "VARAM_TOP %08X", puVar1);
param_1->print(0, l++, "DSP state %04X", *(u16*)(puVar1 + 0));
param_1->print(0, l++, "DSP channel %04X", *(u8*)(puVar1 + 2));
param_1->print(0, l++, "DSP sub-fr %04X", *(u8*)(puVar1 + 3));
param_1->print(0, l++, "DSP cmd wr %04X", *(u16*)(puVar1 + 4));
param_1->print(0, l++, "DSP sub-rd %04X", *(u16*)(puVar1 + 6));
param_1->print(0, l++, "DSP cmd rest %04X", *(u16*)(puVar1 + 8));
l++;
param_1->print(0, l++, "<CPU AUDIO THREAD INFO>");
param_1->print(0, l++, "DSPSyncCount %2d", JASAudioThread::getDSPSyncCount());
}
src/Z2AudioLib/Z2FxLineMgr.cpp
+382 -61
View File
@@ -1,9 +1,15 @@
#include "Z2AudioLib/Z2FxLineMgr.h"
#include "Z2AudioLib/Z2SceneMgr.h"
#include "JSystem/JAHostIO/JAHUGlobal.h"
#include "JSystem/JAHostIO/JAHioMessage.h"
#include "JSystem/JAHostIO/JAHioUtil.h"
#include "JSystem/JAudio2/JASDSPInterface.h"
#include "JSystem/JHostIO/JORFile.h"
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JSupport/JSUMemoryStream.h"
#include "Z2AudioLib/SpotName.h"
#include "Z2AudioLib/Z2SceneMgr.h"
#include "os_report.h"
Z2FxLineMgr::Z2FxLineMgr() : JASGlobalInstance<Z2FxLineMgr>(true) {
@@ -12,9 +18,9 @@ Z2FxLineMgr::Z2FxLineMgr() : JASGlobalInstance<Z2FxLineMgr>(true) {
mFxDataNum = 0;
mSetUnderWaterFx = false;
#if DEBUG
#if DEBUG
mHIOEdit = NULL;
#endif
#endif
}
void Z2FxLineMgr::initDataArc(JKRArchive* arc, JKRHeap* heap) {
@@ -36,42 +42,49 @@ void Z2FxLineMgr::initDataArc(JKRArchive* arc, JKRHeap* heap) {
for (u8 i = 0; i < mFxDataNum; i++) {
void* res = arc->getResource(i);
u32 size = (arc->getResSize(res) + 0x1f) & ~0x1f;
u32 size = ALIGN_NEXT(arc->getResSize(res), 32);
JSUMemoryInputStream stream(res, size);
stream >> mConfig[i].field_0x0;
stream >> mConfig[i].field_0x1;
stream >> mConfig[i].field_0x2;
stream >> mConfig[i].field_0x3;
stream >> mConfig[i].field_0x4;
stream >> mConfig[i].field_0x6;
stream >> mConfig[i].field_0x8[0];
stream >> mConfig[i].field_0x8[1];
stream >> mConfig[i].field_0x8[2];
stream >> mConfig[i].field_0x8[3];
stream >> mConfig[i].field_0x8[4];
stream >> mConfig[i].field_0x8[5];
stream >> mConfig[i].field_0x8[6];
stream >> mConfig[i].field_0x8[7];
stream >> mConfig[i].field_0x18;
stream >> mConfig[i].field_0x19;
stream >> mConfig[i].field_0x1a;
stream >> mConfig[i].field_0x1b;
stream >> mConfig[i].field_0x1c;
stream >> mConfig[i].field_0x1e;
stream >> mConfig[i].field_0x20[0];
stream >> mConfig[i].field_0x20[1];
stream >> mConfig[i].field_0x20[2];
stream >> mConfig[i].field_0x20[3];
stream >> mConfig[i].field_0x20[4];
stream >> mConfig[i].field_0x20[5];
stream >> mConfig[i].field_0x20[6];
stream >> mConfig[i].field_0x20[7];
stream >> mConfig[i].unk0.unk0;
stream >> mConfig[i].unk0.unk1;
stream >> mConfig[i].unk0.unk2;
stream >> mConfig[i].unk0.unk3;
stream >> mConfig[i].unk0.unk4;
stream >> mConfig[i].unk0.unk6;
stream >> mConfig[i].unk0.unk8[0];
stream >> mConfig[i].unk0.unk8[1];
stream >> mConfig[i].unk0.unk8[2];
stream >> mConfig[i].unk0.unk8[3];
stream >> mConfig[i].unk0.unk8[4];
stream >> mConfig[i].unk0.unk8[5];
stream >> mConfig[i].unk0.unk8[6];
stream >> mConfig[i].unk0.unk8[7];
stream >> mConfig[i].unk18.unk0;
stream >> mConfig[i].unk18.unk1;
stream >> mConfig[i].unk18.unk2;
stream >> mConfig[i].unk18.unk3;
stream >> mConfig[i].unk18.unk4;
stream >> mConfig[i].unk18.unk6;
stream >> mConfig[i].unk18.unk8[0];
stream >> mConfig[i].unk18.unk8[1];
stream >> mConfig[i].unk18.unk8[2];
stream >> mConfig[i].unk18.unk8[3];
stream >> mConfig[i].unk18.unk8[4];
stream >> mConfig[i].unk18.unk8[5];
stream >> mConfig[i].unk18.unk8[6];
stream >> mConfig[i].unk18.unk8[7];
JKRFree(res);
}
setLineID(-1, false, false);
setLineID(-1, true, false);
#if DEBUG
if (mHIOEdit)
mHIOEdit->update(false);
if (mHIOEdit)
mHIOEdit->update(true);
#endif
}
void Z2FxLineMgr::setLineID(s8 fxID, bool param_1, bool param_2) {
@@ -102,51 +115,60 @@ void Z2FxLineMgr::setLine(Z2FxLineConfig* config, bool param_1, bool param_2) {
}
JASDsp::FxlineConfig_ dsp_config;
dsp_config.field_0x0 = config->field_0x0;
dsp_config.field_0x2 = config->field_0x1;
dsp_config.field_0x6 = config->field_0x2;
dsp_config.field_0x0 = config->unk0.unk0;
dsp_config.field_0x2 = config->unk0.unk1;
dsp_config.field_0x6 = config->unk0.unk2;
if (param_2) {
dsp_config.field_0x4 = 0;
dsp_config.field_0x8 = 0;
} else {
dsp_config.field_0x4 = config->field_0x4;
dsp_config.field_0x8 = config->field_0x6;
dsp_config.field_0x4 = config->unk0.unk4;
dsp_config.field_0x8 = config->unk0.unk6;
}
dsp_config.field_0xc = config->field_0x3;
dsp_config.field_0x10[0] = config->field_0x8[0];
dsp_config.field_0x10[1] = config->field_0x8[1];
dsp_config.field_0x10[2] = config->field_0x8[2];
dsp_config.field_0x10[3] = config->field_0x8[3];
dsp_config.field_0x10[4] = config->field_0x8[4];
dsp_config.field_0x10[5] = config->field_0x8[5];
dsp_config.field_0x10[6] = config->field_0x8[6];
dsp_config.field_0x10[7] = config->field_0x8[7];
dsp_config.field_0xc = config->unk0.unk3;
dsp_config.field_0x10[0] = config->unk0.unk8[0];
dsp_config.field_0x10[1] = config->unk0.unk8[1];
dsp_config.field_0x10[2] = config->unk0.unk8[2];
dsp_config.field_0x10[3] = config->unk0.unk8[3];
dsp_config.field_0x10[4] = config->unk0.unk8[4];
dsp_config.field_0x10[5] = config->unk0.unk8[5];
dsp_config.field_0x10[6] = config->unk0.unk8[6];
dsp_config.field_0x10[7] = config->unk0.unk8[7];
JASDsp::setFXLine(buf1, (s16*)mFxLineBuffer[buf1], &dsp_config);
#if DEBUG
if (mHIOEdit)
mHIOEdit->syncSetting(buf1, &dsp_config);
#endif
dsp_config.field_0x0 = config->field_0x18;
dsp_config.field_0x2 = config->field_0x19;
dsp_config.field_0x6 = config->field_0x1a;
dsp_config.field_0x0 = config->unk18.unk0;
dsp_config.field_0x2 = config->unk18.unk1;
dsp_config.field_0x6 = config->unk18.unk2;
if (param_2) {
dsp_config.field_0x4 = 0;
dsp_config.field_0x8 = 0;
} else {
dsp_config.field_0x4 = config->field_0x1c;
dsp_config.field_0x8 = config->field_0x1e;
dsp_config.field_0x4 = config->unk18.unk4;
dsp_config.field_0x8 = config->unk18.unk6;
}
dsp_config.field_0xc = config->field_0x1b;
dsp_config.field_0x10[0] = config->field_0x20[0];
dsp_config.field_0x10[1] = config->field_0x20[1];
dsp_config.field_0x10[2] = config->field_0x20[2];
dsp_config.field_0x10[3] = config->field_0x20[3];
dsp_config.field_0x10[4] = config->field_0x20[4];
dsp_config.field_0x10[5] = config->field_0x20[5];
dsp_config.field_0x10[6] = config->field_0x20[6];
dsp_config.field_0x10[7] = config->field_0x20[7];
dsp_config.field_0xc = config->unk18.unk3;
dsp_config.field_0x10[0] = config->unk18.unk8[0];
dsp_config.field_0x10[1] = config->unk18.unk8[1];
dsp_config.field_0x10[2] = config->unk18.unk8[2];
dsp_config.field_0x10[3] = config->unk18.unk8[3];
dsp_config.field_0x10[4] = config->unk18.unk8[4];
dsp_config.field_0x10[5] = config->unk18.unk8[5];
dsp_config.field_0x10[6] = config->unk18.unk8[6];
dsp_config.field_0x10[7] = config->unk18.unk8[7];
JASDsp::setFXLine(buf2, (s16*)mFxLineBuffer[buf2], &dsp_config);
#if DEBUG
if (mHIOEdit)
mHIOEdit->syncSetting(buf2, &dsp_config);
#endif
}
void Z2FxLineMgr::setFxForceOff(bool param_0) {
@@ -158,6 +180,11 @@ void Z2FxLineMgr::setUnderWaterFx(bool isUnderWaterFx) {
if (isUnderWaterFx) {
OS_REPORT("[Z2FxLineMgr::setUnderWaterFx] → underWaterFx!\n");
setLineID(12, true, false);
#if DEBUG
if (mHIOEdit)
mHIOEdit->update(true);
#endif
} else {
OS_REPORT("[Z2FxLineMgr::setUnderWaterFx] → sceneFx!\n");
setSceneFx(Z2GetSceneMgr()->getCurrentSceneNum());
@@ -189,7 +216,7 @@ void Z2FxLineMgr::setSceneFx(s32 sceneNo) {
case Z2SCENE_LAKE_LANTERN_CAVE:
case Z2SCENE_FARON_WOODS_CAVE:
if (Z2GetSceneMgr()->getCurrentRoomNum() == 2) {
return;
break;
}
// fallthrough
case Z2SCENE_FARON_WOODS:
@@ -239,4 +266,298 @@ void Z2FxLineMgr::setSceneFx(s32 sceneNo) {
break;
}
}
#if DEBUG
if (mHIOEdit)
mHIOEdit->update(true);
#endif
}
Z2FxLineEditNode::Z2FxLineEditNode(JKRExpHeap* heap) : JAHFrameNode("FxLineEdit"), mHeap(heap) {
JUT_ASSERT(340, mHeap);
unk74 = JKR_NEW_ARGS(mHeap, 0) LineStereo(false);
appendNode(unk74, NULL);
unk78 = JKR_NEW_ARGS(mHeap, 0) LineStereo(true);
appendNode(unk78, NULL);
Z2GetFxLineMgr()->setHIOEdit(this);
}
void Z2FxLineEditNode::message(JAHControl& control) {
control.makeComment("Line0 : normal_mixing L", 0, 5, 0);
control.makeComment("Line1 : normal_mixing R", 0, 5, 0);
control.makeComment("Line2 : auto_mixing L", 0, 5, 0);
control.makeComment("Line3 : auto_mixing R", 0, 5, 0);
control.returnY(1);
control.makeComment("-- ミックスモード --", 0, 5, 0);
control.indent(1);
control.makeComment("DFX_MIX_STOP 非動作", 0, 5, 0);
control.makeComment("DFX_MIX_BEFORE 出力前にミキシング(第１反射音もFx効果あり)", 0, 5, 0);
control.makeComment("DFX_MIX_AFTER 出力後にミキシング(第１反射音はFx効果なし)", 0, 5, 0);
control.indent(-1);
control.makeComment("-- センド先 --", 0, 5, 0);
control.indent(1);
control.makeComment("DFXS_MAIN_L", 0, 5, 0);
control.makeComment("DFXS_MAIN_R", 0, 5, 0);
control.makeComment("DFXS_FX1", 0, 5, 0);
control.makeComment("DFXS_FX2", 0, 5, 0);
control.makeComment("DFXS_FX3", 0, 5, 0);
control.makeComment("DFXS_FX4", 0, 5, 0);
control.makeComment("DFXS_FM", 0, 5, 0);
control.makeComment("DFXS_DOLBY", 0, 5, 0);
control.makeComment("DFXS_REV", 0, 5, 0);
control.makeComment("DFXS_CHORUS", 0, 5, 0);
control.makeComment("DFXS_MONO", 0, 5, 0);
control.makeComment("DFXS_NONE", 0, 5, 0);
control.indent(-1);
}
void Z2FxLineEditNode::syncSetting(u8 param_1, JASDsp::FxlineConfig_* config) {
JUT_ASSERT(387, config);
Z2FxLineConfigSingle* line_HIO;
switch (param_1) {
case 0:
line_HIO = &unk74->unk70.unk0;
break;
case 1:
line_HIO = &unk74->unk70.unk18;
break;
case 2:
line_HIO = &unk78->unk70.unk0;
break;
case 3:
line_HIO = &unk78->unk70.unk18;
break;
}
JUT_ASSERT(407, line_HIO);
line_HIO->unk0 = config->field_0x0;
line_HIO->unk1 = config->field_0x2;
line_HIO->unk4 = config->field_0x4;
line_HIO->unk2 = config->field_0x6;
line_HIO->unk6 = config->field_0x8;
line_HIO->unk3 = config->field_0xc;
line_HIO->unk8[0] = config->field_0x10[0];
line_HIO->unk8[1] = config->field_0x10[1];
line_HIO->unk8[2] = config->field_0x10[2];
line_HIO->unk8[3] = config->field_0x10[3];
line_HIO->unk8[4] = config->field_0x10[4];
line_HIO->unk8[5] = config->field_0x10[5];
line_HIO->unk8[6] = config->field_0x10[6];
line_HIO->unk8[7] = config->field_0x10[7];
}
void Z2FxLineEditNode::update(bool param_1) {
if (param_1)
unk78->updateNode();
else
unk74->updateNode();
}
static const char* cBfcMask = "bfcファイル(*.bfc)\0*.bfc\0";
void Z2FxLineEditNode::saveLine(LineStereo* node) {
JUT_ASSERT(436, node);
JORFile file;
if (file.open(NULL, 0x6, cBfcMask, NULL, NULL, NULL)) {
// clang-format off
JUT_ASSERT(441, mHeap!=0);
// clang-format on
u32 size = ALIGN_PREV(mHeap->getFreeSize(), 0x20);
JKRHeap* backup = JKRGetCurrentHeap();
JKRSetCurrentHeap(mHeap);
void* saveBuffer = JKRAlloc(size, -1);
JUT_ASSERT(452, saveBuffer);
JKRSetCurrentHeap(backup);
JSUMemoryOutputStream JStack_15c(saveBuffer, size);
JStack_15c << node->unk70.unk0.unk0;
JStack_15c << node->unk70.unk0.unk1;
JStack_15c << node->unk70.unk0.unk2;
JStack_15c << node->unk70.unk0.unk3;
JStack_15c << node->unk70.unk0.unk4;
JStack_15c << node->unk70.unk0.unk6;
JStack_15c << node->unk70.unk0.unk8[0];
JStack_15c << node->unk70.unk0.unk8[1];
JStack_15c << node->unk70.unk0.unk8[2];
JStack_15c << node->unk70.unk0.unk8[3];
JStack_15c << node->unk70.unk0.unk8[4];
JStack_15c << node->unk70.unk0.unk8[5];
JStack_15c << node->unk70.unk0.unk8[6];
JStack_15c << node->unk70.unk0.unk8[7];
JStack_15c << node->unk70.unk18.unk0;
JStack_15c << node->unk70.unk18.unk1;
JStack_15c << node->unk70.unk18.unk2;
JStack_15c << node->unk70.unk18.unk3;
JStack_15c << node->unk70.unk18.unk4;
JStack_15c << node->unk70.unk18.unk6;
JStack_15c << node->unk70.unk18.unk8[0];
JStack_15c << node->unk70.unk18.unk8[1];
JStack_15c << node->unk70.unk18.unk8[2];
JStack_15c << node->unk70.unk18.unk8[3];
JStack_15c << node->unk70.unk18.unk8[4];
JStack_15c << node->unk70.unk18.unk8[5];
JStack_15c << node->unk70.unk18.unk8[6];
JStack_15c << node->unk70.unk18.unk8[7];
file.writeData(saveBuffer, JStack_15c.getPosition());
file.close();
JKRFree(saveBuffer);
} else {
JAHUDialog_OK("セーブに失敗しました.", "save", NULL);
}
}
void Z2FxLineEditNode::loadLine(LineStereo* node) {
JUT_ASSERT(436, node);
JORFile file;
void* dataArray = NULL;
u32 length = 0;
if (file.open(NULL, 0x1, cBfcMask, NULL, NULL, NULL)) {
length = ALIGN_NEXT(file.getFileSize(), 0x20);
dataArray = JKRAllocFromHeap(mHeap, length, 0x20);
JUT_ASSERT(517, dataArray);
u32 readSize = file.readData(dataArray, 0);
file.close();
if (readSize < 1) {
JAHUDialog_OK("読み込み失敗。JORFile::readData()がfalseを返しました", "読み込み", NULL);
JKRFreeToHeap(mHeap, dataArray);
}
} else {
file.close();
JAHUDialog_OK(JAHioUtil::getString("%s を読み込めません", file.getFilename()),
"データを読み込む", NULL);
}
JSUMemoryInputStream stream(dataArray, length);
stream >> node->unk70.unk0.unk0;
stream >> node->unk70.unk0.unk1;
stream >> node->unk70.unk0.unk2;
stream >> node->unk70.unk0.unk3;
stream >> node->unk70.unk0.unk4;
stream >> node->unk70.unk0.unk6;
stream >> node->unk70.unk0.unk8[0];
stream >> node->unk70.unk0.unk8[1];
stream >> node->unk70.unk0.unk8[2];
stream >> node->unk70.unk0.unk8[3];
stream >> node->unk70.unk0.unk8[4];
stream >> node->unk70.unk0.unk8[5];
stream >> node->unk70.unk0.unk8[6];
stream >> node->unk70.unk0.unk8[7];
stream >> node->unk70.unk18.unk0;
stream >> node->unk70.unk18.unk1;
stream >> node->unk70.unk18.unk2;
stream >> node->unk70.unk18.unk3;
stream >> node->unk70.unk18.unk4;
stream >> node->unk70.unk18.unk6;
stream >> node->unk70.unk18.unk8[0];
stream >> node->unk70.unk18.unk8[1];
stream >> node->unk70.unk18.unk8[2];
stream >> node->unk70.unk18.unk8[3];
stream >> node->unk70.unk18.unk8[4];
stream >> node->unk70.unk18.unk8[5];
stream >> node->unk70.unk18.unk8[6];
stream >> node->unk70.unk18.unk8[7];
JKRFree(dataArray);
node->updateNode();
}
void Z2FxLineEditNode::LineStereo::message(JAHControl& control) {
control.makeButton("reset", 0, 3, 0);
control.makeButton("save file", 2, 3, 0);
control.makeButton("load file", 3, 3, 0);
control.returnY(1);
control.makeComment("----- Line L -----", 0, 5, 0);
control.indent(1);
lineEditSingle(&unk70.unk0, control);
control.indent(-1);
control.returnY(1);
control.makeComment("----- Line R -----", 0, 5, 0);
control.indent(1);
lineEditSingle(&unk70.unk18, control);
control.indent(-1);
}
void Z2FxLineEditNode::LineStereo::propertyEvent(JAH_P_Event param_1, uintptr_t param_2) {
if (param_1 == JAH_P_EVENT0)
return;
Z2FxLineEditNode* parent = (Z2FxLineEditNode*)getParent();
switch (param_2) {
case 0:
Z2GetFxLineMgr()->setLineID(-1, mIsDolby, false);
break;
case 2:
parent->saveLine(this);
break;
case 3:
parent->loadLine(this);
break;
}
Z2GetFxLineMgr()->setLine(&unk70, mIsDolby, false);
}
void Z2FxLineEditNode::LineStereo::lineEditSingle(Z2FxLineConfigSingle* param_1,
JAHControl& param_2) {
if (param_1 == NULL)
return;
param_2.startComboBox("mixmode", &param_1->unk0, 3, 0);
param_2.makeComboBoxItem("DFX_MIX_STOP", (u8)0);
param_2.makeComboBoxItem("DFX_MIX_BEFORE", (u8)1);
param_2.makeComboBoxItem("DFX_MIX_AFTER", (u8)2);
param_2.endComboBox();
param_2.returnY(1);
param_2.startComboBox("send1", &param_1->unk1, 3, 0);
param_2.makeComboBoxItem("DFXS_MAIN_L", (u8)0);
param_2.makeComboBoxItem("DFXS_MAIN_R", (u8)1);
param_2.makeComboBoxItem("DFXS_FX1", (u8)2);
param_2.makeComboBoxItem("DFXS_FX2", (u8)3);
param_2.makeComboBoxItem("DFXS_FX3", (u8)4);
param_2.makeComboBoxItem("DFXS_FX4", (u8)5);
param_2.makeComboBoxItem("DFXS_FM", (u8)6);
param_2.makeComboBoxItem("DFXS_DOLBY", (u8)7);
param_2.makeComboBoxItem("DFXS_REV", (u8)8);
param_2.makeComboBoxItem("DFXS_CHORUS", (u8)9);
param_2.makeComboBoxItem("DFXS_MONO", (u8)10);
param_2.makeComboBoxItem("DFXS_NONE", (u8)11);
param_2.endComboBox();
param_2.returnY(1);
param_2.makeSlider("mix1", &param_1->unk4, 0, 0x7fff, 0);
param_2.startComboBox("send2", &param_1->unk2, 3, 0);
param_2.makeComboBoxItem("DFXS_MAIN_L", (u8)0);
param_2.makeComboBoxItem("DFXS_MAIN_R", (u8)1);
param_2.makeComboBoxItem("DFXS_FX1", (u8)2);
param_2.makeComboBoxItem("DFXS_FX2", (u8)3);
param_2.makeComboBoxItem("DFXS_FX3", (u8)4);
param_2.makeComboBoxItem("DFXS_FX4", (u8)5);
param_2.makeComboBoxItem("DFXS_FM", (u8)6);
param_2.makeComboBoxItem("DFXS_DOLBY", (u8)7);
param_2.makeComboBoxItem("DFXS_REV", (u8)8);
param_2.makeComboBoxItem("DFXS_CHORUS", (u8)9);
param_2.makeComboBoxItem("DFXS_MONO", (u8)10);
param_2.makeComboBoxItem("DFXS_NONE", (u8)11);
param_2.endComboBox();
param_2.returnY(1);
param_2.makeSlider("mix2", &param_1->unk6, 0, 0x7fff, 0);
if (mIsDolby)
param_2.makeSlider("feedback_frame", &param_1->unk3, 0, 120, 0);
else
param_2.makeSlider("feedback_frame", &param_1->unk3, 0, 64, 0);
param_2.makeSlider("feedback_filter 0", &param_1->unk8[0], -0x7fff, 0x7fff, 0);
param_2.makeSlider("feedback_filter 1", &param_1->unk8[1], -0x7fff, 0x7fff, 0);
param_2.makeSlider("feedback_filter 2", &param_1->unk8[2], -0x7fff, 0x7fff, 0);
param_2.makeSlider("feedback_filter 3", &param_1->unk8[3], -0x7fff, 0x7fff, 0);
param_2.makeSlider("feedback_filter 4", &param_1->unk8[4], -0x7fff, 0x7fff, 0);
param_2.makeSlider("feedback_filter 5", &param_1->unk8[5], -0x7fff, 0x7fff, 0);
param_2.makeSlider("feedback_filter 6", &param_1->unk8[6], -0x7fff, 0x7fff, 0);
param_2.makeSlider("feedback_filter 7", &param_1->unk8[7], -0x7fff, 0x7fff, 0);
}
src/Z2AudioLib/Z2SceneMgr.cpp
+1 -84
View File
@@ -12,6 +12,7 @@
#include "Z2AudioLib/Z2StatusMgr.h"
#include "d/d_com_inf_game.h"
#include <cstring>
#include "Z2AudioLib/SpotName.h"
Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance<Z2SceneMgr>(true) {
sceneNum = -1;
@@ -46,90 +47,6 @@ void Z2SceneMgr::setInDarkness(bool inDarkness) {
}
}
static char* sSpotName[81] = {
"F_SP00",
"F_SP103",
"R_SP01",
"F_SP104",
"R_SP107",
"F_SP108",
"R_SP108",
"F_SP117",
"F_SP109",
"R_SP109",
"R_SP209",
"F_SP110",
"R_SP110",
"F_SP111",
"F_SP128",
"R_SP128",
"F_SP115",
"F_SP112",
"F_SP126",
"F_SP127",
"R_SP127",
"F_SP113",
"F_SP116",
"R_SP116",
"R_SP160",
"R_SP161",
"F_SP114",
"F_SP118",
"F_SP124",
"F_SP125",
"F_SP121",
"F_SP122",
"F_SP123",
"F_SP200",
"F_SP102",
"",
"R_SP300",
"R_SP301",
"T_ENEMY",
"D_MN54",
"D_MN05",
"D_MN05B",
"D_MN05A",
"D_MN04",
"D_MN04B",
"D_MN04A",
"D_MN01",
"D_MN01B",
"D_MN01A",
"D_MN10",
"D_MN10B",
"D_MN10A",
"D_MN11",
"D_MN11B",
"D_MN11A",
"D_MN06",
"D_MN06B",
"D_MN06A",
"D_MN07",
"D_MN07B",
"D_MN07A",
"D_MN08",
"D_MN08B",
"D_MN08C",
"D_MN08A",
"D_MN08D",
"D_MN09",
"D_MN09A",
"D_MN09B",
"D_MN09C",
"D_SB00",
"D_SB01",
"D_SB02",
"D_SB03",
"D_SB04",
"D_SB05",
"D_SB06",
"D_SB07",
"D_SB08",
"D_SB09",
"D_SB10",
};
void Z2SceneMgr::setSceneExist(bool isSceneExist) {
sceneExist = isSceneExist;
timer = 0;
src/Z2AudioLib/Z2SeqMgr.cpp
+1 -84
View File
@@ -8,94 +8,11 @@
#include "Z2AudioLib/Z2Calc.h"
#include "JSystem/JAudio2/JAISoundChild.h"
#include "JSystem/JAudio2/JAISeq.h"
#include "Z2AudioLib/SpotName.h"
#include "os_report.h"
#include "dusk/audio.h"
static const char* sSpotName[] = {
"F_SP00",
"F_SP103",
"R_SP01",
"F_SP104",
"R_SP107",
"F_SP108",
"R_SP108",
"F_SP117",
"F_SP109",
"R_SP109",
"R_SP209",
"F_SP110",
"R_SP110",
"F_SP111",
"F_SP128",
"R_SP128",
"F_SP115",
"F_SP112",
"F_SP126",
"F_SP127",
"R_SP127",
"F_SP113",
"F_SP116",
"R_SP116",
"R_SP160",
"R_SP161",
"F_SP114",
"F_SP118",
"F_SP124",
"F_SP125",
"F_SP121",
"F_SP122",
"F_SP123",
"F_SP200",
"F_SP102",
"",
"R_SP300",
"R_SP301",
"T_ENEMY",
"D_MN54",
"D_MN05",
"D_MN05B",
"D_MN05A",
"D_MN04",
"D_MN04B",
"D_MN04A",
"D_MN01",
"D_MN01B",
"D_MN01A",
"D_MN10",
"D_MN10B",
"D_MN10A",
"D_MN11",
"D_MN11B",
"D_MN11A",
"D_MN06",
"D_MN06B",
"D_MN06A",
"D_MN07",
"D_MN07B",
"D_MN07A",
"D_MN08",
"D_MN08B",
"D_MN08C",
"D_MN08A",
"D_MN08D",
"D_MN09",
"D_MN09A",
"D_MN09B",
"D_MN09C",
"D_SB00",
"D_SB01",
"D_SB02",
"D_SB03",
"D_SB04",
"D_SB05",
"D_SB06",
"D_SB07",
"D_SB08",
"D_SB09",
"D_SB10",
};
Z2SeqMgr::Z2SeqMgr() : JASGlobalInstance<Z2SeqMgr>(true) {
mMainBgmMaster.forceIn();
mSubBgmMaster.forceIn();
src/Z2AudioLib/Z2StatusMgr.cpp
+1 -84
View File
@@ -3,90 +3,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include <cstring>
static const char* sSpotName[] = {
"F_SP00",
"F_SP103",
"R_SP01",
"F_SP104",
"R_SP107",
"F_SP108",
"R_SP108",
"F_SP117",
"F_SP109",
"R_SP109",
"R_SP209",
"F_SP110",
"R_SP110",
"F_SP111",
"F_SP128",
"R_SP128",
"F_SP115",
"F_SP112",
"F_SP126",
"F_SP127",
"R_SP127",
"F_SP113",
"F_SP116",
"R_SP116",
"R_SP160",
"R_SP161",
"F_SP114",
"F_SP118",
"F_SP124",
"F_SP125",
"F_SP121",
"F_SP122",
"F_SP123",
"F_SP200",
"F_SP102",
"",
"R_SP300",
"R_SP301",
"T_ENEMY",
"D_MN54",
"D_MN05",
"D_MN05B",
"D_MN05A",
"D_MN04",
"D_MN04B",
"D_MN04A",
"D_MN01",
"D_MN01B",
"D_MN01A",
"D_MN10",
"D_MN10B",
"D_MN10A",
"D_MN11",
"D_MN11B",
"D_MN11A",
"D_MN06",
"D_MN06B",
"D_MN06A",
"D_MN07",
"D_MN07B",
"D_MN07A",
"D_MN08",
"D_MN08B",
"D_MN08C",
"D_MN08A",
"D_MN08D",
"D_MN09",
"D_MN09A",
"D_MN09B",
"D_MN09C",
"D_SB00",
"D_SB01",
"D_SB02",
"D_SB03",
"D_SB04",
"D_SB05",
"D_SB06",
"D_SB07",
"D_SB08",
"D_SB09",
"D_SB10",
};
#include "Z2AudioLib/SpotName.h"
Z2StatusMgr::Z2StatusMgr() : JASGlobalInstance(true) {
mHour = 0;
src/Z2AudioLib/Z2WolfHowlMgr.cpp
+1
View File
@@ -6,6 +6,7 @@
#include "Z2AudioLib/Z2SoundMgr.h"
#include "Z2AudioLib/Z2Audience.h"
#include "d/d_demo.h"
#include "Z2AudioLib/SpotName.h"
#include "os_report.h"
static f32 cPitchDown = 0.8909f;
src/d/actor/d_a_alink.cpp
+9 -9
View File
@@ -4453,7 +4453,7 @@ void daAlink_c::playerInit() {
mAtSph.StartCAt(current.pos);
mAnmHeap3.setBufferSize(0x20000);
mAnmHeap3.createHeap(daPy_anmHeap_c::HEAP_TYPE_4);
PLAYER_CREATE_ANM_HEAP(mAnmHeap3, daPy_anmHeap_c::HEAP_TYPE_4, "daAlink_c::mAnmHeap3");
if (checkWolf()) {
changeWolf();
@@ -4462,7 +4462,7 @@ void daAlink_c::playerInit() {
}
mAnmHeap4.setBufferSize(0xB00);
mAnmHeap4.createHeap(daPy_anmHeap_c::HEAP_TYPE_4);
PLAYER_CREATE_ANM_HEAP(mAnmHeap4, daPy_anmHeap_c::HEAP_TYPE_4, "daAlink_c::mAnmHeap4");
setShieldModel();
#if DEBUG
@@ -4507,24 +4507,24 @@ void daAlink_c::playerInit() {
for (i = 0; i < 3; i++) {
mUnderAnmHeap[i].setBuffer(mUnderAnmHeap[0].getBuffer() + (i * 0x2C00));
mUnderAnmHeap[i].createHeap(daPy_anmHeap_c::HEAP_TYPE_3);
PLAYER_CREATE_ANM_HEAP_F(mUnderAnmHeap[i], daPy_anmHeap_c::HEAP_TYPE_3, "daAlink_c::mUnderAnmHeap[%d]", i);
}
mUpperAnmHeap[0].setBuffer(mUnderAnmHeap[0].getBuffer() + 0x8400);
for (i = 0; i < 3; i++) {
mUpperAnmHeap[i].setBuffer(mUpperAnmHeap[0].getBuffer() + (i * 0x2C00));
mUpperAnmHeap[i].createHeap(daPy_anmHeap_c::HEAP_TYPE_3);
PLAYER_CREATE_ANM_HEAP_F(mUpperAnmHeap[i], daPy_anmHeap_c::HEAP_TYPE_3, "daAlink_c::mUpperAnmHeap[%d]", i);
}
mFaceBtpHeap.createHeap(daPy_anmHeap_c::HEAP_TYPE_1);
mFaceBtkHeap.createHeap(daPy_anmHeap_c::HEAP_TYPE_2);
mFaceBckHeap.createHeap(daPy_anmHeap_c::HEAP_TYPE_3);
PLAYER_CREATE_ANM_HEAP(mFaceBtpHeap, daPy_anmHeap_c::HEAP_TYPE_1, "daAlink_c::mFaceBtpHeap");
PLAYER_CREATE_ANM_HEAP(mFaceBtkHeap, daPy_anmHeap_c::HEAP_TYPE_2, "daAlink_c::mFaceBtkHeap");
PLAYER_CREATE_ANM_HEAP(mFaceBckHeap, daPy_anmHeap_c::HEAP_TYPE_3, "daAlink_c::mFaceBckHeap");
for (i = 0; i < 2; i++) {
mItemHeap[i].setBufferSize(0x13200);
mItemHeap[i].createHeap(daPy_anmHeap_c::HEAP_TYPE_4);
PLAYER_CREATE_ANM_HEAP_F(mItemHeap[i], daPy_anmHeap_c::HEAP_TYPE_4, "daAlink_c::mItemHeap[%d]", i);
}
mAnmHeap9.createHeap(daPy_anmHeap_c::HEAP_TYPE_3);
PLAYER_CREATE_ANM_HEAP(mAnmHeap9, daPy_anmHeap_c::HEAP_TYPE_3, "daAlink_c::mAnmHeap9");
resetBasAnime();
mZ2Link.init(&current.pos, &eyePos, &field_0x3720);
src/d/actor/d_a_bg.cpp
+1
View File
@@ -532,6 +532,7 @@ int daBg_c::create() {
if (room_heap != NULL) {
this->heap = JKRCreateSolidHeap(-1, room_heap, false);
JUT_ASSERT(471, heap != NULL);
JKRHEAP_NAME(heap, "d_a_bg Anms");
JKRHeap* old = mDoExt_setCurrentHeap(this->heap);
int rt = createHeap();
src/d/actor/d_a_e_dt.cpp
+6
View File
@@ -1578,11 +1578,17 @@ bool daE_DT_c::pointInSight(cXyz* i_point) {
f32 width = scissor->width;
f32 height = scissor->height;
mDoLib_project(i_point, &proj);
#if TARGET_PC
view_port_class* viewport = dComIfGp_getWindow(dComIfGp_getCameraWinID(idx))->getViewPort();
return proj.x > 0.0f && proj.x < width && proj.y > (30.0f * viewport->height / FB_HEIGHT) && -(30.0f * viewport->height / FB_HEIGHT) < height;
#else
if (proj.x > 0.0f && proj.x < width && proj.y > 30.0f && -30.0f < height) {
return true;
} else {
return false;
}
#endif
}
void daE_DT_c::executeOpening() {
src/d/actor/d_a_e_yg.cpp
+9 -1
View File
@@ -527,7 +527,7 @@ static void search_ground_1(e_yg_class* i_this) {
fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
dBgS_LinChk lin_chk;
cXyz start, end, work;
cXyz pos[16];
cXyz pos[16]{};
s16 y_rot = actor->shape_angle.y;
s8 line_cross_flag = false;
@@ -560,6 +560,14 @@ static void search_ground_1(e_yg_class* i_this) {
pos[i] = actor->current.pos;
pos[i].x += 10000.0f;
}
} else {
// Ensure all elements are initialized. This function is buggy and
// blows up if pos[0].x or pos[0].z is NaN, but for some reason this
// never happens on hardware - probably just dumb luck.
#if AVOID_UB
pos[i] = actor->current.pos;
pos[i].x += 10000.0f;
#endif
}
ANGLE_ADD(y_rot, 0x1000);
src/d/actor/d_a_midna.cpp
+4 -4
View File
@@ -565,12 +565,12 @@ cPhs_Step daMidna_c::create() {
mpFunc = &daMidna_c::checkMetamorphoseEnableBase;
for (u16 i = 0; i < 3; i++) {
mBckHeap[i].createHeap(daPy_anmHeap_c::HEAP_TYPE_3);
PLAYER_CREATE_ANM_HEAP_F(mBckHeap[i], daPy_anmHeap_c::HEAP_TYPE_3, "daMidna_c::mBckHeap[%d]", i);
}
mBtpHeap.createHeap(daPy_anmHeap_c::HEAP_TYPE_1);
mBtkHeap.createHeap(daPy_anmHeap_c::HEAP_TYPE_2);
PLAYER_CREATE_ANM_HEAP_F(mBtpHeap, daPy_anmHeap_c::HEAP_TYPE_1, "daMidna_c::mBtpHeap");
PLAYER_CREATE_ANM_HEAP_F(mBtkHeap, daPy_anmHeap_c::HEAP_TYPE_2, "daMidna_c::mBtkHeap");
mSound.init(&current.pos, &eyePos, 3, 1);
mpShadowModel = mpMorf->getModel();
mpShadowModel->setUserArea((uintptr_t)this);
src/d/actor/d_a_npc_tks.cpp
+8
View File
@@ -823,7 +823,15 @@ void daNpcTks_c::playMotion() {
daNpcF_anmPlayData dat4a = {ANM_JUMP_S, 4.0f, 1};
daNpcF_anmPlayData dat4b = {ANM_FLY, 0.0f, 0};
daNpcF_anmPlayData* pDat4[2] = {&dat4a, &dat4b};
#if TARGET_PC
// Note: this fixes a crash in the cutscene after entering city and likely needs to be revisited as its
// unclear why this was 1 in the first place and unclear why this fixes it
daNpcF_anmPlayData dat5 = {ANM_JUMP_E, 0.0f, 0};
#else
daNpcF_anmPlayData dat5 = {ANM_JUMP_E, 0.0f, 1};
#endif
daNpcF_anmPlayData* pDat5[1] = {&dat5};
daNpcF_anmPlayData dat6a = {ANM_LAND, 0.0f, 1};
daNpcF_anmPlayData dat6b = {ANM_WAIT_A, 4.0f, 0};
src/d/actor/d_a_peru.cpp
+2
View File
@@ -1008,6 +1008,7 @@ int daPeru_c::_cutAppear_Init(int const& param_1) {
initTalk(mFlowNodeNo, NULL);
break;
case 140:
{
static cXyz see_pos;
see_pos.set(0.0f, -300.0f, 300.0f);
mDoMtx_stack_c::ZXYrotS(shape_angle);
@@ -1016,6 +1017,7 @@ int daPeru_c::_cutAppear_Init(int const& param_1) {
mJntAnm.lookPos(&see_pos, 0);
setCnt(80);
break;
}
case 150:
mJntAnm.lookNone(0);
setAction(&daPeru_c::demo_walk_to_window, 0);
src/d/actor/d_a_player.cpp
+7 -3
View File
@@ -237,7 +237,11 @@ void* daPy_anmHeap_c::mallocBuffer() {
return mBuffer;
}
void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType) {
#if TARGET_PC
void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType, const char* name) {
#else
void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType, const char* name) {
#endif
u32 size;
if (i_heapType == 4) {
@@ -260,8 +264,8 @@ void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType) {
JKRHeap* tmp;
mAnimeHeap = mDoExt_createSolidHeapFromGameToCurrent(&tmp, size, 0x20);
JKRHEAP_NAMEF(mAnimeHeap, "Alink anime type %d", i_heapType);
JKRHEAP_NAME(mAnimeHeap, name);
if (i_heapType == 4) {
tmpWork = JKR_NEW_ARRAY(char, size);
JUT_ASSERT(669, tmpWork != NULL);
src/d/d_camera.cpp
+7
View File
@@ -10997,7 +10997,14 @@ static int camera_draw(camera_process_class* i_this) {
#endif
int trim_height = body->TrimHeight();
#if TARGET_PC
trim_height *= viewport->height / FB_HEIGHT;
window->setScissor(0.0f, trim_height, viewport->width, viewport->height - trim_height * 2.0f);
#else
window->setScissor(0.0f, trim_height, FB_WIDTH, FB_HEIGHT - trim_height * 2.0f);
#endif
C_MTXPerspective(process->view.projMtx, process->view.fovy, process->view.aspect, process->view.near_, process->view.far_);
mDoMtx_lookAt(process->view.viewMtx, &process->view.lookat.eye, &process->view.lookat.center,
&process->view.lookat.up, process->view.bank);
src/d/d_file_select.cpp
+1
View File
@@ -5195,6 +5195,7 @@ void dFile_select3D_c::_create(u8 i_mirrorIdx, u8 i_maskIdx) {
if (mpSolidHeap == NULL) {
JUT_ASSERT(5189, mpSolidHeap != NULL);
}
JKRHEAP_NAME(mpSolidHeap, "dFile_select3D_c::mpSolidHeap");
field_0x03c4 = 0.0f;
field_0x03c8 = 0.0f;
src/d/d_k_wmark.cpp
+1
View File
@@ -35,6 +35,7 @@ int dkWmark_c::create() {
mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x880, 0x20);
if (mpHeap != NULL) {
JKRHEAP_NAME(mpHeap, "dkWmark_c::mpHeap");
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Alink", 0x23);
JUT_ASSERT(60, modelData != NULL);
src/d/d_kankyo.cpp
+9 -1
View File
@@ -31,6 +31,9 @@
#include "JSystem/JKernel/JKRSolidHeap.h"
#include <cstdlib>
#include <cstring>
#if TARGET_PC
#include "dusk/imgui/ImGuiConsole.hpp"
#endif
static void GxXFog_set();
@@ -11376,7 +11379,12 @@ void dKy_bg_MAxx_proc(void* bg_model_p) {
Mtx sp1D8;
if (mat_name[6] == '2') {
C_MTXLightPerspective(sp1D8, dComIfGd_getView()->fovy,
camera_p->view.aspect, 1.0f, 1.0f, -0.01f, 0.0f);
camera_p->view.aspect, 1.0f, 1.0f,
#if TARGET_PC
dusk::g_imguiConsole.isWaterProjectionOffsetEnabled() ? -0.01f : 0.0f, 0.0f);
#else
-0.01f, 0.0f);
#endif
} else {
C_MTXLightPerspective(sp1D8, dComIfGd_getView()->fovy,
camera_p->view.aspect, 0.49f, -0.49f, 0.5f, 0.5f);
src/d/d_ky_thunder.cpp
+2
View File
@@ -26,6 +26,8 @@ int dThunder_c::createHeap() {
if (mpHeap == NULL) {
return 0;
}
JKRHEAP_NAME(mpHeap, "dThunder_c::mpHeap");
}
return 1;
src/d/d_menu_collect.cpp
+1
View File
@@ -2222,6 +2222,7 @@ dMenu_Collect3D_c::~dMenu_Collect3D_c() {
void dMenu_Collect3D_c::_create() {
mpHeap->getTotalFreeSize();
mpSolidHeap = mDoExt_createSolidHeapToCurrent(0x25800, mpHeap, 0x20);
JKRHEAP_NAME(mpSolidHeap, "dMenu_Collect3D_c::mpSolidHeap");
mDoExt_setCurrentHeap((JKRHeap*)mpSolidHeap);
daAlink_c* linkActor = daAlink_getAlinkActorClass();
if (linkActor != NULL) {
src/d/d_menu_dmap.cpp
+1
View File
@@ -1649,6 +1649,7 @@ void dMenu_Dmap_c::_create() {
mDmapHeap = JKRCreateExpHeap(field_0xe8->getFreeSize() - 0x10, field_0xe8, false);
JUT_ASSERT(3732, mDmapHeap != NULL);
JKRHEAP_NAME(mDmapHeap, "dMenu_Dmap_c::mDmapHeap");
JKRHeap* heap = mDoExt_setCurrentHeap(mDmapHeap);
u32 sp28 = mDmapHeap->getTotalFreeSize();
src/d/d_simple_model.cpp
+2
View File
@@ -18,6 +18,7 @@ static void dSmplMdl_modelUpdateDL(J3DModel* i_model) {
dSmplMdl_draw_c::dSmplMdl_draw_c() {
for (int i = 0; i < 8; i++) {
mModel[i].init();
mModel[i].setIdx(i);
}
for (int i = 0; i < 500; i++) {
@@ -128,6 +129,7 @@ BOOL diff_model_c::create(J3DModelData* i_modelData, int roomNo, u8 drawBG) {
JUT_ASSERT(397, i_modelData != NULL);
if (mpHeap == NULL) {
mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x2000, 0x20);
JKRHEAP_NAMEF(mpHeap, "Simple model (%d)", idx);
if (mpHeap != NULL) {
mpModel = mDoExt_J3DModel__create(i_modelData, 0x80000, 0x11000084);
src/d/d_stage.cpp
+1
View File
@@ -393,6 +393,7 @@ static void dummy1(dStage_roomControl_c* roomControl) {
JKRExpHeap* dStage_roomControl_c::createMemoryBlock(int i_blockIdx, u32 i_heapSize) {
if (mMemoryBlock[i_blockIdx] == NULL) {
mMemoryBlock[i_blockIdx] = JKRCreateExpHeap(i_heapSize, mDoExt_getArchiveHeap(), false);
JKRHEAP_NAMEF(mMemoryBlock[i_blockIdx], "Room control memory block %d", i_blockIdx);
}
return mMemoryBlock[i_blockIdx];
src/d/d_timer.cpp
+1
View File
@@ -40,6 +40,7 @@ int dTimer_c::_create() {
dComIfGp_setAllMapArchive(resInfo->getArchive());
mp_heap = fopMsgM_createExpHeap(0x11000, NULL);
JKRHEAP_NAME(mp_heap, "dTimer_c::mp_heap");
JKRHeap* prev_heap = mDoExt_setCurrentHeap(mp_heap);
if (mp_heap != NULL) {
mp_heap->getTotalFreeSize();
src/dusk/OSThread.cpp
+2 -12
View File
@@ -616,24 +616,14 @@ s32 OSEnableScheduler(void) {
// ============================================================================
BOOL OSDisableInterrupts(void) {
GetInterruptMutex().lock();
sInterruptLockCount++;
return (BOOL)(sInterruptLockCount > 1); // TRUE if was already locked
return FALSE;
}
BOOL OSRestoreInterrupts(BOOL level) {
if (sInterruptLockCount > 0) {
sInterruptLockCount--;
GetInterruptMutex().unlock();
}
return level;
return FALSE;
}
BOOL OSEnableInterrupts(void) {
if (sInterruptLockCount > 0) {
sInterruptLockCount--;
GetInterruptMutex().unlock();
}
return FALSE;
}
src/dusk/imgui/ImGuiConsole.hpp
+1
View File
@@ -15,6 +15,7 @@ namespace dusk {
void draw();
bool isBloomEnabled() { return m_menuGame.isBloomEnabled(); }
bool isWaterProjectionOffsetEnabled() { return m_menuGame.isWaterProjectionOffsetEnabled(); }
ImGuiMenuTools::CollisionViewSettings& getCollisionViewSettings() { return m_menuTools.getCollisionViewSettings(); }
static bool CheckMenuViewToggle(ImGuiKey key, bool& active);
src/dusk/imgui/ImGuiMapLoader.cpp
+22 -2
View File
@@ -36,6 +36,8 @@ namespace dusk {
if (ImGui::Selectable(region.regionName)) {
if (m_mapLoaderInfo.regionIdx != idx) {
m_mapLoaderInfo.mapIdx = 0;
m_mapLoaderInfo.roomNoIdx = 0;
m_mapLoaderInfo.pointNoIdx = 0;
}
m_mapLoaderInfo.regionIdx = idx;
}
@@ -68,7 +70,7 @@ namespace dusk {
m_mapLoaderInfo.pointNoIdx = 0;
}
}
}else {
} else {
ImGui::Text("No region selected.");
}
@@ -97,6 +99,24 @@ namespace dusk {
}
}
constexpr int MAX_LAYER = 14;
ImGui::Text("Selected Layer: %3d", m_mapLoaderInfo.layer);
ImGui::SameLine();
if (ImGui::Button("-###layerDec")) {
m_mapLoaderInfo.layer--;
if (m_mapLoaderInfo.layer < -1) {
m_mapLoaderInfo.layer = MAX_LAYER;
}
}
ImGui::SameLine();
if (ImGui::Button("+###layerInc")) {
m_mapLoaderInfo.layer++;
if (m_mapLoaderInfo.layer > MAX_LAYER) {
m_mapLoaderInfo.layer = -1;
}
}
if (room.numPoints > 1) {
ImGui::Text("Selected Point: %3d", room.roomPoints[m_mapLoaderInfo.pointNoIdx]);
ImGui::SameLine();
@@ -116,7 +136,7 @@ namespace dusk {
}
if (ImGui::Button("Warp")) {
dComIfGp_setNextStage(map.mapFile, room.roomPoints[m_mapLoaderInfo.pointNoIdx], room.roomNo, -1);
dComIfGp_setNextStage(map.mapFile, room.roomPoints[m_mapLoaderInfo.pointNoIdx], room.roomNo, m_mapLoaderInfo.layer);
}
}
src/dusk/imgui/ImGuiMenuGame.cpp
+5
View File
@@ -24,6 +24,11 @@ namespace dusk {
if (ImGui::BeginMenu("Graphics")) {
ImGui::Checkbox("Native Bloom", &m_graphicsSettings.m_enableBloom);
ImGui::Checkbox("Water Projection Offset", &m_graphicsSettings.m_waterProjectionOffset);
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip("Adds GC-specific -0.01 transS offset\n"
"that causes ~6px ghost artifacts in water reflections");
}
ImGui::EndMenu();
}
src/dusk/imgui/ImGuiMenuGame.hpp
+2
View File
@@ -13,6 +13,7 @@ namespace dusk {
ImGuiMenuGame();
void draw();
bool isBloomEnabled() { return m_graphicsSettings.m_enableBloom; }
bool isWaterProjectionOffsetEnabled() { return m_graphicsSettings.m_waterProjectionOffset; }
void windowInputViewer();
void windowControllerConfig();
@@ -35,6 +36,7 @@ namespace dusk {
struct {
bool m_enableBloom = 1;
bool m_waterProjectionOffset = false;
} m_graphicsSettings;
bool m_showControllerConfig = false;
src/dusk/imgui/ImGuiSaveEditor.cpp
+297 -264
View File
@@ -11,263 +11,273 @@
#include <map>
namespace dusk {
std::map<int, std::string> itemMap = {
{dItemNo_HEART_e, "Heart"},
{dItemNo_GREEN_RUPEE_e, "Green Rupee"},
{dItemNo_BLUE_RUPEE_e, "Blue Rupee"},
{dItemNo_YELLOW_RUPEE_e, "Yellow Rupee"},
{dItemNo_RED_RUPEE_e, "Red Rupee"},
{dItemNo_PURPLE_RUPEE_e, "Purple Rupee"},
{dItemNo_ORANGE_RUPEE_e, "Orange Rupee"},
{dItemNo_SILVER_RUPEE_e, "Silver Rupee"},
{dItemNo_S_MAGIC_e, "Small Magic"},
{dItemNo_L_MAGIC_e, "Large Magic"},
{dItemNo_BOMB_5_e, "Bombs (5)"},
{dItemNo_BOMB_10_e, "Bombs (10)"},
{dItemNo_BOMB_20_e, "Bombs (20)"},
{dItemNo_BOMB_30_e, "Bombs (30)"},
{dItemNo_ARROW_10_e, "Arrows (10)"},
{dItemNo_ARROW_20_e, "Arrows (20)"},
{dItemNo_ARROW_30_e, "Arrows (30)"},
{dItemNo_ARROW_1_e, "Arrows (1)"},
{dItemNo_PACHINKO_SHOT_e, "Pumpkin Seeds"},
{dItemNo_NOENTRY_19_e, "Unknown"},
{dItemNo_NOENTRY_20_e, "Unknown"},
{dItemNo_NOENTRY_21_e, "Unknown"},
{dItemNo_WATER_BOMB_5_e, "Water Bombs (5)"},
{dItemNo_WATER_BOMB_10_e, "Water Bombs (10)"},
{dItemNo_WATER_BOMB_20_e, "Water Bombs (20)"},
{dItemNo_WATER_BOMB_30_e, "Water Bombs (30)"},
{dItemNo_BOMB_INSECT_5_e, "Bomblings (5)"},
{dItemNo_BOMB_INSECT_10_e, "Bomblings (10)"},
{dItemNo_BOMB_INSECT_20_e, "Bomblings (20)"},
{dItemNo_BOMB_INSECT_30_e, "Bomblings (30)"},
{dItemNo_RECOVERY_FAILY_e, "Fairy"},
{dItemNo_TRIPLE_HEART_e, "Triple Hearts"},
{dItemNo_SMALL_KEY_e, "Small Key"},
{dItemNo_KAKERA_HEART_e, "Piece of Heart"},
{dItemNo_UTAWA_HEART_e, "Heart Container"},
{dItemNo_MAP_e, "Map"},
{dItemNo_COMPUS_e, "Compass"},
{dItemNo_DUNGEON_EXIT_e, "Ooccoo Sr."},
{dItemNo_BOSS_KEY_e, "Boss Key"},
{dItemNo_DUNGEON_BACK_e, "Ooccoo Jr."},
{dItemNo_SWORD_e, "Ordon Sword"},
{dItemNo_MASTER_SWORD_e, "Master Sword"},
{dItemNo_WOOD_SHIELD_e, "Wooden Shield"},
{dItemNo_SHIELD_e, "Ordon Shield"},
{dItemNo_HYLIA_SHIELD_e, "Hylian Shield"},
{dItemNo_TKS_LETTER_e, "Ooccoo's Letter"},
{dItemNo_WEAR_CASUAL_e, "Ordon Clothes"},
{dItemNo_WEAR_KOKIRI_e, "Hero's Clothes"},
{dItemNo_ARMOR_e, "Magic Armor"},
{dItemNo_WEAR_ZORA_e, "Zora Armor"},
{dItemNo_MAGIC_LV1_e, "Magic Level 1"},
{dItemNo_DUNGEON_EXIT_2_e, "Ooccoo Sr."},
{dItemNo_WALLET_LV1_e, "Wallet"},
{dItemNo_WALLET_LV2_e, "Big Wallet"},
{dItemNo_WALLET_LV3_e, "Giant Wallet"},
{dItemNo_NOENTRY_55_e, "Unknown"},
{dItemNo_NOENTRY_56_e, "Unknown"},
{dItemNo_NOENTRY_57_e, "Unknown"},
{dItemNo_NOENTRY_58_e, "Unknown"},
{dItemNo_NOENTRY_59_e, "Unknown"},
{dItemNo_NOENTRY_60_e, "Unknown"},
{dItemNo_ZORAS_JEWEL_e, "Coral Earring"},
{dItemNo_HAWK_EYE_e, "Hawkeye"},
{dItemNo_WOOD_STICK_e, "Wooden Sword"},
{dItemNo_BOOMERANG_e, "Gale Boomerang"},
{dItemNo_SPINNER_e, "Spinner"},
{dItemNo_IRONBALL_e, "Ball and Chain"},
{dItemNo_BOW_e, "Hero's Bow"},
{dItemNo_HOOKSHOT_e, "Clawshot"},
{dItemNo_HVY_BOOTS_e, "Iron Boots"},
{dItemNo_COPY_ROD_e, "Dominion Rod"},
{dItemNo_W_HOOKSHOT_e, "Double Clawshots"},
{dItemNo_KANTERA_e, "Lantern"},
{dItemNo_LIGHT_SWORD_e, "Light Sword"},
{dItemNo_FISHING_ROD_1_e, "Fishing Rod"},
{dItemNo_PACHINKO_e, "Slingshot"},
{dItemNo_COPY_ROD_2_e, "Dominion Rod"},
{dItemNo_NOENTRY_77_e, "Unknown"},
{dItemNo_NOENTRY_78_e, "Unknown"},
{dItemNo_BOMB_BAG_LV2_e, "Giant Bomb Bag"},
{dItemNo_BOMB_BAG_LV1_e, "Bomb Bag"},
{dItemNo_BOMB_IN_BAG_e, "Bomb Bag"},
{dItemNo_NOENTRY_82_e, "Unknown"},
{dItemNo_LIGHT_ARROW_e, "Light Arrow"},
{dItemNo_ARROW_LV1_e, "Quiver"},
{dItemNo_ARROW_LV2_e, "Big Quiver"},
{dItemNo_ARROW_LV3_e, "Giant Quiver"},
{dItemNo_NOENTRY_87_e, "Unknown"},
{dItemNo_LURE_ROD_e, "Fishing Rod (Lure)"},
{dItemNo_BOMB_ARROW_e, "Bomb Arrow"},
{dItemNo_HAWK_ARROW_e, "Hawk Arrow"},
{dItemNo_BEE_ROD_e, "Fishing Rod (Bee Larva)"},
{dItemNo_JEWEL_ROD_e, "Fishing Rod (Earring)"},
{dItemNo_WORM_ROD_e, "Fishing Rod (Worm)"},
{dItemNo_JEWEL_BEE_ROD_e, "Fishing Rod (Earring + Bee Larva)"},
{dItemNo_JEWEL_WORM_ROD_e, "Fishing Rod (Earring + Worm)"},
{dItemNo_EMPTY_BOTTLE_e, "Empty Bottle"},
{dItemNo_RED_BOTTLE_e, "Red Potion"},
{dItemNo_GREEN_BOTTLE_e, "Green Potion"},
{dItemNo_BLUE_BOTTLE_e, "Blue Potion"},
{dItemNo_MILK_BOTTLE_e, "Milk Bottle"},
{dItemNo_HALF_MILK_BOTTLE_e, "Half Milk Bottle"},
{dItemNo_OIL_BOTTLE_e, "Lantern Oil"},
{dItemNo_WATER_BOTTLE_e, "Water Bottle"},
{dItemNo_OIL_BOTTLE_2_e, "Oil Bottle"},
{dItemNo_RED_BOTTLE_2_e, "Red Potion"},
{dItemNo_UGLY_SOUP_e, "Nasty Soup"},
{dItemNo_HOT_SPRING_e, "Hotspring Water"},
{dItemNo_FAIRY_e, "Fairy"},
{dItemNo_HOT_SPRING_2_e, "Hotspring Water"},
{dItemNo_OIL2_e, "Lantern Oil"},
{dItemNo_OIL_e, "Lantern Oil"},
{dItemNo_NORMAL_BOMB_e, "Bombs"},
{dItemNo_WATER_BOMB_e, "Water Bombs"},
{dItemNo_POKE_BOMB_e, "Bomblings"},
{dItemNo_FAIRY_DROP_e, "Great Fairy's Tears"},
{dItemNo_WORM_e, "Worm"},
{dItemNo_DROP_BOTTLE_e, ""},
{dItemNo_BEE_CHILD_e, ""},
{dItemNo_CHUCHU_RARE_e, "Rare Chu Jelly"},
{dItemNo_CHUCHU_RED_e, "Red Chu Jelly"},
{dItemNo_CHUCHU_BLUE_e, "Blue Chu Jelly"},
{dItemNo_CHUCHU_GREEN_e, "Green Chu Jelly"},
{dItemNo_CHUCHU_YELLOW_e, "Yellow Chu Jelly"},
{dItemNo_CHUCHU_PURPLE_e, "Purple Chu Jelly"},
{dItemNo_LV1_SOUP_e, "Simple Soup"},
{dItemNo_LV2_SOUP_e, "Good Soup"},
{dItemNo_LV3_SOUP_e, "Superb Soup"},
{dItemNo_LETTER_e, "Renado's Letter"},
{dItemNo_BILL_e, "Invoice"},
{dItemNo_WOOD_STATUE_e, "Wooden Statue"},
{dItemNo_IRIAS_PENDANT_e, "Ilia's Charm"},
{dItemNo_HORSE_FLUTE_e, "Horse Call"},
{dItemNo_NOENTRY_133_e, "Unknown"},
{dItemNo_NOENTRY_134_e, "Unknown"},
{dItemNo_NOENTRY_135_e, "Unknown"},
{dItemNo_NOENTRY_136_e, "Unknown"},
{dItemNo_NOENTRY_137_e, "Unknown"},
{dItemNo_NOENTRY_138_e, "Unknown"},
{dItemNo_NOENTRY_139_e, "Unknown"},
{dItemNo_NOENTRY_140_e, "Unknown"},
{dItemNo_NOENTRY_141_e, "Unknown"},
{dItemNo_NOENTRY_142_e, "Unknown"},
{dItemNo_NOENTRY_143_e, "Unknown"},
{dItemNo_RAFRELS_MEMO_e, "Auru's Memo"},
{dItemNo_ASHS_SCRIBBLING_e, "Ashei's Sketch"},
{dItemNo_NOENTRY_146_e, "Unknown"},
{dItemNo_NOENTRY_147_e, "Unknown"},
{dItemNo_NOENTRY_148_e, "Unknown"},
{dItemNo_NOENTRY_149_e, "Unknown"},
{dItemNo_NOENTRY_150_e, "Unknown"},
{dItemNo_NOENTRY_151_e, "Unknown"},
{dItemNo_NOENTRY_152_e, "Unknown"},
{dItemNo_NOENTRY_153_e, "Unknown"},
{dItemNo_NOENTRY_154_e, "Unknown"},
{dItemNo_NOENTRY_155_e, "Unknown"},
{dItemNo_CHUCHU_YELLOW2_e, "Yellow Chu Jelly"},
{dItemNo_OIL_BOTTLE3_e, "Lantern Oil"},
{dItemNo_SHOP_BEE_CHILD_e, ""},
{dItemNo_CHUCHU_BLACK_e, "Black Chu Jelly"},
{dItemNo_LIGHT_DROP_e, "Tear of Light"},
{dItemNo_DROP_CONTAINER_e, "Vessel of Light (Faron)"},
{dItemNo_DROP_CONTAINER02_e, "Vessel of Light (Eldin)"},
{dItemNo_DROP_CONTAINER03_e, "Vessel of Light (Lanayru)"},
{dItemNo_FILLED_CONTAINER_e, "Vessel of Light (Filled)"},
{dItemNo_MIRROR_PIECE_2_e, "Mirror Shard (Snowpeak Ruins)"},
{dItemNo_MIRROR_PIECE_3_e, "Mirror Shard (Temple of Time)"},
{dItemNo_MIRROR_PIECE_4_e, "Mirror Shard (City in the Sky)"},
{dItemNo_NOENTRY_168_e, "Unknown"},
{dItemNo_NOENTRY_169_e, "Unknown"},
{dItemNo_NOENTRY_170_e, "Unknown"},
{dItemNo_NOENTRY_171_e, "Unknown"},
{dItemNo_NOENTRY_172_e, "Unknown"},
{dItemNo_NOENTRY_173_e, "Unknown"},
{dItemNo_NOENTRY_174_e, "Unknown"},
{dItemNo_NOENTRY_175_e, "Unknown"},
{dItemNo_SMELL_YELIA_POUCH_e, "Scent of Ilia"},
{dItemNo_SMELL_PUMPKIN_e, "Pumpkin Scent"},
{dItemNo_SMELL_POH_e, "Poe Scent"},
{dItemNo_SMELL_FISH_e, "Reekfish Scent"},
{dItemNo_SMELL_CHILDREN_e, "Youth's Scent"},
{dItemNo_SMELL_MEDICINE_e, "Medicine Scent"},
{dItemNo_NOENTRY_182_e, "Unknown"},
{dItemNo_NOENTRY_183_e, "Unknown"},
{dItemNo_NOENTRY_184_e, "Unknown"},
{dItemNo_NOENTRY_185_e, "Unknown"},
{dItemNo_NOENTRY_186_e, "Unknown"},
{dItemNo_NOENTRY_187_e, "Unknown"},
{dItemNo_NOENTRY_188_e, "Unknown"},
{dItemNo_NOENTRY_189_e, "Unknown"},
{dItemNo_NOENTRY_190_e, "Unknown"},
{dItemNo_NOENTRY_191_e, "Unknown"},
{dItemNo_M_BEETLE_e, "Beetle ♂"},
{dItemNo_F_BEETLE_e, "Beetle ♀"},
{dItemNo_M_BUTTERFLY_e, "Butterfly ♂"},
{dItemNo_F_BUTTERFLY_e, "Butterfly ♀"},
{dItemNo_M_STAG_BEETLE_e, "Stag Beetle ♂"},
{dItemNo_F_STAG_BEETLE_e, "Stag Beetle ♀"},
{dItemNo_M_GRASSHOPPER_e, "Grasshopper ♂"},
{dItemNo_F_GRASSHOPPER_e, "Grasshopper ♀"},
{dItemNo_M_NANAFUSHI_e, "Phasmid ♂"},
{dItemNo_F_NANAFUSHI_e, "Phasmid ♀"},
{dItemNo_M_DANGOMUSHI_e, "Pill Bug ♂"},
{dItemNo_F_DANGOMUSHI_e, "Pill Bug ♀"},
{dItemNo_M_MANTIS_e, "Mantis ♂"},
{dItemNo_F_MANTIS_e, "Mantis ♀"},
{dItemNo_M_LADYBUG_e, "Ladybug ♂"},
{dItemNo_F_LADYBUG_e, "Ladybug ♀"},
{dItemNo_M_SNAIL_e, "Snail ♂"},
{dItemNo_F_SNAIL_e, "Snail ♀"},
{dItemNo_M_DRAGONFLY_e, "Dragonfly ♂"},
{dItemNo_F_DRAGONFLY_e, "Dragonfly ♀"},
{dItemNo_M_ANT_e, "Ant ♂"},
{dItemNo_F_ANT_e, "Ant ♀"},
{dItemNo_M_MAYFLY_e, "Mayfly ♂"},
{dItemNo_F_MAYFLY_e, "Mayfly ♀"},
{dItemNo_NOENTRY_216_e, "Unknown"},
{dItemNo_NOENTRY_217_e, "Unknown"},
{dItemNo_NOENTRY_218_e, "Unknown"},
{dItemNo_NOENTRY_219_e, "Unknown"},
{dItemNo_NOENTRY_220_e, "Unknown"},
{dItemNo_NOENTRY_221_e, "Unknown"},
{dItemNo_NOENTRY_222_e, "Unknown"},
{dItemNo_NOENTRY_223_e, "Unknown"},
{dItemNo_POU_SPIRIT_e, ""},
{dItemNo_NOENTRY_225_e, "Unknown"},
{dItemNo_NOENTRY_226_e, "Unknown"},
{dItemNo_NOENTRY_227_e, "Unknown"},
{dItemNo_NOENTRY_228_e, "Unknown"},
{dItemNo_NOENTRY_229_e, "Unknown"},
{dItemNo_NOENTRY_230_e, "Unknown"},
{dItemNo_NOENTRY_231_e, "Unknown"},
{dItemNo_NOENTRY_232_e, "Unknown"},
{dItemNo_ANCIENT_DOCUMENT_e, "Ancient Sky Book"},
{dItemNo_AIR_LETTER_e, "Sky Character"},
{dItemNo_ANCIENT_DOCUMENT2_e, "Ancient Sky Book (Filled)"},
{dItemNo_LV7_DUNGEON_EXIT_e, "Ooccoo Sr. (City in the Sky)"},
{dItemNo_LINKS_SAVINGS_e, "Link's Savings"},
{dItemNo_SMALL_KEY2_e, ""},
{dItemNo_POU_FIRE1_e, ""},
{dItemNo_POU_FIRE2_e, ""},
{dItemNo_POU_FIRE3_e, ""},
{dItemNo_POU_FIRE4_e, ""},
{dItemNo_BOSSRIDER_KEY_e, ""},
{dItemNo_TOMATO_PUREE_e, ""},
{dItemNo_TASTE_e, ""},
{dItemNo_LV5_BOSS_KEY_e, "Bedroom Key"},
{dItemNo_SURFBOARD_e, ""},
{dItemNo_KANTERA2_e, ""},
{dItemNo_L2_KEY_PIECES1_e, "Key Shard (1)"},
{dItemNo_L2_KEY_PIECES2_e, "Key Shard (2)"},
{dItemNo_L2_KEY_PIECES3_e, "Key Shard (3)"},
{dItemNo_KEY_OF_CARAVAN_e, "Bulblin Camp Key"},
{dItemNo_LV2_BOSS_KEY_e, "Key Shard (Completed)"},
{dItemNo_KEY_OF_FILONE_e, "Faron Gate Key"},
{dItemNo_NONE_e, "None"},
enum ItemType {
ITEMTYPE_DEFAULT_e,
ITEMTYPE_EQUIP_e,
};
struct itemInfo {
std::string m_name;
u8 m_type = ITEMTYPE_DEFAULT_e;
};
std::map<int, itemInfo> itemMap = {
{ dItemNo_HEART_e, {"Heart"} },
{ dItemNo_GREEN_RUPEE_e, {"Green Rupee"} },
{ dItemNo_BLUE_RUPEE_e, {"Blue Rupee"} },
{ dItemNo_YELLOW_RUPEE_e, {"Yellow Rupee"} },
{ dItemNo_RED_RUPEE_e, {"Red Rupee"} },
{ dItemNo_PURPLE_RUPEE_e, {"Purple Rupee"} },
{ dItemNo_ORANGE_RUPEE_e, {"Orange Rupee"} },
{ dItemNo_SILVER_RUPEE_e, {"Silver Rupee"} },
{ dItemNo_S_MAGIC_e, {"Small Magic"} },
{ dItemNo_L_MAGIC_e, {"Large Magic"} },
{ dItemNo_BOMB_5_e, {"Bombs (5)"} },
{ dItemNo_BOMB_10_e, {"Bombs (10)"} },
{ dItemNo_BOMB_20_e, {"Bombs (20)"} },
{ dItemNo_BOMB_30_e, {"Bombs (30)"} },
{ dItemNo_ARROW_10_e, {"Arrows (10)"} },
{ dItemNo_ARROW_20_e, {"Arrows (20)"} },
{ dItemNo_ARROW_30_e, {"Arrows (30)"} },
{ dItemNo_ARROW_1_e, {"Arrows (1)"} },
{ dItemNo_PACHINKO_SHOT_e, {"Pumpkin Seeds"} },
{ dItemNo_NOENTRY_19_e, {"Reserved"} },
{ dItemNo_NOENTRY_20_e, {"Reserved"} },
{ dItemNo_NOENTRY_21_e, {"Reserved"} },
{ dItemNo_WATER_BOMB_5_e, {"Water Bombs (5)"} },
{ dItemNo_WATER_BOMB_10_e, {"Water Bombs (10)"} },
{ dItemNo_WATER_BOMB_20_e, {"Water Bombs (20)"} },
{ dItemNo_WATER_BOMB_30_e, {"Water Bombs (30)"} },
{ dItemNo_BOMB_INSECT_5_e, {"Bomblings (5)"} },
{ dItemNo_BOMB_INSECT_10_e, {"Bomblings (10)"} },
{ dItemNo_BOMB_INSECT_20_e, {"Bomblings (20)"} },
{ dItemNo_BOMB_INSECT_30_e, {"Bomblings (30)"} },
{ dItemNo_RECOVERY_FAILY_e, {"Fairy"} },
{ dItemNo_TRIPLE_HEART_e, {"Triple Hearts"} },
{ dItemNo_SMALL_KEY_e, {"Small Key"} },
{ dItemNo_KAKERA_HEART_e, {"Piece of Heart"} },
{ dItemNo_UTAWA_HEART_e, {"Heart Container"} },
{ dItemNo_MAP_e, {"Dungeon Map"} },
{ dItemNo_COMPUS_e, {"Compass"} },
{ dItemNo_DUNGEON_EXIT_e, {"Ooccoo Sr. (First Time)", ITEMTYPE_EQUIP_e} },
{ dItemNo_BOSS_KEY_e, {"Boss Key"} },
{ dItemNo_DUNGEON_BACK_e, {"Ooccoo Jr.", ITEMTYPE_EQUIP_e} },
{ dItemNo_SWORD_e, {"Ordon Sword"} },
{ dItemNo_MASTER_SWORD_e, {"Master Sword"} },
{ dItemNo_WOOD_SHIELD_e, {"Wooden Shield"} },
{ dItemNo_SHIELD_e, {"Ordon Shield"} },
{ dItemNo_HYLIA_SHIELD_e, {"Hylian Shield"} },
{ dItemNo_TKS_LETTER_e, {"Ooccoo's Note", ITEMTYPE_EQUIP_e} },
{ dItemNo_WEAR_CASUAL_e, {"Ordon Clothes"} },
{ dItemNo_WEAR_KOKIRI_e, {"Hero's Clothes"} },
{ dItemNo_ARMOR_e, {"Magic Armor"} },
{ dItemNo_WEAR_ZORA_e, {"Zora Armor"} },
{ dItemNo_MAGIC_LV1_e, {"Magic Level 1"} },
{ dItemNo_DUNGEON_EXIT_2_e, {"Ooccoo Sr.", ITEMTYPE_EQUIP_e} },
{ dItemNo_WALLET_LV1_e, {"Wallet"} },
{ dItemNo_WALLET_LV2_e, {"Big Wallet"} },
{ dItemNo_WALLET_LV3_e, {"Giant Wallet"} },
{ dItemNo_NOENTRY_55_e, {"Reserved"} },
{ dItemNo_NOENTRY_56_e, {"Reserved"} },
{ dItemNo_NOENTRY_57_e, {"Reserved"} },
{ dItemNo_NOENTRY_58_e, {"Reserved"} },
{ dItemNo_NOENTRY_59_e, {"Reserved"} },
{ dItemNo_NOENTRY_60_e, {"Reserved"} },
{ dItemNo_ZORAS_JEWEL_e, {"Coral Earring", ITEMTYPE_EQUIP_e} },
{ dItemNo_HAWK_EYE_e, {"Hawkeye", ITEMTYPE_EQUIP_e} },
{ dItemNo_WOOD_STICK_e, {"Wooden Sword"} },
{ dItemNo_BOOMERANG_e, {"Gale Boomerang", ITEMTYPE_EQUIP_e} },
{ dItemNo_SPINNER_e, {"Spinner", ITEMTYPE_EQUIP_e} },
{ dItemNo_IRONBALL_e, {"Ball and Chain", ITEMTYPE_EQUIP_e} },
{ dItemNo_BOW_e, {"Hero's Bow", ITEMTYPE_EQUIP_e} },
{ dItemNo_HOOKSHOT_e, {"Clawshot", ITEMTYPE_EQUIP_e} },
{ dItemNo_HVY_BOOTS_e, {"Iron Boots", ITEMTYPE_EQUIP_e} },
{ dItemNo_COPY_ROD_e, {"Dominion Rod", ITEMTYPE_EQUIP_e} },
{ dItemNo_W_HOOKSHOT_e, {"Double Clawshots", ITEMTYPE_EQUIP_e} },
{ dItemNo_KANTERA_e, {"Lantern", ITEMTYPE_EQUIP_e} },
{ dItemNo_LIGHT_SWORD_e, {"Light Sword"} },
{ dItemNo_FISHING_ROD_1_e, {"Fishing Rod", ITEMTYPE_EQUIP_e} },
{ dItemNo_PACHINKO_e, {"Slingshot", ITEMTYPE_EQUIP_e} },
{ dItemNo_COPY_ROD_2_e, {"Dominion Rod (Uncharged)"} },
{ dItemNo_NOENTRY_77_e, {"Reserved"} },
{ dItemNo_NOENTRY_78_e, {"Reserved"} },
{ dItemNo_BOMB_BAG_LV2_e, {"Giant Bomb Bag"} },
{ dItemNo_BOMB_BAG_LV1_e, {"Empty Bomb Bag", ITEMTYPE_EQUIP_e} },
{ dItemNo_BOMB_IN_BAG_e, {"Bomb Bag"} },
{ dItemNo_NOENTRY_82_e, {"Reserved"} },
{ dItemNo_LIGHT_ARROW_e, {"Light Arrow"} },
{ dItemNo_ARROW_LV1_e, {"Quiver"} },
{ dItemNo_ARROW_LV2_e, {"Big Quiver"} },
{ dItemNo_ARROW_LV3_e, {"Giant Quiver"} },
{ dItemNo_NOENTRY_87_e, {"Reserved"} },
{ dItemNo_LURE_ROD_e, {"Fishing Rod (Lure)"} },
{ dItemNo_BOMB_ARROW_e, {"Bomb Arrow"} },
{ dItemNo_HAWK_ARROW_e, {"Hawk Arrow"} },
{ dItemNo_BEE_ROD_e, {"Fishing Rod (Bee Larva)", ITEMTYPE_EQUIP_e} },
{ dItemNo_JEWEL_ROD_e, {"Fishing Rod (Earring)", ITEMTYPE_EQUIP_e} },
{ dItemNo_WORM_ROD_e, {"Fishing Rod (Worm)", ITEMTYPE_EQUIP_e} },
{ dItemNo_JEWEL_BEE_ROD_e, {"Fishing Rod (Earring + Bee Larva)", ITEMTYPE_EQUIP_e} },
{ dItemNo_JEWEL_WORM_ROD_e, {"Fishing Rod (Earring + Worm)", ITEMTYPE_EQUIP_e} },
{ dItemNo_EMPTY_BOTTLE_e, {"Empty Bottle", ITEMTYPE_EQUIP_e} },
{ dItemNo_RED_BOTTLE_e, {"Red Potion", ITEMTYPE_EQUIP_e} },
{ dItemNo_GREEN_BOTTLE_e, {"Green Potion", ITEMTYPE_EQUIP_e} },
{ dItemNo_BLUE_BOTTLE_e, {"Blue Potion", ITEMTYPE_EQUIP_e} },
{ dItemNo_MILK_BOTTLE_e, {"Milk Bottle", ITEMTYPE_EQUIP_e} },
{ dItemNo_HALF_MILK_BOTTLE_e, {"Half Milk Bottle", ITEMTYPE_EQUIP_e} },
{ dItemNo_OIL_BOTTLE_e, {"Lantern Oil", ITEMTYPE_EQUIP_e} },
{ dItemNo_WATER_BOTTLE_e, {"Water Bottle", ITEMTYPE_EQUIP_e} },
{ dItemNo_OIL_BOTTLE_2_e, {"Lantern Oil (Scooped)"} },
{ dItemNo_RED_BOTTLE_2_e, {"Red Potion (Scooped)"} },
{ dItemNo_UGLY_SOUP_e, {"Nasty Soup", ITEMTYPE_EQUIP_e} },
{ dItemNo_HOT_SPRING_e, {"Hotspring Water", ITEMTYPE_EQUIP_e} },
{ dItemNo_FAIRY_e, {"Fairy", ITEMTYPE_EQUIP_e} },
{ dItemNo_HOT_SPRING_2_e, {"Hotspring Water (Shop)"} },
{ dItemNo_OIL2_e, {"Lantern Refill (Scooped)"} },
{ dItemNo_OIL_e, {"Lantern Refill (Shop)"} },
{ dItemNo_NORMAL_BOMB_e, {"Bombs", ITEMTYPE_EQUIP_e} },
{ dItemNo_WATER_BOMB_e, {"Water Bombs", ITEMTYPE_EQUIP_e} },
{ dItemNo_POKE_BOMB_e, {"Bomblings", ITEMTYPE_EQUIP_e} },
{ dItemNo_FAIRY_DROP_e, {"Great Fairy's Tears", ITEMTYPE_EQUIP_e} },
{ dItemNo_WORM_e, {"Worm", ITEMTYPE_EQUIP_e} },
{ dItemNo_DROP_BOTTLE_e, {"Great Fairy Tears (Jovani)"} },
{ dItemNo_BEE_CHILD_e, {"Bee Larva", ITEMTYPE_EQUIP_e} },
{ dItemNo_CHUCHU_RARE_e, {"Rare Chu Jelly", ITEMTYPE_EQUIP_e} },
{ dItemNo_CHUCHU_RED_e, {"Red Chu Jelly", ITEMTYPE_EQUIP_e} },
{ dItemNo_CHUCHU_BLUE_e, {"Blue Chu Jelly", ITEMTYPE_EQUIP_e} },
{ dItemNo_CHUCHU_GREEN_e, {"Green Chu Jelly", ITEMTYPE_EQUIP_e} },
{ dItemNo_CHUCHU_YELLOW_e, {"Yellow Chu Jelly", ITEMTYPE_EQUIP_e} },
{ dItemNo_CHUCHU_PURPLE_e, {"Purple Chu Jelly", ITEMTYPE_EQUIP_e} },
{ dItemNo_LV1_SOUP_e, {"Simple Soup", ITEMTYPE_EQUIP_e} },
{ dItemNo_LV2_SOUP_e, {"Good Soup", ITEMTYPE_EQUIP_e} },
{ dItemNo_LV3_SOUP_e, {"Superb Soup", ITEMTYPE_EQUIP_e} },
{ dItemNo_LETTER_e, {"Renado's Letter", ITEMTYPE_EQUIP_e} },
{ dItemNo_BILL_e, {"Invoice", ITEMTYPE_EQUIP_e} },
{ dItemNo_WOOD_STATUE_e, {"Wooden Statue", ITEMTYPE_EQUIP_e} },
{ dItemNo_IRIAS_PENDANT_e, {"Ilia's Charm", ITEMTYPE_EQUIP_e} },
{ dItemNo_HORSE_FLUTE_e, {"Horse Call", ITEMTYPE_EQUIP_e} },
{ dItemNo_NOENTRY_133_e, {"Reserved"} },
{ dItemNo_NOENTRY_134_e, {"Reserved"} },
{ dItemNo_NOENTRY_135_e, {"Reserved"} },
{ dItemNo_NOENTRY_136_e, {"Reserved"} },
{ dItemNo_NOENTRY_137_e, {"Reserved"} },
{ dItemNo_NOENTRY_138_e, {"Reserved"} },
{ dItemNo_NOENTRY_139_e, {"Reserved"} },
{ dItemNo_NOENTRY_140_e, {"Reserved"} },
{ dItemNo_NOENTRY_141_e, {"Reserved"} },
{ dItemNo_NOENTRY_142_e, {"Reserved"} },
{ dItemNo_NOENTRY_143_e, {"Reserved"} },
{ dItemNo_RAFRELS_MEMO_e, {"Auru's Memo", ITEMTYPE_EQUIP_e} },
{ dItemNo_ASHS_SCRIBBLING_e, {"Ashei's Sketch", ITEMTYPE_EQUIP_e} },
{ dItemNo_NOENTRY_146_e, {"Reserved"} },
{ dItemNo_NOENTRY_147_e, {"Reserved"} },
{ dItemNo_NOENTRY_148_e, {"Reserved"} },
{ dItemNo_NOENTRY_149_e, {"Reserved"} },
{ dItemNo_NOENTRY_150_e, {"Reserved"} },
{ dItemNo_NOENTRY_151_e, {"Reserved"} },
{ dItemNo_NOENTRY_152_e, {"Reserved"} },
{ dItemNo_NOENTRY_153_e, {"Reserved"} },
{ dItemNo_NOENTRY_154_e, {"Reserved"} },
{ dItemNo_NOENTRY_155_e, {"Reserved"} },
{ dItemNo_CHUCHU_YELLOW2_e, {"Lantern Refill (Yellow Chu)"} },
{ dItemNo_OIL_BOTTLE3_e, {"Lantern Oil (Coro)"} },
{ dItemNo_SHOP_BEE_CHILD_e, {"Bee Larve (Shop)"} },
{ dItemNo_CHUCHU_BLACK_e, {"Black Chu Jelly", ITEMTYPE_EQUIP_e} },
{ dItemNo_LIGHT_DROP_e, {"Tear of Light"} },
{ dItemNo_DROP_CONTAINER_e, {"Vessel of Light (Faron)"} },
{ dItemNo_DROP_CONTAINER02_e, {"Vessel of Light (Eldin)"} },
{ dItemNo_DROP_CONTAINER03_e, {"Vessel of Light (Lanayru)"} },
{ dItemNo_FILLED_CONTAINER_e, {"Vessel of Light (Filled)"} },
{ dItemNo_MIRROR_PIECE_2_e, {"Mirror Shard (Snowpeak Ruins)"} },
{ dItemNo_MIRROR_PIECE_3_e, {"Mirror Shard (Temple of Time)"} },
{ dItemNo_MIRROR_PIECE_4_e, {"Mirror Shard (City in the Sky)"} },
{ dItemNo_NOENTRY_168_e, {"Reserved"} },
{ dItemNo_NOENTRY_169_e, {"Reserved"} },
{ dItemNo_NOENTRY_170_e, {"Reserved"} },
{ dItemNo_NOENTRY_171_e, {"Reserved"} },
{ dItemNo_NOENTRY_172_e, {"Reserved"} },
{ dItemNo_NOENTRY_173_e, {"Reserved"} },
{ dItemNo_NOENTRY_174_e, {"Reserved"} },
{ dItemNo_NOENTRY_175_e, {"Reserved"} },
{ dItemNo_SMELL_YELIA_POUCH_e, {"Scent of Ilia"} },
{ dItemNo_SMELL_PUMPKIN_e, {"Pumpkin Scent"} },
{ dItemNo_SMELL_POH_e, {"Poe Scent"} },
{ dItemNo_SMELL_FISH_e, {"Reekfish Scent"} },
{ dItemNo_SMELL_CHILDREN_e, {"Youth's Scent"} },
{ dItemNo_SMELL_MEDICINE_e, {"Medicine Scent"} },
{ dItemNo_NOENTRY_182_e, {"Reserved"} },
{ dItemNo_NOENTRY_183_e, {"Reserved"} },
{ dItemNo_NOENTRY_184_e, {"Reserved"} },
{ dItemNo_NOENTRY_185_e, {"Reserved"} },
{ dItemNo_NOENTRY_186_e, {"Reserved"} },
{ dItemNo_NOENTRY_187_e, {"Reserved"} },
{ dItemNo_NOENTRY_188_e, {"Reserved"} },
{ dItemNo_NOENTRY_189_e, {"Reserved"} },
{ dItemNo_NOENTRY_190_e, {"Reserved"} },
{ dItemNo_NOENTRY_191_e, {"Reserved"} },
{ dItemNo_M_BEETLE_e, {"Beetle (M)"} },
{ dItemNo_F_BEETLE_e, {"Beetle (F)"} },
{ dItemNo_M_BUTTERFLY_e, {"Butterfly (M)"} },
{ dItemNo_F_BUTTERFLY_e, {"Butterfly (F)"} },
{ dItemNo_M_STAG_BEETLE_e, {"Stag Beetle (M)"} },
{ dItemNo_F_STAG_BEETLE_e, {"Stag Beetle (F)"} },
{ dItemNo_M_GRASSHOPPER_e, {"Grasshopper (M)"} },
{ dItemNo_F_GRASSHOPPER_e, {"Grasshopper (F)"} },
{ dItemNo_M_NANAFUSHI_e, {"Phasmid (M)"} },
{ dItemNo_F_NANAFUSHI_e, {"Phasmid (F)"} },
{ dItemNo_M_DANGOMUSHI_e, {"Pill Bug (M)"} },
{ dItemNo_F_DANGOMUSHI_e, {"Pill Bug (F)"} },
{ dItemNo_M_MANTIS_e, {"Mantis (M)"} },
{ dItemNo_F_MANTIS_e, {"Mantis (F)"} },
{ dItemNo_M_LADYBUG_e, {"Ladybug (M)"} },
{ dItemNo_F_LADYBUG_e, {"Ladybug (F)"} },
{ dItemNo_M_SNAIL_e, {"Snail (M)"} },
{ dItemNo_F_SNAIL_e, {"Snail (F)"} },
{ dItemNo_M_DRAGONFLY_e, {"Dragonfly (M)"} },
{ dItemNo_F_DRAGONFLY_e, {"Dragonfly (F)"} },
{ dItemNo_M_ANT_e, {"Ant (M)"} },
{ dItemNo_F_ANT_e, {"Ant (F)"} },
{ dItemNo_M_MAYFLY_e, {"Mayfly (M)"} },
{ dItemNo_F_MAYFLY_e, {"Mayfly (F)"} },
{ dItemNo_NOENTRY_216_e, {"Reserved"} },
{ dItemNo_NOENTRY_217_e, {"Reserved"} },
{ dItemNo_NOENTRY_218_e, {"Reserved"} },
{ dItemNo_NOENTRY_219_e, {"Reserved"} },
{ dItemNo_NOENTRY_220_e, {"Reserved"} },
{ dItemNo_NOENTRY_221_e, {"Reserved"} },
{ dItemNo_NOENTRY_222_e, {"Reserved"} },
{ dItemNo_NOENTRY_223_e, {"Reserved"} },
{ dItemNo_POU_SPIRIT_e, {"Poe Soul"} },
{ dItemNo_NOENTRY_225_e, {"Reserved"} },
{ dItemNo_NOENTRY_226_e, {"Reserved"} },
{ dItemNo_NOENTRY_227_e, {"Reserved"} },
{ dItemNo_NOENTRY_228_e, {"Reserved"} },
{ dItemNo_NOENTRY_229_e, {"Reserved"} },
{ dItemNo_NOENTRY_230_e, {"Reserved"} },
{ dItemNo_NOENTRY_231_e, {"Reserved"} },
{ dItemNo_NOENTRY_232_e, {"Reserved"} },
{ dItemNo_ANCIENT_DOCUMENT_e, {"Ancient Sky Book", ITEMTYPE_EQUIP_e} },
{ dItemNo_AIR_LETTER_e, {"Ancient Sky Book (Partial)", ITEMTYPE_EQUIP_e} },
{ dItemNo_ANCIENT_DOCUMENT2_e, {"Ancient Sky Book (Filled)", ITEMTYPE_EQUIP_e} },
{ dItemNo_LV7_DUNGEON_EXIT_e, {"Ooccoo Sr. (City in the Sky)"} },
{ dItemNo_LINKS_SAVINGS_e, {"Purple Rupee (Link's Savings)"} },
{ dItemNo_SMALL_KEY2_e, {"Small Key (North Faron Gate)"} },
{ dItemNo_POU_FIRE1_e, {"Poe Fire 1"} },
{ dItemNo_POU_FIRE2_e, {"Poe Fire 2"} },
{ dItemNo_POU_FIRE3_e, {"Poe Fire 3"} },
{ dItemNo_POU_FIRE4_e, {"Poe Fire 4"} },
{ dItemNo_BOSSRIDER_KEY_e, {"Hyrule Field Keys"} },
{ dItemNo_TOMATO_PUREE_e, {"Ordon Pumpkin", ITEMTYPE_EQUIP_e} },
{ dItemNo_TASTE_e, {"Ordon Goat Cheese", ITEMTYPE_EQUIP_e} },
{ dItemNo_LV5_BOSS_KEY_e, {"Bedroom Key"} },
{ dItemNo_SURFBOARD_e, {"Surf Leaf"} },
{ dItemNo_KANTERA2_e, {"Lantern (Reclaimed)"} },
{ dItemNo_L2_KEY_PIECES1_e, {"Key Shard (1)"} },
{ dItemNo_L2_KEY_PIECES2_e, {"Key Shard (2)"} },
{ dItemNo_L2_KEY_PIECES3_e, {"Key Shard (3)"} },
{ dItemNo_KEY_OF_CARAVAN_e, {"Bulblin Camp Key"} },
{ dItemNo_LV2_BOSS_KEY_e, {"Goron Mines Boss Key"} },
{ dItemNo_KEY_OF_FILONE_e, {"South Faron Gate Key"} },
{ dItemNo_NONE_e, {"None"} },
};
ImGuiSaveEditor::ImGuiSaveEditor() {}
@@ -292,7 +302,7 @@ namespace dusk {
}
if (ImGui::BeginTabItem("Inventory")) {
//DrawInventoryTab();
drawInventoryTab();
ImGui::EndTabItem();
}
@@ -384,7 +394,7 @@ namespace dusk {
int currentSlotNo = selectItemData;
std::string defaultLabel =
currentSlotNo != 0xFF
? fmt::format("Slot {0} ({1})", currentSlotNo, itemMap.find(item.mItems[currentSlotNo])->second)
? fmt::format("Slot {0} ({1})", currentSlotNo, itemMap.find(item.mItems[currentSlotNo])->second.m_name)
: "None";
// TODO: live update equips
@@ -395,7 +405,7 @@ namespace dusk {
for (int i = 0; i < 24; i++) {
u8 itemNo = item.mItems[i];
if (ImGui::Selectable(fmt::format("Slot {0} ({1})", i, itemMap.find(itemNo)->second).c_str())) {
if (ImGui::Selectable(fmt::format("Slot {0} ({1})", i, itemMap.find(itemNo)->second.m_name).c_str())) {
selectItemData = i;
}
}
@@ -439,7 +449,7 @@ namespace dusk {
genSelectItemComboBox("Combo Equip Y", statusA.mMixItem[1]);
if (ImGui::BeginCombo("Clothes", itemMap.find(statusA.mSelectEquip[0])->second.c_str())) {
if (ImGui::BeginCombo("Clothes", itemMap.find(statusA.mSelectEquip[0])->second.m_name.c_str())) {
if (ImGui::Selectable("None")) {
statusA.mSelectEquip[0] = dItemNo_NONE_e;
}
@@ -458,7 +468,7 @@ namespace dusk {
ImGui::EndCombo();
}
if (ImGui::BeginCombo("Sword", itemMap.find(statusA.mSelectEquip[1])->second.c_str())) {
if (ImGui::BeginCombo("Sword", itemMap.find(statusA.mSelectEquip[1])->second.m_name.c_str())) {
if (ImGui::Selectable("None")) {
statusA.mSelectEquip[1] = dItemNo_NONE_e;
}
@@ -477,7 +487,7 @@ namespace dusk {
ImGui::EndCombo();
}
if (ImGui::BeginCombo("Shield", itemMap.find(statusA.mSelectEquip[2])->second.c_str())) {
if (ImGui::BeginCombo("Shield", itemMap.find(statusA.mSelectEquip[2])->second.m_name.c_str())) {
if (ImGui::Selectable("None")) {
statusA.mSelectEquip[2] = dItemNo_NONE_e;
}
@@ -493,7 +503,7 @@ namespace dusk {
ImGui::EndCombo();
}
if (ImGui::BeginCombo("Scent", itemMap.find(statusA.mSelectEquip[3])->second.c_str())) {
if (ImGui::BeginCombo("Scent", itemMap.find(statusA.mSelectEquip[3])->second.m_name.c_str())) {
if (ImGui::Selectable("None")) {
statusA.mSelectEquip[3] = dItemNo_NONE_e;
}
@@ -666,6 +676,29 @@ namespace dusk {
}
void ImGuiSaveEditor::drawInventoryTab() {
dSv_player_item_c& item = dComIfGs_getSaveData()->getPlayer().getItem();
ImGuiBeginGroupPanel("Items", { 200, 100 });
for (int slot = 0; slot < 24; slot++) {
ImGui::Text("Slot %02d: ", slot);
ImGui::SameLine();
if (ImGui::BeginCombo(fmt::format("##ItemComboBox{}", slot).c_str(), itemMap.find(item.mItems[slot])->second.m_name.c_str())) {
if (ImGui::Selectable("None")) {
dComIfGs_setItem(slot, dItemNo_NONE_e);
}
for (int i = 0; i < 254; i++) {
if (itemMap.find(i)->second.m_type != ITEMTYPE_EQUIP_e) continue;
if (ImGui::Selectable(fmt::format("{0}##item_{1}{2}", itemMap.find(i)->second.m_name, slot, i).c_str())) {
dComIfGs_setItem(slot, itemMap.find(i)->first);
}
}
ImGui::EndCombo();
}
}
ImGuiEndGroupPanel();
}
src/dusk/stubs.cpp
-4
View File
@@ -389,10 +389,6 @@ s32 JSUMemoryOutputStream::getAvailable() const {
return mLength - mPosition;
}
s32 JSUMemoryOutputStream::getPosition() const {
return mPosition;
}
#pragma mark JSURandomOutputStream
#include <JSystem/JSupport/JSURandomOutputStream.h>
s32 JSUMemoryOutputStream::seek(s32 offset, JSUStreamSeekFrom origin) {
src/f_op/f_op_actor_mng.cpp
+2
View File
@@ -524,6 +524,7 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback
OSReport_Error("最大空きヒープサイズで確保失敗。[%s]\n", procNameString);
return false;
}
JKRHEAP_NAMEF(heap, "Actor mng (%s)", procNameString);
#if DEBUG
if (!fopAcM::HeapAdjustQuiet) {
// Attempting registration with max heap size. %08x
@@ -625,6 +626,7 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback
if (alignedSize + adjOffset + 0x10 < freeSize) {
newHeap = mDoExt_createSolidHeapFromGame(alignedSize, 0x20);
JKRHEAP_NAMEF(newHeap, "Actor mng (%s)", procNameString);
}
if (fopAcM::HeapAdjustVerbose) {
src/m_Do/m_Do_graphic.cpp
+19
View File
@@ -1081,7 +1081,13 @@ static void trimming(view_class* param_0, view_port_class* param_1) {
GXSetDither(GX_TRUE);
GXSetNumIndStages(0);
Mtx44 ortho;
#if TARGET_PC
C_MTXOrtho(ortho, 0.0f, param_1->height, 0.0f, param_1->width, 0.0f, 10.0f);
#else
C_MTXOrtho(ortho, 0.0f, FB_HEIGHT, 0.0f, FB_WIDTH, 0.0f, 10.0f);
#endif
GXLoadPosMtxImm(cMtx_getIdentity(), 0);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -1089,6 +1095,17 @@ static void trimming(view_class* param_0, view_port_class* param_1) {
GXSetProjection(ortho, GX_ORTHOGRAPHIC);
GXSetCurrentMtx(0);
GXBegin(GX_QUADS, GX_VTXFMT0, 8);
#if TARGET_PC
GXPosition3s16(0, 0, -5);
GXPosition3s16(param_1->width, 0, -5);
GXPosition3s16(param_1->width, sc_top, -5);
GXPosition3s16(0, sc_top, -5);
GXPosition3s16(0, sc_bottom, -5);
GXPosition3s16(param_1->width, sc_bottom, -5);
GXPosition3s16(param_1->width, param_1->height, -5);
GXPosition3s16(0, param_1->height, -5);
#else
GXPosition3s16(0, 0, -5);
GXPosition3s16(FB_WIDTH, 0, -5);
GXPosition3s16(FB_WIDTH, sc_top, -5);
@@ -1097,6 +1114,8 @@ static void trimming(view_class* param_0, view_port_class* param_1) {
GXPosition3s16(FB_WIDTH, sc_bottom, -5);
GXPosition3s16(FB_WIDTH, FB_HEIGHT, -5);
GXPosition3s16(0, FB_HEIGHT, -5);
#endif
GXEnd();
}
GXSetScissor(param_1->scissor.x_orig, param_1->scissor.y_orig, param_1->scissor.width,
src/m_Do/m_Do_main.cpp
+1
View File
@@ -277,6 +277,7 @@ int game_main(int argc, char* argv[]) {
config.logLevel = (AuroraLogLevel)parsed_arg_options["log-level"].as<uint8_t>();
config.mem1Size = 256 * 1024 * 1024;
config.mem2Size = 24 * 1024 * 1024;
config.allowJoystickBackgroundEvents = true;
auroraInfo = aurora_initialize(argc, argv, &config);