Koopa shell boxes respawn

This commit is contained in:
Arceveti
2021-09-25 11:28:13 -07:00
parent 3a6c577a41
commit c93dfc6226
4 changed files with 7 additions and 2 deletions

View File

@@ -219,7 +219,6 @@ void spawn_sparkle_particles(s32 n, s32 radius, s32 height, s32 r) {
#include "behaviors/lll_hexagonal_ring.inc.c"
#include "behaviors/lll_sinking_rectangle.inc.c"
#include "behaviors/tilting_inverted_pyramid.inc.c"
#include "behaviors/koopa_shell.inc.c"
#include "behaviors/tox_box.inc.c"
#include "behaviors/piranha_plant.inc.c"
#include "behaviors/bowser_puzzle_piece.inc.c"

View File

@@ -125,7 +125,7 @@ void exclamation_box_act_4(void) {
spawn_mist_particles_variable(0, 0, 46.0f);
spawn_triangle_break_particles(20, MODEL_CARTOON_STAR, 0.3f, o->oAnimState);
create_sound_spawner(SOUND_GENERAL_BREAK_BOX);
if (o->oBehParams2ndByte < 3) {
if (o->oBehParams2ndByte < 4) {
o->oAction = 5;
cur_obj_hide();
} else

View File

@@ -12,6 +12,10 @@ struct ObjectHitbox sKoopaShellHitbox = {
/* hurtboxHeight: */ 50,
};
void shell_despawn(void) {
if (o->oTimer > 300) obj_flicker_and_disappear(o, 300);
}
void koopa_shell_spawn_water_drop(void) {
struct Object *drop;
spawn_object(o, MODEL_WAVE_TRAIL, bhvObjectWaveTrail);
@@ -63,6 +67,7 @@ void bhv_koopa_shell_loop(void) {
o->oFaceAngleYaw += 0x1000;
cur_obj_move_standard(-20);
koopa_shell_spawn_sparkles(10.0f);
shell_despawn();
break;
case 1:
obj_copy_pos(o, gMarioObject);

View File

@@ -829,6 +829,7 @@ s8 UNUSED debug_sequence_tracker(s16 debugInputSequence[]) {
#include "behaviors/snowman.inc.c"
#include "behaviors/boulder.inc.c"
#include "behaviors/cap.inc.c"
#include "behaviors/koopa_shell.inc.c"
#include "behaviors/spawn_star.inc.c"
#include "behaviors/red_coin.inc.c"
#include "behaviors/hidden_star.inc.c"