From 4c81438a486ef5432cae300d1b48ee3b85ccf8cc Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sat, 19 Sep 2020 16:43:37 -0700
Subject: [PATCH] Prevent mother tuxie softlock

Fixes #6
---
 src/game/behaviors/tuxie.inc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/behaviors/tuxie.inc.c b/src/game/behaviors/tuxie.inc.c
index 9b684adc..118bf01c 100644
--- a/src/game/behaviors/tuxie.inc.c
+++ b/src/game/behaviors/tuxie.inc.c
@@ -12,7 +12,7 @@ void play_penguin_walking_sound(s32 walk) {
 }
 
 void tuxies_mother_act_2(void) {
-    struct Object* player = nearest_player_to_object(o);
+    struct Object* player = gMarioStates[0].marioObj;
     int angleToPlayer = obj_angle_to_object(o, player);
 
     f32 sp24;
@@ -62,7 +62,7 @@ void tuxies_mother_act_1(void) {
                     dialogID = DIALOG_058;
                 else
                     dialogID = DIALOG_059;
-                if (nearest_mario_state_to_object(o) == &gMarioStates[0] && cur_obj_update_dialog_with_cutscene(marioState, 2, 1, CUTSCENE_DIALOG, dialogID, tuxies_mother_act_1_continue_dialog)) {
+                if (cur_obj_update_dialog_with_cutscene(marioState, 2, 1, CUTSCENE_DIALOG, dialogID, tuxies_mother_act_1_continue_dialog)) {
                     if (dialogID == DIALOG_058)
                         o->oSubAction = 1;
                     else
@@ -132,7 +132,7 @@ void tuxies_mother_act_0(void) {
                         o->oSubAction++;
                 break;
             case 1:
-                if (nearest_mario_state_to_object(o) == &gMarioStates[0] && cur_obj_update_dialog_with_cutscene(marioState, 2, 1, CUTSCENE_DIALOG, DIALOG_057, tuxies_mother_act_0_continue_dialog))
+                if (cur_obj_update_dialog_with_cutscene(marioState, 2, 1, CUTSCENE_DIALOG, DIALOG_057, tuxies_mother_act_0_continue_dialog))
                     o->oSubAction++;
                 break;
             case 2: