From 77f4bec4bc6bc3ab5c8e07d268124d108a72eef3 Mon Sep 17 00:00:00 2001 From: Reonu Date: Fri, 22 Jul 2022 15:20:29 +0100 Subject: [PATCH] Delete config_interaction.h (#440) --- include/config.h | 1 - include/config/config_interaction.h | 14 -------------- include/config/config_movement.h | 9 +++++++++ 3 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 include/config/config_interaction.h diff --git a/include/config.h b/include/config.h index 9c6dd908..c4fc3e2b 100644 --- a/include/config.h +++ b/include/config.h @@ -14,7 +14,6 @@ #include "config/config_game.h" #include "config/config_goddard.h" #include "config/config_graphics.h" -#include "config/config_interaction.h" #include "config/config_menu.h" #include "config/config_movement.h" #include "config/config_objects.h" diff --git a/include/config/config_interaction.h b/include/config/config_interaction.h deleted file mode 100644 index 3cf48eed..00000000 --- a/include/config/config_interaction.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -/************************ - * INTERACTION SETTINGS * - ************************/ - -// Various interaction related settings, bug fixes or QoL changes - -/** - * This fixes a bug which allows mario to move when initiating - * a dialog. just as long as mario doesn't enter an action that - * can be interrupted with text. - */ -// #define BUGFIX_DIALOG_TIME_STOP diff --git a/include/config/config_movement.h b/include/config/config_movement.h index 6fa9ff7f..4d909c11 100644 --- a/include/config/config_movement.h +++ b/include/config/config_movement.h @@ -82,3 +82,12 @@ // Re-enables upwarping when entering water. Forces you to only enter water from the top. // #define WATER_PLUNGE_UPWARP + +/** + * This bug allows mario to move when initiating a dialog, + * just as long as mario doesn't enter an action that can + * be interrupted with text + * Uncomment this to fix this bug, and frustrate speedrunners + */ +// #define BUGFIX_DIALOG_TIME_STOP +