Skip to content

zCombo matches #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SquareMan merged 7 commits into from
Feb 17, 2025
Merged

zCombo matches #405

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8486474
Match zNPCGoalJellyAttack::Enter(float, void*)
NotMichael-GH Feb 2, 2025
fa576ff
Even more functions out of the way
NotMichael-GH Feb 2, 2025
c3a40aa
Even more functions out of the way
NotMichael-GH Feb 2, 2025
b16bd28
Merge branch 'main' of https://github.com/TotallyNotMichael-GH/bfbb
NotMichael-GH Feb 2, 2025
8576f0f
Thank you, Square
NotMichael-GH Feb 2, 2025
e669e02
zCombo Matches
NotMichael-GH Feb 14, 2025
358d07d
Merge remote-tracking branch 'upstream/main'
JoshSanch Feb 17, 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
42 changes: 32 additions & 10 deletions src/SB/Game/zCombo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "xTextAsset.h"
#include "zGlobals.h"
#include "zTextBox.h"
#include "zUIFont.h"

extern const char zCombo_Strings[];
extern const F32 zCombo_float_zero;
Expand All @@ -29,19 +30,23 @@ struct widget_chunk : xBase
xhud::text_widget w;
};

extern widget_chunk* comboHUD;
/* .bss */
static xVec3 sUnderCamPos;
static xtextbox * sHideText[5];

extern zComboReward comboReward[16];

extern S32 zCombo_int32_1; // probably comboPending
extern S32 zCombo_int32_2; // probably comboLastCounter
extern S32 zCombo_int32_3; // probably comboCounter
/* .sbss */
static widget_chunk* comboHUD;
static zUIFont* sHideUIF[1];
static S32 comboPending;
static S32 comboLastCounter;
static S32 comboCounter;
static F32 comboTimer;

extern F32 zCombo_float32_1; // probably comboMaxTime
extern F32 zCombo_float32_3; // probably comboTimer
/* .sdata */
static F32 comboMaxTime = 1.0f;
static F32 comboDisplayTime = 2.0f;

extern xBase* sHideText[5];
extern xBase* sHideUIF[1];
extern zComboReward comboReward[16];

void fillCombo(zComboReward* reward)
{
Expand Down Expand Up @@ -80,6 +85,23 @@ void fillCombo(zComboReward* reward)
reward->rewardNum = j;
}

void zCombo_Add(S32 arg0)
{
if (comboTimer < 0.0f)
{
comboTimer = comboMaxTime;
comboPending = arg0 - 1;
return;
}
comboTimer = comboMaxTime;
comboCounter += arg0;
if ((S32) comboPending != 0)
{
comboCounter += comboPending;
comboPending = 0;
}
}

#if 0
// Can't get the floating point instructions to go in the right order
// the zCombo_float32_3 = zCombo_float_minusone always gets lifted to the
Expand Down