etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 03:55:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed wiggler dialog crash

Browse source
This commit is contained in:
MysterD 2022-04-14 19:40:37 -07:00
parent 105907cd71
commit 6b46a04030
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/behaviors/wiggler.inc.c
View file

@ -311,9 +311,10 @@ static void wiggler_act_jumped_on(void) {
// Wait for a second after unsquishing, then show text and either shrink (if
// defeated) or go back to walking
s16 dialogIndex = (o->oHealth - 2);
if (o->header.gfx.scale[1] >= 4.0f) {
if (o->oTimer > 30) {
if (should_start_or_continue_dialog(marioState, o) && cur_obj_update_dialog_with_cutscene(marioState, 2, 0, CUTSCENE_DIALOG, *attackText[o->oHealth - 2], wiggler_act_jumped_on_continue_dialog) != 0) {
if ((dialogIndex >= 0 && dialogIndex <= 2) && should_start_or_continue_dialog(marioState, o) && cur_obj_update_dialog_with_cutscene(marioState, 2, 0, CUTSCENE_DIALOG, *attackText[dialogIndex], wiggler_act_jumped_on_continue_dialog) != 0) {
// Because we don't want the wiggler to disappear after being
// defeated, we leave its health at 1
if (--o->oHealth <= 1) {