AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 14:24:56 +00:00
Code Issues Projects Releases Wiki Activity

Integrate Amuse into hecl cook/extract for MP1/2

Browse Source
This commit is contained in:
Jack Andersen
2018-09-02 14:46:16 -10:00
parent 5a60a0acfc
commit e46ec80b64
150 changed files with 5011 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/GuiSys/CCompoundTargetReticle.cpp
View File

@@ -329,9 +329,9 @@ void CCompoundTargetReticle::UpdateCurrLockOnGroup(float dt, const CStateManager
if (targetId != kInvalidUniqueId)
{
if (TCastToConstPtr<CScriptGrapplePoint> point = mgr.GetObjectById(targetId))
CSfxManager::SfxStart(1393, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_lockon_grapple, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
else
CSfxManager::SfxStart(1377, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_lockon_poi, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
}
if (targetId == kInvalidUniqueId)

2
Runtime/GuiSys/CHudEnergyInterface.cpp
View File

@@ -138,7 +138,7 @@ void CHudEnergyInterface::SetEnergyLow(bool energyLow)
x28_textpane_energywarning->TextSupport().SetText(string);
if (energyLow)
CSfxManager::SfxStart(1405, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_energy_low, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
x1c_27_energyLow = energyLow;
}

4
Runtime/GuiSys/CHudMissileInterface.cpp
View File

@@ -189,12 +189,12 @@ void CHudMissileInterface::Update(float dt, const CStateManager& mgr)
if (x44_latestStatus == EInventoryStatus::Normal && curStatus == EInventoryStatus::Warning)
{
CSfxManager::SfxStart(1397, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_missile_warning, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
x48_missileWarningPulse = g_tweakGui->GetMissileWarningPulseTime();
}
else if (curStatus == EInventoryStatus::Depleted)
{
CSfxManager::SfxStart(1397, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_missile_warning, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
x48_missileWarningPulse = g_tweakGui->GetMissileWarningPulseTime();
}

6
Runtime/GuiSys/CHudThreatInterface.cpp
View File

@@ -197,9 +197,9 @@ void CHudThreatInterface::Update(float dt)
x68_textpane_threatwarning->TextSupport().SetText(string);
if (x4c_threatStatus == EThreatStatus::Normal && newStatus == EThreatStatus::Warning)
CSfxManager::SfxStart(1396, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_threat_warning, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
else if (newStatus == EThreatStatus::Damage)
CSfxManager::SfxStart(1399, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_threat_damage, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
x4c_threatStatus = newStatus;
}
@@ -213,7 +213,7 @@ void CHudThreatInterface::Update(float dt)
xc_damagePulse = (0.5f - x8_damagePulseTimer) / 0.25f;
if (x4c_threatStatus == EThreatStatus::Damage && x8_damagePulseTimer < oldX8)
CSfxManager::SfxStart(1399, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_threat_damage, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
if (x68_textpane_threatwarning)
{

2
Runtime/GuiSys/CHudVisorBeamMenu.cpp
View File

@@ -48,7 +48,7 @@ static const int MenuStringIdx[2][4] =
static const u16 SelectionSfxs[] =
{
1395, 1398
SFXui_select_visor, SFXui_select_beam
};
CHudVisorBeamMenu::CHudVisorBeamMenu(CGuiFrame& baseHud, EHudVisorBeamMenu type,

10
Runtime/GuiSys/CScanDisplay.cpp
View File

@@ -100,7 +100,7 @@ void CScanDisplay::ProcessInput(const CFinalInput& input)
else
{
xc_state = EScanState::ViewingScan;
CSfxManager::SfxStart(1439, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_scan_next_page, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
}
}
}
@@ -118,7 +118,7 @@ void CScanDisplay::ProcessInput(const CFinalInput& input)
}
if (x1ac_pageCounter != oldCounter)
{
CSfxManager::SfxStart(1439, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_scan_next_page, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
if (x1ac_pageCounter == 0)
{
xa8_message->SetIsVisible(true);
@@ -342,7 +342,7 @@ void CScanDisplay::Update(float dt, float scanningTime)
{
xc_state = EScanState::ViewingScan;
x1b0_aPulse = x1a4_xAlpha = 1.f;
CSfxManager::SfxStart(1417, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_scan_complete, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
}
else
{
@@ -352,7 +352,7 @@ void CScanDisplay::Update(float dt, float scanningTime)
g_MainStringTable->GetString(x14_scannableInfo->GetCategory() + 30) +
g_MainStringTable->GetString(30));
SetScanMessageTypeEffect(xa8_message, true);
CSfxManager::SfxStart(1425, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_new_scan_complete, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
}
if (x194_scanStr->GetStringCount() > 2)
@@ -399,7 +399,7 @@ void CScanDisplay::Update(float dt, float scanningTime)
if (tmp == 0.f)
{
dot.SetDotState(CDataDot::EDotState::Done);
CSfxManager::SfxStart(1414, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
CSfxManager::SfxStart(SFXui_scan_pane_reveal, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);
x170_paneStates[i].first = g_tweakGui->GetScanPaneFadeOutTime() + g_tweakGui->GetScanPaneFadeInTime();
}
break;