mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-10-22 11:30:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bombchu Bowling ammo changeable during minigame (#7350)

Browse Source
This commit is contained in:
Jordan Longstaff
2026-10-13 09:39:15 -04:00
committed by GitHub
parent e65fa741db
commit 7146143058
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/Minigames/BombchuBowling.cpp
+16 -5
View File
@@ -88,11 +88,22 @@ static void RegisterBombchuBowlingNoBigCucco() {
}
static void RegisterBombchuBowlingAmmo() {
COND_VB_SHOULD(VB_SET_BOMBCHU_BOWLING_AMMO,
CVAR_BOWLING_VALUE && (CVAR_BOWLING_AMMO_VALUE != CUCCO_BOWLING_AMMO_DEFAULT), {
gPlayState->bombchuBowlingStatus = CVAR_BOWLING_AMMO_VALUE;
*should = false;
});
static s32 prevAmmoValue = CUCCO_BOWLING_AMMO_DEFAULT;
s32 nextAmmoValue = CVAR_BOWLING_VALUE ? CVAR_BOWLING_AMMO_VALUE : CUCCO_BOWLING_AMMO_DEFAULT;
if ((prevAmmoValue != nextAmmoValue) && (gPlayState->bombchuBowlingStatus > 0)) {
gPlayState->bombchuBowlingStatus += nextAmmoValue - prevAmmoValue;
if (gPlayState->bombchuBowlingStatus <= 0) {
gPlayState->bombchuBowlingStatus = -1;
}
prevAmmoValue = nextAmmoValue;
}
COND_VB_SHOULD(VB_SET_BOMBCHU_BOWLING_AMMO, nextAmmoValue != CUCCO_BOWLING_AMMO_DEFAULT, {
prevAmmoValue = CVAR_BOWLING_AMMO_VALUE;
gPlayState->bombchuBowlingStatus = prevAmmoValue;
*should = false;
});
}
static void RegisterBombchuBowlingFirstPrize() {