mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-24 21:15:12 +00:00
Restore vanilla Eyerok boss dialog
This commit is contained in:
parent
d66cbf6dfc
commit
d5ec52fcc2
1 changed files with 5 additions and 5 deletions
|
@ -118,16 +118,16 @@ static void eyerok_boss_act_wake_up(void) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
u8 eyerok_boss_act_show_intro_text_continue_dialog(void) { return o->oAction == EYEROK_BOSS_ACT_SHOW_INTRO_TEXT; }
|
static u8 eyerok_boss_act_show_intro_text_continue_dialog(void) {
|
||||||
|
return o->oAction == EYEROK_BOSS_ACT_SHOW_INTRO_TEXT;
|
||||||
|
}
|
||||||
|
|
||||||
static void eyerok_boss_act_show_intro_text(void) {
|
static void eyerok_boss_act_show_intro_text(void) {
|
||||||
// todo: get dialog working again
|
struct MarioState* marioState = nearest_mario_state_to_object(o);
|
||||||
/*struct MarioState* marioState = nearest_mario_state_to_object(o);
|
|
||||||
if (should_start_or_continue_dialog(marioState, o) && cur_obj_update_dialog_with_cutscene(&gMarioStates[0], 2, 0, CUTSCENE_DIALOG, gBehaviorValues.dialogs.EyerokIntroDialog, eyerok_boss_act_show_intro_text_continue_dialog)) {
|
if (should_start_or_continue_dialog(marioState, o) && cur_obj_update_dialog_with_cutscene(&gMarioStates[0], 2, 0, CUTSCENE_DIALOG, gBehaviorValues.dialogs.EyerokIntroDialog, eyerok_boss_act_show_intro_text_continue_dialog)) {
|
||||||
o->oAction = EYEROK_BOSS_ACT_FIGHT;
|
o->oAction = EYEROK_BOSS_ACT_FIGHT;
|
||||||
network_send_object_reliability(o, TRUE);
|
network_send_object_reliability(o, TRUE);
|
||||||
}*/
|
}
|
||||||
o->oAction = EYEROK_BOSS_ACT_FIGHT;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void eyerok_boss_act_fight(void) {
|
static void eyerok_boss_act_fight(void) {
|
||||||
|
|
Loading…
Reference in a new issue