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

All Changes

Browse Source
This commit is contained in:
Moses Troyer
2025-08-16 17:15:49 +00:00
committed by Banjo Kazooie
parent fd208f77ca
commit c2dd933d22
389 changed files with 7824 additions and 6965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/SM/ch/attacktutorial.c
View File

@@ -33,8 +33,8 @@ static void __chAttackTutorial_spawnEnemyActorForMarker(ActorMarker* marker, enu
s32 pad;
Actor *other = spawn_child_actor(enemy_id, &actor);
actor->unk100 = other->marker;
other->unk100 = actor->marker;
actor->partnerActor = other->marker;
other->partnerActor = actor->marker;
if (actor->unk10_12 == 3 && actor->unk38_31 == 1) {
other->unk38_31 = 1;
} else {
@@ -89,10 +89,10 @@ static void __chAttackTutorial_setState(Actor* this, enum ch_attack_tutorial_sta
case CH_ATTACK_TUTORIAL_STATE_5_SHOW_LEARN_MOVE_DIALOG:
if (this->unk10_12 == 0) {
ability_unlock(ABILITY_4_CLAW_SWIPE);
gcdialog_showText(ASSET_DFF_DIALOG_BOTTLES_CLAW_SWIPE_LEARN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnAbilityBasedOnDialog, __chAttackTutorial_advanceMarkToState2);
gcdialog_showDialog(ASSET_DFF_DIALOG_BOTTLES_CLAW_SWIPE_LEARN, 0xE, this->unk1C, this->marker, __chAttackTutorial_learnAbilityBasedOnDialog, __chAttackTutorial_advanceMarkToState2);
}
else{
gcdialog_showText(
gcdialog_showDialog(
(this->unk10_12 == VEGETABLE_1_TOPPER) ? ASSET_E15_DIALOG_ATTACK_TUTORIAL_FORWARD_ROLL : ASSET_E17_DIALOG_ATTACK_TUTORIAL_RATATAT_RAP,
0xE, this->unk1C, this->marker, __chAttackTutorial_learnAbilityBasedOnDialog, NULL
);
@@ -248,6 +248,6 @@ static void __chAttackTutorial_showDialogText(ActorMarker* marker) {
timed_setStaticCameraToNode(0.0f, 6);
}
gcdialog_showText(dialog_text, dialog_flag, actor->unk1C, actor->marker, __chAttackTutorial_handleDialog, NULL);
gcdialog_showDialog(dialog_text, dialog_flag, actor->unk1C, actor->marker, __chAttackTutorial_handleDialog, NULL);
actor->unk38_31++;
}

16
src/SM/ch/jumptutorial.c
View File

@@ -56,7 +56,7 @@ void chJumpTutorial_setState(Actor *this, s32 state) {
__chJumpTutorial_setStaticCameraToNode4(this);
ability_unlock(ABILITY_A_HOLD_A_JUMP_HIGHER);
gcdialog_showText(ASSET_DF6_DIALOG_BOTTLES_HIGH_JUMP_LEARN, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
gcdialog_showDialog(ASSET_DF6_DIALOG_BOTTLES_HIGH_JUMP_LEARN, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
this->sm_4070.dialog_id = ASSET_E1A_DIALOG_BOTTLES_UNKNOWN;
mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE);
}
@@ -107,12 +107,12 @@ void chJumpTutorial_update(Actor *this) {
break;
case JUMP_TUTORIAL_STATE_2_TEACHING://L8038A6C8
if (!func_803114B0()) {
if (!gcdialog_hasCurrentTextId()) {
if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED)) {
__chJumpTutorial_setStaticCameraToNode4(this);
ability_unlock(ABILITY_7_FEATHERY_FLAP);
gcdialog_showText(ASSET_DF7_DIALOG_BOTTLES_FEATHERY_FLAP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
gcdialog_showDialog(ASSET_DF7_DIALOG_BOTTLES_FEATHERY_FLAP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
this->sm_4070.dialog_id = ASSET_E1B_DIALOG_BOTTLES_UNKNOWN;
mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE);
}//L8038A730
@@ -121,12 +121,12 @@ void chJumpTutorial_update(Actor *this) {
__chJumpTutorial_setStaticCameraToNode4(this);
ability_unlock(ABILITY_8_FLAP_FLIP);
gcdialog_showText(ASSET_DF8_DIALOG_BOTTLES_FLAP_FLIP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
gcdialog_showDialog(ASSET_DF8_DIALOG_BOTTLES_FLAP_FLIP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
this->sm_4070.dialog_id = ASSET_E1C_DIALOG_BOTTLES_UNKNOWN;
mapSpecificFlags_set(SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED, FALSE);
}//L8038A794
if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_A)) {
if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_A_ABILITY_FLIP_UNLOCKED)) {
__chJumpTutorial_setStaticCameraToNode4(this);
func_8028F94C(2, this->unk1C);
@@ -138,8 +138,8 @@ void chJumpTutorial_update(Actor *this) {
dialog_id = ASSET_DF9_DIALOG_BOTTLES_UNKNOWN;
}
gcdialog_showText(dialog_id, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
mapSpecificFlags_set(SM_SPECIFIC_FLAG_A, FALSE);
gcdialog_showDialog(dialog_id, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL);
mapSpecificFlags_set(SM_SPECIFIC_FLAG_A_ABILITY_FLIP_UNLOCKED, FALSE);
this->sm_4070.dialog_id = NULL;
}
}//L8038A828
@@ -151,7 +151,7 @@ void chJumpTutorial_update(Actor *this) {
if (func_8028EFC8() && face_buttons[FACE_BUTTON(BUTTON_B)] == TRUE && func_8028F20C()) {
if (this->sm_4070.dialog_id) {
gcdialog_showText(dialog_id = this->sm_4070.dialog_id, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(dialog_id = this->sm_4070.dialog_id, 0, NULL, NULL, NULL, NULL);
}
}
break;

106
src/SM/ch/smbottles.c
View File

@@ -2,6 +2,8 @@
#include "functions.h"
#include "variables.h"
#include "core2/abilityprogress.h"
/* extern functions */
Actor *func_802D94B4(ActorMarker *, Gfx **, Mtx **, Vtx **);
void func_8028E668(f32 *, f32, f32, f32);
@@ -83,15 +85,15 @@ bool __chSmBottles_isAnySpiralMountainAbilityLearned(void) {
*/
void __chSmBottles_setHasUsedSpiralMountainAbilities(void) {
ability_unlock(ABILITY_3_CAMERA_CONTROL);
ability_setHasUsed(ABILITY_0_BARGE);
ability_setHasUsed(ABILITY_1_BEAK_BOMB);
ability_setHasUsed(ABILITY_2_BEAK_BUSTER);
ability_setHasUsed(ABILITY_3_CAMERA_CONTROL);
ability_setHasUsed(ABILITY_4_CLAW_SWIPE);
ability_setHasUsed(ABILITY_5_CLIMB);
ability_setHasUsed(ABILITY_B_RATATAT_RAP);
ability_setHasUsed(ABILITY_C_ROLL);
ability_setHasUsed(ABILITY_A_HOLD_A_JUMP_HIGHER);
ability_setHasUsed(ABILITY_USED_JUMP);
ability_setHasUsed(ABILITY_USED_FLAP);
ability_setHasUsed(ABILITY_USED_FLIP);
ability_setHasUsed(ABILITY_USED_SWIM);
ability_setHasUsed(ABILITY_USED_CLIMB);
ability_setHasUsed(ABILITY_USED_BEAK_BARGE);
ability_setHasUsed(ABILITY_USED_CLAW);
ability_setHasUsed(ABILITY_USED_TWIRL);
ability_setHasUsed(ABILITY_USED_PECK);
}
/**
@@ -116,11 +118,11 @@ void __chSmBottles_skipIntroTutorial(void) {
* camera that points to the lair. Otherwise, use the camera for the ability.
*/
void __chSmBottles_setStaticCameraToNode(Actor *this) {
if (this->unkF4_8 == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) {
if (this->actorTypeSpecificField == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) {
timed_setStaticCameraToNode(0.0f, 0x12);
}
else { //L80388F68
timed_setStaticCameraToNode(0.0f, chSmBottlesDialogTable[this->unkF4_8 - 1].camera_node);
timed_setStaticCameraToNode(0.0f, chSmBottlesDialogTable[this->actorTypeSpecificField - 1].camera_node);
}
}
@@ -150,7 +152,7 @@ void __chSmBottles_setState(Actor *this, s32 next_state) {
switch (next_state) {
case SM_BOTTLES_STATE_4_UNKNOWN:
other = subaddie_getLinkedActor(this);
molehillMarker = this->unk100;
molehillMarker = this->partnerActor;
if (molehillMarker && other && molehillMarker->id == 0xB8) {
subaddie_set_state_with_direction(other, 3, 0.0001f, 1);
@@ -160,7 +162,7 @@ void __chSmBottles_setState(Actor *this, s32 next_state) {
this->unk44_31 = sfxsource_createSfxsourceAndReturnIndex();
sfxsource_setSfxId(this->unk44_31, 0x3f9);
func_8030DD14(this->unk44_31, 2);
sfxSource_setunk43_7ByIndex(this->unk44_31, 2);
sfxsource_playSfxAtVolume(this->unk44_31, 1.4f);
sfxsource_setSampleRate(this->unk44_31, 0x6590);
@@ -183,7 +185,7 @@ void __chSmBottles_setState(Actor *this, s32 next_state) {
case SM_BOTTLES_STATE_2_UNKNOWN:
other = subaddie_getLinkedActor(this);
molehillMarker = this->unk100;
molehillMarker = this->partnerActor;
if (molehillMarker && other && molehillMarker->id == 0xB8) {
subaddie_set_state_with_direction(other, 2, 0.0001f, 1);
@@ -194,7 +196,7 @@ void __chSmBottles_setState(Actor *this, s32 next_state) {
this->unk44_31 = sfxsource_createSfxsourceAndReturnIndex();
sfxsource_setSfxId(this->unk44_31, 0x3f9);
func_8030DD14(this->unk44_31, 2);
sfxSource_setunk43_7ByIndex(this->unk44_31, 2);
sfxsource_playSfxAtVolume(this->unk44_31, 1.4f);
sfxsource_setSampleRate(this->unk44_31, 0x6590);
@@ -241,7 +243,7 @@ void __chSmBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 a
if (!mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && chmole_learnedAllSpiralMountainAbilities()) {
mapSpecificFlags_set(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED, TRUE);
gcdialog_showText(ASSET_E12_DIALOG_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, __chSmBottles_textCallback, NULL);
gcdialog_showDialog(ASSET_E12_DIALOG_BOTTLES_LEARNED_TUTORIAL_MOVES, 0xe, actor->position, actor->marker, __chSmBottles_textCallback, NULL);
}//L8038933C
else {
if (!(text_id == ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION || text_id == ASSET_E1F_DIALOG_BOTTLES_TUTORIAL_OFFER || text_id == ASSET_E1D_DIALOG_BOTTLES_TUTORIAL_OFFER_WAIT)) {
@@ -249,11 +251,11 @@ void __chSmBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 a
}
switch (text_id) {
case ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED:
case ASSET_D38_DIALOG_EMPTY:
break;
case ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION: /* 2FB8 803893A8 3C188039 */
gcdialog_showText(ASSET_E1F_DIALOG_BOTTLES_TUTORIAL_OFFER, 0x8e, actor->position, actor->marker, __chSmBottles_textCallback, __chSmBottles_textActions);
gcdialog_showDialog(ASSET_E1F_DIALOG_BOTTLES_TUTORIAL_OFFER, 0x8e, actor->position, actor->marker, __chSmBottles_textCallback, __chSmBottles_textActions);
break;
case ASSET_E1F_DIALOG_BOTTLES_TUTORIAL_OFFER: /* 2FEC 803893DC 9209003B */
@@ -277,7 +279,7 @@ void __chSmBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 a
default:
if (actor->state != SM_BOTTLES_STATE_5_UNKNOWN) {
gcdialog_showText(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0x4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_D38_DIALOG_EMPTY, 0x4, NULL, NULL, NULL, NULL);
}
__chSmBottles_setState(actor, actor->state == SM_BOTTLES_STATE_5_UNKNOWN ? SM_BOTTLES_STATE_1_UNKNOWN : SM_BOTTLES_STATE_4_UNKNOWN);
@@ -289,7 +291,7 @@ void __chSmBottles_textCallback(ActorMarker *marker, enum asset_e text_id, s32 a
void __chSmBottles_getRefresherDialog(Actor *this, s32 *text_id, s32 *text_flags) {
// Selects the learn and refresh dialogs.
// Gives the player the ability if not learned.
if (ability_isUnlocked(chSmBottlesDialogTable[this->unkF4_8 - 1].ability)) {
if (ability_isUnlocked(chSmBottlesDialogTable[this->actorTypeSpecificField - 1].ability)) {
if (fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL)) {
*text_id = chSmBottlesDialogIndex + ASSET_E0A_DIALOG_BOTTLES_REFUSE_HELP_1;
chSmBottlesDialogIndex++;
@@ -301,16 +303,16 @@ void __chSmBottles_getRefresherDialog(Actor *this, s32 *text_id, s32 *text_flags
}
else {//L8038956C
*text_flags |= 1;
*text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].refresher_text_id;
*text_id = chSmBottlesDialogTable[this->actorTypeSpecificField - 1].refresher_text_id;
if (*text_id == ASSET_DFE_DIALOG_BOTTLES_DIVE_REFRESHER && !ability_hasUsed(ABILITY_3_CAMERA_CONTROL)) {
if (*text_id == ASSET_DFE_DIALOG_BOTTLES_DIVE_REFRESHER && !ability_hasUsed(ABILITY_USED_SWIM)) {
*text_id = ASSET_DFD_DIALOG_BOTTLES_SWIM_LEARN;
}
}
}
else {//L803895C0
*text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].teach_text_id;
ability_unlock(chSmBottlesDialogTable[this->unkF4_8 - 1].ability);
*text_id = chSmBottlesDialogTable[this->actorTypeSpecificField - 1].teach_text_id;
ability_unlock(chSmBottlesDialogTable[this->actorTypeSpecificField - 1].ability);
}
}
@@ -321,7 +323,7 @@ void __chSmBottles_talk(Actor *this) {
text_flags = 0xe;
text_id = 0;
switch (this->unkF4_8) {
switch (this->actorTypeSpecificField) {
case 1://L8038965C
if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) {
text_flags |= 1;
@@ -332,11 +334,11 @@ void __chSmBottles_talk(Actor *this) {
chSmBottlesDialogIndex = MIN(chSmBottlesDialogIndex, 5);
}
else {//L803896C0
text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].refresher_text_id;
text_id = chSmBottlesDialogTable[this->actorTypeSpecificField - 1].refresher_text_id;
}
}
else {//L803896E8
text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].teach_text_id;
text_id = chSmBottlesDialogTable[this->actorTypeSpecificField - 1].teach_text_id;
mapSpecificFlags_set(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES, TRUE);
}
break;
@@ -361,11 +363,11 @@ void __chSmBottles_talk(Actor *this) {
}
else {//L803897C8
if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)) {
text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].refresher_text_id;
text_id = chSmBottlesDialogTable[this->actorTypeSpecificField - 1].refresher_text_id;
text_flags |= 1;
}
else {
text_id = chSmBottlesDialogTable[this->unkF4_8 - 1].teach_text_id;
text_id = chSmBottlesDialogTable[this->actorTypeSpecificField - 1].teach_text_id;
mapSpecificFlags_set(SM_SPECIFIC_FLAG_2, TRUE);
}
}
@@ -395,7 +397,7 @@ void __chSmBottles_talk(Actor *this) {
}//L80389904
if (text_id) {
gcdialog_showText(text_id, text_flags, this->position, this->marker, __chSmBottles_textCallback, __chSmBottles_textActions);
gcdialog_showDialog(text_id, text_flags, this->position, this->marker, __chSmBottles_textCallback, __chSmBottles_textActions);
}
}
@@ -409,7 +411,7 @@ void __chSmBottles_spawnMolehill(ActorMarker *marker) {
this = marker_getActor(marker);
molehill = spawn_child_actor(ACTOR_12C_MOLEHILL, &this);
this->unk100 = molehill->marker;
this->partnerActor = molehill->marker;
if (marker);
}
@@ -431,7 +433,7 @@ void chSmBottles_update(Actor *this) {
// Checks the actor's selector value is lower than 0x9
// Anything higher is a non-Spiral Mountain ability, and should use a different actor id
if (this->unkF4_8 >= 9) {
if (this->actorTypeSpecificField >= 9) {
return;
}
@@ -441,7 +443,7 @@ void chSmBottles_update(Actor *this) {
this->initialized = TRUE;
marker_setFreeMethod(this->marker, __chSmBottles_free);
if (this->unkF4_8 == 1 || this->unkF4_8 == 8) {//L80389A30
if (this->actorTypeSpecificField == 1 || this->actorTypeSpecificField == 8) {//L80389A30
sp40 = nodeprop_findByActorIdAndActorPosition(ACTOR_349_UNKNOWN, this);
if (!sp40) {
@@ -455,7 +457,7 @@ void chSmBottles_update(Actor *this) {
this->actor_specific_1_f = nodeprop_getRadius(sp40);
}//L80389A8C
if (this->unkF4_8 == 1) {
if (this->actorTypeSpecificField == 1) {
if (volatileFlag_get(VOLATILE_FLAG_1) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) {
__chSmBottles_setState(this, SM_BOTTLES_STATE_3_UNKNOWN);
}
@@ -491,14 +493,14 @@ void chSmBottles_update(Actor *this) {
this->yaw_ideal = (f32) func_80329784(this);
func_80328FB0(this, 4.0f);
if ((this->unkF4_8 == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) ||
(this->unkF4_8 == 8 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)) ||
(this->unkF4_8 == 8 && mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F))
if ((this->actorTypeSpecificField == 1 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) ||
(this->actorTypeSpecificField == 8 && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_2)) ||
(this->actorTypeSpecificField == 8 && mapSpecificFlags_get(SM_SPECIFIC_FLAG_3_ALL_SM_ABILITIES_LEARNED) && !mapSpecificFlags_get(SM_SPECIFIC_FLAG_F))
) {//L80389C50
if (((ml_vec3f_distance(plyr_pos, this->unk1C) < this->actor_specific_1_f) && func_8028F20C()) ||
mapSpecificFlags_get(SM_SPECIFIC_FLAG_10)
) {//L80389C8C
if (func_80329530(this, 0x96)) {
if (subaddie_playerIsWithinSphereAndActive(this, 0x96)) {
func_8028F45C(9, this->position);
}
@@ -507,20 +509,20 @@ void chSmBottles_update(Actor *this) {
}
}
else {//L80389CBC
if (!func_80329530(this, 0xfa) || player_movementGroup() || !func_8028F20C() || func_8028EC04()) {
if (!subaddie_playerIsWithinSphereAndActive(this, 0xfa) || player_movementGroup() || !func_8028F20C() || func_8028EC04()) {
break;
}
sp34 = (chSmBottlesDialogTable[this->unkF4_8 - 1].ability + 1) && ability_isUnlocked(chSmBottlesDialogTable[this->unkF4_8 - 1].ability);
sp34 = (chSmBottlesDialogTable[this->actorTypeSpecificField - 1].ability + 1) && ability_isUnlocked(chSmBottlesDialogTable[this->actorTypeSpecificField - 1].ability);
if (!sp34 && this->unkF4_8 != 1 || fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL) == 0 || chSmBottlesDialogIndex < 6) {
if (this->unkF4_8 != 8 || !fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)) {
if (!sp34 && this->actorTypeSpecificField != 1 || fileProgressFlag_get(FILEPROG_DB_SKIPPED_TUTORIAL) == 0 || chSmBottlesDialogIndex < 6) {
if (this->actorTypeSpecificField != 8 || !fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)) {
if (func_8028EFC8() && face_buttons[FACE_BUTTON(BUTTON_B)] == 1) {
if (sp34 || this->unkF4_8 == 1 || this->unkF4_8 == 8) {
if (sp34 || this->actorTypeSpecificField == 1 || this->actorTypeSpecificField == 8) {
__chSmBottles_setState(this, SM_BOTTLES_STATE_5_UNKNOWN);
}
else {
if (func_80329530(this, 0x96) && !sp34) {
if (subaddie_playerIsWithinSphereAndActive(this, 0x96) && !sp34) {
func_8028F45C(9, this->position);
}
@@ -537,7 +539,7 @@ void chSmBottles_update(Actor *this) {
func_80328FB0(this, 4.0f);
if (0.0 < anctrl_getAnimTimer(this->anctrl) && anctrl_getAnimTimer(this->anctrl) < 0.16) {
func_8030E2C4(this->unk44_31);
sfxSource_func_8030E2C4(this->unk44_31);
}//L80389EA0
if (actor_animationIsAt(this, 0.9999f)) {
@@ -548,13 +550,13 @@ void chSmBottles_update(Actor *this) {
__chSmBottles_setState(this, SM_BOTTLES_STATE_3_UNKNOWN);
}//L80389EE0
else if (actor_animationIsAt(this, 0.14f)) {
FUNC_8030E8B4(SFX_C6_SHAKING_MOUTH, 1.2f, 24000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_C6_SHAKING_MOUTH, 1.2f, 24000, this->position, 1250, 2500);
}
else if (actor_animationIsAt(this, 0.4f)) { //L80389F14
FUNC_8030E8B4(SFX_2C_PULLING_NOISE, 1.2f, 24000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_2C_PULLING_NOISE, 1.2f, 24000, this->position, 1250, 2500);
}
else if (actor_animationIsAt(this, 0.75f)) {//L80389F48
FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1250, 2500);
}
else if (actor_animationIsAt(this, 0.35f)) {//L80389F78
if (mapSpecificFlags_get(SM_SPECIFIC_FLAG_1_TALKED_TO_BOTTLES)) {
@@ -599,7 +601,7 @@ void chSmBottles_update(Actor *this) {
if (this->unk38_0) {
this->lifetime_value += time_getDelta();
if (func_803114C4() != 0xe1d) {
if (gcdialog_getCurrentTextId() != 0xe1d) {
if (face_buttons[FACE_BUTTON(BUTTON_A)] == TRUE) {
bakey_pressed = 1;
}
@@ -610,7 +612,7 @@ void chSmBottles_update(Actor *this) {
if (bakey_pressed != -1) {
fileProgressFlag_set(FILEPROG_DB_SKIPPED_TUTORIAL, bakey_pressed ? 0 : 1);
gcdialog_showText(bakey_pressed ? ASSET_E07_DIALOG_BOTTLES_UNKNOWN : ASSET_E09_DIALOG_BOTTLES_SKIPPED_TUTORIAL, 0xe, this->position, this->marker, __chSmBottles_textCallback,__chSmBottles_textActions);
gcdialog_showDialog(bakey_pressed ? ASSET_E07_DIALOG_BOTTLES_UNKNOWN : ASSET_E09_DIALOG_BOTTLES_SKIPPED_TUTORIAL, 0xe, this->position, this->marker, __chSmBottles_textCallback,__chSmBottles_textActions);
if (!bakey_pressed) {
__chSmBottles_skipIntroTutorial();
@@ -619,7 +621,7 @@ void chSmBottles_update(Actor *this) {
this->unk38_0 = FALSE;
}
else if (!this->has_met_before && 5.0 < this->lifetime_value) {
gcdialog_showText(ASSET_E1D_DIALOG_BOTTLES_TUTORIAL_OFFER_WAIT, 0x86, this->position, this->marker, __chSmBottles_textCallback, NULL);
gcdialog_showDialog(ASSET_E1D_DIALOG_BOTTLES_TUTORIAL_OFFER_WAIT, 0x86, this->position, this->marker, __chSmBottles_textCallback, NULL);
this->has_met_before = TRUE;
}
}
@@ -627,7 +629,7 @@ void chSmBottles_update(Actor *this) {
case SM_BOTTLES_STATE_4_UNKNOWN: //L8038A31C
if (0.35 < anctrl_getAnimTimer(this->anctrl) && anctrl_getAnimTimer(this->anctrl) < 0.9) {
func_8030E2C4(this->unk44_31);
sfxSource_func_8030E2C4(this->unk44_31);
}
else if (actor_animationIsAt(this, 0.9999f)) { //L8038A378
__chSmBottles_setState(this, SM_BOTTLES_STATE_1_UNKNOWN);

8
src/SM/ch/vegetables.c
View File

@@ -202,7 +202,7 @@ static void __chVegetables_vegetableDeathParticles(Actor* this) {
sChVegetable* local = (sChVegetable*)&this->local;
f32 particles_position[3];
FUNC_8030E8B4(SFX_111_WHIPCRACK_DEATH, 1.0f, 32000, this->position, 1000, 2000);
sfx_playFadeShorthandDefault(SFX_111_WHIPCRACK_DEATH, 1.0f, 32000, this->position, 1000, 2000);
if (local->vegetable_type == CH_VEGETABLE_3_COLLIWOBBLE) {
particles_position[0] = this->position_x;
particles_position[1] = this->position_y;
@@ -379,7 +379,7 @@ static void __chVegetables_update(Actor* this) {
if (!this->unk138_23) {
if (0.0f < this->position_y) {
FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1000, 2000);
sfx_playFadeShorthandDefault(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1000, 2000);
this->unk138_23 = 1;
this->scale = 1.0f;
}
@@ -490,10 +490,10 @@ static void __chVegetables_update(Actor* this) {
func_80328FB0(this, 2.0f);
if (local->vegetable_type != CH_VEGETABLE_3_COLLIWOBBLE && actor_animationIsAt(this, 0.3f))
FUNC_8030E8B4(SFX_3F2_UNKNOWN, 1.0f, 22000, this->position, 1000, 2000);
sfx_playFadeShorthandDefault(SFX_3F2_UNKNOWN, 1.0f, 22000, this->position, 1000, 2000);
if (local->vegetable_type == CH_VEGETABLE_3_COLLIWOBBLE && actor_animationIsAt(this, 0.4f))
FUNC_8030E8B4(SFX_2_CLAW_SWIPE, 0.9f, 8000, this->position, 1000, 2000);
sfx_playFadeShorthandDefault(SFX_2_CLAW_SWIPE, 0.9f, 8000, this->position, 1000, 2000);
break;
case CH_VEGETABLES_STATE_3_UNKNOWN: