Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
f50bd48
self setup and others
LivewireCB Mar 18, 2025
6889b80
Merge branch 'main' into dev
LivewireCB Mar 18, 2025
935bf49
zNPC_AnimTable_KingJelly
LivewireCB Mar 19, 2025
ed0e484
fix
LivewireCB Mar 19, 2025
7c83718
removed leftover junk from intially starting the function
LivewireCB Mar 19, 2025
aa52c8a
Merge branch 'main' into dev
LivewireCB Mar 19, 2025
8ef3111
ZNPC_AnimTable_BossSB2 - 73% code match
LivewireCB Mar 20, 2025
2b0e9a9
Merge branch 'main' into dev
LivewireCB Mar 20, 2025
58b715b
Dutchman anim table should be complete, removed some junk from zNPCTy…
LivewireCB Mar 20, 2025
47b834d
Merge branch 'main' into dev
LivewireCB Mar 23, 2025
a48a40f
Anim Tables
LivewireCB Mar 23, 2025
41af867
worst push ever
LivewireCB Mar 24, 2025
44288bc
BossSandy Animtable
LivewireCB Mar 24, 2025
166b339
Merge branch 'main' into dev
LivewireCB Mar 24, 2025
be630ce
ZNPCTypeVillager
LivewireCB Mar 25, 2025
c60a37c
Merge branch 'main' into dev
LivewireCB Mar 25, 2025
4c7e35a
ZNPCTypeVillager functions
LivewireCB Mar 26, 2025
f70f100
Merge branch 'main' into dev
LivewireCB Mar 26, 2025
09177d6
Merge branch 'main' into dev
LivewireCB Mar 27, 2025
1620763
ship it, YOLO
mattbruv Mar 29, 2025
7892da4
Merge branch 'main' into dev
LivewireCB Mar 29, 2025
438c0c7
test commit
LivewireCB Mar 29, 2025
14fa5eb
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Mar 29, 2025
869d131
test
LivewireCB Mar 29, 2025
2d5d24a
Merge branch 'main' into dev
LivewireCB Mar 29, 2025
a4121cc
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Mar 29, 2025
7d1abcb
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Mar 29, 2025
26ca3fc
Merge branch 'main' into dev
LivewireCB Mar 29, 2025
fe56317
Merge branch 'main' into dev
mattbruv Mar 29, 2025
db0369a
add permissions
mattbruv Mar 29, 2025
03a8c26
CI
mattbruv Mar 29, 2025
f54b8a3
asdoijfaoisdjf
mattbruv Mar 29, 2025
e1aec2f
ijasdoifj
mattbruv Mar 29, 2025
a7860c8
ojaspdfijasdfijUPPERCASE test
mattbruv Mar 29, 2025
1199753
KFUCK
mattbruv Mar 29, 2025
6d514aa
ODIO MI PUTA VIDA DIOS MATAME YA
mattbruv Mar 29, 2025
0547e08
FUCOI:JVSIDJklj
mattbruv Mar 29, 2025
8582d38
IJSDOFIJPSDOIFJ
mattbruv Mar 29, 2025
fe15f03
aisdj FUCK FUCK FUCK
mattbruv Mar 29, 2025
a38192d
fuck FUCK !fuck FUCK !fuck FUCK !fuck FUCK !fuck FUCK !fuck FUCK !fuc…
mattbruv Mar 29, 2025
f2942a0
Foiapjsdoifjaoisdjfaoidsjfio
mattbruv Mar 29, 2025
7cd3850
does this dumb shit work?
mattbruv Mar 29, 2025
ac1e272
I am dead inside
mattbruv Mar 29, 2025
e8f84f9
jaspdiofjasdopifj
mattbruv Mar 29, 2025
a6abcdd
IJSDOIFJIOSDJFOIJES
mattbruv Mar 29, 2025
005937e
why me
mattbruv Mar 29, 2025
eff1939
I guess this shit is just fucking impossible
mattbruv Mar 29, 2025
78e4c4d
use newer version
mattbruv Mar 29, 2025
3dde261
garbo
mattbruv Mar 29, 2025
599f23b
Merge remote-tracking branch 'origin/main' into dev
mattbruv Mar 29, 2025
3672d40
t
mattbruv Mar 29, 2025
b067adf
i give up i give up i give up i give up i give up i give up i give up…
mattbruv Mar 29, 2025
09e4ae2
try this
mattbruv Mar 30, 2025
25f16c1
test
mattbruv Mar 30, 2025
dfe2fe1
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Mar 30, 2025
29d8a7c
Merge branch 'main' into dev
LivewireCB Mar 30, 2025
29521b6
functions and a bit of cleanup
LivewireCB Mar 30, 2025
b8a9625
Merge branch 'dev' of https://github.com/LivewireCB/bfbb-decomp into dev
LivewireCB Mar 30, 2025
17beb0a
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Mar 30, 2025
00e6cd7
Merge branch 'main' into dev
LivewireCB Mar 30, 2025
765d157
matched a few functions in Kingjelly, cleaned up both kingjelly and p…
LivewireCB Mar 31, 2025
332eeb5
float fix
LivewireCB Mar 31, 2025
9d3b36a
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Mar 31, 2025
9124b68
Merge branch 'dev' of https://github.com/LivewireCB/bfbb-decomp into dev
LivewireCB Mar 31, 2025
d581911
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Apr 1, 2025
17e5a59
Merge branch 'main' into dev
LivewireCB Apr 1, 2025
4e43241
Prawn and Dutchman functions
LivewireCB Apr 1, 2025
08752c9
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Apr 1, 2025
b80b505
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Apr 2, 2025
0bb02b1
b upd
LivewireCB Apr 3, 2025
15c17d9
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Apr 3, 2025
a8fe36e
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Apr 4, 2025
bd5ca44
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Apr 5, 2025
35274fa
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Apr 6, 2025
0dc8f3e
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Apr 9, 2025
820a864
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Apr 15, 2025
e035c12
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB Apr 18, 2025
3a97bf5
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB May 8, 2025
f37a105
Merge branch 'main' into dev
LivewireCB May 8, 2025
09b0073
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB May 9, 2025
c3eb268
Merge branch 'main' into dev
LivewireCB May 9, 2025
457c551
Merge branch 'main' of https://github.com/bfbbdecomp/bfbb
LivewireCB May 9, 2025
10ffb02
Merge branch 'main' into dev4
LivewireCB May 9, 2025
0ca4561
re-organized BossPlankton. Added all create functions and a few others.
LivewireCB May 9, 2025
99b6882
pr comment retry
LivewireCB May 9, 2025
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
159 changes: 137 additions & 22 deletions src/SB/Game/zNPCTypeBossPlankton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#include <types.h>

// pr comment retry

#define f1585 1.0f
#define f1586 0.0f
#define f1657 0.2f
Expand Down Expand Up @@ -376,29 +378,77 @@ U8 zNPCBPlankton::ColChkByFlags() const
return 16;
}

S32 zNPCGoalBPlanktonBomb::Process(en_trantype*, F32, void*, xScene*)
xFactoryInst* zNPCGoalBPlanktonIdle::create(S32 who, RyzMemGrow* grow, void* info)
{
return 0;
return new (who, grow) zNPCGoalBPlanktonIdle(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonMissle::Process(en_trantype*, F32, void*, xScene*)
xFactoryInst* zNPCGoalBPlanktonAttack::create(S32 who, RyzMemGrow* grow, void* info)
{
return 0;
return new (who, grow) zNPCGoalBPlanktonAttack(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonWall::Process(en_trantype*, F32, void*, xScene*)
xFactoryInst* zNPCGoalBPlanktonAmbush::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonAmbush(who, (zNPCBPlankton&)*info);
}

xFactoryInst* zNPCGoalBPlanktonFlank::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonFlank(who, (zNPCBPlankton&)*info);
}

xFactoryInst* zNPCGoalBPlanktonEvade::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonEvade(who, (zNPCBPlankton&)*info);
}

xFactoryInst* zNPCGoalBPlanktonHunt::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonHunt(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonHunt::Enter(float dt, void* updCtxt)
{
owner.reappear();
get_player_loc();
owner.flag.attacking = true;
owner.delay = 0.0f;
owner.reset_speed();
owner.refresh_orbit();
owner.follow_camera();
return zNPCGoalCommon::Enter(dt, updCtxt);
}

S32 zNPCGoalBPlanktonHunt::Exit(float dt, void* updCtxt)
{
owner.refresh_orbit();
return xGoal::Exit(dt, updCtxt);
}

xFactoryInst* zNPCGoalBPlanktonTaunt::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonTaunt(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonTaunt::Process(en_trantype*, F32, void*, xScene*)
{
return 0;
}

xFactoryInst* zNPCGoalBPlanktonMove::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonMove(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonMove::Process(en_trantype*, F32, void*, xScene*)
{
return 0;
}

xFactoryInst* zNPCGoalBPlanktonBomb::create(S32 who, RyzMemGrow* grow, void* info)
xFactoryInst* zNPCGoalBPlanktonStun::create(S32 who, RyzMemGrow* grow, void* info)
{
return 0; // To-Do
return new (who, grow) zNPCGoalBPlanktonStun(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonStun::Enter(float dt, void* updCtxt)
Expand All @@ -416,6 +466,16 @@ S32 zNPCGoalBPlanktonStun::Exit(float dt, void* updCtxt)
return xGoal::Exit(dt, updCtxt);
}

xFactoryInst* zNPCGoalBPlanktonFall::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonFall(who, (zNPCBPlankton&)*info);
}

xFactoryInst* zNPCGoalBPlanktonDizzy::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonDizzy(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonDizzy::Enter(float dt, void* updCtxt)
{
owner.give_control();
Expand All @@ -424,6 +484,11 @@ S32 zNPCGoalBPlanktonDizzy::Enter(float dt, void* updCtxt)
return zNPCGoalCommon::Enter(dt, updCtxt);
}

xFactoryInst* zNPCGoalBPlanktonBeam::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonBeam(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonBeam::Enter(float dt, void* updCtxt)
{
xParEmitter parE;
Expand All @@ -437,35 +502,85 @@ S32 zNPCGoalBPlanktonBeam::Enter(float dt, void* updCtxt)
return zNPCGoalCommon::Enter(dt, updCtxt);
}

S32 zNPCGoalBPlanktonBomb::Enter(float dt, void* updCtxt)
S32 zNPCGoalBPlanktonBeam::Exit(float dt, void* updCtxt)
{
return zNPCGoalCommon::Enter(dt, updCtxt);
xParEmitter parE;
xParEmitter& pEmit = parE; // this is one of the codes of all time
owner.flag.aim_gun = false;
owner.flag.follow = owner.FOLLOW_NONE;
owner.disable_emitter(pEmit);
return xGoal::Exit(dt, updCtxt);
}

S32 zNPCGoalBPlanktonHunt::Enter(float dt, void* updCtxt)
S32 zNPCGoalBPlanktonBeam::Process(en_trantype* trantype, F32 dt, void* unk,
xScene* xscn) // void* should be someting else.
// cross reference other files for the answer

// Im probably just dumb, but i dont get how this should be written.
{
owner.reappear();
get_player_loc();
owner.flag.attacking = true;
owner.delay = 0.0f;
owner.reset_speed();
owner.refresh_orbit();
owner.follow_camera();
return zNPCGoalCommon::Enter(dt, updCtxt);
S32 tempProcess;
tempProcess = emitted;
if (tempProcess != 2)
{
zNPCGoalBPlanktonBeam::update_warm_up(dt);
}
else if (tempProcess < 2)
{
if (tempProcess == 0)
{
zNPCGoalBPlanktonBeam::update_fire(dt);
}
else
{
zNPCGoalBPlanktonBeam::update_cool_down(dt);
}
}
else if (tempProcess < 4)
{
unk = 0;
tempProcess = owner.next_goal();
return tempProcess;
}

return 0;
}

S32 zNPCGoalBPlanktonHunt::Exit(float dt, void* updCtxt)
xFactoryInst* zNPCGoalBPlanktonWall::create(S32 who, RyzMemGrow* grow, void* info)
{
owner.refresh_orbit();
return xGoal::Exit(dt, updCtxt);
return new (who, grow) zNPCGoalBPlanktonWall(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonWall::Process(en_trantype*, F32, void*, xScene*)
{
return 0;
}

xFactoryInst* zNPCGoalBPlanktonMissle::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonMissle(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonMissle::Process(en_trantype*, F32, void*, xScene*)
{
return 0;
}

xFactoryInst* zNPCGoalBPlanktonBomb::create(S32 who, RyzMemGrow* grow, void* info)
{
return new (who, grow) zNPCGoalBPlanktonBomb(who, (zNPCBPlankton&)*info);
}

S32 zNPCGoalBPlanktonBomb::Enter(float dt, void* updCtxt)
{
return zNPCGoalCommon::Enter(dt, updCtxt);
}

S32 zNPCGoalBPlanktonBomb::Exit(float dt, void* updCtxt)
{
return xGoal::Exit(dt, updCtxt);
}

S32 zNPCGoalBPlanktonTaunt::Process(en_trantype*, F32, void*, xScene*)
S32 zNPCGoalBPlanktonBomb::Process(en_trantype*, F32, void*, xScene*)
{
return 0;
}
Loading