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

Prevent mother tuxie softlock

Browse source 
Fixes #6
This commit is contained in:
MysterD 2020-09-19 16:43:37 -07:00
parent 04738fedd9
commit 9f8fe804ca
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/behaviors/tuxie.inc.c
View file

@ -12,7 +12,7 @@ void play_penguin_walking_sound(s32 walk) {
} }
void tuxies_mother_act_2(void) { 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); int angleToPlayer = obj_angle_to_object(o, player);
f32 sp24; f32 sp24;
@ -62,7 +62,7 @@ void tuxies_mother_act_1(void) {
dialogID = DIALOG_058; dialogID = DIALOG_058;
else else
dialogID = DIALOG_059; 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) if (dialogID == DIALOG_058)
o->oSubAction = 1; o->oSubAction = 1;
else else
@ -132,7 +132,7 @@ void tuxies_mother_act_0(void) {
o->oSubAction++; o->oSubAction++;
break; break;
case 1: 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++; o->oSubAction++;
break; break;
case 2: case 2: