All Changes
This commit is contained in:
committed by
Banjo Kazooie
parent
fd208f77ca
commit
c2dd933d22
@@ -63,7 +63,7 @@ void chGobi1_setState(Actor *this, s32 next_state){
|
||||
}
|
||||
|
||||
if(this->state == 6){
|
||||
FUNC_8030E8B4(SFX_84_GOBI_CRYING, 0.9f, 20000, this->position, 1500, 2500);
|
||||
sfx_playFadeShorthandDefault(SFX_84_GOBI_CRYING, 0.9f, 20000, this->position, 1500, 2500);
|
||||
skeletalAnim_set(this->unk148, 0x241, 0.2f, 0.5f);
|
||||
}
|
||||
}
|
||||
@@ -140,14 +140,14 @@ void chGobi1_update(Actor *this){
|
||||
sp6C = 5;
|
||||
|
||||
if(ml_timer_update(&local->unkC, tick))
|
||||
FUNC_8030E8B4(SFX_84_GOBI_CRYING, 0.9f, 32000, this->position, 1500, 2500);
|
||||
sfx_playFadeShorthandDefault(SFX_84_GOBI_CRYING, 0.9f, 32000, this->position, 1500, 2500);
|
||||
|
||||
if(ml_timer_update(&local->unk10, tick)){
|
||||
for(i = 0; i < 2; i++){
|
||||
sfxsource_setSfxId(local->unk0[i], SFX_3F9_UNKNOWN);
|
||||
func_8030DD14(local->unk0[i], 3);
|
||||
sfxSource_setunk43_7ByIndex(local->unk0[i], 3);
|
||||
sfxsource_setSampleRate(local->unk0[i], 32000);
|
||||
func_8030E2C4(local->unk0[i]);
|
||||
sfxSource_func_8030E2C4(local->unk0[i]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -177,10 +177,10 @@ void chGobi1_update(Actor *this){
|
||||
|
||||
if(this->state == 1 || this->state == 2){
|
||||
if( !this->has_met_before
|
||||
&& func_80329530(this, 250)
|
||||
&& !func_80329530(this, 80)
|
||||
&& subaddie_playerIsWithinSphereAndActive(this, 250)
|
||||
&& !subaddie_playerIsWithinSphereAndActive(this, 80)
|
||||
&& func_8028F2A0()
|
||||
&& gcdialog_showText(0xa73, 0, NULL, NULL, NULL, NULL)
|
||||
&& gcdialog_showDialog(0xa73, 0, NULL, NULL, NULL, NULL)
|
||||
){
|
||||
this->has_met_before = TRUE;
|
||||
}
|
||||
|
Reference in New Issue
Block a user