kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mr-origin-93'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-19 23:04:50 -05:00
parent d1b41e109d 8d2eeb28e3
commit 9443a276c5
63 changed files with 190 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/TTC/ch/blubber.c
View File

@@ -37,10 +37,10 @@ ActorAnimationInfo gChBlubberAnimations[6] = {
{ASSET_B8_ANIM_BLUBBER_RUN, 0.8f}
};
ActorInfo gChBlubber = {
ActorInfo gChBlubber = {
MARKER_A3_BLUBBER, ACTOR_115_BLUBBER, ASSET_370_MODEL_BLUBBER,
0x1, gChBlubberAnimations,
__chBlubber_updateFunc, __chBlubber_update2Func, __chBlubber_drawFunc,
0x1, gChBlubberAnimations,
__chBlubber_updateFunc, __chBlubber_update2Func, __chBlubber_drawFunc,
0, 0x399, 1.8f, 0
};
@@ -162,7 +162,7 @@ static void __chBlubber_updateFunc(Actor *this){
subaddie_set_state_forward(this, CH_BLUBBER_STATE_3_UNKNOWN);
}
if( mapSpecificFlags_get(TTC_SPECIFIC_FLAG_0_BLUBBER_UNKNOWN)
if( mapSpecificFlags_get(TTC_SPECIFIC_FLAG_0_BLUBBER_UNKNOWN)
&& !this->unk138_23
){
if (item_getCount(ITEM_18_GOLD_BULLIONS) == 0) {
@@ -214,7 +214,7 @@ static void __chBlubber_updateFunc(Actor *this){
__chBlubber_checkJiggySpawnedTextAndAdvanceState(this);
break;
case CH_BLUBBER_STATE_3_UNKNOWN:
case CH_BLUBBER_STATE_3_UNKNOWN:
break;
case CH_BLUBBER_STATE_4_UNKNOWN:

10
src/TTC/code_3E30.c
View File

@@ -501,13 +501,11 @@ static void __code3E30_resetCheatCodeProgress(void)
__code3E30_resetSecretCheatCodeProgress();
}
void code3E30_overlayRelease(void)
{
if (sMapState.model1)
{
void code3E30_overlayRelease(void) {
if (sMapState.model1) {
__code3E30_setupCheatCodeTimer(0);
func_8030DA44(sMapState.doorOpeningSfxSourceIdx);
func_8030DA44(sMapState.dullCannonShotSfxSourceId);
sfxsource_freeSfxsourceByIndex(sMapState.doorOpeningSfxSourceIdx);
sfxsource_freeSfxsourceByIndex(sMapState.dullCannonShotSfxSourceId);
}
}