Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/SB/Core/x/xBehaviour.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ struct xListItem_1

struct xGoal : xListItem_1, xFactoryInst
{
xPsyche* psyche;
xPsyche* psyche; //0x18
en_GOALSTATE stat;
S32 flg_able;
S32 flg_able; //0x20
S32 (*fun_process)(xGoal*, void*, en_trantype*, F32, void*);
void* cbdata;

Expand All @@ -250,7 +250,7 @@ struct zNMEGoalCommon : xGoal
S32 bul_entered : 1;
S32 bul_resumed : 1;
S32 bul_unused : 6;
};
} flags;
struct
{
S32 flg_info : 16;
Expand Down
109 changes: 109 additions & 0 deletions src/SB/Game/zParticleSystemWaterfall.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
#include "zParticleSystemWaterfall.h"

void zParticleGeneratorWaterfallSplash::deactivate()
{
zParticleGenerator* pGen;
pGen->deactivate();
locator.deactivate();
}

void zParticleGeneratorWaterfallSplash::activate()
{
zParticleGenerator* pGen;
pGen->activate();
locator.activate(*asset, attach_to); // Make const
}

void zParticleGeneratorWaterfallSplash::reset()
{
zParticleGenerator::reset();
emitted = 0;
locator.restart();
locator.deactivate();
if (&flags != 0) // This arg needs fixed
{
locator.activate(*asset, attach_to);
}
}

S32 zParticleSystemWaterfallSplash::get_asset_size() const
{
return 56; // Calls for 0x38
}

void zParticleSystemWaterfallSplash::scene_enter()
{
batch_group.create();
}

void zParticleGeneratorWaterfallMist::deactivate()
{
zParticleGenerator* pGen;
pGen->deactivate();
locator.deactivate();
}

void zParticleGeneratorWaterfallMist::activate()
{
zParticleGenerator* pGen;
pGen->activate();
locator.activate(*asset, attach_to); // Make const
}

void zParticleGeneratorWaterfallMist::reset()
{
zParticleGenerator::reset();
emitted = 0;
locator.restart();
locator.deactivate();
if (&flags != 0) // This arg needs fixed
{
locator.activate(*asset, attach_to);
}
}

S32 zParticleSystemWaterfallMist::get_asset_size() const
{
return 52; // Calls for 0x34
}

void zParticleSystemWaterfallMist::scene_enter()
{
batch_group.create();
}

void zParticleGeneratorWaterfall::deactivate()
{
zParticleGenerator* pGen;
pGen->deactivate();
locator.deactivate();
}

void zParticleGeneratorWaterfall::activate()
{
zParticleGenerator* pGen;
pGen->activate();
locator.activate(*asset, attach_to); // Make const
}

void zParticleGeneratorWaterfall::reset() // 87%
{
zParticleGenerator::reset();
emitted = 0;
locator.restart();
locator.deactivate();
if (&flags != 0) // This arg needs fixed
{
locator.activate(*asset, attach_to);
}
}

S32 zParticleSystemWaterfall::get_asset_size() const
{
return 76; // Calls for 0x4c
}

void zParticleSystemWaterfall::scene_enter()
{
batch_group.create();
}
Loading